From: WANG Xuerui <kernel@xen0n.name>
To: Paolo Bonzini <pbonzini@redhat.com>, Huacai Chen <chenhuacai@kernel.org>
Cc: Tianrui Zhao <zhaotianrui@loongson.cn>,
Bibo Mao <maobibo@loongson.cn>,
kvm@vger.kernel.org, loongarch@lists.linux.dev,
linux-kernel@vger.kernel.org, WANG Xuerui <git@xen0n.name>
Subject: [PATCH for-6.8 5/5] KVM: LoongArch: Clean up comments of _kvm_get_cpucfg_mask and kvm_check_cpucfg
Date: Wed, 14 Feb 2024 18:15:57 +0800 [thread overview]
Message-ID: <20240214101557.2900512-6-kernel@xen0n.name> (raw)
In-Reply-To: <20240214101557.2900512-1-kernel@xen0n.name>
From: WANG Xuerui <git@xen0n.name>
Remove comments that are merely restatement of the code nearby, and
paraphrase the rest so they read more natural for English speakers (that
lack understanding of Chinese grammar). No functional changes.
Signed-off-by: WANG Xuerui <git@xen0n.name>
---
arch/loongarch/kvm/vcpu.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c
index 9e108ffaba30..ff51d6ba59aa 100644
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -302,20 +302,14 @@ 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.
- */
+ /* If LSX 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.
- */
+ /* Same with LASX */
if (cpu_has_lasx)
*v |= CPUCFG2_LASX;
@@ -336,21 +330,23 @@ static int kvm_check_cpucfg(int id, u64 val)
switch (id) {
case 2:
- /* CPUCFG2 features checking */
if (val & ~mask)
- /* The unsupported features should not be set */
+ /* Unsupported features should not be set */
return -EINVAL;
if (!(val & CPUCFG2_LLFTP))
- /* The LLFTP must be set, as guest must has a constant timer */
+ /* 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 enable FP */
+ /* Single and double float point must both be set when FP is enabled */
return -EINVAL;
if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP))
- /* FP should be set when enable LSX */
+ /* LSX is architecturally defined to imply FP */
return -EINVAL;
if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX))
- /* LSX, FP should be set when enable LASX, and FP has been checked before. */
+ /*
+ * LASX is architecturally defined to imply LSX and FP
+ * FP is checked just above
+ */
return -EINVAL;
return 0;
default:
--
2.43.0
next prev parent reply other threads:[~2024-02-14 10:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 10:15 [PATCH for-6.8 0/5] KVM: LoongArch: Fix wrong CPUCFG ID handling WANG Xuerui
2024-02-14 10:15 ` [PATCH for-6.8 1/5] KVM: LoongArch: Fix input value checking of _kvm_get_cpucfg WANG Xuerui
2024-02-14 10:15 ` [PATCH for-6.8 2/5] KVM: LoongArch: Fix kvm_check_cpucfg incorrectly accepting bad CPUCFG IDs WANG Xuerui
2024-02-14 10:15 ` [PATCH for-6.8 3/5] KVM: LoongArch: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask WANG Xuerui
2024-02-14 10:15 ` [PATCH for-6.8 4/5] KVM: LoongArch: Streamline control flow of kvm_check_cpucfg WANG Xuerui
2024-02-14 13:06 ` Huacai Chen
2024-02-14 10:15 ` WANG Xuerui [this message]
2024-02-14 13:08 ` [PATCH for-6.8 5/5] KVM: LoongArch: Clean up comments of _kvm_get_cpucfg_mask and kvm_check_cpucfg Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240214101557.2900512-6-kernel@xen0n.name \
--to=kernel@xen0n.name \
--cc=chenhuacai@kernel.org \
--cc=git@xen0n.name \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loongarch@lists.linux.dev \
--cc=maobibo@loongson.cn \
--cc=pbonzini@redhat.com \
--cc=zhaotianrui@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox