Re: [PATCH 2/2] KVM: Fix kvm_free_physmem memory leak.

[Avi Kivity]

François Diakhate wrote:
Make sure that kvm_free_physmem actually frees memory
when a memory slot is not user allocated.
@@ -4195,7 +4195,7 @@ int kvm_arch_set_memory_region(struct kvm *kvm,
                        memslot->userspace_addr = userspace_addr;
                        spin_unlock(&kvm->mmu_lock);
                } else {
-                       if (!old.user_alloc && old.rmap) {
+                       if (!old.user_alloc && old.rmap && current->mm) {
                                int ret;

  

What's the purpose of this?

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a87f45e..b0d7435 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -639,8 +639,17 @@ void kvm_free_physmem(struct kvm *kvm)
 {
        int i;

-       for (i = 0; i < kvm->nmemslots; ++i)
+       for (i = 0; i < kvm->nmemslots; ++i) {
+               struct kvm_userspace_memory_region mem = {
+                       .slot = i,
+                       .guest_phys_addr = kvm->memslots[i].base_gfn << 
PAGE_SHIFT,
+                       .memory_size = 0,
+                       .flags = 0,
+               };
+
+               kvm_set_memory_region(kvm, &mem, kvm->memslots[i].user_alloc);
                kvm_free_physmem_slot(&kvm->memslots[i], NULL);
+       }
 }
  

Better to fix kvm_free_physmem_slot() if it doesn't handle 
!user_allocated memory properly.

--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html