Skip to content

Commit a952d60

Browse files
lrq-maxsean-jc
authored andcommitted
KVM: Use vfree for memory allocated by vcalloc()/__vcalloc()
commit 37b2a65("KVM: use __vcalloc for very large allocations") replaced kvzalloc()/kvcalloc() with vcalloc(), but didn't replace kvfree() with vfree(). Signed-off-by: Li RongQing <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent b628cb5 commit a952d60

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

arch/x86/kvm/mmu/page_track.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bool kvm_page_track_write_tracking_enabled(struct kvm *kvm)
4141

4242
void kvm_page_track_free_memslot(struct kvm_memory_slot *slot)
4343
{
44-
kvfree(slot->arch.gfn_write_track);
44+
vfree(slot->arch.gfn_write_track);
4545
slot->arch.gfn_write_track = NULL;
4646
}
4747

arch/x86/kvm/x86.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12731,7 +12731,7 @@ static void memslot_rmap_free(struct kvm_memory_slot *slot)
1273112731
int i;
1273212732

1273312733
for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
12734-
kvfree(slot->arch.rmap[i]);
12734+
vfree(slot->arch.rmap[i]);
1273512735
slot->arch.rmap[i] = NULL;
1273612736
}
1273712737
}
@@ -12743,7 +12743,7 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
1274312743
memslot_rmap_free(slot);
1274412744

1274512745
for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {
12746-
kvfree(slot->arch.lpage_info[i - 1]);
12746+
vfree(slot->arch.lpage_info[i - 1]);
1274712747
slot->arch.lpage_info[i - 1] = NULL;
1274812748
}
1274912749

@@ -12835,7 +12835,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm,
1283512835
memslot_rmap_free(slot);
1283612836

1283712837
for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) {
12838-
kvfree(slot->arch.lpage_info[i - 1]);
12838+
vfree(slot->arch.lpage_info[i - 1]);
1283912839
slot->arch.lpage_info[i - 1] = NULL;
1284012840
}
1284112841
return -ENOMEM;

virt/kvm/kvm_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ static void kvm_destroy_dirty_bitmap(struct kvm_memory_slot *memslot)
10201020
if (!memslot->dirty_bitmap)
10211021
return;
10221022

1023-
kvfree(memslot->dirty_bitmap);
1023+
vfree(memslot->dirty_bitmap);
10241024
memslot->dirty_bitmap = NULL;
10251025
}
10261026

0 commit comments

Comments
 (0)