KVM: VMX: cleanup VMXON region allocation
v2 cover KVM: VMX: cleanup VMXON region allocation
Minor cleanup with no functional change (intended):
- Rename 'kvm_area' to 'vmxon_region'
- Simplify setting revision_id for VMXON region when eVMCS is in use
Changes since v1:
- Patches prefix ('KVM: VMX:' now) [Sean Christopherson]
- Add Sean's R-b to PATCH1
- Do not rename alloc_vmcs_cpu() to alloc_vmx_area_cpu() and add a comment explaining why we call VMXON region 'VMCS' [Sean Christopherson]
Vitaly Kuznetsov (2):
KVM: VMX: rename 'kvm_area' to 'vmxon_region'
KVM: VMX: untangle VMXON revision_id setting when using eVMCS
arch/x86/kvm/vmx/vmx.c | 42 +++++++++++++++++++----------------------- arch/x86/kvm/vmx/vmx.h | 12 +++++++++--- 2 files changed, 28 insertions(+), 26 deletions(-)
Signature · 1 line
2.24.1
PATCH v2 1/2 KVM: VMX: rename 'kvm_area' to 'vmxon_region'
The name 'kvm_area' is misleading (as we have way too many areas which are KVM related), what alloc_kvm_area()/free_kvm_area() functions really do is allocate/free VMXON region for all CPUs. Rename accordingly.
No functional change intended.
--- arch/x86/kvm/vmx/vmx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kvm/vmx/vmx.c +5 -5
@@ -2635,7 +2635,7 @@ int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs)return -ENOMEM ; } -static void free_kvm_area (void ) +static void free_vmxon_regions (void ) {int cpu;
@@ -2645,7 +2645,7 @@ static void free_kvm_area(void) } } -static __init int alloc_kvm_area (void ) +static __init int alloc_vmxon_regions (void ) {int cpu;
@@ -2654,7 +2654,7 @@ static __init int alloc_kvm_area(void) vmcs =alloc_vmcs_cpu (false, cpu,GFP_KERNEL );if (!vmcs) { -free_kvm_area (); +free_vmxon_regions ();return -ENOMEM ; }
@@ -7815,7 +7815,7 @@ static __init int hardware_setup(void)return r; } - r =alloc_kvm_area (); + r =alloc_vmxon_regions ();if (r)nested_vmx_hardware_unsetup ();return r;
@@ -7826,7 +7826,7 @@ static __exit void hardware_unsetup(void)if (nested)nested_vmx_hardware_unsetup (); -free_kvm_area (); +free_vmxon_regions (); }static bool vmx_check_apicv_inhibit_reasons (ulong bit)
Signature · 1 line
2.24.1
PATCH v2 2/2 KVM: VMX: untangle VMXON revision_id setting when using eVMCS
In reply to Vitaly KuznetsovAs stated in alloc_vmxon_regions(), VMXON region needs to be tagged with revision id from MSR_IA32_VMX_BASIC even in case of eVMCS. The logic to do so is not very straightforward: first, we set hdr.revision_id = KVM_EVMCS_VERSION in alloc_vmcs_cpu() just to reset it back to vmcs_config.revision_id in alloc_vmxon_regions(). Simplify this by introducing 'enum vmcs_type' parameter to alloc_vmcs_cpu().
No functional change intended.
--- arch/x86/kvm/vmx/vmx.c | 32 ++++++++++++++------------------ arch/x86/kvm/vmx/vmx.h | 12 +++++++++--- 2 files changed, 23 insertions(+), 21 deletions(-)
arch/x86/kvm/vmx/vmx.c +14 -18
@@ -2554,7 +2554,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,return 0 ; } -struct vmcs *alloc_vmcs_cpu (bool shadow,int cpu,gfp_t flags) +struct vmcs *alloc_vmcs_cpu (enum vmcs_type type,int cpu,gfp_t flags) {int node =cpu_to_node (cpu);struct page *pages;
@@ -2566,13 +2566,21 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags) vmcs =page_address (pages);memset (vmcs,0 , vmcs_config.size); -/* KVM supports Enlightened VMCS v1 only */ -if (static_branch_unlikely (&enable_evmcs)) +/* +* When eVMCS is enabled, vmcs->revision_id needs to be set to the +* supported eVMCS version (KVM_EVMCS_VERSION) instead of revision_id +* reported by MSR_IA32_VMX_BASIC. +* +* However, even though not explicitly documented by TLFS, VMXArea +* passed as VMXON argument should still be marked with revision_id +* reported by physical CPU. +*/ +if (type !=VMXON_REGION &&static_branch_unlikely (&enable_evmcs)) vmcs->hdr.revision_id =KVM_EVMCS_VERSION ;else vmcs->hdr.revision_id = vmcs_config.revision_id; -if (shadow) +if (type ==SHADOW_VMCS_REGION ) vmcs->hdr.shadow_vmcs =1 ;return vmcs; }
@@ -2652,25 +2660,13 @@ static __init int alloc_vmxon_regions(void)for_each_possible_cpu (cpu) {struct vmcs *vmcs; - vmcs =alloc_vmcs_cpu (false, cpu,GFP_KERNEL ); +/* The VMXON region is really just a special type of VMCS. */ + vmcs =alloc_vmcs_cpu (VMXON_REGION , cpu,GFP_KERNEL );if (!vmcs) {free_vmxon_regions ();return -ENOMEM ; } -/* -* When eVMCS is enabled, alloc_vmcs_cpu() sets -* vmcs->revision_id to KVM_EVMCS_VERSION instead of -* revision_id reported by MSR_IA32_VMX_BASIC. -* -* However, even though not explicitly documented by -* TLFS, VMXArea passed as VMXON argument should -* still be marked with revision_id reported by -* physical CPU. -*/ -if (static_branch_unlikely (&enable_evmcs)) - vmcs->hdr.revision_id = vmcs_config.revision_id; -per_cpu (vmxarea, cpu) = vmcs; }return 0 ;
arch/x86/kvm/vmx/vmx.h +9 -3
@@ -489,7 +489,13 @@ static inline struct pi_desc *vcpu_to_pi_desc(struct kvm_vcpu *vcpu)return &(to_vmx (vcpu)->pi_desc); } -struct vmcs *alloc_vmcs_cpu (bool shadow,int cpu,gfp_t flags); +enum vmcs_type { +VMXON_REGION , +VMCS_REGION , +SHADOW_VMCS_REGION , +}; + +struct vmcs *alloc_vmcs_cpu (enum vmcs_type type,int cpu,gfp_t flags);void free_vmcs (struct vmcs *vmcs);int alloc_loaded_vmcs (struct loaded_vmcs *loaded_vmcs);void free_loaded_vmcs (struct loaded_vmcs *loaded_vmcs);
@@ -498,8 +504,8 @@ void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs);static inline struct vmcs *alloc_vmcs (bool shadow) { -return alloc_vmcs_cpu (shadow,raw_smp_processor_id (), -GFP_KERNEL_ACCOUNT ); +return alloc_vmcs_cpu (shadow ?SHADOW_VMCS_REGION :VMCS_REGION , +raw_smp_processor_id (),GFP_KERNEL_ACCOUNT ); }u64 construct_eptp (struct kvm_vcpu *vcpu,unsigned long root_hpa);
Signature · 1 line
2.24.1
Re: [PATCH v2 2/2] KVM: VMX: untangle VMXON revision_id setting when using eVMCS
Quoted 11 lines · Vitaly Kuznetsov
As stated in
alloc_vmxon_regions(), VMXON region needs to be tagged with revision id fromMSR_IA32_VMX_BASICeven in case of eVMCS. The logic to do so is not very straightforward: first, we set hdr.revision_id =KVM_EVMCS_VERSIONinalloc_vmcs_cpu()just to reset it back to vmcs_config.revision_id inalloc_vmxon_regions(). Simplify this by introducing 'enumvmcs_type' parameter toalloc_vmcs_cpu().No functional change intended.
Signed-off-by Vitaly Kuznetsov <[email protected]>---
...
Review
Quoted 3 lines
(quoted diff) +3
-0+ * However, even though not explicitly documented by TLFS, VMXArea + * passed as VMXON argument should still be marked with revision_id + * reported by physical CPU.
LOL, nice.
Quoted 24 lines
(quoted diff) +10
-2+ */ + if (type != VMXON_REGION && static_branch_unlikely(&enable_evmcs)) vmcs->hdr.revision_id = KVM_EVMCS_VERSION; else vmcs->hdr.revision_id = vmcs_config.revision_id; - if (shadow) + if (type == SHADOW_VMCS_REGION) vmcs->hdr.shadow_vmcs = 1; return vmcs; } -struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags); +enum vmcs_type { + VMXON_REGION, + VMCS_REGION, + SHADOW_VMCS_REGION, +}; + +struct vmcs *alloc_vmcs_cpu(enum vmcs_type type, int cpu, gfp_t flags); void free_vmcs(struct vmcs *vmcs); int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs); void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs);
Review void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs); · line 505
Quoted 2 lines
(quoted diff) +0
-0@@ -498,8 +504,8 @@ void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs); static inline struct vmcs *alloc_vmcs(bool shadow)
I think it'd be cleaner overall to take "enum vmcs_type" in alloc_vmcs(). Then the ternary operator goes away and the callers (all two of 'em) are self-documenting. E.g.
arch/x86/kvm/vmx/nested.c +1 -1
@@ -4566,7 +4566,7 @@ static struct vmcs *alloc_shadow_vmcs(struct kvm_vcpu *vcpu)WARN_ON (loaded_vmcs == &vmx->vmcs01 && loaded_vmcs->shadow_vmcs);if (!loaded_vmcs->shadow_vmcs) { - loaded_vmcs->shadow_vmcs =alloc_vmcs (true); + loaded_vmcs->shadow_vmcs =alloc_vmcs (SHADOW_VMCS_REGION );if (loaded_vmcs->shadow_vmcs)vmcs_clear (loaded_vmcs->shadow_vmcs); }
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -2605,7 +2605,7 @@ void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs)int alloc_loaded_vmcs (struct loaded_vmcs *loaded_vmcs) { - loaded_vmcs->vmcs =alloc_vmcs (false); + loaded_vmcs->vmcs =alloc_vmcs (VMCS_REGION );if (!loaded_vmcs->vmcs)return -ENOMEM ;
arch/x86/kvm/vmx/vmx.h +3 -3
@@ -502,10 +502,10 @@ void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs);void loaded_vmcs_init (struct loaded_vmcs *loaded_vmcs);void loaded_vmcs_clear (struct loaded_vmcs *loaded_vmcs); -static inline struct vmcs *alloc_vmcs (bool shadow) +static inline struct vmcs *alloc_vmcs (enum vmcs_type type) { -return alloc_vmcs_cpu (shadow ?SHADOW_VMCS_REGION :VMCS_REGION , -raw_smp_processor_id (),GFP_KERNEL_ACCOUNT ); +return alloc_vmcs_cpu (type,raw_smp_processor_id (), +GFP_KERNEL_ACCOUNT ); }u64 construct_eptp (struct kvm_vcpu *vcpu,unsigned long root_hpa);
Quoted 11 lines
(quoted diff) +2
-2{ - return alloc_vmcs_cpu(shadow, raw_smp_processor_id(), - GFP_KERNEL_ACCOUNT); + return alloc_vmcs_cpu(shadow ? SHADOW_VMCS_REGION : VMCS_REGION, + raw_smp_processor_id(), GFP_KERNEL_ACCOUNT); } u64 construct_eptp(struct kvm_vcpu *vcpu, unsigned long root_hpa);Signature · 1 line
2.24.1
Re: [PATCH v2 2/2] KVM: VMX: untangle VMXON revision_id setting when using eVMCS
Quoted 47 lines · Sean Christopherson
Quoted 11 lines · Vitaly Kuznetsov
As stated in
alloc_vmxon_regions(), VMXON region needs to be tagged with revision id fromMSR_IA32_VMX_BASICeven in case of eVMCS. The logic to do so is not very straightforward: first, we set hdr.revision_id =KVM_EVMCS_VERSIONinalloc_vmcs_cpu()just to reset it back to vmcs_config.revision_id inalloc_vmxon_regions(). Simplify this by introducing 'enumvmcs_type' parameter toalloc_vmcs_cpu().No functional change intended.
Signed-off-by Vitaly Kuznetsov <[email protected]>---
...
Review
Quoted 3 lines
(quoted diff) +3
-0+ * However, even though not explicitly documented by TLFS, VMXArea + * passed as VMXON argument should still be marked with revision_id + * reported by physical CPU.LOL, nice.
Quoted 25 lines
(quoted diff) +10
-2+ */ + if (type != VMXON_REGION && static_branch_unlikely(&enable_evmcs)) vmcs->hdr.revision_id = KVM_EVMCS_VERSION; else vmcs->hdr.revision_id = vmcs_config.revision_id; - if (shadow) + if (type == SHADOW_VMCS_REGION) vmcs->hdr.shadow_vmcs = 1; return vmcs; } -struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags); +enum vmcs_type { + VMXON_REGION, + VMCS_REGION, + SHADOW_VMCS_REGION, +}; + +struct vmcs *alloc_vmcs_cpu(enum vmcs_type type, int cpu, gfp_t flags); void free_vmcs(struct vmcs *vmcs); int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs); void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs);@@ -498,8 +504,8 @@ void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs);
Quoted 5 lines
Review void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs); · line 505
Quoted 1 line
(quoted diff) +0
-0static inline struct vmcs *alloc_vmcs(bool shadow)I think it'd be cleaner overall to take "enum
vmcs_type" inalloc_vmcs(). Then the ternary operator goes away and the callers (all two of 'em) are self-documenting.
Ya, it didn't seem to be needed with my initial suggestion to rename alloc_vmcs_cpu() to alloc_vmx_area_cpu() because in case we think of VMXON region as something different from VMCS we have only two options:
normal VMCS or shadow VMCS and bool flag works perfectly.
v3 is on the way, stay tuned!
Signature · 1 line
Vitaly