]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iommu/vt-d: Remove real DMA lookup in find_domain
authorJon Derrick <jonathan.derrick@intel.com>
Wed, 27 May 2020 16:56:17 +0000 (10:56 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:49:26 +0000 (17:49 +0200)
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

index 11ed871dd25522131086f498f854f9fb6a29d93a..fde7aba49b746336a18d84b2f0b18337c2262c79 100644 (file)
@@ -2518,9 +2518,6 @@ struct dmar_domain *find_domain(struct device *dev)
        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))