[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <97d6a7da-2777-293a-4dab-668fe16dc2e9@redhat.com>
Date: Fri, 7 May 2021 09:42:47 +0200
From: David Hildenbrand <david@...hat.com>
To: Ben Gardon <bgardon@...gle.com>, linux-kernel@...r.kernel.org,
kvm@...r.kernel.org
Cc: Paolo Bonzini <pbonzini@...hat.com>, Peter Xu <peterx@...hat.com>,
Sean Christopherson <seanjc@...gle.com>,
Peter Shier <pshier@...gle.com>,
Yulei Zhang <yulei.kernel@...il.com>,
Wanpeng Li <kernellwp@...il.com>,
Xiao Guangrong <xiaoguangrong.eric@...il.com>,
Kai Huang <kai.huang@...el.com>,
Keqian Zhu <zhukeqian1@...wei.com>
Subject: Re: [PATCH v3 1/8] KVM: x86/mmu: Deduplicate rmap freeing
On 06.05.21 20:42, Ben Gardon wrote:
> Small code deduplication. No functional change expected.
>
> Signed-off-by: Ben Gardon <bgardon@...gle.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;
> }
>
Reviewed-by: David Hildenbrand <david@...hat.com>
--
Thanks,
David / dhildenb
Powered by blists - more mailing lists