5.7-stable patches

added patches:
	iommu-vt-d-remove-real-dma-lookup-in-find_domain.patch

diff --git a/queue-5.7/iommu-vt-d-remove-real-dma-lookup-in-find_domain.patch b/queue-5.7/iommu-vt-d-remove-real-dma-lookup-in-find_domain.patch
new file mode 100644 (file)
index 0000000..ff32742
--- /dev/null
+++ b/queue-5.7/iommu-vt-d-remove-real-dma-lookup-in-find_domain.patch
@@ -0,0 +1,39 @@
+From bba9cc2cf82840bd3c9b3f4f7edac2dc8329c241 Mon Sep 17 00:00:00 2001
+From: Jon Derrick <jonathan.derrick@intel.com>
+Date: Wed, 27 May 2020 10:56:17 -0600
+Subject: iommu/vt-d: Remove real DMA lookup in find_domain
+
+From: Jon Derrick <jonathan.derrick@intel.com>
+
+commit bba9cc2cf82840bd3c9b3f4f7edac2dc8329c241 upstream.
+
+By removing the real DMA indirection in find_domain(), we can allow
+sub-devices of a real DMA device to have their own valid
+device_domain_info. The dmar lookup and context entry removal paths have
+been fixed to account for sub-devices.
+
+Fixes: 2b0140c69637 ("iommu/vt-d: Use pci_real_dma_dev() for mapping")
+Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
+Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
+Link: https://lore.kernel.org/r/20200527165617.297470-4-jonathan.derrick@intel.com
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207575
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Signed-off-by: Sushma Kalakota <sushmax.kalakota@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/iommu/intel-iommu.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
+@@ -2518,9 +2518,6 @@ struct dmar_domain *find_domain(struct d
+       if (unlikely(attach_deferred(dev) || iommu_dummy(dev)))
+               return NULL;
+ 
+-      if (dev_is_pci(dev))
+-              dev = &pci_real_dma_dev(to_pci_dev(dev))->dev;
+-
+       /* No lock here, assumes no domain exit in normal case */
+       info = dev->archdata.iommu;
+       if (likely(info))

diff --git a/queue-5.7/series b/queue-5.7/series
index 9227af955d0fe2286a46c690e5941dc0932078e0..5d3c0b10db58a4f3a70378b6ed406bc2d6271338 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -474,3 +474,4 @@ powerpc-64s-fix-kvm-interrupt-using-wrong-save-area.patch
 e1000e-do-not-wake-up-the-system-via-wol-if-device-wakeup-is-disabled.patch
 net-octeon-mgmt-repair-filling-of-rx-ring.patch
 net-core-device_rename-use-rwsem-instead-of-a-seqcount.patch
+iommu-vt-d-remove-real-dma-lookup-in-find_domain.patch