linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Bernard Metzler <bmt@zurich.ibm.com>,
	Zhu Yanjun <yanjunz@nvidia.com>,
	Logan Gunthorpe <logang@deltatee.com>,
	Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>,
	Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>,
	Santosh Shilimkar <santosh.shilimkar@oracle.com>,
	linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com,
	linux-pci@vger.kernel.org, iommu@lists.linux-foundation.org,
	Jason Gunthorpe <jgg@nvidia.com>
Subject: [PATCH 02/10] RDMA/umem: use ib_dma_max_seg_size instead of dma_get_max_seg_size
Date: Fri,  6 Nov 2020 19:19:33 +0100	[thread overview]
Message-ID: <20201106181941.1878556-3-hch@lst.de> (raw)
In-Reply-To: <20201106181941.1878556-1-hch@lst.de>

RDMA ULPs must not call DMA mapping APIs directly but instead use the
ib_dma_* wrappers.

Fixes: 0c16d9635e3a ("RDMA/umem: Move to allocate SG table from pages")
Reported-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/infiniband/core/umem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index e9fecbdf391bcc..0d4da44f30cd68 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -220,10 +220,10 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr,
 
 		cur_base += ret * PAGE_SIZE;
 		npages -= ret;
-		sg = __sg_alloc_table_from_pages(
-			&umem->sg_head, page_list, ret, 0, ret << PAGE_SHIFT,
-			dma_get_max_seg_size(device->dma_device), sg, npages,
-			GFP_KERNEL);
+		sg = __sg_alloc_table_from_pages(&umem->sg_head, page_list, ret,
+				0, ret << PAGE_SHIFT,
+				ib_dma_max_seg_size(device), sg, npages,
+				GFP_KERNEL);
 		umem->sg_nents = umem->sg_head.nents;
 		if (IS_ERR(sg)) {
 			unpin_user_pages_dirty_lock(page_list, ret, 0);
-- 
2.28.0


  parent reply	other threads:[~2020-11-06 18:20 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-06 18:19 remove dma_virt_ops v2 Christoph Hellwig
2020-11-06 18:19 ` [PATCH 01/10] RMDA/sw: don't allow drivers using dma_virt_ops on highmem configs Christoph Hellwig
2020-11-06 18:19 ` Christoph Hellwig [this message]
2020-11-06 18:19 ` [PATCH 03/10] RDMA: lift ibdev_to_node from rds to common code Christoph Hellwig
2020-11-06 18:19 ` [PATCH 04/10] nvme-rdma: use ibdev_to_node instead of dereferencing ->dma_device Christoph Hellwig
2020-11-06 18:19 ` [PATCH 05/10] rds: stop using dmapool Christoph Hellwig
2020-11-06 18:19 ` [PATCH 06/10] RDMA/core: remove ib_dma_{alloc,free}_coherent Christoph Hellwig
2020-11-06 18:19 ` [PATCH 07/10] RDMA/core: remove use of dma_virt_ops Christoph Hellwig
2020-11-06 18:19 ` [PATCH 08/10] PCI/P2PDMA: Remove the DMA_VIRT_OPS hacks Christoph Hellwig
2020-11-06 18:19 ` [PATCH 09/10] PCI/P2PDMA: Cleanup __pci_p2pdma_map_sg a bit Christoph Hellwig
2020-11-06 18:19 ` [PATCH 10/10] dma-mapping: remove dma_virt_ops Christoph Hellwig
2020-11-12  9:40 ` remove dma_virt_ops v2 Christoph Hellwig
2020-11-12 13:23   ` Jason Gunthorpe
2020-11-12 17:36     ` santosh.shilimkar
2020-11-17 10:50       ` Ka-Cheong Poon
2020-11-17 19:10         ` santosh.shilimkar
2020-11-12 16:59 ` Jason Gunthorpe
2020-11-12 17:09   ` Christoph Hellwig
2020-11-12 17:39     ` Jason Gunthorpe
2020-11-13  8:50       ` Christoph Hellwig
2020-11-17 14:01         ` Mike Marciniszyn
2020-11-17 19:41 ` Jason Gunthorpe

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=20201106181941.1878556-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=bhelgaas@google.com \
    --cc=bmt@zurich.ibm.com \
    --cc=dennis.dalessandro@cornelisnetworks.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jgg@nvidia.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=logang@deltatee.com \
    --cc=mike.marciniszyn@cornelisnetworks.com \
    --cc=rds-devel@oss.oracle.com \
    --cc=santosh.shilimkar@oracle.com \
    --cc=yanjunz@nvidia.com \
    /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).