KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs()
PATCH v2 1/2 KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs()
nested_vmx_setup_ctls_msrs() initializes the vmcs_conf.nested, which stores the global VMX MSR configurations when nested is supported, regardless of any particular CPUID settings for one VM.
Commit 6defc591846d ("KVM: nVMX: include conditional controls in /dev/kvm KVM_GET_MSRS") added the some feature flags for secondary proc-based controls, so that those features can be available in KVM_GET_MSRS. Yet this commit did not remove the obsolete comments in nested_vmx_setup_ctls_msrs().
Just fix the comments, and no functional change intended.
--- arch/x86/kvm/vmx/nested.c | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/kvm/vmx/nested.c +0 -5
@@ -6863,11 +6863,6 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps) msrs->procbased_ctls_low &= ~(CPU_BASED_CR3_LOAD_EXITING |CPU_BASED_CR3_STORE_EXITING ); -/* -* secondary cpu-based controls. Do not include those that -* depend on CPUID bits, they are added later by -* vmx_vcpu_after_set_cpuid. -*/ msrs->secondary_ctls_low =0 ; msrs->secondary_ctls_high = vmcs_conf->cpu_based_2nd_exec_ctrl;
Signature · 1 line
2.25.1
PATCH v2 2/2 KVM: nVMX: Add helpers to setup VMX control msr configs
nested_vmx_setup_ctls_msrs() is used to set up the various VMX MSR controls for nested VMX. But it is a bit lengthy, just add helpers to setup the configuration of VMX MSRs.
--- arch/x86/kvm/vmx/nested.c | 129 +++++++++++++++++++++++++------------- 1 file changed, 85 insertions(+), 44 deletions(-)
arch/x86/kvm/vmx/nested.c +85 -44
@@ -6750,36 +6750,9 @@ static u64 nested_vmx_calc_vmcs_enum_msr(void)return (u64 )max_idx <<VMCS_FIELD_INDEX_SHIFT ; } -/* -* nested_vmx_setup_ctls_msrs() sets up variables containing the values to be -* returned for the various VMX controls MSRs when nested VMX is enabled. -* The same values should also be used to verify that vmcs12 control fields are -* valid during nested entry from L1 to L2. -* Each of these control msrs has a low and high 32-bit half: A low bit is on -* if the corresponding bit in the (32-bit) control field *must* be on, and a -* bit in the high half is on if the corresponding bit in the control field -* may be on. See also vmx_control_verify(). -*/ -void nested_vmx_setup_ctls_msrs (struct vmcs_config *vmcs_conf,u32 ept_caps) +static inline void nested_vmx_setup_pinbased_ctls (struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) { -struct nested_vmx_msrs *msrs = &vmcs_conf->nested; - -/* -* Note that as a general rule, the high half of the MSRs (bits in -* the control fields which may be 1) should be initialized by the -* intersection of the underlying hardware's MSR (i.e., features which -* can be supported) and the list of features we want to expose - -* because they are known to be properly supported in our code. -* Also, usually, the low half of the MSRs (bits which must be 1) can -* be set to 0, meaning that L1 may turn off any of these bits. The -* reason is that if one of these bits is necessary, it will appear -* in vmcs01 and prepare_vmcs02, when it bitwise-or's the control -* fields of vmcs01 and vmcs02, will turn these bits off - and -* nested_vmx_l1_wants_exit() will not pass related exits to L1. -* These rules have exceptions below. -*/ - -/* pin-based controls */ msrs->pinbased_ctls_low =PIN_BASED_ALWAYSON_WITHOUT_TRUE_MSR ;
@@ -6792,8 +6765,11 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps) msrs->pinbased_ctls_high |=PIN_BASED_ALWAYSON_WITHOUT_TRUE_MSR |PIN_BASED_VMX_PREEMPTION_TIMER ; +} -/* exit controls */ +static inline void nested_vmx_setup_exit_ctls (struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) +{ msrs->exit_ctls_low =VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR ;
@@ -6812,8 +6788,11 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)/* We support free control of debug control saving. */ msrs->exit_ctls_low &= ~VM_EXIT_SAVE_DEBUG_CONTROLS ; +} -/* entry controls */ +static inline void nested_vmx_setup_entry_ctls (struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) +{ msrs->entry_ctls_low =VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR ;
@@ -6829,8 +6808,11 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)/* We support free control of debug control loading. */ msrs->entry_ctls_low &= ~VM_ENTRY_LOAD_DEBUG_CONTROLS ; +} -/* cpu-based controls */ +static inline void nested_vmx_setup_cpubased_ctls (struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) +{ msrs->procbased_ctls_low =CPU_BASED_ALWAYSON_WITHOUT_TRUE_MSR ;
@@ -6862,7 +6844,12 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)/* We support free control of CR3 access interception. */ msrs->procbased_ctls_low &= ~(CPU_BASED_CR3_LOAD_EXITING |CPU_BASED_CR3_STORE_EXITING ); +} +static inline void nested_vmx_setup_secondary_ctls (u32 ept_caps, +struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) +{ msrs->secondary_ctls_low =0 ; msrs->secondary_ctls_high = vmcs_conf->cpu_based_2nd_exec_ctrl;
@@ -6944,8 +6931,11 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)if (enable_sgx) msrs->secondary_ctls_high |=SECONDARY_EXEC_ENCLS_EXITING ; +} -/* miscellaneous data */ +static inline void nested_vmx_setup_misc_data (struct vmcs_config *vmcs_conf, +struct nested_vmx_msrs *msrs) +{ msrs->misc_low = (u32 )vmcs_conf->misc &VMX_MISC_SAVE_EFER_LMA ; msrs->misc_low |= MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS |
@@ -6953,13 +6943,16 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)VMX_MISC_ACTIVITY_HLT |VMX_MISC_ACTIVITY_WAIT_SIPI ; msrs->misc_high =0 ; +} -/* -* This MSR reports some information about VMX support. We -* should return information about the VMX we emulate for the -* guest, and the VMCS structure we give it - not about the -* VMX support of the underlying hardware. -*/ +/* +* VMX basic MSR reports some information about VMX support. We should +* return information about the VMX we emulate for the guest, and the +* VMCS structure we give it - not about the VMX support of the underlying +* hardware. +*/ +static inline void nested_vmx_setup_basic (struct nested_vmx_msrs *msrs) +{ msrs->basic =VMCS12_REVISION | VMX_BASIC_TRUE_CTLS |
@@ -6968,12 +6961,15 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)if (cpu_has_vmx_basic_inout ()) msrs->basic |=VMX_BASIC_INOUT ; +} -/* -* These MSRs specify bits which the guest must keep fixed on -* while L1 is in VMXON mode (in L1's root mode, or running an L2). -* We picked the standard core2 setting. -*/ +/* +* cr0_fixed & cr4_fixed MSRs specify bits which the guest must keep fixed +* on while L1 is in VMXON mode (in L1's root mode, or running an L2). +* We picked the standard core2 setting. +*/ +static inline void nested_vmx_setup_cr_fixed (struct nested_vmx_msrs *msrs) +{#define VMXON_CR0_ALWAYSON (X86_CR0_PE | X86_CR0_PG | X86_CR0_NE)#define VMXON_CR4_ALWAYSON X86_CR4_VMXE msrs->cr0_fixed0 =VMXON_CR0_ALWAYSON ;
@@ -6985,6 +6981,51 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)if (vmx_umip_emulated ()) msrs->cr4_fixed1 |=X86_CR4_UMIP ; +} + +/* +* nested_vmx_setup_ctls_msrs() sets up variables containing the values to be +* returned for the various VMX controls MSRs when nested VMX is enabled. +* The same values should also be used to verify that vmcs12 control fields are +* valid during nested entry from L1 to L2. +* Each of these control msrs has a low and high 32-bit half: A low bit is on +* if the corresponding bit in the (32-bit) control field *must* be on, and a +* bit in the high half is on if the corresponding bit in the control field +* may be on. See also vmx_control_verify(). +*/ +void nested_vmx_setup_ctls_msrs (struct vmcs_config *vmcs_conf,u32 ept_caps) +{ +struct nested_vmx_msrs *msrs = &vmcs_conf->nested; + +/* +* Note that as a general rule, the high half of the MSRs (bits in +* the control fields which may be 1) should be initialized by the +* intersection of the underlying hardware's MSR (i.e., features which +* can be supported) and the list of features we want to expose - +* because they are known to be properly supported in our code. +* Also, usually, the low half of the MSRs (bits which must be 1) can +* be set to 0, meaning that L1 may turn off any of these bits. The +* reason is that if one of these bits is necessary, it will appear +* in vmcs01 and prepare_vmcs02, when it bitwise-or's the control +* fields of vmcs01 and vmcs02, will turn these bits off - and +* nested_vmx_l1_wants_exit() will not pass related exits to L1. +* These rules have exceptions below. +*/ +nested_vmx_setup_pinbased_ctls (vmcs_conf, msrs); + +nested_vmx_setup_exit_ctls (vmcs_conf, msrs); + +nested_vmx_setup_entry_ctls (vmcs_conf, msrs); + +nested_vmx_setup_cpubased_ctls (vmcs_conf, msrs); + +nested_vmx_setup_secondary_ctls (ept_caps, vmcs_conf, msrs); + +nested_vmx_setup_misc_data (vmcs_conf, msrs); + +nested_vmx_setup_basic (msrs); + +nested_vmx_setup_cr_fixed (msrs); msrs->vmcs_enum =nested_vmx_calc_vmcs_enum_msr (); }
Signature · 1 line
2.25.1
Sean Christopherson
maintainerRe: [PATCH v2 2/2] KVM: nVMX: Add helpers to setup VMX control msr configs
Quoted 20 lines · Yu Zhang
nested_vmx_setup_ctls_msrs()is used to set up the various VMX MSR controls for nested VMX. But it is a bit lengthy, just add helpers to setup the configuration of VMX MSRs.Suggested-by Sean Christopherson <[email protected]>Signed-off-by Yu Zhang <[email protected]>--- arch/x86/kvm/vmx/nested.c | 129 +++++++++++++++++++++++++------------- 1 file changed, 85 insertions(+), 44 deletions(-)arch/x86/kvm/vmx/nested.c +0
-2@@ -6750,36 +6750,9 @@ static u64 nested_vmx_calc_vmcs_enum_msr(void)return (u64 )max_idx <<VMCS_FIELD_INDEX_SHIFT ; } -/* -* nested_vmx_setup_ctls_msrs() sets up variables containing the values to be
arch/x86/kvm/vmx/nested.c static u64 nested_vmx_calc_vmcs_enum_msr(void) · line 6753
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +1
-9-* returned for the various VMX controls MSRs when nested VMX is enabled. -* The same values should also be used to verify that vmcs12 control fields are -* valid during nested entry from L1 to L2. -* Each of these control msrs has a low and high 32-bit half: A low bit is on -* if the corresponding bit in the (32-bit) control field *must* be on, and a -* bit in the high half is on if the corresponding bit in the control field -* may be on. See also vmx_control_verify(). -*/ -void nested_vmx_setup_ctls_msrs (struct vmcs_config *vmcs_conf,u32 ept_caps) +static inline void nested_vmx_setup_pinbased_ctls(struct vmcs_config *vmcs_conf,
No need for the "inline", this isn't performance sensitive code, and odds are very, very good the compiler will inline the code anyways.
Quoted 29 lines
arch/x86/kvm/vmx/nested.c +10
-6@@ -6953,13 +6943,16 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)VMX_MISC_ACTIVITY_HLT |VMX_MISC_ACTIVITY_WAIT_SIPI ; msrs->misc_high =0 ; +} -/* -* This MSR reports some information about VMX support. We -* should return information about the VMX we emulate for the -* guest, and the VMCS structure we give it - not about the -* VMX support of the underlying hardware. -*/ +/* +* VMX basic MSR reports some information about VMX support. We should +* return information about the VMX we emulate for the guest, and the +* VMCS structure we give it - not about the VMX support of the underlying +* hardware. +*/ +static inline void nested_vmx_setup_basic (struct nested_vmx_msrs *msrs) +{ msrs->basic =VMCS12_REVISION | VMX_BASIC_TRUE_CTLS |@@ -6968,12 +6961,15 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps)if (cpu_has_vmx_basic_inout ()) msrs->basic |=VMX_BASIC_INOUT ; +}
arch/x86/kvm/vmx/nested.c void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps) · line 6970
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +5
-5-/* -* These MSRs specify bits which the guest must keep fixed on -* while L1 is in VMXON mode (in L1's root mode, or running an L2). -* We picked the standard core2 setting. -*/ +/* +* cr0_fixed & cr4_fixed MSRs specify bits which the guest must keep fixed +* on while L1 is in VMXON mode (in L1's root mode, or running an L2). +* We picked the standard core2 setting. +*/
This change is flawed, the comment is specific to the fixed0 MSRs, not to all flavors of fixed MSRs and thus not to the function as a whole. As much as I want to clean up the comments, for this patch I think it's best to leave them alone.
No need to send a v2, I'll fixup when applying.
Quoted 5 lines · Yu Zhang
nested_vmx_setup_ctls_msrs()initializes the vmcs_conf.nested, which stores the global VMX MSR configurations when nested is supported, regardless of any particular CPUID settings for one VM.
Quoted 7 lines
Commit
6defc591846d("KVM: nVMX: include conditional controls in/dev/kvmKVM_GET_MSRS") added the some feature flags for secondary proc-based controls, so that those features can be available inKVM_GET_MSRS. Yet this commit did not remove the obsolete comments innested_vmx_setup_ctls_msrs().[...]
Applied to kvm-x86 vmx, thanks!
[1/2] KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs()
https://github.com/kvm-x86/linux/commit/ad36aab37ae4 [2/2] KVM: nVMX: Add helpers to setup VMX control msr configs https://github.com/kvm-x86/linux/commit/f6cde92083de
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes