All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/2] dmabuf/heaps: implement DMA_BUF_IOCTL_RW_FILE for system_heap
@ 2025-05-13  9:28 wangtao
  2025-05-13 11:32 ` Christian König
  0 siblings, 1 reply; 29+ messages in thread
From: wangtao @ 2025-05-13  9:28 UTC (permalink / raw)
  To: sumit.semwal, christian.koenig, benjamin.gaignard, Brian.Starkey,
	jstultz, tjmercier
  Cc: linux-media, dri-devel, linaro-mm-sig, linux-kernel, bintian.wang,
	yipengxiang, liulu.liu, feng.han, wangtao

Support direct file I/O operations for system_heap dma-buf objects.
Implementation includes:
1. Convert sg_table to bio_vec
2. Set IOCB_DIRECT when O_DIRECT is supported
3. Invoke vfs_iocb_iter_read()/vfs_iocb_iter_write() for actual I/O

Performance metrics (UFS 4.0 device @4GB/s, Arm64 CPU @1GHz):

| Metric             |    1MB |    8MB |    64MB |   1024MB |   3072MB |
|--------------------|-------:|-------:|--------:|---------:|---------:|
| Buffer Read (us)   |   1658 |   9028 |   69295 |  1019783 |  2978179 |
| Direct Read (us)   |    707 |   2647 |   18689 |   299627 |   937758 |
| Buffer Rate (MB/s) |    603 |    886 |     924 |     1004 |     1032 |
| Direct Rate (MB/s) |   1414 |   3022 |    3425 |     3418 |     3276 |

Signed-off-by: wangtao <tao.wangtao@honor.com>
---
 drivers/dma-buf/heaps/system_heap.c | 118 ++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c
index 26d5dc89ea16..f7b71b9843aa 100644
--- a/drivers/dma-buf/heaps/system_heap.c
+++ b/drivers/dma-buf/heaps/system_heap.c
@@ -20,6 +20,8 @@
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/bvec.h>
+#include <linux/uio.h>
 
 static struct dma_heap *sys_heap;
 
@@ -281,6 +283,121 @@ static void system_heap_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)
 	iosys_map_clear(map);
 }
 
+static struct bio_vec *system_heap_init_bvec(struct system_heap_buffer *buffer,
+			size_t offset, size_t len, int *nr_segs)
+{
+	struct sg_table *sgt = &buffer->sg_table;
+	struct scatterlist *sg;
+	size_t length = 0;
+	unsigned int i, k = 0;
+	struct bio_vec *bvec;
+	size_t sg_left;
+	size_t sg_offset;
+	size_t sg_len;
+
+	bvec = kvcalloc(sgt->nents, sizeof(*bvec), GFP_KERNEL);
+	if (!bvec)
+		return NULL;
+
+	for_each_sg(sgt->sgl, sg, sgt->nents, i) {
+		length += sg->length;
+		if (length <= offset)
+			continue;
+
+		sg_left = length - offset;
+		sg_offset = sg->offset + sg->length - sg_left;
+		sg_len = min(sg_left, len);
+
+		bvec[k].bv_page = sg_page(sg);
+		bvec[k].bv_len = sg_len;
+		bvec[k].bv_offset = sg_offset;
+		k++;
+
+		offset += sg_len;
+		len -= sg_len;
+		if (len <= 0)
+			break;
+	}
+
+	*nr_segs = k;
+	return bvec;
+}
+
+static int system_heap_rw_file(struct system_heap_buffer *buffer, bool is_read,
+		bool direct_io, struct file *filp, loff_t file_offset,
+		size_t buf_offset, size_t len)
+{
+	struct bio_vec *bvec;
+	int nr_segs = 0;
+	struct iov_iter iter;
+	struct kiocb kiocb;
+	ssize_t ret = 0;
+
+	if (direct_io) {
+		if (!(filp->f_mode & FMODE_CAN_ODIRECT))
+			return -EINVAL;
+	}
+
+	bvec = system_heap_init_bvec(buffer, buf_offset, len, &nr_segs);
+	if (!bvec)
+		return -ENOMEM;
+
+	iov_iter_bvec(&iter, is_read ? ITER_DEST : ITER_SOURCE, bvec, nr_segs, len);
+	init_sync_kiocb(&kiocb, filp);
+	kiocb.ki_pos = file_offset;
+	if (direct_io)
+		kiocb.ki_flags |= IOCB_DIRECT;
+
+	while (kiocb.ki_pos < file_offset + len) {
+		if (is_read)
+			ret = vfs_iocb_iter_read(filp, &kiocb, &iter);
+		else
+			ret = vfs_iocb_iter_write(filp, &kiocb, &iter);
+		if (ret <= 0)
+			break;
+	}
+
+	kvfree(bvec);
+	return ret < 0 ? ret : 0;
+}
+
+static int system_heap_dma_buf_rw_file(struct dma_buf *dmabuf,
+			struct dma_buf_rw_file *back)
+{
+	struct system_heap_buffer *buffer = dmabuf->priv;
+	int ret = 0;
+	__u32 op = back->flags & DMA_BUF_RW_FLAGS_OP_MASK;
+	bool direct_io = back->flags & DMA_BUF_RW_FLAGS_DIRECT;
+	struct file *filp;
+
+	if (op != DMA_BUF_RW_FLAGS_READ && op != DMA_BUF_RW_FLAGS_WRITE)
+		return -EINVAL;
+	if (direct_io) {
+		if (!PAGE_ALIGNED(back->file_offset) ||
+			!PAGE_ALIGNED(back->buf_offset) ||
+			!PAGE_ALIGNED(back->buf_len))
+		return -EINVAL;
+	}
+	if (!back->buf_len || back->buf_len > dmabuf->size ||
+		back->buf_offset >= dmabuf->size ||
+		back->buf_offset + back->buf_len > dmabuf->size)
+		return -EINVAL;
+	if (back->file_offset + back->buf_len < back->file_offset)
+		return -EINVAL;
+
+	filp = fget(back->fd);
+	if (!filp)
+		return -EBADF;
+
+	mutex_lock(&buffer->lock);
+	ret = system_heap_rw_file(buffer, op == DMA_BUF_RW_FLAGS_READ, direct_io,
+			filp, back->file_offset, back->buf_offset, back->buf_len);
+	mutex_unlock(&buffer->lock);
+
+	fput(filp);
+	return ret;
+}
+
 static void system_heap_dma_buf_release(struct dma_buf *dmabuf)
 {
 	struct system_heap_buffer *buffer = dmabuf->priv;
@@ -308,6 +425,7 @@ static const struct dma_buf_ops system_heap_buf_ops = {
 	.mmap = system_heap_mmap,
 	.vmap = system_heap_vmap,
 	.vunmap = system_heap_vunmap,
+	.rw_file = system_heap_dma_buf_rw_file,
 	.release = system_heap_dma_buf_release,
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 29+ messages in thread
* Re: [PATCH 2/2] dmabuf/heaps: implement DMA_BUF_IOCTL_RW_FILE for system_heap
@ 2025-05-14 12:57 kernel test robot
  0 siblings, 0 replies; 29+ messages in thread
From: kernel test robot @ 2025-05-14 12:57 UTC (permalink / raw)
  To: oe-kbuild; +Cc: lkp, Dan Carpenter

BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
In-Reply-To: <20250513092803.2096-1-tao.wangtao@honor.com>
References: <20250513092803.2096-1-tao.wangtao@honor.com>
TO: wangtao <tao.wangtao@honor.com>
TO: sumit.semwal@linaro.org
TO: christian.koenig@amd.com
TO: benjamin.gaignard@collabora.com
TO: Brian.Starkey@arm.com
TO: jstultz@google.com
TO: tjmercier@google.com
CC: linux-media@vger.kernel.org
CC: dri-devel@lists.freedesktop.org
CC: linaro-mm-sig@lists.linaro.org
CC: linux-kernel@vger.kernel.org
CC: bintian.wang@honor.com
CC: yipengxiang@honor.com
CC: liulu.liu@honor.com
CC: feng.han@honor.com
CC: wangtao <tao.wangtao@honor.com>

Hi wangtao,

kernel test robot noticed the following build warnings:

[auto build test WARNING on sailus-media-tree/master]
[also build test WARNING on linus/master sailus-media-tree/streams v6.15-rc6 next-20250514]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/wangtao/dmabuf-heaps-implement-DMA_BUF_IOCTL_RW_FILE-for-system_heap/20250513-173852
base:   git://linuxtv.org/sailus/media_tree.git master
patch link:    https://lore.kernel.org/r/20250513092803.2096-1-tao.wangtao%40honor.com
patch subject: [PATCH 2/2] dmabuf/heaps: implement DMA_BUF_IOCTL_RW_FILE for system_heap
:::::: branch date: 27 hours ago
:::::: commit date: 27 hours ago
config: loongarch-randconfig-r071-20250514 (https://download.01.org/0day-ci/archive/20250514/202505142015.sGmTug2W-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 14.2.0

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
| Closes: https://lore.kernel.org/r/202505142015.sGmTug2W-lkp@intel.com/

smatch warnings:
drivers/dma-buf/heaps/system_heap.c:376 system_heap_dma_buf_rw_file() warn: if statement not indented

vim +376 drivers/dma-buf/heaps/system_heap.c

817989ef7a0f10 wangtao 2025-05-13  363  
817989ef7a0f10 wangtao 2025-05-13  364  static int system_heap_dma_buf_rw_file(struct dma_buf *dmabuf,
817989ef7a0f10 wangtao 2025-05-13  365  			struct dma_buf_rw_file *back)
817989ef7a0f10 wangtao 2025-05-13  366  {
817989ef7a0f10 wangtao 2025-05-13  367  	struct system_heap_buffer *buffer = dmabuf->priv;
817989ef7a0f10 wangtao 2025-05-13  368  	int ret = 0;
817989ef7a0f10 wangtao 2025-05-13  369  	__u32 op = back->flags & DMA_BUF_RW_FLAGS_OP_MASK;
817989ef7a0f10 wangtao 2025-05-13  370  	bool direct_io = back->flags & DMA_BUF_RW_FLAGS_DIRECT;
817989ef7a0f10 wangtao 2025-05-13  371  	struct file *filp;
817989ef7a0f10 wangtao 2025-05-13  372  
817989ef7a0f10 wangtao 2025-05-13  373  	if (op != DMA_BUF_RW_FLAGS_READ && op != DMA_BUF_RW_FLAGS_WRITE)
817989ef7a0f10 wangtao 2025-05-13  374  		return -EINVAL;
817989ef7a0f10 wangtao 2025-05-13  375  	if (direct_io) {
817989ef7a0f10 wangtao 2025-05-13 @376  		if (!PAGE_ALIGNED(back->file_offset) ||
817989ef7a0f10 wangtao 2025-05-13  377  			!PAGE_ALIGNED(back->buf_offset) ||
817989ef7a0f10 wangtao 2025-05-13  378  			!PAGE_ALIGNED(back->buf_len))
817989ef7a0f10 wangtao 2025-05-13  379  		return -EINVAL;
817989ef7a0f10 wangtao 2025-05-13  380  	}
817989ef7a0f10 wangtao 2025-05-13  381  	if (!back->buf_len || back->buf_len > dmabuf->size ||
817989ef7a0f10 wangtao 2025-05-13  382  		back->buf_offset >= dmabuf->size ||
817989ef7a0f10 wangtao 2025-05-13  383  		back->buf_offset + back->buf_len > dmabuf->size)
817989ef7a0f10 wangtao 2025-05-13  384  		return -EINVAL;
817989ef7a0f10 wangtao 2025-05-13  385  	if (back->file_offset + back->buf_len < back->file_offset)
817989ef7a0f10 wangtao 2025-05-13  386  		return -EINVAL;
817989ef7a0f10 wangtao 2025-05-13  387  
817989ef7a0f10 wangtao 2025-05-13  388  	filp = fget(back->fd);
817989ef7a0f10 wangtao 2025-05-13  389  	if (!filp)
817989ef7a0f10 wangtao 2025-05-13  390  		return -EBADF;
817989ef7a0f10 wangtao 2025-05-13  391  
817989ef7a0f10 wangtao 2025-05-13  392  	mutex_lock(&buffer->lock);
817989ef7a0f10 wangtao 2025-05-13  393  	ret = system_heap_rw_file(buffer, op == DMA_BUF_RW_FLAGS_READ, direct_io,
817989ef7a0f10 wangtao 2025-05-13  394  			filp, back->file_offset, back->buf_offset, back->buf_len);
817989ef7a0f10 wangtao 2025-05-13  395  	mutex_unlock(&buffer->lock);
817989ef7a0f10 wangtao 2025-05-13  396  
817989ef7a0f10 wangtao 2025-05-13  397  	fput(filp);
817989ef7a0f10 wangtao 2025-05-13  398  	return ret;
817989ef7a0f10 wangtao 2025-05-13  399  }
817989ef7a0f10 wangtao 2025-05-13  400  

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

^ permalink raw reply	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2025-05-27 15:10 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-13  9:28 [PATCH 2/2] dmabuf/heaps: implement DMA_BUF_IOCTL_RW_FILE for system_heap wangtao
2025-05-13 11:32 ` Christian König
2025-05-13 12:30   ` wangtao
2025-05-13 13:17     ` Christian König
2025-05-14 11:02       ` wangtao
2025-05-14 12:00         ` Christian König
2025-05-15 14:03           ` wangtao
2025-05-15 14:26             ` Christian König
2025-05-16  7:40               ` wangtao
2025-05-16  8:36                 ` Christian König
2025-05-16  9:49                   ` wangtao
2025-05-16 10:29                     ` Christian König
2025-05-19  4:08                       ` wangtao
2025-05-19  7:47                         ` Christian König
2025-05-16 18:37                   ` T.J. Mercier
2025-05-19  4:37                     ` wangtao
2025-05-19 12:03                     ` wangtao
2025-05-20  4:06                       ` wangtao
2025-05-21  2:00                         ` T.J. Mercier
2025-05-21  4:17                           ` wangtao
2025-05-21  7:35                             ` Christian König
2025-05-21 10:25                               ` wangtao
2025-05-21 11:56                                 ` Christian König
2025-05-22  8:02                                   ` wangtao
2025-05-22 11:57                                     ` Christian König
2025-05-22 12:29                                       ` wangtao
2025-05-27 14:35                                       ` wangtao
2025-05-27 15:10                                         ` Christian König
  -- strict thread matches above, loose matches on Subject: below --
2025-05-14 12:57 kernel test robot

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.