From patchwork Thu Feb 22 10:51:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 204679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp169753dyb; Thu, 22 Feb 2024 02:54:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1lWXrtyUWRl105suIht+y+SglzzxMb/gHAtCRuB0vbzb/usY8VozJW0/jNnxd2xSZl28NnKRathKeIyoc0+BnW+KXnQ== X-Google-Smtp-Source: AGHT+IGjwnrpl3stW4pTs1eyUedZ7Y4vzqduxPddTdNdkVUdKzUO8mfZnQzwfMF6Mtpcsv3mjOfk X-Received: by 2002:a05:6a21:3994:b0:19e:c7d8:6246 with SMTP id ad20-20020a056a21399400b0019ec7d86246mr23166002pzc.13.1708599273964; Thu, 22 Feb 2024 02:54:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708599273; cv=pass; d=google.com; s=arc-20160816; b=u+jOP4d1vusGjzrrgRh/IS7d50p/8cu5llufge/ASugf5UaPf90CFJJQRi8lFqU3dG IQvVpXmflO1OVGlwdz13aKxXwCjWtkKo5GLNKbnRBM28kuHVYkHt/9HEEO69lp4q8NMY 7+XltqcIt1IK/GBp9mjE8jwb2vV/Tc3e0ZpsIFvbfOCb8TOxbGUqHgAtAXaxfCWi2gJT 6jBszeyRbU5CR8sK249iI7Q3KWQhJ9XnrlFeYtNrI8C43DYDA/8klq9uVjE9qc5ccIWx cJw3Mbc8/pfR1IEdaKNddU2+UV/sEY5TSNt1WAeI6JStt9ZXLPMQiw5mIHuOm3RZqMYh Zbvg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=C+0Ge+cJ+LpgrqLewl6HK6oug7J0T5MjPLVvoIIdaGk=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=OyHZlXZtG3QvRP57add4RA7ZUsp/6W9Ci+X6jU5JKwSCzltOd6dPjaQsNvAWaOj7xL 9aXExOb3/V5URM5guNjNIpF5+WU6Pm+3jwH1P7k3DOQWVkbPFhXbPPs2TlQvrgspJwx3 My7rO13aoKVqG3j+J6rbFuRNJXD+y1OynmqqpLAS2zYSMoSjg48u7B++jrjPo5Xyv/PO 9AIy9YSVVJJ3YbC/TB+ftX0APdoQxNkkXD641xEDrbjeFfo+bghQczgFsvsCzD/bxBy+ QW93Z+HOmuqhRi7w6spAgRmjvnbY0LkvqbQxb67rFI5OVRiyk2XUUIspUO+j8XUg30Wb prBw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=SkrHJcYL; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w16-20020a170902e89000b001dbf91098bdsi7120710plg.369.2024.02.22.02.54.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:54:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=SkrHJcYL; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C4392287B21 for ; Thu, 22 Feb 2024 10:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C30F54D5A6; Thu, 22 Feb 2024 10:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="SkrHJcYL" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80E0A3EA97; Thu, 22 Feb 2024 10:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599082; cv=none; b=MUPN5aqGWu5c1MHLgXMjhoTxAtOys7ThjDyoe1QYhN/feGWA4F09wkw1abpGSi1dB1bWzVz8JPbZguQsWOcmIOE6LKtFp0kv9wSkIGxEqV7GBQH7zluluy4YFTzQgegOe+XcwCBdM9XZE07PrxvIevpj/SmDfVWGtM+V1kyQSeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599082; c=relaxed/simple; bh=VJZfbAVi6WlL1YN41uqTvRQi/gfcPVL7ShPRTBNjidw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Op4qyLs1oD2ENuVGdBFDbGRCqWBw+7Vv/nVXXUc3BXfkXSRVYmM+7JgKBTLg68xxI/3OrCKBe55U4UZbTCVXOtcFrKJAbQSTrL8WwIHKbLH0Rxvdbjv+gL10zPf6lZI9UabHDNpIZJbAKNyT2kKEYz9DVPmqBp71XBUILVdYdA8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=SkrHJcYL; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1708599078; bh=VJZfbAVi6WlL1YN41uqTvRQi/gfcPVL7ShPRTBNjidw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SkrHJcYLlHbX9i49HFsfw3cdsjRm/JmT+e1KQlpmqpjdVg2V58AoaatShElR/C+GJ vpUM6YifqA9gquqPIAIBaAcbcm0LEE7jOPk98Q7wLDFVExVnE9a1vwrBkMZIYvDbzp Z9U6m+DZ1BON8R1UMnKqFs3CAokYPzeQOJj06Vtk= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:58fe:4c0e:8c24:2aff]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id 4A45460562; Thu, 22 Feb 2024 18:51:18 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v4 3/3] LoongArch: KVM: Streamline kvm_check_cpucfg and improve comments Date: Thu, 22 Feb 2024 18:51:09 +0800 Message-ID: <20240222105109.2042732-4-kernel@xen0n.name> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222105109.2042732-1-kernel@xen0n.name> References: <20240222105109.2042732-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791596192210627954 X-GMAIL-MSGID: 1791596192210627954 From: WANG Xuerui All the checks currently done in kvm_check_cpucfg can be realized with early returns, so just do that to avoid extra cognitive burden related to the return value handling. While at it, clean up comments of _kvm_get_cpucfg_mask and kvm_check_cpucfg, by removing comments that are merely restatement of the code nearby, and paraphrasing the rest so they read more natural for English speakers (that likely are not familiar with the actual Chinese-influenced grammar). No functional changes intended. Signed-off-by: WANG Xuerui Reviewed-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 42 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 9f63bbaf19c1..128b89d00ced 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -305,20 +305,16 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v) switch (id) { case 2: - /* Return CPUCFG2 features which have been supported by KVM */ + /* CPUCFG2 features unconditionally supported by KVM */ *v = CPUCFG2_FP | CPUCFG2_FPSP | CPUCFG2_FPDP | CPUCFG2_FPVERS | CPUCFG2_LLFTP | CPUCFG2_LLFTPREV | CPUCFG2_LAM; /* - * If LSX is supported by CPU, it is also supported by KVM, - * as we implement it. + * For the ISA extensions listed below, if one is supported + * by the host, then it is also supported by KVM. */ if (cpu_has_lsx) *v |= CPUCFG2_LSX; - /* - * if LASX is supported by CPU, it is also supported by KVM, - * as we implement it. - */ if (cpu_has_lasx) *v |= CPUCFG2_LASX; @@ -349,24 +345,26 @@ static int kvm_check_cpucfg(int id, u64 val) switch (id) { case 2: - /* CPUCFG2 features checking */ if (!(val & CPUCFG2_LLFTP)) - /* The LLFTP must be set, as guest must has a constant timer */ - ret = -EINVAL; - else if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) - /* Single and double float point must both be set when enable FP */ - ret = -EINVAL; - else if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP)) - /* FP should be set when enable LSX */ - ret = -EINVAL; - else if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX)) - /* LSX, FP should be set when enable LASX, and FP has been checked before. */ - ret = -EINVAL; - break; + /* Guests must have a constant timer */ + return -EINVAL; + if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) + /* Single and double float point must both be set when FP is enabled */ + return -EINVAL; + if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP)) + /* LSX architecturally implies FP but val does not satisfy that */ + return -EINVAL; + if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX)) + /* LASX architecturally implies LSX and FP but val does not satisfy that */ + return -EINVAL; + return 0; default: - break; + /* + * Values for the other CPUCFG IDs are not being further validated + * besides the mask check above. + */ + return 0; } - return ret; } static int kvm_get_one_reg(struct kvm_vcpu *vcpu,