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

Commit 63f3ac48 authored by Jan Dakinevich's avatar Jan Dakinevich Committed by Radim Krčmář
Browse files

KVM: VMX: clean up declaration of VPID/EPT invalidation types 



 - Remove VMX_EPT_EXTENT_INDIVIDUAL_ADDR, since there is no such type of
   EPT invalidation

 - Add missing VPID types names

Signed-off-by: default avatarJan Dakinevich <jan.dakinevich@gmail.com>
Tested-by: default avatarLadi Prosek <lprosek@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent c7dd15b3

arch/x86/include/asm/vmx.h

+4 −1
Original line number Diff line number Diff line
@@ -400,10 +400,11 @@ enum vmcs_field { 
#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT	(KVM_USER_MEM_SLOTS + 2)



#define VMX_NR_VPIDS				(1 << 16)

#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR		0

#define VMX_VPID_EXTENT_SINGLE_CONTEXT		1

#define VMX_VPID_EXTENT_ALL_CONTEXT		2

#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL	3



#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR		0

#define VMX_EPT_EXTENT_CONTEXT			1

#define VMX_EPT_EXTENT_GLOBAL			2

#define VMX_EPT_EXTENT_SHIFT			24
@@ -420,8 +421,10 @@ enum vmcs_field { 
#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)



#define VMX_VPID_INVVPID_BIT                    (1ull << 0) /* (32 - 32) */

#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT     (1ull << 8) /* (40 - 32) */

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

#define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT      (1ull << 10) /* (42 - 32) */

#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT   (1ull << 11) /* (43 - 32) */



#define VMX_EPT_DEFAULT_GAW			3

#define VMX_EPT_MAX_GAW				0x4