From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-block@vger.kernel.org, linux-pci@vger.kernel.org,
linux-mm@kvack.org, iommu@lists.linux-foundation.org,
iommu@lists.linux.dev
Cc: "Stephen Bates" <sbates@raithlin.com>,
"Christoph Hellwig" <hch@lst.de>,
"Dan Williams" <dan.j.williams@intel.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Christian König" <christian.koenig@amd.com>,
"John Hubbard" <jhubbard@nvidia.com>,
"Don Dutile" <ddutile@redhat.com>,
"Matthew Wilcox" <willy@infradead.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Minturn Dave B" <dave.b.minturn@intel.com>,
"Jason Ekstrand" <jason@jlekstrand.net>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Xiong Jianxin" <jianxin.xiong@intel.com>,
"Bjorn Helgaas" <helgaas@kernel.org>,
"Ira Weiny" <ira.weiny@intel.com>,
"Robin Murphy" <robin.murphy@arm.com>,
"Martin Oliveira" <martin.oliveira@eideticom.com>,
"Chaitanya Kulkarni" <ckulkarnilinux@gmail.com>,
"Ralph Campbell" <rcampbell@nvidia.com>,
"Logan Gunthorpe" <logang@deltatee.com>
Subject: [PATCH v8 07/13] iommu: Explicitly skip bus address marked segments in __iommu_map_sg()
Date: Fri, 8 Jul 2022 10:50:58 -0600 [thread overview]
Message-ID: <20220708165104.5005-8-logang@deltatee.com> (raw)
In-Reply-To: <20220708165104.5005-1-logang@deltatee.com>
In order to support PCI P2PDMA mappings with dma-iommu, explicitly skip
any segments marked with sg_dma_mark_bus_address() in __iommu_map_sg().
These segments should not be mapped into the IOVA and will be handled
separately in as subsequent patch for dma-iommu.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/iommu/iommu.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 847ad47a2dfd..2844a3e02a89 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2457,6 +2457,9 @@ static ssize_t __iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
len = 0;
}
+ if (sg_is_dma_bus_address(sg))
+ goto next;
+
if (len) {
len += sg->length;
} else {
@@ -2464,6 +2467,7 @@ static ssize_t __iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
start = s_phys;
}
+next:
if (++i < nents)
sg = sg_next(sg);
}
--
2.30.2
next prev parent reply other threads:[~2022-07-08 16:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 16:50 [PATCH v8 00/13] DMA Mapping P2PDMA Pages Logan Gunthorpe
2022-07-08 16:50 ` [PATCH v8 01/13] lib/scatterlist: add flag for indicating P2PDMA segments in an SGL Logan Gunthorpe
2022-07-14 5:12 ` Christoph Hellwig
2022-07-08 16:50 ` [PATCH v8 02/13] PCI/P2PDMA: Attempt to set map_type if it has not been set Logan Gunthorpe
2022-07-08 16:50 ` [PATCH v8 03/13] PCI/P2PDMA: Introduce helpers for dma_map_sg implementations Logan Gunthorpe
2022-07-08 16:50 ` [PATCH v8 04/13] dma-mapping: allow EREMOTEIO return code for P2PDMA transfers Logan Gunthorpe
2022-07-08 16:50 ` [PATCH v8 05/13] dma-direct: support PCI P2PDMA pages in dma-direct map_sg Logan Gunthorpe
2022-07-08 16:50 ` [PATCH v8 06/13] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Logan Gunthorpe
2022-07-08 16:50 ` Logan Gunthorpe [this message]
2022-07-08 16:50 ` [PATCH v8 08/13] iommu/dma: support PCI P2PDMA pages in dma-iommu map_sg Logan Gunthorpe
2022-07-08 16:51 ` [PATCH v8 09/13] nvme-pci: check DMA ops when indicating support for PCI P2PDMA Logan Gunthorpe
2022-07-08 16:51 ` [PATCH v8 10/13] nvme-pci: convert to using dma_map_sgtable() Logan Gunthorpe
2022-07-08 16:51 ` [PATCH v8 11/13] RDMA/core: introduce ib_dma_pci_p2p_dma_supported() Logan Gunthorpe
2022-07-08 16:51 ` [PATCH v8 12/13] RDMA/rw: drop pci_p2pdma_[un]map_sg() Logan Gunthorpe
2022-07-08 16:51 ` [PATCH v8 13/13] PCI/P2PDMA: Remove pci_p2pdma_[un]map_sg() Logan Gunthorpe
2022-07-14 5:13 ` [PATCH v8 00/13] DMA Mapping P2PDMA Pages Christoph Hellwig
2022-07-26 11:29 ` Christoph Hellwig
2022-07-26 15:55 ` Logan Gunthorpe
2022-08-01 14:04 ` Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220708165104.5005-8-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=christian.koenig@amd.com \
--cc=ckulkarnilinux@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dave.b.minturn@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ddutile@redhat.com \
--cc=hch@lst.de \
--cc=helgaas@kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=iommu@lists.linux.dev \
--cc=ira.weiny@intel.com \
--cc=jason@jlekstrand.net \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=jianxin.xiong@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=martin.oliveira@eideticom.com \
--cc=rcampbell@nvidia.com \
--cc=robin.murphy@arm.com \
--cc=sbates@raithlin.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).