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 14/23] kvm: x86: Emulate IA32_XFD_ERR for guest
Date: Fri, 17 Dec 2021 07:29:54 -0800	[thread overview]
Message-ID: <20211217153003.1719189-15-jing2.liu@intel.com> (raw)
In-Reply-To: <20211217153003.1719189-1-jing2.liu@intel.com>

Emulate read/write to IA32_XFD_ERR MSR.

Only the saved value in the guest_fpu container is touched in the
emulation handler. Actual MSR update is handled right before entering
the guest (with preemption disabled)

Signed-off-by: Zeng Guang <guang.zeng@intel.com>
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Signed-off-by: Jing Liu <jing2.liu@intel.com>
---
 arch/x86/kvm/x86.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e528085030b3..15b093c58b3d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1358,7 +1358,7 @@ static const u32 msrs_to_save_all[] = {
 	MSR_F15H_PERF_CTL3, MSR_F15H_PERF_CTL4, MSR_F15H_PERF_CTL5,
 	MSR_F15H_PERF_CTR0, MSR_F15H_PERF_CTR1, MSR_F15H_PERF_CTR2,
 	MSR_F15H_PERF_CTR3, MSR_F15H_PERF_CTR4, MSR_F15H_PERF_CTR5,
-	MSR_IA32_XFD,
+	MSR_IA32_XFD, MSR_IA32_XFD_ERR,
 };
 
 static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)];
@@ -3681,6 +3681,17 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
 		fpu_update_guest_xfd(&vcpu->arch.guest_fpu, data);
 		break;
+	case MSR_IA32_XFD_ERR:
+		if (!msr_info->host_initiated &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_XFD))
+			return 1;
+
+		if (data & ~(XFEATURE_MASK_USER_DYNAMIC &
+			     vcpu->arch.guest_supported_xcr0))
+			return 1;
+
+		vcpu->arch.guest_fpu.xfd_err = data;
+		break;
 #endif
 	default:
 		if (kvm_pmu_is_valid_msr(vcpu, msr))
@@ -4010,6 +4021,13 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
 		msr_info->data = vcpu->arch.guest_fpu.fpstate->xfd;
 		break;
+	case MSR_IA32_XFD_ERR:
+		if (!msr_info->host_initiated &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_XFD))
+			return 1;
+
+		msr_info->data = vcpu->arch.guest_fpu.xfd_err;
+		break;
 #endif
 	default:
 		if (kvm_pmu_is_valid_msr(vcpu, msr_info->index))
@@ -6445,6 +6463,7 @@ static void kvm_init_msr_list(void)
 				continue;
 			break;
 		case MSR_IA32_XFD:
+		case MSR_IA32_XFD_ERR:
 			if (!kvm_cpu_cap_has(X86_FEATURE_XFD))
 				continue;
 			break;
-- 
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 ` [PATCH v2 13/23] kvm: x86: Intercept #NM for saving IA32_XFD_ERR Jing Liu
2021-12-17 15:29 ` Jing Liu [this message]
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-15-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).