From: Chuck Lever <cel@kernel.org> To: unlisted-recipients:; (no To-header on input) Cc: iommu@lists.linux.dev, linux-rdma@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com> Subject: [PATCH RFC 5/9] dma-direct: Support direct mapping bio_vec arrays Date: Thu, 19 Oct 2023 11:26:05 -0400 [thread overview] Message-ID: <169772916546.5232.14817964507475231582.stgit@klimt.1015granger.net> (raw) In-Reply-To: <169772852492.5232.17148564580779995849.stgit@klimt.1015granger.net> From: Chuck Lever <chuck.lever@oracle.com> Cc: iommu@lists.linux.dev Cc: linux-rdma@vger.kernel.org Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- kernel/dma/direct.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/dma/direct.h | 17 +++++++++ 2 files changed, 109 insertions(+) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 9596ae1aa0da..7587c5c3d051 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -423,6 +423,26 @@ void dma_direct_sync_sg_for_device(struct device *dev, dir); } } + +void dma_direct_sync_bvecs_for_device(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + phys_addr_t paddr = dma_to_phys(dev, bv_dma_address(bv)); + + if (unlikely(is_swiotlb_buffer(dev, paddr))) + swiotlb_sync_single_for_device(dev, paddr, bv->bv_len, + dir); + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_device(paddr, bv->bv_len, + dir); + } +} #endif #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \ @@ -516,6 +536,78 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, return ret; } +void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + phys_addr_t paddr; + + bv = &bvecs[i]; + paddr = dma_to_phys(dev, bv_dma_address(bv)); + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_cpu(paddr, bv->bv_len, dir); + + if (unlikely(is_swiotlb_buffer(dev, paddr))) + swiotlb_sync_single_for_cpu(dev, paddr, bv->bv_len, + dir); + + if (dir == DMA_FROM_DEVICE) + arch_dma_mark_clean(paddr, bv->bv_len); + } + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_cpu_all(); +} + +/* + * Unmaps segments, except for ones marked as pci_p2pdma which do not + * require any further action as they contain a bus address. + */ +void dma_direct_unmap_bvecs(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir, + unsigned long attrs) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + if (bv_dma_is_bus_address(bv)) + bv_dma_unmark_bus_address(bv); + else + dma_direct_unmap_page(dev, bv_dma_address(bv), + bv_dma_len(bv), dir, attrs); + } + +} + +int dma_direct_map_bvecs(struct device *dev, struct bio_vec *bvecs, int nents, + enum dma_data_direction dir, unsigned long attrs) +{ + struct bio_vec *bv; + int i; + + /* p2p DMA mapping support can be added later */ + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + bv->bv_dma_address = dma_direct_map_page(dev, bv->bv_page, + bv->bv_offset, bv->bv_len, dir, attrs); + if (bv->bv_dma_address == DMA_MAPPING_ERROR) + goto out_unmap; + bv_dma_len(bv) = bv->bv_len; + } + + return nents; + +out_unmap: + dma_direct_unmap_bvecs(dev, bvecs, i, dir, attrs | DMA_ATTR_SKIP_CPU_SYNC); + return -EIO; +} + dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir, unsigned long attrs) { diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index 97ec892ea0b5..6db1ccd04d21 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -20,17 +20,26 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma, bool dma_direct_need_sync(struct device *dev, dma_addr_t dma_addr); int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, unsigned long attrs); +int dma_direct_map_bvecs(struct device *dev, struct bio_vec *bvecs, int nents, + enum dma_data_direction dir, unsigned long attrs); size_t dma_direct_max_mapping_size(struct device *dev); #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \ defined(CONFIG_SWIOTLB) void dma_direct_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir); +void dma_direct_sync_bvecs_for_device(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir); #else static inline void dma_direct_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir) { } + +static inline void dma_direct_sync_bvecs_for_device(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ +} #endif #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \ @@ -40,6 +49,10 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, unsigned long attrs); void dma_direct_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir); +void dma_direct_unmap_bvecs(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir, unsigned long attrs); +void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir); #else static inline void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, @@ -50,6 +63,10 @@ static inline void dma_direct_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir) { } +static inline void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ +} #endif static inline void dma_direct_sync_single_for_device(struct device *dev,
WARNING: multiple messages have this Message-ID (diff)
From: Chuck Lever <cel@kernel.org> Cc: iommu@lists.linux.dev, linux-rdma@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com> Subject: [PATCH RFC 5/9] dma-direct: Support direct mapping bio_vec arrays Date: Thu, 19 Oct 2023 11:26:05 -0400 [thread overview] Message-ID: <169772916546.5232.14817964507475231582.stgit@klimt.1015granger.net> (raw) In-Reply-To: <169772852492.5232.17148564580779995849.stgit@klimt.1015granger.net> From: Chuck Lever <chuck.lever@oracle.com> Cc: iommu@lists.linux.dev Cc: linux-rdma@vger.kernel.org Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- kernel/dma/direct.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/dma/direct.h | 17 +++++++++ 2 files changed, 109 insertions(+) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 9596ae1aa0da..7587c5c3d051 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -423,6 +423,26 @@ void dma_direct_sync_sg_for_device(struct device *dev, dir); } } + +void dma_direct_sync_bvecs_for_device(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + phys_addr_t paddr = dma_to_phys(dev, bv_dma_address(bv)); + + if (unlikely(is_swiotlb_buffer(dev, paddr))) + swiotlb_sync_single_for_device(dev, paddr, bv->bv_len, + dir); + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_device(paddr, bv->bv_len, + dir); + } +} #endif #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \ @@ -516,6 +536,78 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, return ret; } +void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + phys_addr_t paddr; + + bv = &bvecs[i]; + paddr = dma_to_phys(dev, bv_dma_address(bv)); + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_cpu(paddr, bv->bv_len, dir); + + if (unlikely(is_swiotlb_buffer(dev, paddr))) + swiotlb_sync_single_for_cpu(dev, paddr, bv->bv_len, + dir); + + if (dir == DMA_FROM_DEVICE) + arch_dma_mark_clean(paddr, bv->bv_len); + } + + if (!dev_is_dma_coherent(dev)) + arch_sync_dma_for_cpu_all(); +} + +/* + * Unmaps segments, except for ones marked as pci_p2pdma which do not + * require any further action as they contain a bus address. + */ +void dma_direct_unmap_bvecs(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir, + unsigned long attrs) +{ + struct bio_vec *bv; + int i; + + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + if (bv_dma_is_bus_address(bv)) + bv_dma_unmark_bus_address(bv); + else + dma_direct_unmap_page(dev, bv_dma_address(bv), + bv_dma_len(bv), dir, attrs); + } + +} + +int dma_direct_map_bvecs(struct device *dev, struct bio_vec *bvecs, int nents, + enum dma_data_direction dir, unsigned long attrs) +{ + struct bio_vec *bv; + int i; + + /* p2p DMA mapping support can be added later */ + for (i = 0; i < nents; i++) { + bv = &bvecs[i]; + bv->bv_dma_address = dma_direct_map_page(dev, bv->bv_page, + bv->bv_offset, bv->bv_len, dir, attrs); + if (bv->bv_dma_address == DMA_MAPPING_ERROR) + goto out_unmap; + bv_dma_len(bv) = bv->bv_len; + } + + return nents; + +out_unmap: + dma_direct_unmap_bvecs(dev, bvecs, i, dir, attrs | DMA_ATTR_SKIP_CPU_SYNC); + return -EIO; +} + dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir, unsigned long attrs) { diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index 97ec892ea0b5..6db1ccd04d21 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -20,17 +20,26 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma, bool dma_direct_need_sync(struct device *dev, dma_addr_t dma_addr); int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, unsigned long attrs); +int dma_direct_map_bvecs(struct device *dev, struct bio_vec *bvecs, int nents, + enum dma_data_direction dir, unsigned long attrs); size_t dma_direct_max_mapping_size(struct device *dev); #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \ defined(CONFIG_SWIOTLB) void dma_direct_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir); +void dma_direct_sync_bvecs_for_device(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir); #else static inline void dma_direct_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir) { } + +static inline void dma_direct_sync_bvecs_for_device(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ +} #endif #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \ @@ -40,6 +49,10 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, unsigned long attrs); void dma_direct_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir); +void dma_direct_unmap_bvecs(struct device *dev, struct bio_vec *bvecs, + int nents, enum dma_data_direction dir, unsigned long attrs); +void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir); #else static inline void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, @@ -50,6 +63,10 @@ static inline void dma_direct_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir) { } +static inline void dma_direct_sync_bvecs_for_cpu(struct device *dev, + struct bio_vec *bvecs, int nents, enum dma_data_direction dir) +{ +} #endif static inline void dma_direct_sync_single_for_device(struct device *dev,
next prev parent reply other threads:[~2023-10-19 15:26 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-19 15:25 [PATCH RFC 0/9] Exploring biovec support in (R)DMA API Chuck Lever 2023-10-19 15:25 ` Chuck Lever 2023-10-19 15:25 ` [PATCH RFC 1/9] dma-debug: Fix a typo in a debugging eye-catcher Chuck Lever 2023-10-20 4:49 ` Christoph Hellwig 2023-10-20 13:38 ` Chuck Lever III 2023-10-23 5:56 ` Christoph Hellwig 2023-10-19 15:25 ` [PATCH RFC 2/9] bvec: Add bio_vec fields to manage DMA mapping Chuck Lever 2023-10-19 15:25 ` Chuck Lever 2023-10-19 15:25 ` [PATCH RFC 3/9] dma-debug: Add dma_debug_ helpers for mapping bio_vec arrays Chuck Lever 2023-10-19 15:25 ` Chuck Lever 2023-10-19 21:38 ` kernel test robot 2023-10-19 23:21 ` Chuck Lever III 2023-10-23 2:43 ` Liu, Yujie 2023-10-23 14:27 ` Chuck Lever III 2023-10-19 21:49 ` kernel test robot 2023-10-19 15:25 ` [PATCH RFC 4/9] mm: kmsan: Add support for DMA " Chuck Lever 2023-10-19 15:25 ` Chuck Lever 2023-10-19 15:26 ` Chuck Lever [this message] 2023-10-19 15:26 ` [PATCH RFC 5/9] dma-direct: Support direct " Chuck Lever 2023-10-19 15:26 ` [PATCH RFC 6/9] DMA-API: Add dma_sync_bvecs_for_cpu() and dma_sync_bvecs_for_device() Chuck Lever 2023-10-19 15:26 ` Chuck Lever 2023-10-19 15:26 ` [PATCH RFC 7/9] DMA: Add dma_map_bvecs_attrs() Chuck Lever 2023-10-19 15:26 ` Chuck Lever 2023-10-19 22:10 ` kernel test robot 2023-10-19 15:26 ` [PATCH RFC 8/9] iommu/dma: Support DMA-mapping a bio_vec array Chuck Lever 2023-10-19 15:26 ` Chuck Lever 2023-10-19 15:26 ` [PATCH RFC 9/9] RDMA: Add helpers for DMA-mapping an array of bio_vecs Chuck Lever 2023-10-19 15:26 ` Chuck Lever 2023-10-19 15:53 ` [PATCH RFC 0/9] Exploring biovec support in (R)DMA API Matthew Wilcox 2023-10-19 17:48 ` Chuck Lever 2023-10-20 4:58 ` Christoph Hellwig 2023-10-20 10:30 ` Robin Murphy 2023-10-23 5:59 ` Christoph Hellwig 2023-10-19 16:43 ` Robin Murphy 2023-10-19 17:53 ` 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=169772916546.5232.14817964507475231582.stgit@klimt.1015granger.net \ --to=cel@kernel.org \ --cc=chuck.lever@oracle.com \ --cc=iommu@lists.linux.dev \ --cc=linux-rdma@vger.kernel.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.