Commit d7bfc9ff authored by Xin Li's avatar Xin Li Committed by Sean Christopherson
Browse files

KVM: VMX: Move MSR_IA32_VMX_BASIC bit defines to asm/vmx.h 



Move the bit defines for MSR_IA32_VMX_BASIC from msr-index.h to vmx.h so
that they are colocated with other VMX MSR bit defines, and with the
helpers that extract specific information from an MSR_IA32_VMX_BASIC value.

Opportunistically use BIT_ULL() instead of open coding hex values.

Opportunistically rename VMX_BASIC_64 to VMX_BASIC_32BIT_PHYS_ADDR_ONLY,
as "VMX_BASIC_64" is widly misleading.  The flag enumerates that addresses
are limited to 32 bits, not that 64-bit addresses are allowed.

Last but not least, opportunistically #define DUAL_MONITOR_TREATMENT so
that all known single-bit feature flags are defined (this will allow
replacing open-coded literals in the future).

Cc: Shan Kang <shan.kang@intel.com>
Cc: Kai Huang <kai.huang@intel.com>
Signed-off-by: default avatarXin Li <xin3.li@intel.com>
[sean: split to separate patch, write changelog]
Reviewed-by: default avatarZhao Liu <zhao1.liu@intel.com>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20240605231918.2915961-5-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent b6717d35

arch/x86/include/asm/msr-index.h

+0 −8
Original line number Diff line number Diff line
@@ -1177,14 +1177,6 @@ 
#define MSR_IA32_VMX_VMFUNC             0x00000491

#define MSR_IA32_VMX_PROCBASED_CTLS3	0x00000492



/* VMX_BASIC bits and bitmasks */

#define VMX_BASIC_VMCS_SIZE_SHIFT	32

#define VMX_BASIC_TRUE_CTLS		(1ULL << 55)

#define VMX_BASIC_64		0x0001000000000000LLU

#define VMX_BASIC_MEM_TYPE_SHIFT	50

#define VMX_BASIC_MEM_TYPE_MASK	0x003c000000000000LLU

#define VMX_BASIC_INOUT		0x0040000000000000LLU



/* Resctrl MSRs: */

/* - Intel: */

#define MSR_IA32_L3_QOS_CFG		0xc81

arch/x86/include/asm/vmx.h

+7 −0
Original line number Diff line number Diff line
@@ -135,6 +135,13 @@ 
#define VMX_VMFUNC_EPTP_SWITCHING               VMFUNC_CONTROL_BIT(EPTP_SWITCHING)

#define VMFUNC_EPTP_ENTRIES  512



#define VMX_BASIC_VMCS_SIZE_SHIFT		32

#define VMX_BASIC_32BIT_PHYS_ADDR_ONLY		BIT_ULL(48)

#define VMX_BASIC_DUAL_MONITOR_TREATMENT	BIT_ULL(49)

#define VMX_BASIC_MEM_TYPE_SHIFT		50

#define VMX_BASIC_INOUT				BIT_ULL(54)

#define VMX_BASIC_TRUE_CTLS			BIT_ULL(55)



static inline u32 vmx_basic_vmcs_revision_id(u64 vmx_basic)

{

	return vmx_basic & GENMASK_ULL(30, 0);