From patchwork Thu Jan 4 19:01:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Logan Gunthorpe X-Patchwork-Id: 10145515 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6425060594 for ; Thu, 4 Jan 2018 19:06:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43F0C223A5 for ; Thu, 4 Jan 2018 19:06:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38BA8287FB; Thu, 4 Jan 2018 19:06:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE0A0223A5 for ; Thu, 4 Jan 2018 19:06:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752983AbeADTGI (ORCPT ); Thu, 4 Jan 2018 14:06:08 -0500 Received: from ale.deltatee.com ([207.54.116.67]:39200 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752822AbeADTCD (ORCPT ); Thu, 4 Jan 2018 14:02:03 -0500 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eXAm4-0002vg-Td; Thu, 04 Jan 2018 12:02:01 -0700 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1eXAlz-00020T-AU; Thu, 04 Jan 2018 12:01:51 -0700 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, linux-nvdimm@lists.01.org, linux-block@vger.kernel.org Cc: Stephen Bates , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , Bjorn Helgaas , Jason Gunthorpe , Max Gurtovoy , Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Benjamin Herrenschmidt , Logan Gunthorpe Date: Thu, 4 Jan 2018 12:01:28 -0700 Message-Id: <20180104190137.7654-4-logang@deltatee.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180104190137.7654-1-logang@deltatee.com> References: <20180104190137.7654-1-logang@deltatee.com> X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-nvme@lists.infradead.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, linux-block@vger.kernel.org, sbates@raithlin.com, hch@lst.de, axboe@kernel.dk, sagi@grimberg.me, bhelgaas@google.com, jgg@mellanox.com, maxg@mellanox.com, keith.busch@intel.com, dan.j.williams@intel.com, jglisse@redhat.com, benh@kernel.crashing.org, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH 03/12] pci-p2p: Add PCI p2pmem dma mappings to adjust the bus offset X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA address used when mapping PCI P2P memory must be the PCI bus address. Thus, introduce pci_p2pmem_[un]map_sg() to map the correct addresses when using P2P memory. For this, we assume that an SGL passed to these functions contain all p2p memory or no p2p memory. Signed-off-by: Logan Gunthorpe --- drivers/pci/p2p.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/memremap.h | 1 + include/linux/pci-p2p.h | 9 +++++++++ 3 files changed, 53 insertions(+) diff --git a/drivers/pci/p2p.c b/drivers/pci/p2p.c index 03330c7b5e6d..87cec87b02e3 100644 --- a/drivers/pci/p2p.c +++ b/drivers/pci/p2p.c @@ -184,6 +184,8 @@ int pci_p2pmem_add_resource(struct pci_dev *pdev, int bar, size_t size, pgmap->res.end = pgmap->res.start + size - 1; pgmap->ref = &pdev->p2p->devmap_ref; pgmap->type = MEMORY_DEVICE_PCI_P2P; + pgmap->pci_p2p_bus_offset = pci_bus_address(pdev, bar) - + pci_resource_start(pdev, bar); addr = devm_memremap_pages(&pdev->dev, pgmap); if (IS_ERR(addr)) @@ -598,3 +600,44 @@ void pci_p2pmem_publish(struct pci_dev *pdev, bool publish) pdev->p2p->published = publish; } EXPORT_SYMBOL_GPL(pci_p2pmem_publish); + +/* + * pci_p2pmem_map_sg - map a pci p2p sg for dma + * @sg:scatter list to map + * @nents:elements in the scatter list + * + * Returns the number of sgls mapped + */ +int pci_p2pmem_map_sg(struct scatterlist *sg, int nents) +{ + struct dev_pagemap *pgmap; + struct scatterlist *s; + phys_addr_t paddr; + int i; + + for_each_sg(sg, s, nents, i) { + pgmap = sg_page(s)->pgmap; + paddr = sg_phys(s); + + s->dma_address = paddr - pgmap->pci_p2p_bus_offset; + sg_dma_len(s) = s->length; + } + + return nents; +} +EXPORT_SYMBOL_GPL(pci_p2pmem_map_sg); + +/** + * pci_p2pmem_unmap_sg - unmap a pci p2p sg for dma + * @sg:scatter list to map + * @nents:elements in the scatter list + */ +void pci_p2pmem_unmap_sg(struct scatterlist *sg, int nents) +{ + struct scatterlist *s; + int i; + + for_each_sg(sg, s, nents, i) + dma_mark_clean(phys_to_virt(sg_phys(s)), sg_dma_len(s)); +} +EXPORT_SYMBOL_GPL(pci_p2pmem_unmap_sg); diff --git a/include/linux/memremap.h b/include/linux/memremap.h index c17a6d167d48..a792f87b9dc3 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -125,6 +125,7 @@ struct dev_pagemap { struct device *dev; void *data; enum memory_type type; + u64 pci_p2p_bus_offset; }; #ifdef CONFIG_ZONE_DEVICE diff --git a/include/linux/pci-p2p.h b/include/linux/pci-p2p.h index f811c97a5886..154c39905fc9 100644 --- a/include/linux/pci-p2p.h +++ b/include/linux/pci-p2p.h @@ -34,6 +34,8 @@ int pci_p2pmem_alloc_sgl(struct pci_dev *pdev, struct scatterlist **sgl, void pci_p2pmem_free_sgl(struct pci_dev *pdev, struct scatterlist *sgl, unsigned int nents); void pci_p2pmem_publish(struct pci_dev *pdev, bool publish); +int pci_p2pmem_map_sg(struct scatterlist *sg, int nents); +void pci_p2pmem_unmap_sg(struct scatterlist *sg, int nents); #else /* CONFIG_PCI_P2P */ static inline int pci_p2pmem_add_resource(struct pci_dev *pdev, int bar, size_t size, u64 offset) @@ -81,5 +83,12 @@ static inline void pci_p2pmem_free_sgl(struct pci_dev *pdev, static inline void pci_p2pmem_publish(struct pci_dev *pdev, bool publish) { } +static inline int pci_p2pmem_map_sg(struct scatterlist *sg, int nents) +{ + return -ENODEV; +} +static inline void pci_p2pmem_unmap_sg(struct scatterlist *sg, int nents) +{ +} #endif /* CONFIG_PCI_P2P */ #endif /* _LINUX_PCI_P2P_H */