Commit a674bcab authored by Alex Williamson's avatar Alex Williamson Committed by Greg Kroah-Hartman

KVM: unmap pages from the iommu when slots are removed

commit 32f6daad upstream.

We've been adding new mappings, but not destroying old mappings.
This can lead to a page leak as pages are pinned using
get_user_pages, but only unpinned with put_page if they still
exist in the memslots list on vm shutdown.  A memslot that is
destroyed while an iommu domain is enabled for the guest will
therefore result in an elevated page reference count that is
never cleared.

Additionally, without this fix, the iommu is only programmed
with the first translation for a gpa.  This can result in
peer-to-peer errors if a mapping is destroyed and replaced by a
new mapping at the same gpa as the iommu will still be pointing
to the original, pinned memory address.
Signed-off-by: default avatarAlex Williamson <>
Signed-off-by: default avatarMarcelo Tosatti <>
Signed-off-by: default avatarJonathan Nieder <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 9239fabf
......@@ -554,6 +554,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id);
int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
int kvm_iommu_map_guest(struct kvm *kvm);
int kvm_iommu_unmap_guest(struct kvm *kvm);
int kvm_assign_device(struct kvm *kvm,
......@@ -567,6 +568,11 @@ static inline int kvm_iommu_map_pages(struct kvm *kvm,
return 0;
static inline void kvm_iommu_unmap_pages(struct kvm *kvm,
struct kvm_memory_slot *slot)
static inline int kvm_iommu_map_guest(struct kvm *kvm)
return -ENODEV;
......@@ -285,6 +285,11 @@ static void kvm_iommu_put_pages(struct kvm *kvm,
void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
kvm_iommu_put_pages(kvm, slot->base_gfn, slot->npages);
static int kvm_iommu_unmap_memslots(struct kvm *kvm)
int i, idx;
......@@ -293,10 +298,9 @@ static int kvm_iommu_unmap_memslots(struct kvm *kvm)
idx = srcu_read_lock(&kvm->srcu);
slots = kvm_memslots(kvm);
for (i = 0; i < slots->nmemslots; i++) {
kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
for (i = 0; i < slots->nmemslots; i++)
kvm_iommu_unmap_pages(kvm, &slots->memslots[i]);
srcu_read_unlock(&kvm->srcu, idx);
return 0;
......@@ -796,12 +796,13 @@ skip_lpage:
if (r)
goto out_free;
/* map the pages in iommu page table */
/* map/unmap the pages in iommu page table */
if (npages) {
r = kvm_iommu_map_pages(kvm, &new);
if (r)
goto out_free;
} else
kvm_iommu_unmap_pages(kvm, &old);
r = -ENOMEM;
slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment