Skip to content

Commit d7bfc9f

Browse files
xinli-intelsean-jc
authored andcommitted
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: Xin Li <xin3.li@intel.com> [sean: split to separate patch, write changelog] Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Kai Huang <kai.huang@intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Link: https://lore.kernel.org/r/20240605231918.2915961-5-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent b6717d3 commit d7bfc9f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,14 +1177,6 @@
11771177
#define MSR_IA32_VMX_VMFUNC 0x00000491
11781178
#define MSR_IA32_VMX_PROCBASED_CTLS3 0x00000492
11791179

1180-
/* VMX_BASIC bits and bitmasks */
1181-
#define VMX_BASIC_VMCS_SIZE_SHIFT 32
1182-
#define VMX_BASIC_TRUE_CTLS (1ULL << 55)
1183-
#define VMX_BASIC_64 0x0001000000000000LLU
1184-
#define VMX_BASIC_MEM_TYPE_SHIFT 50
1185-
#define VMX_BASIC_MEM_TYPE_MASK 0x003c000000000000LLU
1186-
#define VMX_BASIC_INOUT 0x0040000000000000LLU
1187-
11881180
/* Resctrl MSRs: */
11891181
/* - Intel: */
11901182
#define MSR_IA32_L3_QOS_CFG 0xc81

arch/x86/include/asm/vmx.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,13 @@
135135
#define VMX_VMFUNC_EPTP_SWITCHING VMFUNC_CONTROL_BIT(EPTP_SWITCHING)
136136
#define VMFUNC_EPTP_ENTRIES 512
137137

138+
#define VMX_BASIC_VMCS_SIZE_SHIFT 32
139+
#define VMX_BASIC_32BIT_PHYS_ADDR_ONLY BIT_ULL(48)
140+
#define VMX_BASIC_DUAL_MONITOR_TREATMENT BIT_ULL(49)
141+
#define VMX_BASIC_MEM_TYPE_SHIFT 50
142+
#define VMX_BASIC_INOUT BIT_ULL(54)
143+
#define VMX_BASIC_TRUE_CTLS BIT_ULL(55)
144+
138145
static inline u32 vmx_basic_vmcs_revision_id(u64 vmx_basic)
139146
{
140147
return vmx_basic & GENMASK_ULL(30, 0);

0 commit comments

Comments
 (0)