kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jing Liu <jing2.liu@intel.com>
To: x86@kernel.org, kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org, tglx@linutronix.de,
	mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
	pbonzini@redhat.com
Cc: seanjc@google.com, jun.nakajima@intel.com, kevin.tian@intel.com,
	jing2.liu@linux.intel.com, jing2.liu@intel.com,
	guang.zeng@intel.com, wei.w.wang@intel.com, yang.zhong@intel.com
Subject: [PATCH v2 13/23] kvm: x86: Intercept #NM for saving IA32_XFD_ERR
Date: Fri, 17 Dec 2021 07:29:53 -0800	[thread overview]
Message-ID: <20211217153003.1719189-14-jing2.liu@intel.com> (raw)
In-Reply-To: <20211217153003.1719189-1-jing2.liu@intel.com>

Guest IA32_XFD_ERR is generally modified in two places:

  - Set by CPU when #NM is triggered;
  - Cleared by guest in its #NM handler;

Intercept #NM for the first case, if guest CPUID includes any dynamic
xfeature. #NM is rare if the guest doesn't use dynamic features.
Otherwise, there is at most one exception per guest task given a
dynamic feature.

Save the current XFD_ERR value to the guest_fpu container in the #NM
VM-exit handler. This must be done with interrupt/preemption disabled,
otherwise the unsaved MSR value may be clobbered by host operations.

Inject a virtual #NM to the guest after saving the MSR value.

Restore the host value (always ZERO outside of the host #NM
handler) before enabling preemption.

Restore the guest value from the guest_fpu container right before
entering the guest (with preemption disabled).

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jing Liu <jing2.liu@intel.com>
---
TODO: Investigate delaying #NM interception until guest sets a dynamic
feature in XCR0.

 arch/x86/kvm/vmx/vmcs.h |  5 +++++
 arch/x86/kvm/vmx/vmx.c  | 15 ++++++++++++++-
 arch/x86/kvm/x86.c      |  6 ++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/vmx/vmcs.h b/arch/x86/kvm/vmx/vmcs.h
index 6e5de2e2b0da..c57798b56f95 100644
--- a/arch/x86/kvm/vmx/vmcs.h
+++ b/arch/x86/kvm/vmx/vmcs.h
@@ -129,6 +129,11 @@ static inline bool is_machine_check(u32 intr_info)
 	return is_exception_n(intr_info, MC_VECTOR);
 }
 
+static inline bool is_nm(u32 intr_info)
+{
+	return is_exception_n(intr_info, NM_VECTOR);
+}
+
 /* Undocumented: icebp/int1 */
 static inline bool is_icebp(u32 intr_info)
 {
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9453743ce0c4..483075045253 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -36,6 +36,7 @@
 #include <asm/debugreg.h>
 #include <asm/desc.h>
 #include <asm/fpu/api.h>
+#include <asm/fpu/xstate.h>
 #include <asm/idtentry.h>
 #include <asm/io.h>
 #include <asm/irq_remapping.h>
@@ -763,6 +764,9 @@ void vmx_update_exception_bitmap(struct kvm_vcpu *vcpu)
 		vmcs_write32(PAGE_FAULT_ERROR_CODE_MATCH, match);
 	}
 
+	if (vcpu->arch.guest_supported_xcr0 & XFEATURE_MASK_USER_DYNAMIC)
+		eb |= (1u << NM_VECTOR);
+
 	vmcs_write32(EXCEPTION_BITMAP, eb);
 }
 
@@ -4750,7 +4754,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)
 	vect_info = vmx->idt_vectoring_info;
 	intr_info = vmx_get_intr_info(vcpu);
 
-	if (is_machine_check(intr_info) || is_nmi(intr_info))
+	if (is_machine_check(intr_info) || is_nmi(intr_info) || is_nm(intr_info))
 		return 1; /* handled by handle_exception_nmi_irqoff() */
 
 	if (is_invalid_opcode(intr_info))
@@ -6338,6 +6342,12 @@ static void handle_interrupt_nmi_irqoff(struct kvm_vcpu *vcpu,
 	kvm_after_interrupt(vcpu);
 }
 
