linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
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
Subject: Re: [PATCH] KVM: x86/mmu: Move individual kvm_mmu initialization into common helper
Date: Wed, 23 Sep 2020 19:02:45 +0200	[thread overview]
Message-ID: <815dfaef-54e3-f0e8-9641-8a87f8910b74@redhat.com> (raw)
In-Reply-To: <20200923163314.8181-1-sean.j.christopherson@intel.com>

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


      reply	other threads:[~2020-09-23 17:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-23 16:33 [PATCH] KVM: x86/mmu: Move individual kvm_mmu initialization into common helper Sean Christopherson
2020-09-23 17:02 ` Paolo Bonzini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=815dfaef-54e3-f0e8-9641-8a87f8910b74@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sean.j.christopherson@intel.com \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).