Patchwork [v4,3/3] KVM: x86: Enable Intel MPX for guest

login
register
mail settings
Submitter Liu, Jinsong
Date Feb. 21, 2014, 5:57 p.m.
Message ID <DE8DF0795D48FD4CA783C40EC829233501509C2B@SHSMSX101.ccr.corp.intel.com>
Download mbox | patch
Permalink /patch/322980/
State New
Headers show

Comments

Liu, Jinsong - Feb. 21, 2014, 5:57 p.m.
From 8b3a3b1f08c166e0c2cdc6162e6fa95d9c7ad2ec Mon Sep 17 00:00:00 2001
From: Liu Jinsong <jinsong.liu@intel.com>
Date: Sat, 22 Feb 2014 08:53:27 +0800
Subject: [PATCH v4 3/3] KVM: x86: Enable Intel MPX for guest

This patch enable Intel MPX feature to guest.

Signed-off-by: Xudong Hao <xudong.hao@intel.com>
Signed-off-by: Liu Jinsong <jinsong.liu@intel.com>
---
 arch/x86/kvm/cpuid.c |    2 +-
 arch/x86/kvm/x86.c   |    6 ++++++
 arch/x86/kvm/x86.h   |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
Paolo Bonzini - Feb. 21, 2014, 6:07 p.m.
Il 21/02/2014 18:57, Liu, Jinsong ha scritto:
> -		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(RDSEED) |
> +		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(MPX) | F(RDSEED) |
>  		F(ADX);

MPX also needs to be conditional on mpx_supported here, like it is done 
with f_rdtscp for example.

Paolo
Liu, Jinsong - Feb. 24, 2014, 3:40 a.m.
Paolo Bonzini wrote:
> Il 21/02/2014 18:57, Liu, Jinsong ha scritto:
>> -		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(RDSEED) |
>> +		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(MPX) | F(RDSEED) |
>>  		F(ADX);
> 
> MPX also needs to be conditional on mpx_supported here, like it is
> done with f_rdtscp for example.
> 
> Paolo

Yes, has updated and sent out.

Thanks,
Jinsong
Liu, Jinsong - Feb. 24, 2014, 10:48 a.m.
Liu, Jinsong wrote:
> Paolo Bonzini wrote:
>> Il 21/02/2014 18:57, Liu, Jinsong ha scritto:
>>> -		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(RDSEED) |
>>> +		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(MPX) | F(RDSEED) |
>>>  		F(ADX);
>> 
>> MPX also needs to be conditional on mpx_supported here, like it is
>> done with f_rdtscp for example.
>> 
>> Paolo
> 
> Yes, has updated and sent out.
> 
> Thanks,
> Jinsong

Seems some issues when I send via git send-email.
Re-send it under Windows, please ignore if you receive PATCH v5 twice.

Thanks,
Jinsong

Patch

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index b241325..b377d83 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -303,7 +303,7 @@  static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
 	/* cpuid 7.0.ebx */
 	const u32 kvm_supported_word9_x86_features =
 		F(FSGSBASE) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) |
-		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(RDSEED) |
+		F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | F(MPX) | F(RDSEED) |
 		F(ADX);
 
 	/* all calls to cpuid_count() should be made on the same cpu */
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 89e4e27..3570e71 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -599,6 +599,9 @@  int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
 	u64 old_xcr0 = vcpu->arch.xcr0;
 	u64 valid_bits;
 
+	if (!kvm_x86_ops->mpx_supported || !kvm_x86_ops->mpx_supported())
+		xcr0 &= ~(XSTATE_BNDREGS | XSTATE_BNDCSR);
+
 	/* Only support XCR_XFEATURE_ENABLED_MASK(xcr0) now  */
 	if (index != XCR_XFEATURE_ENABLED_MASK)
 		return 1;
@@ -616,6 +619,9 @@  int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
 	if (xcr0 & ~valid_bits)
 		return 1;
 
+	if ((!(xcr0 & XSTATE_BNDREGS)) != (!(xcr0 & XSTATE_BNDCSR)))
+		return 1;
+
 	kvm_put_guest_xcr0(vcpu);
 	vcpu->arch.xcr0 = xcr0;
 
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 8da5823..392ecbf 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -122,7 +122,8 @@  int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
 	gva_t addr, void *val, unsigned int bytes,
 	struct x86_exception *exception);
 
-#define KVM_SUPPORTED_XCR0	(XSTATE_FP | XSTATE_SSE | XSTATE_YMM)
+#define KVM_SUPPORTED_XCR0     (XSTATE_FP | XSTATE_SSE | XSTATE_YMM \
+				| XSTATE_BNDREGS | XSTATE_BNDCSR)
 extern u64 host_xcr0;
 
 extern unsigned int min_timer_period_us;