Prechádzať zdrojové kódy

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: Glauber Costa <glommer@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Glauber Costa 16 rokov pred
rodič
commit
6f89724829
1 zmenil súbory, kde vykonal 4 pridanie a 1 odobranie
  1. 4 1
      virt/kvm/kvm_main.c

+ 4 - 1
virt/kvm/kvm_main.c

@@ -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);