Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55412b2e authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

kvm: x86: Add kvm_x86_ops hook that enables XSAVES for guest 



Expose the XSAVES feature to the guest if the kvm_x86_ops say it is
available.

Signed-off-by: default avatarWanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5c404cab

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -771,6 +771,7 @@ struct kvm_x86_ops { 
			       enum x86_intercept_stage stage);

	void (*handle_external_intr)(struct kvm_vcpu *vcpu);

	bool (*mpx_supported)(void);

	bool (*xsaves_supported)(void);



	int (*check_nested_events)(struct kvm_vcpu *vcpu, bool external_intr);

arch/x86/include/asm/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#define SECONDARY_EXEC_PAUSE_LOOP_EXITING	0x00000400

#define SECONDARY_EXEC_ENABLE_INVPCID		0x00001000

#define SECONDARY_EXEC_SHADOW_VMCS              0x00004000

#define SECONDARY_EXEC_XSAVES			0x00100000





#define PIN_BASED_EXT_INTR_MASK                 0x00000001

arch/x86/kvm/cpuid.c

+2 −1
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, 
	unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0;

	unsigned f_invpcid = kvm_x86_ops->invpcid_supported() ? F(INVPCID) : 0;

	unsigned f_mpx = kvm_x86_ops->mpx_supported() ? F(MPX) : 0;

	unsigned f_xsaves = kvm_x86_ops->xsaves_supported() ? F(XSAVES) : 0;



	/* cpuid 1.edx */

	const u32 kvm_supported_word0_x86_features =
@@ -322,7 +323,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, 


	/* cpuid 0xD.1.eax */

	const u32 kvm_supported_word10_x86_features =

		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1);

		F(XSAVEOPT) | F(XSAVEC) | F(XGETBV1) | f_xsaves;



	/* all calls to cpuid_count() should be made on the same cpu */

	get_cpu();

arch/x86/kvm/svm.c

+6 −0
Original line number Diff line number Diff line
@@ -4127,6 +4127,11 @@ static bool svm_mpx_supported(void) 
	return false;

}



static bool svm_xsaves_supported(void)

{

	return false;

}



static bool svm_has_wbinvd_exit(void)

{

	return true;
@@ -4414,6 +4419,7 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.rdtscp_supported = svm_rdtscp_supported,

	.invpcid_supported = svm_invpcid_supported,

	.mpx_supported = svm_mpx_supported,

	.xsaves_supported = svm_xsaves_supported,



	.set_supported_cpuid = svm_set_supported_cpuid,

arch/x86/kvm/vmx.c

+7 −0
Original line number Diff line number Diff line
@@ -7553,6 +7553,12 @@ static bool vmx_mpx_supported(void) 
		(vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_BNDCFGS);

}



static bool vmx_xsaves_supported(void)

{

	return vmcs_config.cpu_based_2nd_exec_ctrl &

		SECONDARY_EXEC_XSAVES;

}



static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)

{

	u32 exit_intr_info;
@@ -9329,6 +9335,7 @@ static struct kvm_x86_ops vmx_x86_ops = { 
	.check_intercept = vmx_check_intercept,

	.handle_external_intr = vmx_handle_external_intr,

	.mpx_supported = vmx_mpx_supported,

	.xsaves_supported = vmx_xsaves_supported,



	.check_nested_events = vmx_check_nested_events,