From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: "Jiří Paleček" <jpalecek@web.de>,
kvm@vger.kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>
Subject: Re: [PATCH] kvm: Nested KVM MMUs need PAE root too
Date: Mon, 26 Aug 2019 09:11:32 -0700 [thread overview]
Message-ID: <20190826161132.GD19381@linux.intel.com> (raw)
In-Reply-To: <87lfvgm8a9.fsf@vitty.brq.redhat.com>
On Mon, Aug 26, 2019 at 02:16:14PM +0200, Vitaly Kuznetsov wrote:
> Jiří Paleček <jpalecek@web.de> writes:
> > @@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu)
> > vcpu->arch.guest_mmu.prev_roots[i] = KVM_MMU_ROOT_INFO_INVALID;
> >
> > vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa;
> > - return alloc_mmu_pages(vcpu);
> > +
> > + ret = alloc_mmu_pages(vcpu, &vcpu->arch.guest_mmu);
> > + if (ret)
> > + return ret;
> > +
> > + ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu);
> > + if (ret)
> > + goto fail_allocate_root;
>
> (personal preference) here you're just jumping over 'return' so I'd
> prefer this to be written as:
>
> ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu);
> if (!ret)
> return 0;
>
> free_mmu_pages(&vcpu->arch.guest_mmu);
> return ret;
>
> and no label/goto required.
Or alternatively:
ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu);
if (ret)
free_mmu_pages(&vcpu->arch.guest_mmu);
return ret;
since error handling is usually *not* the fall through path.
> > +
> > + return ret;
> > + fail_allocate_root:
> > + free_mmu_pages(&vcpu->arch.guest_mmu);
> > + return ret;
> > }
> >
> > static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,
> > @@ -6102,7 +6115,8 @@ unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)
> > void kvm_mmu_destroy(struct kvm_vcpu *vcpu)
> > {
> > kvm_mmu_unload(vcpu);
> > - free_mmu_pages(vcpu);
> > + free_mmu_pages(&vcpu->arch.root_mmu);
> > + free_mmu_pages(&vcpu->arch.guest_mmu);
> > mmu_free_memory_caches(vcpu);
> > }
> >
> > --
> > 2.23.0.rc1
> >
>
> --
> Vitaly
next prev parent reply other threads:[~2019-08-26 16:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-22 17:42 [PATCH] kvm: Nested KVM MMUs need PAE root too Jiří Paleček
2019-08-26 12:16 ` Vitaly Kuznetsov
2019-08-26 16:11 ` Sean Christopherson [this message]
2019-08-31 12:45 ` Jiri Palecek
2019-09-03 20:33 ` Sean Christopherson
2019-09-11 16:04 ` Paolo Bonzini
[not found] <87y2z7rmgw.fsf@debian>
2019-09-04 9:53 ` Vitaly Kuznetsov
2019-09-04 11:03 ` Jiri Palecek
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=20190826161132.GD19381@linux.intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jpalecek@web.de \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=vkuznets@redhat.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).