From: Paolo Bonzini <pbonzini@redhat.com>
To: Ben Gardon <bgardon@google.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Peter Shier <pshier@google.com>,
Junaid Shahid <junaids@google.com>,
Jim Mattson <jmattson@google.com>,
Yulei Zhang <yulei.kernel@gmail.com>,
Wanpeng Li <kernellwp@gmail.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Xiao Guangrong <xiaoguangrong.eric@gmail.com>
Subject: Re: [PATCH 3/6] KVM: x86/mmu: Deduplicate rmap freeing in allocate_memslot_rmap
Date: Wed, 28 Apr 2021 12:00:43 +0200 [thread overview]
Message-ID: <2e5ecc0b-0ef4-a663-3b1d-81d020626b39@redhat.com> (raw)
In-Reply-To: <20210427223635.2711774-4-bgardon@google.com>
Typo in the commit subject, I guess?
Paolo
On 28/04/21 00:36, Ben Gardon wrote:
> Small code deduplication. No functional change expected.
>
> Signed-off-by: Ben Gardon <bgardon@google.com>
> ---
> arch/x86/kvm/x86.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index cf3b67679cf0..5bcf07465c47 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -10818,17 +10818,23 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
> kvm_hv_destroy_vm(kvm);
> }
>
> -void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
> +static void free_memslot_rmap(struct kvm_memory_slot *slot)
> {
> int i;
>
> for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
> kvfree(slot->arch.rmap[i]);
> slot->arch.rmap[i] = NULL;
> + }
> +}
>
> - if (i == 0)
> - continue;
> +void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
> +{
> + int i;
> +
> + free_memslot_rmap(slot);
>
> + for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {
> kvfree(slot->arch.lpage_info[i - 1]);
> slot->arch.lpage_info[i - 1] = NULL;
> }
> @@ -10894,12 +10900,9 @@ static int kvm_alloc_memslot_metadata(struct kvm_memory_slot *slot,
> return 0;
>
> out_free:
> - for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
> - kvfree(slot->arch.rmap[i]);
> - slot->arch.rmap[i] = NULL;
> - if (i == 0)
> - continue;
> + free_memslot_rmap(slot);
>
> + for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {
> kvfree(slot->arch.lpage_info[i - 1]);
> slot->arch.lpage_info[i - 1] = NULL;
> }
>
next prev parent reply other threads:[~2021-04-28 10:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 22:36 [PATCH 0/6] Lazily allocate memslot rmaps Ben Gardon
2021-04-27 22:36 ` [PATCH 1/6] KVM: x86/mmu: Track if shadow MMU active Ben Gardon
2021-04-27 22:36 ` [PATCH 2/6] KVM: x86/mmu: Skip rmap operations if shadow MMU inactive Ben Gardon
2021-04-27 22:36 ` [PATCH 3/6] KVM: x86/mmu: Deduplicate rmap freeing in allocate_memslot_rmap Ben Gardon
2021-04-28 10:00 ` Paolo Bonzini [this message]
2021-04-28 16:23 ` Ben Gardon
2021-04-27 22:36 ` [PATCH 4/6] KVM: x86/mmu: Factor out allocating memslot rmap Ben Gardon
2021-04-27 22:36 ` [PATCH 5/6] KVM: x86/mmu: Protect kvm->memslots with a mutex Ben Gardon
2021-04-28 6:25 ` Paolo Bonzini
2021-04-28 16:40 ` Ben Gardon
2021-04-28 17:46 ` Paolo Bonzini
2021-04-28 20:40 ` Ben Gardon
2021-04-28 21:41 ` Paolo Bonzini
2021-04-28 21:46 ` Ben Gardon
2021-04-28 23:42 ` Paolo Bonzini
2021-04-29 0:40 ` Sean Christopherson
2021-04-29 1:42 ` Sean Christopherson
2021-04-29 7:02 ` Paolo Bonzini
2021-04-29 17:45 ` Ben Gardon
2021-04-27 22:36 ` [PATCH 6/6] KVM: x86/mmu: Lazily allocate memslot rmaps Ben Gardon
2021-04-28 10:03 ` Paolo Bonzini
2021-04-28 16:45 ` Ben Gardon
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=2e5ecc0b-0ef4-a663-3b1d-81d020626b39@redhat.com \
--to=pbonzini@redhat.com \
--cc=bgardon@google.com \
--cc=jmattson@google.com \
--cc=junaids@google.com \
--cc=kernellwp@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterx@redhat.com \
--cc=pshier@google.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--cc=xiaoguangrong.eric@gmail.com \
--cc=yulei.kernel@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.