From nobody Wed Oct 8 00:45:54 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 BF36128A3E2; Fri, 4 Jul 2025 08:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751619041; cv=none; b=YqelkdVU3z6PnBVo1nngt9t3J2V2Q88Q2O7dQ5+F+orpuXHlw4Zjry6zoFugwcPzpF6Vn499n+MH/YAxJg8kFHVFLg7IhwBf2O3IxTuebkYwQF237zq31HbwfjLE0HkzX0IOZRihBNT7RBfwbFvi37t8a60BmOBETFXZmWgE39A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751619041; c=relaxed/simple; bh=DrjhtQTH+Cyf9KhD0UkQrnxsuV2+za6u42Op3QD6mDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OsD2o45rL10Pc5NAFi7UdRhRo9jBYsPuvj302CJY0Ap6eTEcEGZmGh2N7d5/AEiJ9xfRCBkEl2s3jUvKY/qv9SWfg560yxDmj/T/d5R+toKhOrbtpRNEyJkxWtvwhKq2Z7517zJo+Cs2Bg4wt+gUzRSMLULt58qPcuALBajzIpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=R4qLDPdQ; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="R4qLDPdQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751619040; x=1783155040; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DrjhtQTH+Cyf9KhD0UkQrnxsuV2+za6u42Op3QD6mDw=; b=R4qLDPdQAy4jOq/SaL+Upg8NaqCxcahLRwectKJKpbut5+jilSmCnVgB PYXRCxEmfSHc4chWnT/4eXreucFNoAjLXzKUFmLPBM/9ugaPjjb+NupLV awYAcOfcoLjXesyeTyQM/ZpRDLLXHy82SAuS4R3XsOG5OFnItRgbruFqE /6zbZMbPbsbaRLvTqhTFCYdAQmtyBTmCXaBu/CUMFnj4gzmbQz0RJFbG9 0DVhc1n9paRTZ2U6Db563vTkO3J93HwOIsnkfvDceqgtwzWZcFKonPJ5D 2hRspx0tY6hGmXIQ7u9yoV3+TPc4etbBhLo+7bN6EZPWIeQU2nx9gdeHA Q==; X-CSE-ConnectionGUID: wbEaTB0WRwOa+0LP4pQVbg== X-CSE-MsgGUID: sxCEynoKTG+eKF9sUiLyGg== X-IronPort-AV: E=McAfee;i="6800,10657,11483"; a="79391578" X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="79391578" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2025 01:50:35 -0700 X-CSE-ConnectionGUID: hh6ecGcMQcazWc49C1ZNWg== X-CSE-MsgGUID: mLcMTZbhQZOMEA1rnnULZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="154721949" Received: from 984fee019967.jf.intel.com ([10.165.54.94]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2025 01:50:35 -0700 From: Chao Gao To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, seanjc@google.com, pbonzini@redhat.com, dave.hansen@intel.com Cc: rick.p.edgecombe@intel.com, mlevitsk@redhat.com, john.allen@amd.com, weijiang.yang@intel.com, minipli@grsecurity.net, xin@zytor.com, Chao Gao , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v11 02/23] KVM: x86: Add kvm_msr_{read,write}() helpers Date: Fri, 4 Jul 2025 01:49:33 -0700 Message-ID: <20250704085027.182163-3-chao.gao@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250704085027.182163-1-chao.gao@intel.com> References: <20250704085027.182163-1-chao.gao@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yang Weijiang Wrap __kvm_{get,set}_msr() into two new helpers for KVM usage and use the helpers to replace existing usage of the raw functions. kvm_msr_{read,write}() are KVM-internal helpers, i.e. used when KVM needs to get/set a MSR value for emulating CPU behavior, i.e., host_initiated =3D= =3D %true in the helpers. Suggested-by: Sean Christopherson Signed-off-by: Yang Weijiang Signed-off-by: Chao Gao Reviewed-by: Maxim Levitsky --- arch/x86/include/asm/kvm_host.h | 3 ++- arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/x86.c | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index 1f3f8601747f..e07a03dbce6a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2152,9 +2152,10 @@ void kvm_enable_efer_bits(u64); bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer); int kvm_emulate_msr_read_with_filter(struct kvm_vcpu *vcpu, u32 index, u64= *data); int kvm_emulate_msr_write_with_filter(struct kvm_vcpu *vcpu, u32 index, u6= 4 data); -int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data, bool host_i= nitiated); int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); +int kvm_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); +int kvm_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu); int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu); int kvm_emulate_as_nop(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index b2d006756e02..9db246671885 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -1992,7 +1992,7 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *= ebx, if (function =3D=3D 7 && index =3D=3D 0) { u64 data; if ((*ebx & (feature_bit(RTM) | feature_bit(HLE))) && - !__kvm_get_msr(vcpu, MSR_IA32_TSX_CTRL, &data, true) && + !kvm_msr_read(vcpu, MSR_IA32_TSX_CTRL, &data) && (data & TSX_CTRL_CPUID_CLEAR)) *ebx &=3D ~(feature_bit(RTM) | feature_bit(HLE)); } else if (function =3D=3D 0x80000007) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 11d84075cd14..51b37492142c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1895,8 +1895,8 @@ static int kvm_set_msr_ignored_check(struct kvm_vcpu = *vcpu, * Returns 0 on success, non-0 otherwise. * Assumes vcpu_load() was already called. */ -int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data, - bool host_initiated) +static int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data, + bool host_initiated) { struct msr_data msr; int ret; @@ -1922,6 +1922,16 @@ int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, = u64 *data, return ret; } =20 +int kvm_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data) +{ + return __kvm_set_msr(vcpu, index, data, true); +} + +int kvm_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data) +{ + return __kvm_get_msr(vcpu, index, data, true); +} + static int kvm_get_msr_ignored_check(struct kvm_vcpu *vcpu, u32 index, u64 *data, bool host_initiated) { @@ -12591,7 +12601,7 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool ini= t_event) MSR_IA32_MISC_ENABLE_BTS_UNAVAIL; =20 __kvm_set_xcr(vcpu, 0, XFEATURE_MASK_FP); - __kvm_set_msr(vcpu, MSR_IA32_XSS, 0, true); + kvm_msr_write(vcpu, MSR_IA32_XSS, 0); } =20 /* All GPRs except RDX (handled below) are zeroed on RESET/INIT. */ --=20 2.47.1