Skip to content

Commit

Permalink
PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
Browse files Browse the repository at this point in the history
Presently, there is no path to DMA map P2PDMA memory, so if a TLP targeting
this memory hits the root complex and an IOMMU is present, the IOMMU will
reject the transaction, even if the RC would support P2PDMA.

So until the kernel knows to map these DMA addresses in the IOMMU, we
should not enable the whitelist when an IOMMU is present.

Link: https://lore.kernel.org/linux-pci/20190522201252.2997-1-logang@deltatee.com/
Fixes: 0f97da8 ("PCI/P2PDMA: Allow P2P DMA between any devices under AMD ZEN Root Complex")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Logan Gunthorpe authored and Bjorn Helgaas committed Jun 19, 2019
1 parent a188339 commit 6dbbd05
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/pci/p2pdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/percpu-refcount.h>
#include <linux/random.h>
#include <linux/seq_buf.h>
#include <linux/iommu.h>

struct pci_p2pdma {
struct percpu_ref devmap_ref;
Expand Down Expand Up @@ -284,6 +285,9 @@ static bool root_complex_whitelist(struct pci_dev *dev)
struct pci_dev *root = pci_get_slot(host->bus, PCI_DEVFN(0, 0));
unsigned short vendor, device;

if (iommu_present(dev->dev.bus))
return false;

if (!root)
return false;

Expand Down

0 comments on commit 6dbbd05

Please sign in to comment.