From patchwork Fri Feb 16 09:37:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 202015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp400466dyb; Fri, 16 Feb 2024 01:41:06 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVXAtEnQj9ftgE6tQvQixdg3CWS0rz3CyaYp7V3fEscpbthzMKkebI72CMCrxiTJSMnqaAYdj2McfQ3ip34SaYKkc7s0g== X-Google-Smtp-Source: AGHT+IG5BptFLsDnCTRCNn4pnTNAzjjvVCdHluM/GQuuo67BfMtPn3fw4e3kZSZDk2HyJ4HsuCAb X-Received: by 2002:a05:6a20:94c4:b0:19e:487e:39e7 with SMTP id ht4-20020a056a2094c400b0019e487e39e7mr7075454pzb.16.1708076466642; Fri, 16 Feb 2024 01:41:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708076466; cv=pass; d=google.com; s=arc-20160816; b=j1EbwbV1I5gsKRMreR36ZdtwE+Os+cHlJCU+3DcKs2Ylub4cRQ5olD8N0hV3wc+Xt5 9py0fFPbJ+dA3+/ckv1nabFY789Lqqvs91uINfFt02sKGTeYO3/p6qnZgDgmuNR/4APt VipS8+WqdsQPqJcnRPlnKJeeDsNpPOm2YjOXNBpszHKmuz/Vm3/w/POZvPodnLk+H6b+ ZXC3So/Ir1zJocq9QH88QSeIq8N0iMA7uuRbZzPDYfOA+WWvOUJ9w0RV8dkF1zTenXZm oJz3iqGHKZSToDScRfXXiWUBp8xIpkMex5eR16vsqMOcmHtj/BQuhTFnaeED+2tE4z6/ V7ww== 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=URrTWB3RZXs3TvqdoUZj743iiVYmCnop4gfoxoLRxZ4=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=biwKtI7DAhkpjYngBR4Jm17Ijv38oso+2BTbgMSVEwdxQKDgV0rIYcj8qNK6UJ3hqQ J0z0B3Rsvy0kVi7Z4f1Jqz+XDh1G3UeoZUuCrXXi2zNH12fSsKdfBPiM4MyXLYOOJ0uc 47Uf1VVYKrMi7344DCdSGJVQw579BEYnJ2IVfkTqUPkBXYpdDIo58iRP2RPde3Saq9iH 0Dy2WaRlWOD2x6gx7tjBaaKELvJlBEy2FbIajVrq0ACm2hSVub4m/n8bHbYPz2PY9R/Y PL3xhqHzMw5BEZmMlGsaIVInjex0dqAYkIUi4jY+xFdd23Ho0sSCEPUeTCNBFoIgRZCD QOdQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=pTrLmwBK; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-68340-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68340-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 i134-20020a636d8c000000b005cef24b3015si2678073pgc.219.2024.02.16.01.41.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 01:41:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68340-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=pTrLmwBK; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-68340-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68340-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 99C35B24534 for ; Fri, 16 Feb 2024 09:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF05C1CA8D; Fri, 16 Feb 2024 09:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="pTrLmwBK" 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 47A691BF3F; Fri, 16 Feb 2024 09:38:14 +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=1708076296; cv=none; b=NReycuoF8nBtCc8+H6VkOZtg77ePrG1j+x1HFcj1C4DmeuSITBpVBxYCxkWJxqz6tT97lRJMHnRcx/waDvUe/t3BDps/ucqS4mZ1sP6bvqD7kK2uoPzDdwqz9cuQYyxM9wXGI+JSNg2tQmql/Ld4qH5LCHGO8PigXeX6i56Lzlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708076296; c=relaxed/simple; bh=rEiWf82DA18Wx2w8gv0lu+0/shLFZ5W8HKb5RPqBJ7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EPsrh67aKfhTgHby7zEz1Z007e8KCug0ArXsgpdmPA3loVc7t6dZRtR7kE6CtwgG8Wst+QPMLIPzmur5qylt9VmFRHdw8fIG5Q1ROm+54A3MpHf0Rm/zQVZo/6e0pUwSNrjQefHuCE64TAIk8Lhgz2X17hB0dZ57+5ddBuWwvyA= 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=pTrLmwBK; 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=1708076291; bh=rEiWf82DA18Wx2w8gv0lu+0/shLFZ5W8HKb5RPqBJ7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pTrLmwBKY5FMRgpMJJ/RZ1TDW9MvxnohZrjBSKIT+aNui7lLW9PmTFV7CQs93mMjX Me1+9Qf7l0KpD+BzrX+11EuiVSnbcL9pNarzKfLvn3yX+y6utgNThy3Yowy4W0L9Js qtcy5HAk8cVmrLOuwG7XpPgStPEs85sYwW4Vr1Io= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:cda4:aa27:b0f6:1748]) (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 C9BE660187; Fri, 16 Feb 2024 17:38:11 +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 RESEND for-6.8 v3 2/3] LoongArch: KVM: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask Date: Fri, 16 Feb 2024 17:37:58 +0800 Message-ID: <20240216093759.3038760-3-kernel@xen0n.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216093759.3038760-1-kernel@xen0n.name> References: <20240216093759.3038760-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: 1791047988944199692 X-GMAIL-MSGID: 1791047988944199692 From: WANG Xuerui 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 --- 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 124cd7a75061..e5acd4c08071 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) { switch (id) { case 2: @@ -335,7 +335,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; @@ -563,7 +563,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;