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 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>, "Jakowski Andrzej" <andrzej.jakowski@intel.com>, "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>, "Jason Gunthorpe" <jgg@nvidia.com> Subject: [PATCH v6 07/21] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Date: Thu, 7 Apr 2022 09:47:03 -0600 [thread overview] Message-ID: <20220407154717.7695-8-logang@deltatee.com> (raw) In-Reply-To: <20220407154717.7695-1-logang@deltatee.com> Add a flags member to the dma_map_ops structure with one flag to indicate support for PCI P2PDMA. Also, add a helper to check if a device supports PCI P2PDMA. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> --- include/linux/dma-map-ops.h | 10 ++++++++++ include/linux/dma-mapping.h | 5 +++++ kernel/dma/mapping.c | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 752f91e5eb5d..4d4161d58ce0 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -11,7 +11,17 @@ struct cma; +/* + * Values for struct dma_map_ops.flags: + * + * DMA_F_PCI_P2PDMA_SUPPORTED: Indicates the dma_map_ops implementation can + * handle PCI P2PDMA pages in the map_sg/unmap_sg operation. + */ +#define DMA_F_PCI_P2PDMA_SUPPORTED (1 << 0) + struct dma_map_ops { + unsigned int flags; + void *(*alloc)(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index dca2b1355bb1..f7c61b2b4b5e 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -140,6 +140,7 @@ int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, unsigned long attrs); bool dma_can_mmap(struct device *dev); int dma_supported(struct device *dev, u64 mask); +bool dma_pci_p2pdma_supported(struct device *dev); int dma_set_mask(struct device *dev, u64 mask); int dma_set_coherent_mask(struct device *dev, u64 mask); u64 dma_get_required_mask(struct device *dev); @@ -250,6 +251,10 @@ static inline int dma_supported(struct device *dev, u64 mask) { return 0; } +static inline bool dma_pci_p2pdma_supported(struct device *dev) +{ + return false; +} static inline int dma_set_mask(struct device *dev, u64 mask) { return -EIO; diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 9f65d1041638..21793506fdb6 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -722,6 +722,24 @@ int dma_supported(struct device *dev, u64 mask) } EXPORT_SYMBOL(dma_supported); +bool dma_pci_p2pdma_supported(struct device *dev) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + /* if ops is not set, dma direct will be used which supports P2PDMA */ + if (!ops) + return true; + + /* + * Note: dma_ops_bypass is not checked here because P2PDMA should + * not be used with dma mapping ops that do not have support even + * if the specific device is bypassing them. + */ + + return ops->flags & DMA_F_PCI_P2PDMA_SUPPORTED; +} +EXPORT_SYMBOL_GPL(dma_pci_p2pdma_supported); + #ifdef CONFIG_ARCH_HAS_DMA_SET_MASK void arch_dma_set_mask(struct device *dev, u64 mask); #else -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
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 Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Stephen Bates" <sbates@raithlin.com>, "Jason Ekstrand" <jason@jlekstrand.net>, "Ira Weiny" <ira.weiny@intel.com>, "Christoph Hellwig" <hch@lst.de>, "Minturn Dave B" <dave.b.minturn@intel.com>, "Martin Oliveira" <martin.oliveira@eideticom.com>, "Matthew Wilcox" <willy@infradead.org>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Chaitanya Kulkarni" <ckulkarnilinux@gmail.com>, "Bjorn Helgaas" <helgaas@kernel.org>, "Jason Gunthorpe" <jgg@nvidia.com>, "Ralph Campbell" <rcampbell@nvidia.com>, "John Hubbard" <jhubbard@nvidia.com>, "Dan Williams" <dan.j.williams@intel.com>, "Jakowski Andrzej" <andrzej.jakowski@intel.com>, "Xiong Jianxin" <jianxin.xiong@intel.com>, "Logan Gunthorpe" <logang@deltatee.com>, "Robin Murphy" <robin.murphy@arm.com>, "Christian König" <christian.koenig@amd.com> Subject: [PATCH v6 07/21] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Date: Thu, 7 Apr 2022 09:47:03 -0600 [thread overview] Message-ID: <20220407154717.7695-8-logang@deltatee.com> (raw) In-Reply-To: <20220407154717.7695-1-logang@deltatee.com> Add a flags member to the dma_map_ops structure with one flag to indicate support for PCI P2PDMA. Also, add a helper to check if a device supports PCI P2PDMA. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> --- include/linux/dma-map-ops.h | 10 ++++++++++ include/linux/dma-mapping.h | 5 +++++ kernel/dma/mapping.c | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 752f91e5eb5d..4d4161d58ce0 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -11,7 +11,17 @@ struct cma; +/* + * Values for struct dma_map_ops.flags: + * + * DMA_F_PCI_P2PDMA_SUPPORTED: Indicates the dma_map_ops implementation can + * handle PCI P2PDMA pages in the map_sg/unmap_sg operation. + */ +#define DMA_F_PCI_P2PDMA_SUPPORTED (1 << 0) + struct dma_map_ops { + unsigned int flags; + void *(*alloc)(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index dca2b1355bb1..f7c61b2b4b5e 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -140,6 +140,7 @@ int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, unsigned long attrs); bool dma_can_mmap(struct device *dev); int dma_supported(struct device *dev, u64 mask); +bool dma_pci_p2pdma_supported(struct device *dev); int dma_set_mask(struct device *dev, u64 mask); int dma_set_coherent_mask(struct device *dev, u64 mask); u64 dma_get_required_mask(struct device *dev); @@ -250,6 +251,10 @@ static inline int dma_supported(struct device *dev, u64 mask) { return 0; } +static inline bool dma_pci_p2pdma_supported(struct device *dev) +{ + return false; +} static inline int dma_set_mask(struct device *dev, u64 mask) { return -EIO; diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 9f65d1041638..21793506fdb6 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -722,6 +722,24 @@ int dma_supported(struct device *dev, u64 mask) } EXPORT_SYMBOL(dma_supported); +bool dma_pci_p2pdma_supported(struct device *dev) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + /* if ops is not set, dma direct will be used which supports P2PDMA */ + if (!ops) + return true; + + /* + * Note: dma_ops_bypass is not checked here because P2PDMA should + * not be used with dma mapping ops that do not have support even + * if the specific device is bypassing them. + */ + + return ops->flags & DMA_F_PCI_P2PDMA_SUPPORTED; +} +EXPORT_SYMBOL_GPL(dma_pci_p2pdma_supported); + #ifdef CONFIG_ARCH_HAS_DMA_SET_MASK void arch_dma_set_mask(struct device *dev, u64 mask); #else -- 2.30.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-04-07 17:27 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-07 15:46 [PATCH v6 00/21] Userspace P2PDMA with O_DIRECT NVMe devices Logan Gunthorpe 2022-04-07 15:46 ` Logan Gunthorpe 2022-04-07 15:46 ` [PATCH v6 01/21] lib/scatterlist: add flag for indicating P2PDMA segments in an SGL Logan Gunthorpe 2022-04-07 15:46 ` Logan Gunthorpe 2022-04-07 15:46 ` [PATCH v6 02/21] PCI/P2PDMA: Attempt to set map_type if it has not been set Logan Gunthorpe 2022-04-07 15:46 ` Logan Gunthorpe 2022-04-07 15:46 ` [PATCH v6 03/21] PCI/P2PDMA: Expose pci_p2pdma_map_type() Logan Gunthorpe 2022-04-07 15:46 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 04/21] PCI/P2PDMA: Introduce helpers for dma_map_sg implementations Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 05/21] dma-mapping: allow EREMOTEIO return code for P2PDMA transfers Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 06/21] dma-direct: support PCI P2PDMA pages in dma-direct map_sg Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe [this message] 2022-04-07 15:47 ` [PATCH v6 07/21] dma-mapping: add flags to dma_map_ops to indicate PCI P2PDMA support Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 08/21] iommu/dma: support PCI P2PDMA pages in dma-iommu map_sg Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 09/21] nvme-pci: check DMA ops when indicating support for PCI P2PDMA Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 10/21] nvme-pci: convert to using dma_map_sgtable() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 11/21] RDMA/core: introduce ib_dma_pci_p2p_dma_supported() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 12/21] RDMA/rw: drop pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 13/21] PCI/P2PDMA: Remove pci_p2pdma_[un]map_sg() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 14/21] mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 15/21] iov_iter: introduce iov_iter_get_pages_[alloc_]flags() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 16/21] block: add check when merging zone device pages Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 17/21] lib/scatterlist: " Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 18/21] block: set FOLL_PCI_P2PDMA in __bio_iov_iter_get_pages() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 19/21] block: set FOLL_PCI_P2PDMA in bio_map_user_iov() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 20/21] PCI/P2PDMA: Introduce pci_mmap_p2pmem() Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-05-27 12:55 ` Jason Gunthorpe 2022-05-27 12:55 ` Jason Gunthorpe 2022-05-27 15:35 ` Logan Gunthorpe 2022-05-27 15:35 ` Logan Gunthorpe 2022-05-27 19:03 ` Jason Gunthorpe 2022-05-27 19:03 ` Jason Gunthorpe 2022-05-27 22:41 ` Logan Gunthorpe 2022-05-27 22:41 ` Logan Gunthorpe 2022-06-02 0:00 ` Jason Gunthorpe 2022-06-02 0:00 ` Jason Gunthorpe 2022-06-02 16:16 ` Logan Gunthorpe 2022-06-02 16:16 ` Logan Gunthorpe 2022-06-02 16:30 ` Jason Gunthorpe 2022-06-02 16:30 ` Jason Gunthorpe 2022-06-02 16:45 ` Logan Gunthorpe 2022-06-02 16:45 ` Logan Gunthorpe 2022-06-02 17:18 ` Jason Gunthorpe 2022-06-02 17:18 ` Jason Gunthorpe 2022-06-02 16:49 ` Logan Gunthorpe 2022-06-02 16:49 ` Logan Gunthorpe 2022-06-02 17:28 ` Jason Gunthorpe 2022-06-02 17:28 ` Jason Gunthorpe 2022-06-02 17:49 ` Logan Gunthorpe 2022-06-02 17:49 ` Logan Gunthorpe 2022-04-07 15:47 ` [PATCH v6 21/21] nvme-pci: allow mmaping the CMB in userspace Logan Gunthorpe 2022-04-07 15:47 ` Logan Gunthorpe 2022-05-16 22:31 ` [PATCH v6 00/21] Userspace P2PDMA with O_DIRECT NVMe devices Chaitanya Kulkarni 2022-05-16 22:31 ` Chaitanya Kulkarni via iommu 2022-05-16 22:35 ` Logan Gunthorpe 2022-05-16 22:35 ` Logan 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=20220407154717.7695-8-logang@deltatee.com \ --to=logang@deltatee.com \ --cc=andrzej.jakowski@intel.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=ira.weiny@intel.com \ --cc=jason@jlekstrand.net \ --cc=jgg@nvidia.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.