+static void handle_exception_nm(struct kvm_vcpu *vcpu)
+{
+	rdmsrl(MSR_IA32_XFD_ERR, vcpu->arch.guest_fpu.xfd_err);
+	kvm_queue_exception(vcpu, NM_VECTOR);
+}
+
 static void handle_exception_nmi_irqoff(struct vcpu_vmx *vmx)
 {
 	const unsigned long nmi_entry = (unsigned long)asm_exc_nmi_noist;
@@ -6346,6 +6356,9 @@ static void handle_exception_nmi_irqoff(struct vcpu_vmx *vmx)
 	/* if exit due to PF check for async PF */
 	if (is_page_fault(intr_info))
 		vmx->vcpu.arch.apf.host_apf_flags = kvm_read_and_reset_apf_flags();
+	/* if exit due to NM, handle before preemptions are enabled */
+	else if (is_nm(intr_info))
+		handle_exception_nm(&vmx->vcpu);
 	/* Handle machine checks before interrupts are enabled */
 	else if (is_machine_check(intr_info))
 		kvm_machine_check();
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a274146ef439..e528085030b3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9894,6 +9894,9 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 	if (test_thread_flag(TIF_NEED_FPU_LOAD))
 		switch_fpu_return();
 
+	if (vcpu->arch.guest_fpu.xfd_err)
+		wrmsrl(MSR_IA32_XFD_ERR, vcpu->arch.guest_fpu.xfd_err);
+
 	if (unlikely(vcpu->arch.switch_db_regs)) {
 		set_debugreg(0, 7);
 		set_debugreg(vcpu->arch.eff_db[0], 0);
@@ -9957,6 +9960,9 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 
 	static_call(kvm_x86_handle_exit_irqoff)(vcpu);
 
+	if (vcpu->arch.guest_fpu.xfd_err)
+		wrmsrl(MSR_IA32_XFD_ERR, 0);
+
 	/*
 	 * Consume any pending interrupts, including the possible source of
 	 * VM-Exit on SVM and any ticks that occur between VM-Exit and now.
-- 
2.27.0


  parent reply	other threads:[~2021-12-17 15:31 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-17 15:29 [PATCH v2 00/23] AMX Support in KVM Jing Liu
2021-12-17 15:29 ` [PATCH v2 01/23] x86/fpu: Extend fpu_xstate_prctl() with guest permissions Jing Liu
2021-12-17 18:45   ` Thomas Gleixner
2021-12-17 18:47     ` Thomas Gleixner
2021-12-17 15:29 ` [PATCH v2 02/23] x86/fpu: Prepare guest FPU for dynamically enabled FPU features Jing Liu
2021-12-17 15:29 ` [PATCH v2 03/23] kvm: x86: Fix xstate_required_size() to follow XSTATE alignment rule Jing Liu
2021-12-17 15:29 ` [PATCH v2 04/23] kvm: x86: Exclude unpermitted xfeatures at KVM_GET_SUPPORTED_CPUID Jing Liu
2021-12-20 13:20   ` Paolo Bonzini
2021-12-17 15:29 ` [PATCH v2 05/23] kvm: x86: Check permitted dynamic xfeatures at KVM_SET_CPUID2 Jing Liu
2021-12-17 15:29 ` [PATCH v2 06/23] x86/fpu: Make XFD initialization in __fpstate_reset() a function argument Jing Liu
2021-12-17 15:29 ` [PATCH v2 07/23] x86/fpu: Add guest support to xfd_enable_feature() Jing Liu
2021-12-17 15:29 ` [PATCH v2 08/23] x86/fpu: Provide fpu_update_guest_perm_features() for guest Jing Liu
2021-12-17 18:50   ` Thomas Gleixner
2021-12-17 15:29 ` [PATCH v2 09/23] kvm: x86: Enable dynamic XSAVE features at KVM_SET_CPUID2 Jing Liu
2021-12-17 15:29 ` [PATCH v2 10/23] x86/fpu: Provide fpu_update_guest_xfd() for IA32_XFD emulation Jing Liu
2021-12-17 15:29 ` [PATCH v2 11/23] kvm: x86: Add emulation for IA32_XFD Jing Liu
2021-12-17 15:29 ` [PATCH v2 12/23] x86/fpu: Prepare xfd_err in struct fpu_guest Jing Liu
2021-12-17 15:29 ` Jing Liu [this message]
2021-12-17 15:29 ` [PATCH v2 14/23] kvm: x86: Emulate IA32_XFD_ERR for guest Jing Liu
2021-12-17 15:29 ` [PATCH v2 15/23] kvm: x86: Add XCR0 support for Intel AMX Jing Liu
2021-12-17 15:29 ` [PATCH v2 16/23] kvm: x86: Add CPUID " Jing Liu
2021-12-17 15:29 ` [PATCH v2 17/23] x86/fpu: add uabi_size to guest_fpu Jing Liu
2021-12-17 15:29 ` [PATCH v2 18/23] kvm: x86: Get/set expanded xstate buffer Jing Liu
2021-12-20  9:04   ` Paolo Bonzini
2021-12-21  2:45     ` Wang, Wei W
2021-12-21  8:45       ` Paolo Bonzini
2021-12-21  9:06         ` Wang, Wei W
2021-12-21  9:30           ` Paolo Bonzini
2021-12-17 15:29 ` [PATCH v2 19/23] kvm: selftests: Add support for KVM_CAP_XSAVE2 Jing Liu
2021-12-20 13:19   ` Paolo Bonzini
2021-12-17 15:30 ` [PATCH v2 20/23] docs: kvm: Add KVM_GET_XSAVE2 Jing Liu
2021-12-20  9:04   ` Paolo Bonzini
2021-12-17 15:30 ` [PATCH v2 21/23] x86/fpu: Provide fpu_sync_guest_vmexit_xfd_state() Jing Liu
2021-12-17 15:30 ` [PATCH v2 22/23] kvm: x86: Disable interception for IA32_XFD on demand Jing Liu
2021-12-20  9:07   ` Paolo Bonzini
2021-12-21  6:42     ` Liu, Jing2
2021-12-21  8:46       ` Paolo Bonzini
2021-12-17 15:30 ` [PATCH v2 23/23] kvm: x86: Disable RDMSR interception of IA32_XFD_ERR Jing Liu
2021-12-20  9:08   ` Paolo Bonzini
2021-12-21  6:29     ` Liu, Jing2
2021-12-21  8:48       ` Paolo Bonzini
2021-12-21  9:00         ` Liu, Jing2
2021-12-21  9:05           ` Paolo Bonzini
2021-12-17 18:52 ` [PATCH v2 00/23] AMX Support in KVM Thomas Gleixner

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=20211217153003.1719189-14-jing2.liu@intel.com \
    --to=jing2.liu@intel.com \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=guang.zeng@intel.com \
    --cc=jing2.liu@linux.intel.com \
    --cc=jun.nakajima@intel.com \
    --cc=kevin.tian@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=wei.w.wang@intel.com \
    --cc=x86@kernel.org \
    --cc=yang.zhong@intel.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).