KVM: VMX: introduce alloc_loaded_vmcs

Group together the calls to alloc_vmcs and loaded_vmcs_init.  Soon we'll also
allocate an MSR bitmap there.

Cc: stable@vger.kernel.org       # prereq for Spectre mitigation
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry-picked from f21f165ef922c2146cc5bdc620f542953c41714b)

Orabug: 28069548

Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
    arch/x86/kvm/vmx.c
Contextual

Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 633be63fd08d57a2e81475ffae2f91a0659f4f8b..4b2c767216d77a799974fb848bd700998c74040c 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3391,11 +3391,6 @@ static struct vmcs *alloc_vmcs_cpu(int cpu)
        return vmcs;
 }
 
-static struct vmcs *alloc_vmcs(void)
-{
-       return alloc_vmcs_cpu(raw_smp_processor_id());
-}
-
 static void free_vmcs(struct vmcs *vmcs)
 {
        free_pages((unsigned long)vmcs, vmcs_config.order);
@@ -3419,6 +3414,21 @@ static void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs)
                wrmsrl(MSR_IA32_PRED_CMD, FEATURE_SET_IBPB);
 }
 
+static struct vmcs *alloc_vmcs(void)
+{
+       return alloc_vmcs_cpu(raw_smp_processor_id());
+}
+
+static int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs)
+{
+       loaded_vmcs->vmcs = alloc_vmcs();
+       if (!loaded_vmcs->vmcs)
+               return -ENOMEM;
+
+       loaded_vmcs_init(loaded_vmcs);
+       return 0;
+}
+
 static void free_kvm_area(void)
 {
        int cpu;
@@ -6741,6 +6751,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
        struct kvm_segment cs;
        struct vcpu_vmx *vmx = to_vmx(vcpu);
        struct vmcs *shadow_vmcs;
+       int r;
        const u64 VMXON_NEEDED_FEATURES = FEATURE_CONTROL_LOCKED
                | FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
 
@@ -6782,10 +6793,9 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
                return 1;
        }
 
-       vmx->nested.vmcs02.vmcs = alloc_vmcs();
-       if (!vmx->nested.vmcs02.vmcs)
+       r = alloc_loaded_vmcs(&vmx->nested.vmcs02);
+       if (r < 0)
                goto out_vmcs02;
-       loaded_vmcs_init(&vmx->nested.vmcs02);
 
        if (cpu_has_vmx_msr_bitmap()) {
                vmx->nested.msr_bitmap =
@@ -8700,15 +8710,10 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
                goto uninit_vcpu;
        }
 
-       vmx->loaded_vmcs = &vmx->vmcs01;
-       vmx->loaded_vmcs->vmcs = alloc_vmcs();
-       if (!vmx->loaded_vmcs->vmcs)
+       err = alloc_loaded_vmcs(&vmx->vmcs01);
+       if (err < 0)
                goto free_msrs;
-       if (!vmm_exclusive)
-               kvm_cpu_vmxon(__pa(per_cpu(vmxarea, raw_smp_processor_id())));
-       loaded_vmcs_init(vmx->loaded_vmcs);
-       if (!vmm_exclusive)
-               kvm_cpu_vmxoff();
+       vmx->loaded_vmcs = &vmx->vmcs01;
 
        cpu = get_cpu();
        vmx_vcpu_load(&vmx->vcpu, cpu);