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

Commit e799794e authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: VMX: more MSR_IA32_VMX_EPT_VPID_CAP capability bits 



Required for EPT misconfiguration handler.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 71db6023

arch/x86/include/asm/vmx.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -352,9 +352,16 @@ enum vmcs_field { 
#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR		0

#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR		0

#define VMX_EPT_EXTENT_CONTEXT			1

#define VMX_EPT_EXTENT_CONTEXT			1

#define VMX_EPT_EXTENT_GLOBAL			2

#define VMX_EPT_EXTENT_GLOBAL			2



#define VMX_EPT_EXECUTE_ONLY_BIT		(1ull)

#define VMX_EPT_PAGE_WALK_4_BIT			(1ull << 6)

#define VMX_EPTP_UC_BIT				(1ull << 8)

#define VMX_EPTP_WB_BIT				(1ull << 14)

#define VMX_EPT_2MB_PAGE_BIT			(1ull << 16)

#define VMX_EPT_EXTENT_INDIVIDUAL_BIT		(1ull << 24)

#define VMX_EPT_EXTENT_INDIVIDUAL_BIT		(1ull << 24)

#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)



#define VMX_EPT_DEFAULT_GAW			3

#define VMX_EPT_DEFAULT_GAW			3

#define VMX_EPT_MAX_GAW				0x4

#define VMX_EPT_MAX_GAW				0x4

#define VMX_EPT_MT_EPTE_SHIFT			3

#define VMX_EPT_MT_EPTE_SHIFT			3

arch/x86/kvm/vmx.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -270,6 +270,26 @@ static inline bool cpu_has_vmx_flexpriority(void) 
		cpu_has_vmx_virtualize_apic_accesses();

		cpu_has_vmx_virtualize_apic_accesses();

}

}





static inline bool cpu_has_vmx_ept_execute_only(void)

{

	return !!(vmx_capability.ept & VMX_EPT_EXECUTE_ONLY_BIT);

}



static inline bool cpu_has_vmx_eptp_uncacheable(void)

{

	return !!(vmx_capability.ept & VMX_EPTP_UC_BIT);

}



static inline bool cpu_has_vmx_eptp_writeback(void)

{

	return !!(vmx_capability.ept & VMX_EPTP_WB_BIT);

}



static inline bool cpu_has_vmx_ept_2m_page(void)

{

	return !!(vmx_capability.ept & VMX_EPT_2MB_PAGE_BIT);

}



static inline int cpu_has_vmx_invept_individual_addr(void)

static inline int cpu_has_vmx_invept_individual_addr(void)

{

{

	return !!(vmx_capability.ept & VMX_EPT_EXTENT_INDIVIDUAL_BIT);

	return !!(vmx_capability.ept & VMX_EPT_EXTENT_INDIVIDUAL_BIT);