* [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers
@ 2025-04-30 8:56 oushixiong1025
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: oushixiong1025 @ 2025-04-30 8:56 UTC (permalink / raw)
To: Sumit Semwal
Cc: Christian König, linux-media, dri-devel, linaro-mm-sig,
linux-kernel, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
From: Shixiong Ou <oushixiong@kylinos.cn>
[WHY] Some Importer does not need to call dma_buf_map_attachment() to
get the scatterlist info, especially those drivers of hardware that do
not support DMA, such as the udl, the virtgpu and the ast.
[HOW] skip map_dma_buf() when dma_buf_dynamic_attach() for some drivers.
Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
---
drivers/accel/ivpu/ivpu_gem.c | 2 +-
drivers/accel/qaic/qaic_data.c | 2 +-
drivers/dma-buf/dma-buf.c | 29 ++++++++++---------
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +-
drivers/gpu/drm/armada/armada_gem.c | 2 +-
drivers/gpu/drm/drm_prime.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +-
.../drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +-
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
drivers/gpu/drm/tegra/gem.c | 4 +--
drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +-
drivers/gpu/drm/xe/xe_dma_buf.c | 2 +-
drivers/iio/industrialio-buffer.c | 2 +-
drivers/infiniband/core/umem_dmabuf.c | 3 +-
.../common/videobuf2/videobuf2-dma-contig.c | 2 +-
.../media/common/videobuf2/videobuf2-dma-sg.c | 2 +-
.../platform/nvidia/tegra-vde/dmabuf-cache.c | 2 +-
drivers/misc/fastrpc.c | 2 +-
drivers/usb/gadget/function/f_fs.c | 2 +-
drivers/xen/gntdev-dmabuf.c | 2 +-
include/linux/dma-buf.h | 5 ++--
net/core/devmem.c | 2 +-
22 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
index 8741c73b92ce..5258a66ed945 100644
--- a/drivers/accel/ivpu/ivpu_gem.c
+++ b/drivers/accel/ivpu/ivpu_gem.c
@@ -183,7 +183,7 @@ struct drm_gem_object *ivpu_gem_prime_import(struct drm_device *dev,
struct drm_gem_object *obj;
int ret;
- attach = dma_buf_attach(dma_buf, attach_dev);
+ attach = dma_buf_attach(dma_buf, attach_dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c
index 43aba57b48f0..c13c64d59143 100644
--- a/drivers/accel/qaic/qaic_data.c
+++ b/drivers/accel/qaic/qaic_data.c
@@ -803,7 +803,7 @@ struct drm_gem_object *qaic_gem_prime_import(struct drm_device *dev, struct dma_
obj = &bo->base;
get_dma_buf(dma_buf);
- attach = dma_buf_attach(dma_buf, dev->dev);
+ attach = dma_buf_attach(dma_buf, dev->dev, false);
if (IS_ERR(attach)) {
ret = PTR_ERR(attach);
goto attach_fail;
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 5baa83b85515..dd7fe5fbf197 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -904,7 +904,7 @@ static struct sg_table *__map_dma_buf(struct dma_buf_attachment *attach,
struct dma_buf_attachment *
dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
const struct dma_buf_attach_ops *importer_ops,
- void *importer_priv)
+ void *importer_priv, bool skip_map)
{
struct dma_buf_attachment *attach;
int ret;
@@ -941,8 +941,6 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
*/
if (dma_buf_attachment_is_dynamic(attach) !=
dma_buf_is_dynamic(dmabuf)) {
- struct sg_table *sgt;
-
dma_resv_lock(attach->dmabuf->resv, NULL);
if (dma_buf_is_dynamic(attach->dmabuf)) {
ret = dmabuf->ops->pin(attach);
@@ -950,16 +948,20 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
goto err_unlock;
}
- sgt = __map_dma_buf(attach, DMA_BIDIRECTIONAL);
- if (!sgt)
- sgt = ERR_PTR(-ENOMEM);
- if (IS_ERR(sgt)) {
- ret = PTR_ERR(sgt);
- goto err_unpin;
+ if (!skip_map) {
+ struct sg_table *sgt;
+
+ sgt = __map_dma_buf(attach, DMA_BIDIRECTIONAL);
+ if (!sgt)
+ sgt = ERR_PTR(-ENOMEM);
+ if (IS_ERR(sgt)) {
+ ret = PTR_ERR(sgt);
+ goto err_unpin;
+ }
+ attach->sgt = sgt;
+ attach->dir = DMA_BIDIRECTIONAL;
}
dma_resv_unlock(attach->dmabuf->resv);
- attach->sgt = sgt;
- attach->dir = DMA_BIDIRECTIONAL;
}
return attach;
@@ -989,9 +991,10 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_dynamic_attach, "DMA_BUF");
* mapping.
*/
struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
- struct device *dev)
+ struct device *dev,
+ bool skip_map)
{
- return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL);
+ return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL, skip_map);
}
EXPORT_SYMBOL_NS_GPL(dma_buf_attach, "DMA_BUF");
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index e6913fcf2c7b..26c94834e6d2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -479,7 +479,7 @@ struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,
return obj;
attach = dma_buf_dynamic_attach(dma_buf, dev->dev,
- &amdgpu_dma_buf_attach_ops, obj);
+ &amdgpu_dma_buf_attach_ops, obj, false);
if (IS_ERR(attach)) {
drm_gem_object_put(obj);
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 1a1680d71486..7e1a82828b87 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -514,7 +514,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
}
}
- attach = dma_buf_attach(buf, dev->dev);
+ attach = dma_buf_attach(buf, dev->dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index bdb51c8f262e..8e70abca33b9 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -949,7 +949,7 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,
if (!dev->driver->gem_prime_import_sg_table)
return ERR_PTR(-EINVAL);
- attach = dma_buf_attach(dma_buf, attach_dev);
+ attach = dma_buf_attach(dma_buf, attach_dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index 9473050ac842..6015f6beb8e6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -305,7 +305,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
return ERR_PTR(-E2BIG);
/* need to attach */
- attach = dma_buf_attach(dma_buf, dev->dev);
+ attach = dma_buf_attach(dma_buf, dev->dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index 2fda549dd82d..1992241fdf54 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -287,7 +287,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
goto out_import;
/* Now try a fake an importer */
- import_attach = dma_buf_attach(dmabuf, obj->base.dev->dev);
+ import_attach = dma_buf_attach(dmabuf, obj->base.dev->dev, false);
if (IS_ERR(import_attach)) {
err = PTR_ERR(import_attach);
goto out_import;
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index 30cf1cdc1aa3..41fb4149409e 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -114,7 +114,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
}
}
- attach = dma_buf_attach(dma_buf, dev->dev);
+ attach = dma_buf_attach(dma_buf, dev->dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index ace3e5a805cf..e5527c9d10bb 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -79,7 +79,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_
if (obj->dma_buf) {
struct dma_buf *buf = obj->dma_buf;
- map->attach = dma_buf_attach(buf, dev);
+ map->attach = dma_buf_attach(buf, dev, false);
if (IS_ERR(map->attach)) {
err = PTR_ERR(map->attach);
goto free;
@@ -470,7 +470,7 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm,
* domain, map it first to the DRM device to get an sgt.
*/
if (tegra->domain) {
- attach = dma_buf_attach(buf, drm->dev);
+ attach = dma_buf_attach(buf, drm->dev, false);
if (IS_ERR(attach)) {
err = PTR_ERR(attach);
goto free;
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 4de2a63ccd18..6d9d1fe342b6 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -326,7 +326,7 @@ struct drm_gem_object *virtgpu_gem_prime_import(struct drm_device *dev,
drm_gem_private_object_init(dev, obj, buf->size);
attach = dma_buf_dynamic_attach(buf, dev->dev,
- &virtgpu_dma_buf_attach_ops, obj);
+ &virtgpu_dma_buf_attach_ops, obj, true);
if (IS_ERR(attach)) {
kfree(bo);
return ERR_CAST(attach);
diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c
index f7a20264ea33..9f524b9ed425 100644
--- a/drivers/gpu/drm/xe/xe_dma_buf.c
+++ b/drivers/gpu/drm/xe/xe_dma_buf.c
@@ -293,7 +293,7 @@ struct drm_gem_object *xe_gem_prime_import(struct drm_device *dev,
attach_ops = test->attach_ops;
#endif
- attach = dma_buf_dynamic_attach(dma_buf, dev->dev, attach_ops, &bo->ttm.base);
+ attach = dma_buf_dynamic_attach(dma_buf, dev->dev, attach_ops, &bo->ttm.base, false);
if (IS_ERR(attach)) {
obj = ERR_CAST(attach);
goto out_err;
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index a80f7cc25a27..1296af4c2f7a 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -1679,7 +1679,7 @@ static int iio_buffer_attach_dmabuf(struct iio_dev_buffer_pair *ib,
goto err_free_priv;
}
- attach = dma_buf_attach(dmabuf, indio_dev->dev.parent);
+ attach = dma_buf_attach(dmabuf, indio_dev->dev.parent, false);
if (IS_ERR(attach)) {
err = PTR_ERR(attach);
goto err_dmabuf_put;
diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/core/umem_dmabuf.c
index 0ec2e4120cc9..ed635c407cbd 100644
--- a/drivers/infiniband/core/umem_dmabuf.c
+++ b/drivers/infiniband/core/umem_dmabuf.c
@@ -159,7 +159,8 @@ ib_umem_dmabuf_get_with_dma_device(struct ib_device *device,
dmabuf,
dma_device,
ops,
- umem_dmabuf);
+ umem_dmabuf,
+ false);
if (IS_ERR(umem_dmabuf->attach)) {
ret = ERR_CAST(umem_dmabuf->attach);
goto out_free_umem;
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index a13ec569c82f..362f5b555ce2 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -786,7 +786,7 @@ static void *vb2_dc_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
buf->vb = vb;
/* create attachment for the dmabuf with the user device */
- dba = dma_buf_attach(dbuf, buf->dev);
+ dba = dma_buf_attach(dbuf, buf->dev, false);
if (IS_ERR(dba)) {
pr_err("failed to attach dmabuf\n");
kfree(buf);
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index c6ddf2357c58..4f9a4e9783a1 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -632,7 +632,7 @@ static void *vb2_dma_sg_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
buf->dev = dev;
/* create attachment for the dmabuf with the user device */
- dba = dma_buf_attach(dbuf, buf->dev);
+ dba = dma_buf_attach(dbuf, buf->dev, false);
if (IS_ERR(dba)) {
pr_err("failed to attach dmabuf\n");
kfree(buf);
diff --git a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
index b34244ea14dd..d04da2d3e4da 100644
--- a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
+++ b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
@@ -95,7 +95,7 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde,
goto ref;
}
- attachment = dma_buf_attach(dmabuf, dev);
+ attachment = dma_buf_attach(dmabuf, dev, false);
if (IS_ERR(attachment)) {
dev_err(dev, "Failed to attach dmabuf\n");
err = PTR_ERR(attachment);
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 7b7a22c91fe4..aee6f4cbd6c6 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -778,7 +778,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
goto get_err;
}
- map->attach = dma_buf_attach(map->buf, sess->dev);
+ map->attach = dma_buf_attach(map->buf, sess->dev, false);
if (IS_ERR(map->attach)) {
dev_err(sess->dev, "Failed to attach dmabuf\n");
err = PTR_ERR(map->attach);
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 2dea9e42a0f8..51926ffdb843 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1487,7 +1487,7 @@ static int ffs_dmabuf_attach(struct file *file, int fd)
if (IS_ERR(dmabuf))
return PTR_ERR(dmabuf);
- attach = dma_buf_attach(dmabuf, gadget->dev.parent);
+ attach = dma_buf_attach(dmabuf, gadget->dev.parent, false);
if (IS_ERR(attach)) {
err = PTR_ERR(attach);
goto err_dmabuf_put;
diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c
index 5453d86324f6..9de191b6d1f7 100644
--- a/drivers/xen/gntdev-dmabuf.c
+++ b/drivers/xen/gntdev-dmabuf.c
@@ -587,7 +587,7 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev,
gntdev_dmabuf->priv = priv;
gntdev_dmabuf->fd = fd;
- attach = dma_buf_attach(dma_buf, dev);
+ attach = dma_buf_attach(dma_buf, dev, false);
if (IS_ERR(attach)) {
ret = ERR_CAST(attach);
goto fail_free_obj;
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 36216d28d8bd..1ea25089b3ba 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -598,11 +598,12 @@ dma_buf_attachment_is_dynamic(struct dma_buf_attachment *attach)
}
struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
- struct device *dev);
+ struct device *dev,
+ bool skip_map);
struct dma_buf_attachment *
dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
const struct dma_buf_attach_ops *importer_ops,
- void *importer_priv);
+ void *importer_priv, bool skip_map);
void dma_buf_detach(struct dma_buf *dmabuf,
struct dma_buf_attachment *attach);
int dma_buf_pin(struct dma_buf_attachment *attach);
diff --git a/net/core/devmem.c b/net/core/devmem.c
index 6e27a47d0493..8137ecff9e39 100644
--- a/net/core/devmem.c
+++ b/net/core/devmem.c
@@ -202,7 +202,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd,
binding->dmabuf = dmabuf;
- binding->attachment = dma_buf_attach(binding->dmabuf, dev->dev.parent);
+ binding->attachment = dma_buf_attach(binding->dmabuf, dev->dev.parent, false);
if (IS_ERR(binding->attachment)) {
err = PTR_ERR(binding->attachment);
NL_SET_ERR_MSG(extack, "Failed to bind dmabuf to device");
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
2025-04-30 8:56 [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers oushixiong1025
@ 2025-04-30 8:56 ` oushixiong1025
2025-04-30 11:03 ` Christian König
` (2 more replies)
2025-04-30 8:56 ` [PATCH 3/3] drm/udl: Use the default gem_prime_import function oushixiong1025
` (2 subsequent siblings)
3 siblings, 3 replies; 9+ messages in thread
From: oushixiong1025 @ 2025-04-30 8:56 UTC (permalink / raw)
To: Sumit Semwal
Cc: Christian König, linux-media, dri-devel, linaro-mm-sig,
linux-kernel, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
From: Shixiong Ou <oushixiong@kylinos.cn>
[WHY]
On some boards, the dma_mask of Aspeed devices is 0xffff_ffff, this
quite possibly causes the SWIOTLB to be triggered when importing dmabuf.
However IO_TLB_SEGSIZE limits the maximum amount of available memory
for DMA Streaming Mapping, as dmesg following:
[ 24.885303][ T1947] ast 0000:07:00.0: swiotlb buffer is full (sz: 3145728 bytes), total 32768 (slots), used 0 (slots)
[HOW] Provide an interface so that attachment is not mapped when
importing dma-buf.
Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
---
drivers/gpu/drm/ast/ast_drv.c | 2 +-
drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +++++++
drivers/gpu/drm/drm_prime.c | 67 ++++++++++++++++++++++++--
drivers/gpu/drm/udl/udl_drv.c | 2 +-
include/drm/drm_drv.h | 3 ++
include/drm/drm_gem_shmem_helper.h | 6 +++
6 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index 6fbf62a99c48..2dac6acf79e7 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -64,7 +64,7 @@ static const struct drm_driver ast_driver = {
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
- DRM_GEM_SHMEM_DRIVER_OPS,
+ DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
DRM_FBDEV_SHMEM_DRIVER_OPS,
};
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index d99dee67353a..655d841df933 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -799,6 +799,23 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
}
EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table);
+struct drm_gem_object *
+drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
+ struct dma_buf_attachment *attach)
+{
+ size_t size = PAGE_ALIGN(attach->dmabuf->size);
+ struct drm_gem_shmem_object *shmem;
+
+ shmem = __drm_gem_shmem_create(dev, size, true, NULL);
+ if (IS_ERR(shmem))
+ return ERR_CAST(shmem);
+
+ drm_dbg_prime(dev, "size = %zu\n", size);
+
+ return &shmem->base;
+}
+EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_attachment);
+
MODULE_DESCRIPTION("DRM SHMEM memory-management helpers");
MODULE_IMPORT_NS("DMA_BUF");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 8e70abca33b9..522cf974e202 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -911,6 +911,62 @@ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,
}
EXPORT_SYMBOL(drm_gem_prime_export);
+/**
+ * drm_gem_prime_import_dev_skip_map - core implementation of the import callback
+ * @dev: drm_device to import into
+ * @dma_buf: dma-buf object to import
+ * @attach_dev: struct device to dma_buf attach
+ *
+ * This function exports a dma-buf without get it's scatter/gather table.
+ *
+ * Drivers who need to get an scatter/gather table for objects need to call
+ * drm_gem_prime_import_dev() instead.
+ */
+struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
+ struct dma_buf *dma_buf,
+ struct device *attach_dev)
+{
+ struct dma_buf_attachment *attach;
+ struct drm_gem_object *obj;
+ int ret;
+
+ if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
+ obj = dma_buf->priv;
+ if (obj->dev == dev) {
+ /*
+ * Importing dmabuf exported from our own gem increases
+ * refcount on gem itself instead of f_count of dmabuf.
+ */
+ drm_gem_object_get(obj);
+ return obj;
+ }
+ }
+
+ attach = dma_buf_attach(dma_buf, attach_dev, true);
+ if (IS_ERR(attach))
+ return ERR_CAST(attach);
+
+ get_dma_buf(dma_buf);
+
+ obj = dev->driver->gem_prime_import_attachment(dev, attach);
+ if (IS_ERR(obj)) {
+ ret = PTR_ERR(obj);
+ goto fail_detach;
+ }
+
+ obj->import_attach = attach;
+ obj->resv = dma_buf->resv;
+
+ return obj;
+
+fail_detach:
+ dma_buf_detach(dma_buf, attach);
+ dma_buf_put(dma_buf);
+
+ return ERR_PTR(ret);
+}
+EXPORT_SYMBOL(drm_gem_prime_import_dev_skip_map);
+
/**
* drm_gem_prime_import_dev - core implementation of the import callback
* @dev: drm_device to import into
@@ -946,9 +1002,6 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,
}
}
- if (!dev->driver->gem_prime_import_sg_table)
- return ERR_PTR(-EINVAL);
-
attach = dma_buf_attach(dma_buf, attach_dev, false);
if (IS_ERR(attach))
return ERR_CAST(attach);
@@ -998,7 +1051,13 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev);
struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
struct dma_buf *dma_buf)
{
- return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
+ if (dev->driver->gem_prime_import_sg_table)
+ return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
+ else if (dev->driver->gem_prime_import_attachment)
+ return drm_gem_prime_import_dev_skip_map(dev, dma_buf, dev->dev);
+ else
+ return ERR_PTR(-EINVAL);
+
}
EXPORT_SYMBOL(drm_gem_prime_import);
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 05b3a152cc33..c00d8b8834f2 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -72,7 +72,7 @@ static const struct drm_driver driver = {
/* GEM hooks */
.fops = &udl_driver_fops,
- DRM_GEM_SHMEM_DRIVER_OPS,
+ DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
.gem_prime_import = udl_driver_gem_prime_import,
DRM_FBDEV_SHMEM_DRIVER_OPS,
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index a43d707b5f36..aef8d9051fcd 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -326,6 +326,9 @@ struct drm_driver {
struct dma_buf_attachment *attach,
struct sg_table *sgt);
+ struct drm_gem_object *(*gem_prime_import_attachment)(
+ struct drm_device *dev,
+ struct dma_buf_attachment *attach);
/**
* @dumb_create:
*
diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
index cef5a6b5a4d6..39a93c222aaa 100644
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
@@ -274,6 +274,9 @@ struct drm_gem_object *
drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
struct dma_buf_attachment *attach,
struct sg_table *sgt);
+struct drm_gem_object *
+drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
+ struct dma_buf_attachment *attach);
int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
struct drm_mode_create_dumb *args);
@@ -287,4 +290,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
.gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, \
.dumb_create = drm_gem_shmem_dumb_create
+#define DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS \
+ .gem_prime_import_attachment = drm_gem_shmem_prime_import_attachment, \
+ .dumb_create = drm_gem_shmem_dumb_create
#endif /* __DRM_GEM_SHMEM_HELPER_H__ */
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] drm/udl: Use the default gem_prime_import function
2025-04-30 8:56 [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers oushixiong1025
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
@ 2025-04-30 8:56 ` oushixiong1025
2025-04-30 10:56 ` [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers Christian König
2025-05-01 21:33 ` kernel test robot
3 siblings, 0 replies; 9+ messages in thread
From: oushixiong1025 @ 2025-04-30 8:56 UTC (permalink / raw)
To: Sumit Semwal
Cc: Christian König, linux-media, dri-devel, linaro-mm-sig,
linux-kernel, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
From: Shixiong Ou <oushixiong@kylinos.cn>
Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
---
drivers/gpu/drm/udl/udl_drv.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index c00d8b8834f2..8107549b12e5 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -49,22 +49,6 @@ static int udl_usb_reset_resume(struct usb_interface *interface)
return drm_mode_config_helper_resume(dev);
}
-/*
- * FIXME: Dma-buf sharing requires DMA support by the importing device.
- * This function is a workaround to make USB devices work as well.
- * See todo.rst for how to fix the issue in the dma-buf framework.
- */
-static struct drm_gem_object *udl_driver_gem_prime_import(struct drm_device *dev,
- struct dma_buf *dma_buf)
-{
- struct udl_device *udl = to_udl(dev);
-
- if (!udl->dmadev)
- return ERR_PTR(-ENODEV);
-
- return drm_gem_prime_import_dev(dev, dma_buf, udl->dmadev);
-}
-
DEFINE_DRM_GEM_FOPS(udl_driver_fops);
static const struct drm_driver driver = {
@@ -73,7 +57,6 @@ static const struct drm_driver driver = {
/* GEM hooks */
.fops = &udl_driver_fops,
DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
- .gem_prime_import = udl_driver_gem_prime_import,
DRM_FBDEV_SHMEM_DRIVER_OPS,
.name = DRIVER_NAME,
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers
2025-04-30 8:56 [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers oushixiong1025
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
2025-04-30 8:56 ` [PATCH 3/3] drm/udl: Use the default gem_prime_import function oushixiong1025
@ 2025-04-30 10:56 ` Christian König
2025-05-01 21:33 ` kernel test robot
3 siblings, 0 replies; 9+ messages in thread
From: Christian König @ 2025-04-30 10:56 UTC (permalink / raw)
To: oushixiong1025, Sumit Semwal
Cc: linux-media, dri-devel, linaro-mm-sig, linux-kernel,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
On 4/30/25 10:56, oushixiong1025@163.com wrote:
> From: Shixiong Ou <oushixiong@kylinos.cn>
>
> [WHY] Some Importer does not need to call dma_buf_map_attachment() to
> get the scatterlist info, especially those drivers of hardware that do
> not support DMA, such as the udl, the virtgpu and the ast.
>
> [HOW] skip map_dma_buf() when dma_buf_dynamic_attach() for some drivers.
This patch is based on outdated code. Please see drm-misc-next where the mapping during attach was already dropped.
commit b72f66f22c0e39ae6684c43fead774c13db24e73
Author: Christian König <christian.koenig@amd.com>
Date: Tue Feb 11 17:20:53 2025 +0100
dma-buf: drop caching of sg_tables
That was purely for the transition from static to dynamic dma-buf
handling and can be removed again now.
Regards,
Christian.
> Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
> ---
> drivers/accel/ivpu/ivpu_gem.c | 2 +-
> drivers/accel/qaic/qaic_data.c | 2 +-
> drivers/dma-buf/dma-buf.c | 29 ++++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +-
> drivers/gpu/drm/armada/armada_gem.c | 2 +-
> drivers/gpu/drm/drm_prime.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +-
> .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
> drivers/gpu/drm/tegra/gem.c | 4 +--
> drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +-
> drivers/gpu/drm/xe/xe_dma_buf.c | 2 +-
> drivers/iio/industrialio-buffer.c | 2 +-
> drivers/infiniband/core/umem_dmabuf.c | 3 +-
> .../common/videobuf2/videobuf2-dma-contig.c | 2 +-
> .../media/common/videobuf2/videobuf2-dma-sg.c | 2 +-
> .../platform/nvidia/tegra-vde/dmabuf-cache.c | 2 +-
> drivers/misc/fastrpc.c | 2 +-
> drivers/usb/gadget/function/f_fs.c | 2 +-
> drivers/xen/gntdev-dmabuf.c | 2 +-
> include/linux/dma-buf.h | 5 ++--
> net/core/devmem.c | 2 +-
> 22 files changed, 41 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
> index 8741c73b92ce..5258a66ed945 100644
> --- a/drivers/accel/ivpu/ivpu_gem.c
> +++ b/drivers/accel/ivpu/ivpu_gem.c
> @@ -183,7 +183,7 @@ struct drm_gem_object *ivpu_gem_prime_import(struct drm_device *dev,
> struct drm_gem_object *obj;
> int ret;
>
> - attach = dma_buf_attach(dma_buf, attach_dev);
> + attach = dma_buf_attach(dma_buf, attach_dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
>
> diff --git a/drivers/accel/qaic/qaic_data.c b/drivers/accel/qaic/qaic_data.c
> index 43aba57b48f0..c13c64d59143 100644
> --- a/drivers/accel/qaic/qaic_data.c
> +++ b/drivers/accel/qaic/qaic_data.c
> @@ -803,7 +803,7 @@ struct drm_gem_object *qaic_gem_prime_import(struct drm_device *dev, struct dma_
> obj = &bo->base;
> get_dma_buf(dma_buf);
>
> - attach = dma_buf_attach(dma_buf, dev->dev);
> + attach = dma_buf_attach(dma_buf, dev->dev, false);
> if (IS_ERR(attach)) {
> ret = PTR_ERR(attach);
> goto attach_fail;
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index 5baa83b85515..dd7fe5fbf197 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -904,7 +904,7 @@ static struct sg_table *__map_dma_buf(struct dma_buf_attachment *attach,
> struct dma_buf_attachment *
> dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
> const struct dma_buf_attach_ops *importer_ops,
> - void *importer_priv)
> + void *importer_priv, bool skip_map)
> {
> struct dma_buf_attachment *attach;
> int ret;
> @@ -941,8 +941,6 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
> */
> if (dma_buf_attachment_is_dynamic(attach) !=
> dma_buf_is_dynamic(dmabuf)) {
> - struct sg_table *sgt;
> -
> dma_resv_lock(attach->dmabuf->resv, NULL);
> if (dma_buf_is_dynamic(attach->dmabuf)) {
> ret = dmabuf->ops->pin(attach);
> @@ -950,16 +948,20 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
> goto err_unlock;
> }
>
> - sgt = __map_dma_buf(attach, DMA_BIDIRECTIONAL);
> - if (!sgt)
> - sgt = ERR_PTR(-ENOMEM);
> - if (IS_ERR(sgt)) {
> - ret = PTR_ERR(sgt);
> - goto err_unpin;
> + if (!skip_map) {
> + struct sg_table *sgt;
> +
> + sgt = __map_dma_buf(attach, DMA_BIDIRECTIONAL);
> + if (!sgt)
> + sgt = ERR_PTR(-ENOMEM);
> + if (IS_ERR(sgt)) {
> + ret = PTR_ERR(sgt);
> + goto err_unpin;
> + }
> + attach->sgt = sgt;
> + attach->dir = DMA_BIDIRECTIONAL;
> }
> dma_resv_unlock(attach->dmabuf->resv);
> - attach->sgt = sgt;
> - attach->dir = DMA_BIDIRECTIONAL;
> }
>
> return attach;
> @@ -989,9 +991,10 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_dynamic_attach, "DMA_BUF");
> * mapping.
> */
> struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
> - struct device *dev)
> + struct device *dev,
> + bool skip_map)
> {
> - return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL);
> + return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL, skip_map);
> }
> EXPORT_SYMBOL_NS_GPL(dma_buf_attach, "DMA_BUF");
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> index e6913fcf2c7b..26c94834e6d2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> @@ -479,7 +479,7 @@ struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,
> return obj;
>
> attach = dma_buf_dynamic_attach(dma_buf, dev->dev,
> - &amdgpu_dma_buf_attach_ops, obj);
> + &amdgpu_dma_buf_attach_ops, obj, false);
> if (IS_ERR(attach)) {
> drm_gem_object_put(obj);
> return ERR_CAST(attach);
> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> index 1a1680d71486..7e1a82828b87 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -514,7 +514,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
> }
> }
>
> - attach = dma_buf_attach(buf, dev->dev);
> + attach = dma_buf_attach(buf, dev->dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
>
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index bdb51c8f262e..8e70abca33b9 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -949,7 +949,7 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,
> if (!dev->driver->gem_prime_import_sg_table)
> return ERR_PTR(-EINVAL);
>
> - attach = dma_buf_attach(dma_buf, attach_dev);
> + attach = dma_buf_attach(dma_buf, attach_dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> index 9473050ac842..6015f6beb8e6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
> @@ -305,7 +305,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
> return ERR_PTR(-E2BIG);
>
> /* need to attach */
> - attach = dma_buf_attach(dma_buf, dev->dev);
> + attach = dma_buf_attach(dma_buf, dev->dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> index 2fda549dd82d..1992241fdf54 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> @@ -287,7 +287,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915,
> goto out_import;
>
> /* Now try a fake an importer */
> - import_attach = dma_buf_attach(dmabuf, obj->base.dev->dev);
> + import_attach = dma_buf_attach(dmabuf, obj->base.dev->dev, false);
> if (IS_ERR(import_attach)) {
> err = PTR_ERR(import_attach);
> goto out_import;
> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> index 30cf1cdc1aa3..41fb4149409e 100644
> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> @@ -114,7 +114,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
> }
> }
>
> - attach = dma_buf_attach(dma_buf, dev->dev);
> + attach = dma_buf_attach(dma_buf, dev->dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
>
> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
> index ace3e5a805cf..e5527c9d10bb 100644
> --- a/drivers/gpu/drm/tegra/gem.c
> +++ b/drivers/gpu/drm/tegra/gem.c
> @@ -79,7 +79,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_
> if (obj->dma_buf) {
> struct dma_buf *buf = obj->dma_buf;
>
> - map->attach = dma_buf_attach(buf, dev);
> + map->attach = dma_buf_attach(buf, dev, false);
> if (IS_ERR(map->attach)) {
> err = PTR_ERR(map->attach);
> goto free;
> @@ -470,7 +470,7 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm,
> * domain, map it first to the DRM device to get an sgt.
> */
> if (tegra->domain) {
> - attach = dma_buf_attach(buf, drm->dev);
> + attach = dma_buf_attach(buf, drm->dev, false);
> if (IS_ERR(attach)) {
> err = PTR_ERR(attach);
> goto free;
> diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
> index 4de2a63ccd18..6d9d1fe342b6 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_prime.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
> @@ -326,7 +326,7 @@ struct drm_gem_object *virtgpu_gem_prime_import(struct drm_device *dev,
> drm_gem_private_object_init(dev, obj, buf->size);
>
> attach = dma_buf_dynamic_attach(buf, dev->dev,
> - &virtgpu_dma_buf_attach_ops, obj);
> + &virtgpu_dma_buf_attach_ops, obj, true);
> if (IS_ERR(attach)) {
> kfree(bo);
> return ERR_CAST(attach);
> diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c
> index f7a20264ea33..9f524b9ed425 100644
> --- a/drivers/gpu/drm/xe/xe_dma_buf.c
> +++ b/drivers/gpu/drm/xe/xe_dma_buf.c
> @@ -293,7 +293,7 @@ struct drm_gem_object *xe_gem_prime_import(struct drm_device *dev,
> attach_ops = test->attach_ops;
> #endif
>
> - attach = dma_buf_dynamic_attach(dma_buf, dev->dev, attach_ops, &bo->ttm.base);
> + attach = dma_buf_dynamic_attach(dma_buf, dev->dev, attach_ops, &bo->ttm.base, false);
> if (IS_ERR(attach)) {
> obj = ERR_CAST(attach);
> goto out_err;
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index a80f7cc25a27..1296af4c2f7a 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -1679,7 +1679,7 @@ static int iio_buffer_attach_dmabuf(struct iio_dev_buffer_pair *ib,
> goto err_free_priv;
> }
>
> - attach = dma_buf_attach(dmabuf, indio_dev->dev.parent);
> + attach = dma_buf_attach(dmabuf, indio_dev->dev.parent, false);
> if (IS_ERR(attach)) {
> err = PTR_ERR(attach);
> goto err_dmabuf_put;
> diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/core/umem_dmabuf.c
> index 0ec2e4120cc9..ed635c407cbd 100644
> --- a/drivers/infiniband/core/umem_dmabuf.c
> +++ b/drivers/infiniband/core/umem_dmabuf.c
> @@ -159,7 +159,8 @@ ib_umem_dmabuf_get_with_dma_device(struct ib_device *device,
> dmabuf,
> dma_device,
> ops,
> - umem_dmabuf);
> + umem_dmabuf,
> + false);
> if (IS_ERR(umem_dmabuf->attach)) {
> ret = ERR_CAST(umem_dmabuf->attach);
> goto out_free_umem;
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> index a13ec569c82f..362f5b555ce2 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> @@ -786,7 +786,7 @@ static void *vb2_dc_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
> buf->vb = vb;
>
> /* create attachment for the dmabuf with the user device */
> - dba = dma_buf_attach(dbuf, buf->dev);
> + dba = dma_buf_attach(dbuf, buf->dev, false);
> if (IS_ERR(dba)) {
> pr_err("failed to attach dmabuf\n");
> kfree(buf);
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> index c6ddf2357c58..4f9a4e9783a1 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> @@ -632,7 +632,7 @@ static void *vb2_dma_sg_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
>
> buf->dev = dev;
> /* create attachment for the dmabuf with the user device */
> - dba = dma_buf_attach(dbuf, buf->dev);
> + dba = dma_buf_attach(dbuf, buf->dev, false);
> if (IS_ERR(dba)) {
> pr_err("failed to attach dmabuf\n");
> kfree(buf);
> diff --git a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
> index b34244ea14dd..d04da2d3e4da 100644
> --- a/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
> +++ b/drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
> @@ -95,7 +95,7 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde,
> goto ref;
> }
>
> - attachment = dma_buf_attach(dmabuf, dev);
> + attachment = dma_buf_attach(dmabuf, dev, false);
> if (IS_ERR(attachment)) {
> dev_err(dev, "Failed to attach dmabuf\n");
> err = PTR_ERR(attachment);
> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> index 7b7a22c91fe4..aee6f4cbd6c6 100644
> --- a/drivers/misc/fastrpc.c
> +++ b/drivers/misc/fastrpc.c
> @@ -778,7 +778,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
> goto get_err;
> }
>
> - map->attach = dma_buf_attach(map->buf, sess->dev);
> + map->attach = dma_buf_attach(map->buf, sess->dev, false);
> if (IS_ERR(map->attach)) {
> dev_err(sess->dev, "Failed to attach dmabuf\n");
> err = PTR_ERR(map->attach);
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index 2dea9e42a0f8..51926ffdb843 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -1487,7 +1487,7 @@ static int ffs_dmabuf_attach(struct file *file, int fd)
> if (IS_ERR(dmabuf))
> return PTR_ERR(dmabuf);
>
> - attach = dma_buf_attach(dmabuf, gadget->dev.parent);
> + attach = dma_buf_attach(dmabuf, gadget->dev.parent, false);
> if (IS_ERR(attach)) {
> err = PTR_ERR(attach);
> goto err_dmabuf_put;
> diff --git a/drivers/xen/gntdev-dmabuf.c b/drivers/xen/gntdev-dmabuf.c
> index 5453d86324f6..9de191b6d1f7 100644
> --- a/drivers/xen/gntdev-dmabuf.c
> +++ b/drivers/xen/gntdev-dmabuf.c
> @@ -587,7 +587,7 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev,
> gntdev_dmabuf->priv = priv;
> gntdev_dmabuf->fd = fd;
>
> - attach = dma_buf_attach(dma_buf, dev);
> + attach = dma_buf_attach(dma_buf, dev, false);
> if (IS_ERR(attach)) {
> ret = ERR_CAST(attach);
> goto fail_free_obj;
> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
> index 36216d28d8bd..1ea25089b3ba 100644
> --- a/include/linux/dma-buf.h
> +++ b/include/linux/dma-buf.h
> @@ -598,11 +598,12 @@ dma_buf_attachment_is_dynamic(struct dma_buf_attachment *attach)
> }
>
> struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
> - struct device *dev);
> + struct device *dev,
> + bool skip_map);
> struct dma_buf_attachment *
> dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
> const struct dma_buf_attach_ops *importer_ops,
> - void *importer_priv);
> + void *importer_priv, bool skip_map);
> void dma_buf_detach(struct dma_buf *dmabuf,
> struct dma_buf_attachment *attach);
> int dma_buf_pin(struct dma_buf_attachment *attach);
> diff --git a/net/core/devmem.c b/net/core/devmem.c
> index 6e27a47d0493..8137ecff9e39 100644
> --- a/net/core/devmem.c
> +++ b/net/core/devmem.c
> @@ -202,7 +202,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd,
>
> binding->dmabuf = dmabuf;
>
> - binding->attachment = dma_buf_attach(binding->dmabuf, dev->dev.parent);
> + binding->attachment = dma_buf_attach(binding->dmabuf, dev->dev.parent, false);
> if (IS_ERR(binding->attachment)) {
> err = PTR_ERR(binding->attachment);
> NL_SET_ERR_MSG(extack, "Failed to bind dmabuf to device");
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
@ 2025-04-30 11:03 ` Christian König
[not found] ` <c93177d7-be53-4f37-96d4-d09323737581@163.com>
2025-05-01 9:04 ` kernel test robot
2025-05-02 15:36 ` kernel test robot
2 siblings, 1 reply; 9+ messages in thread
From: Christian König @ 2025-04-30 11:03 UTC (permalink / raw)
To: oushixiong1025, Sumit Semwal
Cc: linux-media, dri-devel, linaro-mm-sig, linux-kernel,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
On 4/30/25 10:56, oushixiong1025@163.com wrote:
> From: Shixiong Ou <oushixiong@kylinos.cn>
>
> [WHY]
> On some boards, the dma_mask of Aspeed devices is 0xffff_ffff, this
> quite possibly causes the SWIOTLB to be triggered when importing dmabuf.
> However IO_TLB_SEGSIZE limits the maximum amount of available memory
> for DMA Streaming Mapping, as dmesg following:
>
> [ 24.885303][ T1947] ast 0000:07:00.0: swiotlb buffer is full (sz: 3145728 bytes), total 32768 (slots), used 0 (slots)
>
> [HOW] Provide an interface so that attachment is not mapped when
> importing dma-buf.
This is unecessary. The extra abstraction in DRM is only useful when you want to implement the obj->funcs->get_sg_table() callback.
When a driver doesn't want to expose an sg_table for a buffer or want some other special handling it can simply do so by implementing the DMA-buf interface directly.
See drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c for an example on how to do this.
Regards,
Christian.
>
> Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
> ---
> drivers/gpu/drm/ast/ast_drv.c | 2 +-
> drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +++++++
> drivers/gpu/drm/drm_prime.c | 67 ++++++++++++++++++++++++--
> drivers/gpu/drm/udl/udl_drv.c | 2 +-
> include/drm/drm_drv.h | 3 ++
> include/drm/drm_gem_shmem_helper.h | 6 +++
> 6 files changed, 91 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 6fbf62a99c48..2dac6acf79e7 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -64,7 +64,7 @@ static const struct drm_driver ast_driver = {
> .minor = DRIVER_MINOR,
> .patchlevel = DRIVER_PATCHLEVEL,
>
> - DRM_GEM_SHMEM_DRIVER_OPS,
> + DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
> DRM_FBDEV_SHMEM_DRIVER_OPS,
> };
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index d99dee67353a..655d841df933 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -799,6 +799,23 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
> }
> EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table);
>
> +struct drm_gem_object *
> +drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
> + struct dma_buf_attachment *attach)
> +{
> + size_t size = PAGE_ALIGN(attach->dmabuf->size);
> + struct drm_gem_shmem_object *shmem;
> +
> + shmem = __drm_gem_shmem_create(dev, size, true, NULL);
> + if (IS_ERR(shmem))
> + return ERR_CAST(shmem);
> +
> + drm_dbg_prime(dev, "size = %zu\n", size);
> +
> + return &shmem->base;
> +}
> +EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_attachment);
> +
> MODULE_DESCRIPTION("DRM SHMEM memory-management helpers");
> MODULE_IMPORT_NS("DMA_BUF");
> MODULE_LICENSE("GPL v2");
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index 8e70abca33b9..522cf974e202 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -911,6 +911,62 @@ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,
> }
> EXPORT_SYMBOL(drm_gem_prime_export);
>
> +/**
> + * drm_gem_prime_import_dev_skip_map - core implementation of the import callback
> + * @dev: drm_device to import into
> + * @dma_buf: dma-buf object to import
> + * @attach_dev: struct device to dma_buf attach
> + *
> + * This function exports a dma-buf without get it's scatter/gather table.
> + *
> + * Drivers who need to get an scatter/gather table for objects need to call
> + * drm_gem_prime_import_dev() instead.
> + */
> +struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
> + struct dma_buf *dma_buf,
> + struct device *attach_dev)
> +{
> + struct dma_buf_attachment *attach;
> + struct drm_gem_object *obj;
> + int ret;
> +
> + if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
> + obj = dma_buf->priv;
> + if (obj->dev == dev) {
> + /*
> + * Importing dmabuf exported from our own gem increases
> + * refcount on gem itself instead of f_count of dmabuf.
> + */
> + drm_gem_object_get(obj);
> + return obj;
> + }
> + }
> +
> + attach = dma_buf_attach(dma_buf, attach_dev, true);
> + if (IS_ERR(attach))
> + return ERR_CAST(attach);
> +
> + get_dma_buf(dma_buf);
> +
> + obj = dev->driver->gem_prime_import_attachment(dev, attach);
> + if (IS_ERR(obj)) {
> + ret = PTR_ERR(obj);
> + goto fail_detach;
> + }
> +
> + obj->import_attach = attach;
> + obj->resv = dma_buf->resv;
> +
> + return obj;
> +
> +fail_detach:
> + dma_buf_detach(dma_buf, attach);
> + dma_buf_put(dma_buf);
> +
> + return ERR_PTR(ret);
> +}
> +EXPORT_SYMBOL(drm_gem_prime_import_dev_skip_map);
> +
> /**
> * drm_gem_prime_import_dev - core implementation of the import callback
> * @dev: drm_device to import into
> @@ -946,9 +1002,6 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,
> }
> }
>
> - if (!dev->driver->gem_prime_import_sg_table)
> - return ERR_PTR(-EINVAL);
> -
> attach = dma_buf_attach(dma_buf, attach_dev, false);
> if (IS_ERR(attach))
> return ERR_CAST(attach);
> @@ -998,7 +1051,13 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev);
> struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
> struct dma_buf *dma_buf)
> {
> - return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
> + if (dev->driver->gem_prime_import_sg_table)
> + return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
> + else if (dev->driver->gem_prime_import_attachment)
> + return drm_gem_prime_import_dev_skip_map(dev, dma_buf, dev->dev);
> + else
> + return ERR_PTR(-EINVAL);
> +
> }
> EXPORT_SYMBOL(drm_gem_prime_import);
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index 05b3a152cc33..c00d8b8834f2 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -72,7 +72,7 @@ static const struct drm_driver driver = {
>
> /* GEM hooks */
> .fops = &udl_driver_fops,
> - DRM_GEM_SHMEM_DRIVER_OPS,
> + DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
> .gem_prime_import = udl_driver_gem_prime_import,
> DRM_FBDEV_SHMEM_DRIVER_OPS,
>
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index a43d707b5f36..aef8d9051fcd 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -326,6 +326,9 @@ struct drm_driver {
> struct dma_buf_attachment *attach,
> struct sg_table *sgt);
>
> + struct drm_gem_object *(*gem_prime_import_attachment)(
> + struct drm_device *dev,
> + struct dma_buf_attachment *attach);
> /**
> * @dumb_create:
> *
> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
> index cef5a6b5a4d6..39a93c222aaa 100644
> --- a/include/drm/drm_gem_shmem_helper.h
> +++ b/include/drm/drm_gem_shmem_helper.h
> @@ -274,6 +274,9 @@ struct drm_gem_object *
> drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
> struct dma_buf_attachment *attach,
> struct sg_table *sgt);
> +struct drm_gem_object *
> +drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
> + struct dma_buf_attachment *attach);
> int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
> struct drm_mode_create_dumb *args);
>
> @@ -287,4 +290,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
> .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, \
> .dumb_create = drm_gem_shmem_dumb_create
>
> +#define DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS \
> + .gem_prime_import_attachment = drm_gem_shmem_prime_import_attachment, \
> + .dumb_create = drm_gem_shmem_dumb_create
> #endif /* __DRM_GEM_SHMEM_HELPER_H__ */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
[not found] ` <c93177d7-be53-4f37-96d4-d09323737581@163.com>
@ 2025-04-30 14:48 ` Christian König
0 siblings, 0 replies; 9+ messages in thread
From: Christian König @ 2025-04-30 14:48 UTC (permalink / raw)
To: oushixiong, Sumit Semwal
Cc: linux-media, dri-devel, linaro-mm-sig, linux-kernel,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, Dave Airlie, Sean Paul, Shixiong Ou
On 4/30/25 16:13, oushixiong wrote:
>
> 在 2025/4/30 19:03, Christian König 写道:
>> On 4/30/25 10:56,oushixiong1025@163.com wrote:
>>> From: Shixiong Ou<oushixiong@kylinos.cn>
>>>
>>> [WHY]
>>> On some boards, the dma_mask of Aspeed devices is 0xffff_ffff, this
>>> quite possibly causes the SWIOTLB to be triggered when importing dmabuf.
>>> However IO_TLB_SEGSIZE limits the maximum amount of available memory
>>> for DMA Streaming Mapping, as dmesg following:
>>>
>>> [ 24.885303][ T1947] ast 0000:07:00.0: swiotlb buffer is full (sz: 3145728 bytes), total 32768 (slots), used 0 (slots)
>>>
>>> [HOW] Provide an interface so that attachment is not mapped when
>>> importing dma-buf.
>> This is unecessary. The extra abstraction in DRM is only useful when you want to implement the obj->funcs->get_sg_table() callback.
>>
>> When a driver doesn't want to expose an sg_table for a buffer or want some other special handling it can simply do so by implementing the DMA-buf interface directly.
>>
>> See drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c for an example on how to do this.
>>
>> Regards,
>> Christian.
>
>
> Thanks for the reminder,
>
> most drivers that use DRM_GEM_SHADOW_PLANE_HELPER_FUNCSand DRM_GEM_SHMEM_DRIVER_OPS
>
> don't need to import the sg_table, such as the udl and the ast and so on at the moment.
>
> They just need to call dma_buf_vmap() to get the kernel virtual address of the shared buffer.
>
> So I wondered if there was a simple generic PRIME implementation for these drivers.
>
> If you don't recommend this, Maybe try to implement it in DRM_GEM_SHMEM_DRIVER_OPS ?
Well if you only want to implement vmap/vunmap the necessary code in the driver would look something like this:
const struct dma_buf_ops amdgpu_dmabuf_ops = {
.map_dma_buf = dummy_map_function,
.release = drm_gem_dmabuf_release,
.mmap = drm_gem_dmabuf_mmap,
.vmap = drm_gem_dmabuf_vmap,
.vunmap = drm_gem_dmabuf_vunmap,
};
struct dma_buf *drv_gem_prime_export(struct drm_gem_object *gobj,
int flags)
{
struct dma_buf *buf;
buf = drm_gem_prime_export(gobj, flags);
if (!IS_ERR(buf))
buf->ops = &amdgpu_dmabuf_ops;
return buf;
}
The only thing which could be improved is the dummy_map_function. As far as I can see we could make the map function optional in DMA-buf now.
Apart from that you could make a DRM helper from that few lines, but to be honest I don't think it's worth it. It reduces the loc a bit, but there is no real complexity here which drivers could share.
Regards,
Christian.
>
> Regards,
>
> Shixiong Ou.
>
>>> Signed-off-by: Shixiong Ou<oushixiong@kylinos.cn>
>>> ---
>>> drivers/gpu/drm/ast/ast_drv.c | 2 +-
>>> drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +++++++
>>> drivers/gpu/drm/drm_prime.c | 67 ++++++++++++++++++++++++--
>>> drivers/gpu/drm/udl/udl_drv.c | 2 +-
>>> include/drm/drm_drv.h | 3 ++
>>> include/drm/drm_gem_shmem_helper.h | 6 +++
>>> 6 files changed, 91 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
>>> index 6fbf62a99c48..2dac6acf79e7 100644
>>> --- a/drivers/gpu/drm/ast/ast_drv.c
>>> +++ b/drivers/gpu/drm/ast/ast_drv.c
>>> @@ -64,7 +64,7 @@ static const struct drm_driver ast_driver = {
>>> .minor = DRIVER_MINOR,
>>> .patchlevel = DRIVER_PATCHLEVEL,
>>> - DRM_GEM_SHMEM_DRIVER_OPS,
>>> + DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
>>> DRM_FBDEV_SHMEM_DRIVER_OPS,
>>> };
>>> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
>>> index d99dee67353a..655d841df933 100644
>>> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
>>> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
>>> @@ -799,6 +799,23 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
>>> }
>>> EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table);
>>> +struct drm_gem_object *
>>> +drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
>>> + struct dma_buf_attachment *attach)
>>> +{
>>> + size_t size = PAGE_ALIGN(attach->dmabuf->size);
>>> + struct drm_gem_shmem_object *shmem;
>>> +
>>> + shmem = __drm_gem_shmem_create(dev, size, true, NULL);
>>> + if (IS_ERR(shmem))
>>> + return ERR_CAST(shmem);
>>> +
>>> + drm_dbg_prime(dev, "size = %zu\n", size);
>>> +
>>> + return &shmem->base;
>>> +}
>>> +EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_attachment);
>>> +
>>> MODULE_DESCRIPTION("DRM SHMEM memory-management helpers");
>>> MODULE_IMPORT_NS("DMA_BUF");
>>> MODULE_LICENSE("GPL v2");
>>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>>> index 8e70abca33b9..522cf974e202 100644
>>> --- a/drivers/gpu/drm/drm_prime.c
>>> +++ b/drivers/gpu/drm/drm_prime.c
>>> @@ -911,6 +911,62 @@ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,
>>> }
>>> EXPORT_SYMBOL(drm_gem_prime_export);
>>> +/**
>>> + * drm_gem_prime_import_dev_skip_map - core implementation of the import callback
>>> + * @dev: drm_device to import into
>>> + * @dma_buf: dma-buf object to import
>>> + * @attach_dev: struct device to dma_buf attach
>>> + *
>>> + * This function exports a dma-buf without get it's scatter/gather table.
>>> + *
>>> + * Drivers who need to get an scatter/gather table for objects need to call
>>> + * drm_gem_prime_import_dev() instead.
>>> + */
>>> +struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
>>> + struct dma_buf *dma_buf,
>>> + struct device *attach_dev)
>>> +{
>>> + struct dma_buf_attachment *attach;
>>> + struct drm_gem_object *obj;
>>> + int ret;
>>> +
>>> + if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
>>> + obj = dma_buf->priv;
>>> + if (obj->dev == dev) {
>>> + /*
>>> + * Importing dmabuf exported from our own gem increases
>>> + * refcount on gem itself instead of f_count of dmabuf.
>>> + */
>>> + drm_gem_object_get(obj);
>>> + return obj;
>>> + }
>>> + }
>>> +
>>> + attach = dma_buf_attach(dma_buf, attach_dev, true);
>>> + if (IS_ERR(attach))
>>> + return ERR_CAST(attach);
>>> +
>>> + get_dma_buf(dma_buf);
>>> +
>>> + obj = dev->driver->gem_prime_import_attachment(dev, attach);
>>> + if (IS_ERR(obj)) {
>>> + ret = PTR_ERR(obj);
>>> + goto fail_detach;
>>> + }
>>> +
>>> + obj->import_attach = attach;
>>> + obj->resv = dma_buf->resv;
>>> +
>>> + return obj;
>>> +
>>> +fail_detach:
>>> + dma_buf_detach(dma_buf, attach);
>>> + dma_buf_put(dma_buf);
>>> +
>>> + return ERR_PTR(ret);
>>> +}
>>> +EXPORT_SYMBOL(drm_gem_prime_import_dev_skip_map);
>>> +
>>> /**
>>> * drm_gem_prime_import_dev - core implementation of the import callback
>>> * @dev: drm_device to import into
>>> @@ -946,9 +1002,6 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,
>>> }
>>> }
>>> - if (!dev->driver->gem_prime_import_sg_table)
>>> - return ERR_PTR(-EINVAL);
>>> -
>>> attach = dma_buf_attach(dma_buf, attach_dev, false);
>>> if (IS_ERR(attach))
>>> return ERR_CAST(attach);
>>> @@ -998,7 +1051,13 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev);
>>> struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
>>> struct dma_buf *dma_buf)
>>> {
>>> - return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
>>> + if (dev->driver->gem_prime_import_sg_table)
>>> + return drm_gem_prime_import_dev(dev, dma_buf, dev->dev);
>>> + else if (dev->driver->gem_prime_import_attachment)
>>> + return drm_gem_prime_import_dev_skip_map(dev, dma_buf, dev->dev);
>>> + else
>>> + return ERR_PTR(-EINVAL);
>>> +
>>> }
>>> EXPORT_SYMBOL(drm_gem_prime_import);
>>> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
>>> index 05b3a152cc33..c00d8b8834f2 100644
>>> --- a/drivers/gpu/drm/udl/udl_drv.c
>>> +++ b/drivers/gpu/drm/udl/udl_drv.c
>>> @@ -72,7 +72,7 @@ static const struct drm_driver driver = {
>>> /* GEM hooks */
>>> .fops = &udl_driver_fops,
>>> - DRM_GEM_SHMEM_DRIVER_OPS,
>>> + DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS,
>>> .gem_prime_import = udl_driver_gem_prime_import,
>>> DRM_FBDEV_SHMEM_DRIVER_OPS,
>>> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
>>> index a43d707b5f36..aef8d9051fcd 100644
>>> --- a/include/drm/drm_drv.h
>>> +++ b/include/drm/drm_drv.h
>>> @@ -326,6 +326,9 @@ struct drm_driver {
>>> struct dma_buf_attachment *attach,
>>> struct sg_table *sgt);
>>> + struct drm_gem_object *(*gem_prime_import_attachment)(
>>> + struct drm_device *dev,
>>> + struct dma_buf_attachment *attach);
>>> /**
>>> * @dumb_create:
>>> *
>>> diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
>>> index cef5a6b5a4d6..39a93c222aaa 100644
>>> --- a/include/drm/drm_gem_shmem_helper.h
>>> +++ b/include/drm/drm_gem_shmem_helper.h
>>> @@ -274,6 +274,9 @@ struct drm_gem_object *
>>> drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
>>> struct dma_buf_attachment *attach,
>>> struct sg_table *sgt);
>>> +struct drm_gem_object *
>>> +drm_gem_shmem_prime_import_attachment(struct drm_device *dev,
>>> + struct dma_buf_attachment *attach);
>>> int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>>> struct drm_mode_create_dumb *args);
>>> @@ -287,4 +290,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
>>> .gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, \
>>> .dumb_create = drm_gem_shmem_dumb_create
>>> +#define DRM_GEM_SHMEM_SIMPLE_DRIVER_OPS \
>>> + .gem_prime_import_attachment = drm_gem_shmem_prime_import_attachment, \
>>> + .dumb_create = drm_gem_shmem_dumb_create
>>> #endif /* __DRM_GEM_SHMEM_HELPER_H__ */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
2025-04-30 11:03 ` Christian König
@ 2025-05-01 9:04 ` kernel test robot
2025-05-02 15:36 ` kernel test robot
2 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2025-05-01 9:04 UTC (permalink / raw)
To: oushixiong1025, Sumit Semwal
Cc: llvm, oe-kbuild-all, Christian König, linux-media, dri-devel,
linaro-mm-sig, linux-kernel, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Dave Airlie,
Sean Paul, Shixiong Ou
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on char-misc/char-misc-testing char-misc/char-misc-next char-misc/char-misc-linus usb/usb-testing usb/usb-next usb/usb-linus xen-tip/linux-next linus/master v6.15-rc4]
[cannot apply to tegra/for-next drm-xe/drm-xe-next rmk-arm/drm-armada-devel rmk-arm/drm-armada-fixes next-20250430]
[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/oushixiong1025-163-com/drm-prime-Support-importing-DMA-BUF-without-sg_table/20250430-170136
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/20250430085658.540746-2-oushixiong1025%40163.com
patch subject: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
config: arm64-randconfig-003-20250501 (https://download.01.org/0day-ci/archive/20250501/202505011655.qTmh4UA7-lkp@intel.com/config)
compiler: clang version 21.0.0git (https://github.com/llvm/llvm-project f819f46284f2a79790038e1f6649172789734ae8)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250501/202505011655.qTmh4UA7-lkp@intel.com/reproduce)
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>
| Closes: https://lore.kernel.org/oe-kbuild-all/202505011655.qTmh4UA7-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_prime.c:925:24: warning: no previous prototype for function 'drm_gem_prime_import_dev_skip_map' [-Wmissing-prototypes]
925 | struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
| ^
drivers/gpu/drm/drm_prime.c:925:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
925 | struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
| ^
| static
1 warning generated.
vim +/drm_gem_prime_import_dev_skip_map +925 drivers/gpu/drm/drm_prime.c
913
914 /**
915 * drm_gem_prime_import_dev_skip_map - core implementation of the import callback
916 * @dev: drm_device to import into
917 * @dma_buf: dma-buf object to import
918 * @attach_dev: struct device to dma_buf attach
919 *
920 * This function exports a dma-buf without get it's scatter/gather table.
921 *
922 * Drivers who need to get an scatter/gather table for objects need to call
923 * drm_gem_prime_import_dev() instead.
924 */
> 925 struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
926 struct dma_buf *dma_buf,
927 struct device *attach_dev)
928 {
929 struct dma_buf_attachment *attach;
930 struct drm_gem_object *obj;
931 int ret;
932
933 if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
934 obj = dma_buf->priv;
935 if (obj->dev == dev) {
936 /*
937 * Importing dmabuf exported from our own gem increases
938 * refcount on gem itself instead of f_count of dmabuf.
939 */
940 drm_gem_object_get(obj);
941 return obj;
942 }
943 }
944
945 attach = dma_buf_attach(dma_buf, attach_dev, true);
946 if (IS_ERR(attach))
947 return ERR_CAST(attach);
948
949 get_dma_buf(dma_buf);
950
951 obj = dev->driver->gem_prime_import_attachment(dev, attach);
952 if (IS_ERR(obj)) {
953 ret = PTR_ERR(obj);
954 goto fail_detach;
955 }
956
957 obj->import_attach = attach;
958 obj->resv = dma_buf->resv;
959
960 return obj;
961
962 fail_detach:
963 dma_buf_detach(dma_buf, attach);
964 dma_buf_put(dma_buf);
965
966 return ERR_PTR(ret);
967 }
968 EXPORT_SYMBOL(drm_gem_prime_import_dev_skip_map);
969
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers
2025-04-30 8:56 [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers oushixiong1025
` (2 preceding siblings ...)
2025-04-30 10:56 ` [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers Christian König
@ 2025-05-01 21:33 ` kernel test robot
3 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2025-05-01 21:33 UTC (permalink / raw)
To: oushixiong1025, Sumit Semwal
Cc: oe-kbuild-all, Christian König, linux-media, dri-devel,
linaro-mm-sig, linux-kernel, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Dave Airlie,
Sean Paul, Shixiong Ou
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on char-misc/char-misc-testing char-misc/char-misc-next char-misc/char-misc-linus usb/usb-testing usb/usb-next usb/usb-linus xen-tip/linux-next linus/master v6.15-rc4]
[cannot apply to tegra/for-next drm-xe/drm-xe-next rmk-arm/drm-armada-devel rmk-arm/drm-armada-fixes next-20250430]
[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/oushixiong1025-163-com/drm-prime-Support-importing-DMA-BUF-without-sg_table/20250430-170136
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/20250430085658.540746-1-oushixiong1025%40163.com
patch subject: [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers
config: arc-randconfig-002-20250501 (https://download.01.org/0day-ci/archive/20250502/202505020434.7EfUIAjh-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250502/202505020434.7EfUIAjh-lkp@intel.com/reproduce)
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>
| Closes: https://lore.kernel.org/oe-kbuild-all/202505020434.7EfUIAjh-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/dma-buf/dma-buf.c:908: warning: Function parameter or struct member 'skip_map' not described in 'dma_buf_dynamic_attach'
>> drivers/dma-buf/dma-buf.c:996: warning: Function parameter or struct member 'skip_map' not described in 'dma_buf_attach'
vim +908 drivers/dma-buf/dma-buf.c
84335675f2223c drivers/dma-buf/dma-buf.c Simona Vetter 2021-01-15 817
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 818 /**
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 819 * DOC: locking convention
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 820 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 821 * In order to avoid deadlock situations between dma-buf exports and importers,
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 822 * all dma-buf API users must follow the common dma-buf locking convention.
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 823 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 824 * Convention for importers
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 825 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 826 * 1. Importers must hold the dma-buf reservation lock when calling these
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 827 * functions:
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 828 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 829 * - dma_buf_pin()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 830 * - dma_buf_unpin()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 831 * - dma_buf_map_attachment()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 832 * - dma_buf_unmap_attachment()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 833 * - dma_buf_vmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 834 * - dma_buf_vunmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 835 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 836 * 2. Importers must not hold the dma-buf reservation lock when calling these
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 837 * functions:
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 838 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 839 * - dma_buf_attach()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 840 * - dma_buf_dynamic_attach()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 841 * - dma_buf_detach()
e3ecbd21776f1f drivers/dma-buf/dma-buf.c Maíra Canal 2023-02-23 842 * - dma_buf_export()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 843 * - dma_buf_fd()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 844 * - dma_buf_get()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 845 * - dma_buf_put()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 846 * - dma_buf_mmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 847 * - dma_buf_begin_cpu_access()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 848 * - dma_buf_end_cpu_access()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 849 * - dma_buf_map_attachment_unlocked()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 850 * - dma_buf_unmap_attachment_unlocked()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 851 * - dma_buf_vmap_unlocked()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 852 * - dma_buf_vunmap_unlocked()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 853 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 854 * Convention for exporters
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 855 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 856 * 1. These &dma_buf_ops callbacks are invoked with unlocked dma-buf
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 857 * reservation and exporter can take the lock:
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 858 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 859 * - &dma_buf_ops.attach()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 860 * - &dma_buf_ops.detach()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 861 * - &dma_buf_ops.release()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 862 * - &dma_buf_ops.begin_cpu_access()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 863 * - &dma_buf_ops.end_cpu_access()
8021fa16b7ec0a drivers/dma-buf/dma-buf.c Dmitry Osipenko 2023-05-30 864 * - &dma_buf_ops.mmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 865 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 866 * 2. These &dma_buf_ops callbacks are invoked with locked dma-buf
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 867 * reservation and exporter can't take the lock:
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 868 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 869 * - &dma_buf_ops.pin()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 870 * - &dma_buf_ops.unpin()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 871 * - &dma_buf_ops.map_dma_buf()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 872 * - &dma_buf_ops.unmap_dma_buf()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 873 * - &dma_buf_ops.vmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 874 * - &dma_buf_ops.vunmap()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 875 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 876 * 3. Exporters must hold the dma-buf reservation lock when calling these
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 877 * functions:
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 878 *
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 879 * - dma_buf_move_notify()
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 880 */
ae2e7f28a170c0 drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 881
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 882 /**
85804b70cca68d drivers/dma-buf/dma-buf.c Simona Vetter 2020-12-11 883 * dma_buf_dynamic_attach - Add the device to dma_buf's attachments list
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 884 * @dmabuf: [in] buffer to attach device to.
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 885 * @dev: [in] device to be attached.
6f49c2515e2258 drivers/dma-buf/dma-buf.c Randy Dunlap 2020-04-07 886 * @importer_ops: [in] importer operations for the attachment
6f49c2515e2258 drivers/dma-buf/dma-buf.c Randy Dunlap 2020-04-07 887 * @importer_priv: [in] importer private pointer for the attachment
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 888 *
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 889 * Returns struct dma_buf_attachment pointer for this attachment. Attachments
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 890 * must be cleaned up by calling dma_buf_detach().
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 891 *
85804b70cca68d drivers/dma-buf/dma-buf.c Simona Vetter 2020-12-11 892 * Optionally this calls &dma_buf_ops.attach to allow device-specific attach
85804b70cca68d drivers/dma-buf/dma-buf.c Simona Vetter 2020-12-11 893 * functionality.
85804b70cca68d drivers/dma-buf/dma-buf.c Simona Vetter 2020-12-11 894 *
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 895 * Returns:
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 896 *
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 897 * A pointer to newly created &dma_buf_attachment on success, or a negative
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 898 * error code wrapped into a pointer on failure.
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 899 *
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 900 * Note that this can fail if the backing storage of @dmabuf is in a place not
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 901 * accessible to @dev, and cannot be moved to a more suitable place. This is
2904a8c1311f02 drivers/dma-buf/dma-buf.c Simona Vetter 2016-12-09 902 * indicated with the error code -EBUSY.
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 903 */
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 904 struct dma_buf_attachment *
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 905 dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev,
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 906 const struct dma_buf_attach_ops *importer_ops,
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 907 void *importer_priv, bool skip_map)
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 @908 {
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 909 struct dma_buf_attachment *attach;
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 910 int ret;
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 911
d1aa06a1eaf5f7 drivers/base/dma-buf.c Laurent Pinchart 2012-01-26 912 if (WARN_ON(!dmabuf || !dev))
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 913 return ERR_PTR(-EINVAL);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 914
4981cdb063e3e9 drivers/dma-buf/dma-buf.c Christian König 2020-02-19 915 if (WARN_ON(importer_ops && !importer_ops->move_notify))
4981cdb063e3e9 drivers/dma-buf/dma-buf.c Christian König 2020-02-19 916 return ERR_PTR(-EINVAL);
4981cdb063e3e9 drivers/dma-buf/dma-buf.c Christian König 2020-02-19 917
db7942b6292306 drivers/dma-buf/dma-buf.c Markus Elfring 2017-05-08 918 attach = kzalloc(sizeof(*attach), GFP_KERNEL);
34d84ec4881d13 drivers/dma-buf/dma-buf.c Markus Elfring 2017-05-08 919 if (!attach)
a9fbc3b73127ef drivers/base/dma-buf.c Laurent Pinchart 2012-01-26 920 return ERR_PTR(-ENOMEM);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 921
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 922 attach->dev = dev;
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 923 attach->dmabuf = dmabuf;
09606b5446c25b drivers/dma-buf/dma-buf.c Christian König 2018-03-22 924 if (importer_ops)
09606b5446c25b drivers/dma-buf/dma-buf.c Christian König 2018-03-22 925 attach->peer2peer = importer_ops->allow_peer2peer;
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 926 attach->importer_ops = importer_ops;
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 927 attach->importer_priv = importer_priv;
2ed9201bdd9a8e drivers/base/dma-buf.c Laurent Pinchart 2012-01-26 928
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 929 if (dmabuf->ops->attach) {
a19741e5e5a9f1 drivers/dma-buf/dma-buf.c Christian König 2018-05-28 930 ret = dmabuf->ops->attach(dmabuf, attach);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 931 if (ret)
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 932 goto err_attach;
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 933 }
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 934 dma_resv_lock(dmabuf->resv, NULL);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 935 list_add(&attach->node, &dmabuf->attachments);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 936 dma_resv_unlock(dmabuf->resv);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 937
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 938 /* When either the importer or the exporter can't handle dynamic
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 939 * mappings we cache the mapping here to avoid issues with the
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 940 * reservation object lock.
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 941 */
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 942 if (dma_buf_attachment_is_dynamic(attach) !=
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 943 dma_buf_is_dynamic(dmabuf)) {
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 944 dma_resv_lock(attach->dmabuf->resv, NULL);
809d9c72c2f83e drivers/dma-buf/dma-buf.c Dmitry Osipenko 2022-10-17 945 if (dma_buf_is_dynamic(attach->dmabuf)) {
7e008b02557cce drivers/dma-buf/dma-buf.c Christian König 2021-05-17 946 ret = dmabuf->ops->pin(attach);
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 947 if (ret)
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 948 goto err_unlock;
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 949 }
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 950
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 951 if (!skip_map) {
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 952 struct sg_table *sgt;
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 953
84335675f2223c drivers/dma-buf/dma-buf.c Simona Vetter 2021-01-15 954 sgt = __map_dma_buf(attach, DMA_BIDIRECTIONAL);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 955 if (!sgt)
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 956 sgt = ERR_PTR(-ENOMEM);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 957 if (IS_ERR(sgt)) {
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 958 ret = PTR_ERR(sgt);
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 959 goto err_unpin;
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 960 }
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 961 attach->sgt = sgt;
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 962 attach->dir = DMA_BIDIRECTIONAL;
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 963 }
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 964 dma_resv_unlock(attach->dmabuf->resv);
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 965 }
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 966
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 967 return attach;
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 968
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 969 err_attach:
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 970 kfree(attach);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 971 return ERR_PTR(ret);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 972
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 973 err_unpin:
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 974 if (dma_buf_is_dynamic(attach->dmabuf))
7e008b02557cce drivers/dma-buf/dma-buf.c Christian König 2021-05-17 975 dmabuf->ops->unpin(attach);
bb42df4662a447 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 976
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 977 err_unlock:
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 978 dma_resv_unlock(attach->dmabuf->resv);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 979
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 980 dma_buf_detach(dmabuf, attach);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 981 return ERR_PTR(ret);
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 982 }
cdd30ebb1b9f36 drivers/dma-buf/dma-buf.c Peter Zijlstra 2024-12-02 983 EXPORT_SYMBOL_NS_GPL(dma_buf_dynamic_attach, "DMA_BUF");
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 984
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 985 /**
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 986 * dma_buf_attach - Wrapper for dma_buf_dynamic_attach
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 987 * @dmabuf: [in] buffer to attach device to.
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 988 * @dev: [in] device to be attached.
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 989 *
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 990 * Wrapper to call dma_buf_dynamic_attach() for drivers which still use a static
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 991 * mapping.
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 992 */
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 993 struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 994 struct device *dev,
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 995 bool skip_map)
15fd552d186cb0 drivers/dma-buf/dma-buf.c Christian König 2018-07-03 @996 {
8935ae05eee351 drivers/dma-buf/dma-buf.c Shixiong Ou 2025-04-30 997 return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL, skip_map);
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 998 }
cdd30ebb1b9f36 drivers/dma-buf/dma-buf.c Peter Zijlstra 2024-12-02 999 EXPORT_SYMBOL_NS_GPL(dma_buf_attach, "DMA_BUF");
d15bd7ee445d07 drivers/base/dma-buf.c Sumit Semwal 2011-12-26 1000
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
2025-04-30 11:03 ` Christian König
2025-05-01 9:04 ` kernel test robot
@ 2025-05-02 15:36 ` kernel test robot
2 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2025-05-02 15:36 UTC (permalink / raw)
To: oushixiong1025, Sumit Semwal
Cc: oe-kbuild-all, Christian König, linux-media, dri-devel,
linaro-mm-sig, linux-kernel, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Dave Airlie,
Sean Paul, Shixiong Ou
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on char-misc/char-misc-testing char-misc/char-misc-next char-misc/char-misc-linus usb/usb-testing usb/usb-next usb/usb-linus xen-tip/linux-next linus/master v6.15-rc4]
[cannot apply to tegra/for-next drm-xe/drm-xe-next rmk-arm/drm-armada-devel rmk-arm/drm-armada-fixes next-20250501]
[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/oushixiong1025-163-com/drm-prime-Support-importing-DMA-BUF-without-sg_table/20250430-170136
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/20250430085658.540746-2-oushixiong1025%40163.com
patch subject: [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table
config: arc-randconfig-002-20250501 (https://download.01.org/0day-ci/archive/20250502/202505022224.FCDQ8TCB-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250502/202505022224.FCDQ8TCB-lkp@intel.com/reproduce)
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>
| Closes: https://lore.kernel.org/oe-kbuild-all/202505022224.FCDQ8TCB-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_prime.c:925:24: warning: no previous prototype for 'drm_gem_prime_import_dev_skip_map' [-Wmissing-prototypes]
925 | struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/drm_gem_prime_import_dev_skip_map +925 drivers/gpu/drm/drm_prime.c
913
914 /**
915 * drm_gem_prime_import_dev_skip_map - core implementation of the import callback
916 * @dev: drm_device to import into
917 * @dma_buf: dma-buf object to import
918 * @attach_dev: struct device to dma_buf attach
919 *
920 * This function exports a dma-buf without get it's scatter/gather table.
921 *
922 * Drivers who need to get an scatter/gather table for objects need to call
923 * drm_gem_prime_import_dev() instead.
924 */
> 925 struct drm_gem_object *drm_gem_prime_import_dev_skip_map(struct drm_device *dev,
926 struct dma_buf *dma_buf,
927 struct device *attach_dev)
928 {
929 struct dma_buf_attachment *attach;
930 struct drm_gem_object *obj;
931 int ret;
932
933 if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
934 obj = dma_buf->priv;
935 if (obj->dev == dev) {
936 /*
937 * Importing dmabuf exported from our own gem increases
938 * refcount on gem itself instead of f_count of dmabuf.
939 */
940 drm_gem_object_get(obj);
941 return obj;
942 }
943 }
944
945 attach = dma_buf_attach(dma_buf, attach_dev, true);
946 if (IS_ERR(attach))
947 return ERR_CAST(attach);
948
949 get_dma_buf(dma_buf);
950
951 obj = dev->driver->gem_prime_import_attachment(dev, attach);
952 if (IS_ERR(obj)) {
953 ret = PTR_ERR(obj);
954 goto fail_detach;
955 }
956
957 obj->import_attach = attach;
958 obj->resv = dma_buf->resv;
959
960 return obj;
961
962 fail_detach:
963 dma_buf_detach(dma_buf, attach);
964 dma_buf_put(dma_buf);
965
966 return ERR_PTR(ret);
967 }
968 EXPORT_SYMBOL(drm_gem_prime_import_dev_skip_map);
969
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-05-02 15:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-30 8:56 [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers oushixiong1025
2025-04-30 8:56 ` [PATCH 2/3] drm/prime: Support importing DMA-BUF without sg_table oushixiong1025
2025-04-30 11:03 ` Christian König
[not found] ` <c93177d7-be53-4f37-96d4-d09323737581@163.com>
2025-04-30 14:48 ` Christian König
2025-05-01 9:04 ` kernel test robot
2025-05-02 15:36 ` kernel test robot
2025-04-30 8:56 ` [PATCH 3/3] drm/udl: Use the default gem_prime_import function oushixiong1025
2025-04-30 10:56 ` [PATCH 1/3] dma-buf: add flags to skip map_dma_buf() for some drivers Christian König
2025-05-01 21:33 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox