Commit 6f897248 authored by Glauber Costa's avatar Glauber Costa Committed by Avi Kivity

KVM: Really remove a slot when a user ask us so

Right now, KVM does not remove a slot when we do a
register ioctl for size 0 (would be the expected behaviour).

Instead, we only mark it as empty, but keep all bitmaps
and allocated data structures present. It completely
nullifies our chances of reusing that same slot again
for mapping a different piece of memory.

In this patch, we destroy rmaps, and vfree() the
pointers that used to hold the dirty bitmap, rmap
and lpage_info structures.
Signed-off-by: default avatarGlauber Costa <glommer@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7b701591
...@@ -1020,7 +1020,10 @@ int __kvm_set_memory_region(struct kvm *kvm, ...@@ -1020,7 +1020,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
goto out_free; goto out_free;
} }
kvm_free_physmem_slot(&old, &new); kvm_free_physmem_slot(&old, npages ? &new : NULL);
/* Slot deletion case: we have to update the current slot */
if (!npages)
*memslot = old;
#ifdef CONFIG_DMAR #ifdef CONFIG_DMAR
/* map the pages in iommu page table */ /* map the pages in iommu page table */
r = kvm_iommu_map_pages(kvm, base_gfn, npages); r = kvm_iommu_map_pages(kvm, base_gfn, npages);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment