Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] KVM: x86/mmu: Move individual kvm_mmu initialization into
 common helper
To:     Sean Christopherson <sean.j.christopherson@intel.com>
Cc:     Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20200923163314.8181-1-sean.j.christopherson@intel.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <815dfaef-54e3-f0e8-9641-8a87f8910b74@redhat.com>
Date:   Wed, 23 Sep 2020 19:02:45 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.11.0
MIME-Version: 1.0
In-Reply-To: <20200923163314.8181-1-sean.j.christopherson@intel.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 23/09/20 18:33, Sean Christopherson wrote:
> 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>
> ---
>  arch/x86/kvm/mmu/mmu.c | 25 +++++++++----------------
>  1 file changed, 9 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 76c5826e29a2..a2c4c71ce5f2 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -5682,11 +5682,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
> @@ -5712,7 +5718,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;
> @@ -5726,25 +5731,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;
>  
> 

Queued, thanks.

Paolo