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

Commit 518c8aee authored by Gui Jianfeng's avatar Gui Jianfeng Committed by Avi Kivity
Browse files

KVM: VMX: Make sure single type invvpid is supported before issuing invvpid instruction 



According to SDM, we need check whether single-context INVVPID type is supported
before issuing invvpid instruction.

Signed-off-by: default avatarGui Jianfeng <guijianfeng@cn.fujitsu.com>
Reviewed-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 7bee342a

arch/x86/include/asm/vmx.h

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ enum vmcs_field { 
#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)



#define VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT      (1ull << 9) /* (41 - 32) */



#define VMX_EPT_DEFAULT_GAW			3

#define VMX_EPT_MAX_GAW				0x4

#define VMX_EPT_MT_EPTE_SHIFT			3

arch/x86/kvm/vmx.c

+7 −1
Original line number Diff line number Diff line
@@ -360,6 +360,11 @@ static inline bool cpu_has_vmx_invept_global(void) 
	return vmx_capability.ept & VMX_EPT_EXTENT_GLOBAL_BIT;

}



static inline bool cpu_has_vmx_invvpid_single(void)

{

	return vmx_capability.vpid & VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT;

}



static inline bool cpu_has_vmx_ept(void)

{

	return vmcs_config.cpu_based_2nd_exec_ctrl &
@@ -504,6 +509,7 @@ static inline void vpid_sync_vcpu_all(struct vcpu_vmx *vmx) 
	if (vmx->vpid == 0)

		return;



	if (cpu_has_vmx_invvpid_single())

		__invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0);

}