Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[profile/ivi/kernel-adaptation-intel-automotive.git] / virt / kvm / iommu.c

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index a457d21..e9fff98 100644 (file)
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -240,9 +240,13 @@ int kvm_iommu_map_guest(struct kvm *kvm)
                return -ENODEV;
        }
 
                return -ENODEV;
        }
 

+       mutex_lock(&kvm->slots_lock);
+

        kvm->arch.iommu_domain = iommu_domain_alloc(&pci_bus_type);
        kvm->arch.iommu_domain = iommu_domain_alloc(&pci_bus_type);

-       if (!kvm->arch.iommu_domain)
-               return -ENOMEM;
+       if (!kvm->arch.iommu_domain) {
+               r = -ENOMEM;
+               goto out_unlock;
+       }

 
        if (!allow_unsafe_assigned_interrupts &&
            !iommu_domain_has_cap(kvm->arch.iommu_domain,
 
        if (!allow_unsafe_assigned_interrupts &&
            !iommu_domain_has_cap(kvm->arch.iommu_domain,


@@ -253,17 +257,16 @@ int kvm_iommu_map_guest(struct kvm *kvm)
                       " module option.\n", __func__);
                iommu_domain_free(kvm->arch.iommu_domain);
                kvm->arch.iommu_domain = NULL;
                       " module option.\n", __func__);
                iommu_domain_free(kvm->arch.iommu_domain);
                kvm->arch.iommu_domain = NULL;

-               return -EPERM;
+               r = -EPERM;
+               goto out_unlock;

        }
 
        r = kvm_iommu_map_memslots(kvm);
        if (r)
        }
 
        r = kvm_iommu_map_memslots(kvm);
        if (r)

-               goto out_unmap;
-
-       return 0;
+               kvm_iommu_unmap_memslots(kvm);

 
 

-out_unmap:
-       kvm_iommu_unmap_memslots(kvm);
+out_unlock:
+       mutex_unlock(&kvm->slots_lock);

        return r;
 }
 
        return r;
 }
 


@@ -310,6 +313,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 idx;
 static int kvm_iommu_unmap_memslots(struct kvm *kvm)
 {
        int idx;


@@ -320,7 +328,7 @@ static int kvm_iommu_unmap_memslots(struct kvm *kvm)
        slots = kvm_memslots(kvm);
 
        kvm_for_each_memslot(memslot, slots)
        slots = kvm_memslots(kvm);
 
        kvm_for_each_memslot(memslot, slots)

-               kvm_iommu_put_pages(kvm, memslot->base_gfn, memslot->npages);
+               kvm_iommu_unmap_pages(kvm, memslot);

 
        srcu_read_unlock(&kvm->srcu, idx);
 
 
        srcu_read_unlock(&kvm->srcu, idx);
 


@@ -335,7 +343,11 @@ int kvm_iommu_unmap_guest(struct kvm *kvm)
        if (!domain)
                return 0;
 
        if (!domain)
                return 0;
 

+       mutex_lock(&kvm->slots_lock);

        kvm_iommu_unmap_memslots(kvm);
        kvm_iommu_unmap_memslots(kvm);

+       kvm->arch.iommu_domain = NULL;
+       mutex_unlock(&kvm->slots_lock);
+

        iommu_domain_free(domain);
        return 0;
 }
        iommu_domain_free(domain);
        return 0;
 }