KVM: x86/mmu: Move individual kvm_mmu initialization into common helper

Move initialization of 'struct kvm_mmu' fields into alloc_mmu_pages() to
consolidate code, and rename the helper to __kvm_mmu_create().

No functional change intended.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923163314.8181-1-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index d58658d15366b5eb20f800581bb61a8900f5c20c..32e0e5c0524e5b50d1a4fb5a4072da197b820e1a 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -5711,11 +5711,17 @@ static void free_mmu_pages(struct kvm_mmu *mmu)
        free_page((unsigned long)mmu->lm_root);
 }
 
-static int alloc_mmu_pages(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)
+static int __kvm_mmu_create(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)
 {
        struct page *page;
        int i;
 
+       mmu->root_hpa = INVALID_PAGE;
+       mmu->root_pgd = 0;
+       mmu->translate_gpa = translate_gpa;
+       for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
+               mmu->prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;
+
        /*
         * When using PAE paging, the four PDPTEs are treated as 'root' pages,
         * while the PDP table is a per-vCPU construct that's allocated at MMU
@@ -5741,7 +5747,6 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)
 
 int kvm_mmu_create(struct kvm_vcpu *vcpu)
 {
-       uint i;
        int ret;
 
        vcpu->arch.mmu_pte_list_desc_cache.kmem_cache = pte_list_desc_cache;
@@ -5755,25 +5760,13 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu)
        vcpu->arch.mmu = &vcpu->arch.root_mmu;
        vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;
 
-       vcpu->arch.root_mmu.root_hpa = INVALID_PAGE;
-       vcpu->arch.root_mmu.root_pgd = 0;
-       vcpu->arch.root_mmu.translate_gpa = translate_gpa;
-       for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
-               vcpu->arch.root_mmu.prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;
-
-       vcpu->arch.guest_mmu.root_hpa = INVALID_PAGE;
-       vcpu->arch.guest_mmu.root_pgd = 0;
-       vcpu->arch.guest_mmu.translate_gpa = translate_gpa;
-       for (i = 0; i < KVM_MMU_NUM_PREV_ROOTS; i++)
-               vcpu->arch.guest_mmu.prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;
-
        vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa;
 
-       ret = alloc_mmu_pages(vcpu, &vcpu->arch.guest_mmu);
+       ret = __kvm_mmu_create(vcpu, &vcpu->arch.guest_mmu);
        if (ret)
                return ret;
 
-       ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu);
+       ret = __kvm_mmu_create(vcpu, &vcpu->arch.root_mmu);
        if (ret)
                goto fail_allocate_root;