From: Yang Weijiang <weijiang.yang@intel.com>
To: seanjc@google.com, pbonzini@redhat.com, dave.hansen@intel.com,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, chao.gao@intel.com,
rick.p.edgecombe@intel.com, mlevitsk@redhat.com,
john.allen@amd.com, weijiang.yang@intel.com
Subject: [PATCH v7 15/26] KVM: x86: Load guest FPU state when access XSAVE-managed MSRs
Date: Fri, 24 Nov 2023 00:53:19 -0500 [thread overview]
Message-ID: <20231124055330.138870-16-weijiang.yang@intel.com> (raw)
In-Reply-To: <20231124055330.138870-1-weijiang.yang@intel.com>
From: Sean Christopherson <seanjc@google.com>
Load the guest's FPU state if userspace is accessing MSRs whose values
are managed by XSAVES. Introduce two helpers, kvm_{get,set}_xstate_msr(),
to facilitate access to such kind of MSRs.
If MSRs supported in kvm_caps.supported_xss are passed through to guest,
the guest MSRs are swapped with host's before vCPU exits to userspace and
after it reenters kernel before next VM-entry.
Because the modified code is also used for the KVM_GET_MSRS device ioctl(),
explicitly check @vcpu is non-null before attempting to load guest state.
The XSAVE-managed MSRs cannot be retrieved via the device ioctl() without
loading guest FPU state (which doesn't exist).
Note that guest_cpuid_has() is not queried as host userspace is allowed to
access MSRs that have not been exposed to the guest, e.g. it might do
KVM_SET_MSRS prior to KVM_SET_CPUID2.
The two helpers are put here in order to manifest accessing xsave-managed MSRs
requires special check and handling to guarantee the correctness of read/write
to the MSRs.
Signed-off-by: Sean Christopherson <seanjc@google.com>
Co-developed-by: Yang Weijiang <weijiang.yang@intel.com>
Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
---
arch/x86/kvm/x86.c | 35 ++++++++++++++++++++++++++++++++++-
arch/x86/kvm/x86.h | 24 ++++++++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 607082aca80d..fd48b825510c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -133,6 +133,9 @@ static int __set_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2);
static void __get_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2);
static DEFINE_MUTEX(vendor_module_lock);
+static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
+static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
+
struct kvm_x86_ops kvm_x86_ops __read_mostly;
#define KVM_X86_OP(func) \
@@ -4482,6 +4485,21 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
}
EXPORT_SYMBOL_GPL(kvm_get_msr_common);
+/*
+ * Returns true if the MSR in question is managed via XSTATE, i.e. is context
+ * switched with the rest of guest FPU state.
+ */
+static bool is_xstate_managed_msr(u32 index)
+{
+ switch (index) {
+ case MSR_IA32_U_CET:
+ case MSR_IA32_PL0_SSP ... MSR_IA32_PL3_SSP:
+ return true;
+ default:
+ return false;
+ }
+}
+
/*
* Read or write a bunch of msrs. All parameters are kernel addresses.
*
@@ -4492,11 +4510,26 @@ static int __msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs,
int (*do_msr)(struct kvm_vcpu *vcpu,
unsigned index, u64 *data))
{
+ bool fpu_loaded = false;
int i;
- for (i = 0; i < msrs->nmsrs; ++i)
+ for (i = 0; i < msrs->nmsrs; ++i) {
+ /*
+ * If userspace is accessing one or more XSTATE-managed MSRs,
+ * temporarily load the guest's FPU state so that the guest's
+ * MSR value(s) is resident in hardware, i.e. so that KVM can
+ * get/set the MSR via RDMSR/WRMSR.
+ */
+ if (vcpu && !fpu_loaded && kvm_caps.supported_xss &&
+ is_xstate_managed_msr(entries[i].index)) {
+ kvm_load_guest_fpu(vcpu);
+ fpu_loaded = true;
+ }
if (do_msr(vcpu, entries[i].index, &entries[i].data))
break;
+ }
+ if (fpu_loaded)
+ kvm_put_guest_fpu(vcpu);
return i;
}
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 5184fde1dc54..6e42ede335f5 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -541,4 +541,28 @@ int kvm_sev_es_string_io(struct kvm_vcpu *vcpu, unsigned int size,
unsigned int port, void *data, unsigned int count,
int in);
+/*
+ * Lock and/or reload guest FPU and access xstate MSRs. For accesses initiated
+ * by host, guest FPU is loaded in __msr_io(). For accesses initiated by guest,
+ * guest FPU should have been loaded already.
+ */
+
+static inline void kvm_get_xstate_msr(struct kvm_vcpu *vcpu,
+ struct msr_data *msr_info)
+{
+ KVM_BUG_ON(!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm);
+ kvm_fpu_get();
+ rdmsrl(msr_info->index, msr_info->data);
+ kvm_fpu_put();
+}
+
+static inline void kvm_set_xstate_msr(struct kvm_vcpu *vcpu,
+ struct msr_data *msr_info)
+{
+ KVM_BUG_ON(!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm);
+ kvm_fpu_get();
+ wrmsrl(msr_info->index, msr_info->data);
+ kvm_fpu_put();
+}
+
#endif
--
2.27.0
next prev parent reply other threads:[~2023-11-24 8:00 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 5:53 [PATCH v7 00/26] Enable CET Virtualization Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 01/26] x86/fpu/xstate: Always preserve non-user xfeatures/flags in __state_perm Yang Weijiang
2023-11-30 17:24 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 02/26] x86/fpu/xstate: Refine CET user xstate bit enabling Yang Weijiang
2023-11-24 9:40 ` Peter Zijlstra
2023-11-27 2:55 ` Yang, Weijiang
2023-11-28 1:31 ` Edgecombe, Rick P
2023-11-28 8:50 ` Peter Zijlstra
2023-11-28 1:31 ` Edgecombe, Rick P
2023-11-28 7:52 ` Yang, Weijiang
2023-11-30 17:26 ` Maxim Levitsky
2023-12-01 6:51 ` Yang, Weijiang
2023-12-05 9:53 ` Maxim Levitsky
2023-12-06 1:03 ` Yang, Weijiang
2023-12-06 15:57 ` Maxim Levitsky
2023-12-08 14:57 ` Yang, Weijiang
2023-12-08 15:15 ` Maxim Levitsky
2023-12-13 9:30 ` Yang, Weijiang
2023-12-13 13:31 ` Maxim Levitsky
2023-12-13 17:01 ` Chang S. Bae
2023-12-14 3:12 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 03/26] x86/fpu/xstate: Add CET supervisor mode state support Yang Weijiang
2023-11-24 9:45 ` Peter Zijlstra
2023-11-27 4:06 ` Yang, Weijiang
2023-11-28 1:34 ` Edgecombe, Rick P
2023-11-30 17:27 ` Maxim Levitsky
2023-12-01 7:01 ` Yang, Weijiang
2023-12-05 9:53 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 04/26] x86/fpu/xstate: Introduce XFEATURE_MASK_KERNEL_DYNAMIC xfeature set Yang Weijiang
2023-11-28 1:46 ` Edgecombe, Rick P
2023-11-28 8:00 ` Yang, Weijiang
2023-11-30 17:33 ` Maxim Levitsky
2023-12-01 7:49 ` Yang, Weijiang
2023-12-05 9:55 ` Maxim Levitsky
2023-12-06 3:00 ` Yang, Weijiang
2023-12-06 16:11 ` Maxim Levitsky
2023-12-08 15:57 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 05/26] x86/fpu/xstate: Introduce fpu_guest_cfg for guest FPU configuration Yang Weijiang
2023-11-28 14:58 ` Edgecombe, Rick P
2023-11-29 14:12 ` Yang, Weijiang
2023-11-29 17:08 ` Edgecombe, Rick P
2023-11-30 13:28 ` Yang, Weijiang
2023-11-30 17:29 ` Maxim Levitsky
2023-11-30 18:02 ` Edgecombe, Rick P
2023-11-30 17:29 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 06/26] x86/fpu/xstate: Create guest fpstate with guest specific config Yang Weijiang
2023-11-28 15:19 ` Edgecombe, Rick P
2023-11-29 14:16 ` Yang, Weijiang
2023-11-30 17:36 ` Maxim Levitsky
2023-12-01 8:36 ` Yang, Weijiang
2023-12-05 9:57 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 07/26] x86/fpu/xstate: Warn if kernel dynamic xfeatures detected in normal fpstate Yang Weijiang
2023-11-28 15:25 ` Edgecombe, Rick P
2023-11-29 14:18 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 08/26] KVM: x86: Rework cpuid_get_supported_xcr0() to operate on vCPU data Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 09/26] KVM: x86: Rename kvm_{g,s}et_msr() to menifest emulation operations Yang Weijiang
2023-11-30 17:36 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 10/26] KVM: x86: Refine xsave-managed guest register/MSR reset handling Yang Weijiang
2023-11-30 17:36 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 11/26] KVM: x86: Add kvm_msr_{read,write}() helpers Yang Weijiang
2023-11-30 17:37 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 12/26] KVM: x86: Report XSS as to-be-saved if there are supported features Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 13/26] KVM: x86: Refresh CPUID on write to guest MSR_IA32_XSS Yang Weijiang
2023-11-30 17:37 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 14/26] KVM: x86: Initialize kvm_caps.supported_xss Yang Weijiang
2023-11-24 5:53 ` Yang Weijiang [this message]
2023-11-30 17:38 ` [PATCH v7 15/26] KVM: x86: Load guest FPU state when access XSAVE-managed MSRs Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 16/26] KVM: x86: Add fault checks for guest CR4.CET setting Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 17/26] KVM: x86: Report KVM supported CET MSRs as to-be-saved Yang Weijiang
2023-11-30 17:40 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 18/26] KVM: VMX: Introduce CET VMCS fields and control bits Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 19/26] KVM: x86: Use KVM-governed feature framework to track "SHSTK/IBT enabled" Yang Weijiang
2023-11-30 17:40 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 20/26] KVM: VMX: Emulate read and write to CET MSRs Yang Weijiang
2023-11-30 17:41 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 21/26] KVM: x86: Save and reload SSP to/from SMRAM Yang Weijiang
2023-11-30 17:42 ` Maxim Levitsky
2023-12-01 2:23 ` Chao Gao
2023-12-04 0:45 ` Yang, Weijiang
2023-12-05 10:02 ` Maxim Levitsky
2023-12-01 8:55 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 22/26] KVM: VMX: Set up interception for CET MSRs Yang Weijiang
2023-11-30 17:44 ` Maxim Levitsky
2023-12-01 6:33 ` Chao Gao
2023-12-05 10:04 ` Maxim Levitsky
2023-12-01 9:45 ` Yang, Weijiang
2023-12-05 10:07 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 23/26] KVM: VMX: Set host constant supervisor states to VMCS fields Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 24/26] KVM: x86: Enable CET virtualization for VMX and advertise to userspace Yang Weijiang
2023-11-30 17:46 ` Maxim Levitsky
2023-12-01 16:15 ` Yang, Weijiang
2023-12-05 10:07 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 25/26] KVM: nVMX: Introduce new VMX_BASIC bit for event error_code delivery to L1 Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 26/26] KVM: nVMX: Enable CET support for nested guest Yang Weijiang
2023-11-30 17:53 ` Maxim Levitsky
2023-12-04 8:50 ` Yang, Weijiang
2023-12-05 10:12 ` Maxim Levitsky
2023-12-06 9:22 ` Yang, Weijiang
2023-12-06 17:24 ` Maxim Levitsky
2023-12-08 15:15 ` Yang, Weijiang
2023-12-08 15:22 ` Maxim Levitsky
2023-12-12 8:56 ` Yang, Weijiang
2023-12-12 11:09 ` Maxim Levitsky
2023-12-15 2:29 ` [PATCH v7 00/26] Enable CET Virtualization Yang, Weijiang
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=20231124055330.138870-16-weijiang.yang@intel.com \
--to=weijiang.yang@intel.com \
--cc=chao.gao@intel.com \
--cc=dave.hansen@intel.com \
--cc=john.allen@amd.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=seanjc@google.com \
/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;
as well as URLs for NNTP newsgroup(s).