| Message ID | 20240222105109.2042732-3-kernel@xen0n.name |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id
by22csp171025dyb;
Thu, 22 Feb 2024 02:57:50 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCXb6TZWUmpqPEYIE30a5+02HIoAibKd3RYd54phU9NmpcEoKeATW1MWcgVdrVLA/yKPefqsNUGhgYwVzYHAkm4MqNq1Uw==
X-Google-Smtp-Source:
AGHT+IH6662ZTjuytSH7RzzXa4hDCYyfKIG3ZUE2Calb18pd5PEdeA21hjVjFCk/F8eP0dE/vy2t
X-Received: by 2002:a17:90b:386:b0:299:10d8:31cb with SMTP id
ga6-20020a17090b038600b0029910d831cbmr17605029pjb.12.1708599470196;
Thu, 22 Feb 2024 02:57:50 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1708599470; cv=pass;
d=google.com; s=arc-20160816;
b=ZTD6uMmwP/Wvgp8JKdCtyN6zxUN1wFQqiY1WQeQ0n3ee0KIE85UeQBXaeUPKBAv54A
1lHq0HShqD7YK6Z/uWfNvQ4J5Yst0KNZHzRt4ecRZORveNM8ZypmMHLK2M+KT/lFz/sV
CViSGUs6N0bYtcpBLFJTlNDssb5hBIsWNCucsJj8+zu+elHwFWgSU1UlmLnU4Op7nuMR
A/hbxLSf2mUVhKkwB2p83jkpisjUa69lgDlY5ihRHoVHGgFgtq3giYXbTh0vx2r1jcjN
tg4GbDweZf4+sU4zZa1JxzilI5LiRYNS5mO4SanNpiNo2OturVFRYqw8eoHtuz3aZ/09
qIcw==
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=gEsIZug05BOdNSyzPXaq8w+pK7vxmJqGJNj4PRReNdU=;
fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=;
b=qTavlBf5Dc3yoS+lTEWCyEdOgOeJo/ZEoNZkX8LnuWC3iOgDAarFLoQK/Oeogbgmd1
81GDh2B8skVYBR6nj0FRmAS4EcxSaT9KhtF2sKpslMCDBWZggQE5fYSET85Be52wjnVy
oRfMufluTgjvkwPnIhfPKEhdwyf3bvSOj5PawQ3YwDxnwVJNuGwT47kzPYZG9Za6v3ul
6Xnr5TcHKx6ncPhthk5VNY/qUSJSph2mSQkkb+DjfrlY3esSk9Ho+44CSIC/hUX2ck1L
EgwfFjpOORzUgg0aO3laKHffrSJPw1+ekZGRsIdOTcdxZ0KqvKy6Tc/RV1w+uAfAUZCx
I6cQ==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@xen0n.name header.s=mail header.b=t0TbktWh;
arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass
dkdomain=xen0n.name);
spf=pass (google.com: domain of
linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org"
Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org.
[2604:1380:40f1:3f00::1])
by mx.google.com with ESMTPS id
me13-20020a17090b17cd00b002993be51a7dsi3431514pjb.163.2024.02.22.02.57.49
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 22 Feb 2024 02:57:50 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@xen0n.name header.s=mail header.b=t0TbktWh;
arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass
dkdomain=xen0n.name);
spf=pass (google.com: domain of
linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:40f1:3f00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-76362-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 68046B26DB3
for <ouuuleilei@gmail.com>; Thu, 22 Feb 2024 10:54:24 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id B9FEB4D137;
Thu, 22 Feb 2024 10:51:23 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name
header.b="t0TbktWh"
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 8E2853EA7B;
Thu, 22 Feb 2024 10:51:19 +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=1708599081; cv=none;
b=RyhqdIWGnlnM/1a+vqydvrpkoK0eq0jmI257uwaJq0vVtLU7v6D2c312YYhs9lzp9ecoOr+GdHBV33GZZvKq6MQ2Jc2U+eRCRaV3ly+eetNGKewhzHgeS3a3P4nxF2/YWp50zQtygDKd0qq0tbUavIMOLycr/YQClC52/yWmWEI=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1708599081; c=relaxed/simple;
bh=+kB69uQHwSK7H63LamYjOdOPcWFCgJ8ZtDGfI9wdO64=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=UWwIyr7zo3L4R28al2xAOaGBKNZJVhoX70PLZjrZZALM8i7uhLzs4VEPGrmaKbCl+tQvvte0AOjQO650QVPcnhAmtrgaKZ/f5h4ENXbkjeybcc9K4A+x/QRZDMJM2kBI8r/BRBX4WOm4lDEOCubMt01wjE07KORRkzuHjtEWruU=
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=t0TbktWh; 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=1708599077; bh=+kB69uQHwSK7H63LamYjOdOPcWFCgJ8ZtDGfI9wdO64=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=t0TbktWhrWL0jXKnKQgj+Dhjo1VjhW4k5oVFbL7zAudpKZrF/6OC0li9EW+HZpDuk
wyIvd9efy4trVP3UvrVOWOZStSgss21zDa/QyXneVl0UKZBftaYgcJqM8UoZaF3RY5
8MllbF/de0Ks0vQRFQ7vdhDJpJKVS1fyF51+Bqrc=
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 78495601C8;
Thu, 22 Feb 2024 18:51:17 +0800 (CST)
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 v4 2/3] LoongArch: KVM: Rename _kvm_get_cpucfg to
_kvm_get_cpucfg_mask
Date: Thu, 22 Feb 2024 18:51:08 +0800
Message-ID: <20240222105109.2042732-3-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: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1791596398275849391
X-GMAIL-MSGID: 1791596398275849391
|
| Series |
KVM: LoongArch: Fix wrong CPUCFG ID handling
|
|
Commit Message
WANG Xuerui
Feb. 22, 2024, 10:51 a.m. UTC
From: WANG Xuerui <git@xen0n.name> The function is not actually a getter of guest CPUCFG, but rather validation of the input CPUCFG ID plus information about the supported bit flags of that CPUCFG leaf. So rename it to avoid confusion. Signed-off-by: WANG Xuerui <git@xen0n.name> --- arch/loongarch/kvm/vcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On 2024/2/22 下午6:51, WANG Xuerui wrote: > From: WANG Xuerui <git@xen0n.name> > > The function is not actually a getter of guest CPUCFG, but rather > validation of the input CPUCFG ID plus information about the supported > bit flags of that CPUCFG leaf. So rename it to avoid confusion. > > Signed-off-by: WANG Xuerui <git@xen0n.name> > --- > arch/loongarch/kvm/vcpu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c > index 7fd32de6656b..9f63bbaf19c1 100644 > --- a/arch/loongarch/kvm/vcpu.c > +++ b/arch/loongarch/kvm/vcpu.c > @@ -298,7 +298,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) > return ret; > } > > -static int _kvm_get_cpucfg(int id, u64 *v) > +static int _kvm_get_cpucfg_mask(int id, u64 *v) > { > if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) > return -EINVAL; > @@ -339,7 +339,7 @@ static int kvm_check_cpucfg(int id, u64 val) > u64 mask = 0; > int ret; > > - ret = _kvm_get_cpucfg(id, &mask); > + ret = _kvm_get_cpucfg_mask(id, &mask); > if (ret) > return ret; > > @@ -567,7 +567,7 @@ static int kvm_loongarch_get_cpucfg_attr(struct kvm_vcpu *vcpu, > uint64_t val; > uint64_t __user *uaddr = (uint64_t __user *)attr->addr; > > - ret = _kvm_get_cpucfg(attr->attr, &val); > + ret = _kvm_get_cpucfg_mask(attr->attr, &val); > if (ret) > return ret; > > Reviewed-by: Bibo Mao <maobibo@loongson.cn>
diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 7fd32de6656b..9f63bbaf19c1 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -298,7 +298,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) return ret; } -static int _kvm_get_cpucfg(int id, u64 *v) +static int _kvm_get_cpucfg_mask(int id, u64 *v) { if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) return -EINVAL; @@ -339,7 +339,7 @@ static int kvm_check_cpucfg(int id, u64 val) u64 mask = 0; int ret; - ret = _kvm_get_cpucfg(id, &mask); + ret = _kvm_get_cpucfg_mask(id, &mask); if (ret) return ret; @@ -567,7 +567,7 @@ static int kvm_loongarch_get_cpucfg_attr(struct kvm_vcpu *vcpu, uint64_t val; uint64_t __user *uaddr = (uint64_t __user *)attr->addr; - ret = _kvm_get_cpucfg(attr->attr, &val); + ret = _kvm_get_cpucfg_mask(attr->attr, &val); if (ret) return ret;