Move all drivers to a common dma-buf locking convention
Subsystems (21)
v5 cover Move all drivers to a common dma-buf locking convention
Hello,
This series moves all drivers to a dynamic dma-buf locking specification. From now on all dma-buf importers are made responsible for holding dma-buf's reservation lock around all operations performed over dma-bufs in accordance to the locking specification. This allows us to utilize reservation lock more broadly around kernel without fearing of a potential deadlocks.
This patchset passes all i915 selftests. It was also tested using VirtIO, Panfrost, Lima, Tegra, udmabuf, AMDGPU and Nouveau drivers. I tested cases of display+GPU, display+V4L and GPU+V4L dma-buf sharing (where appropriate), which covers majority of kernel drivers since rest of the drivers share same or similar code paths.
Changelog:
v5: - Added acks and r-bs that were given to v4.
- Changed i915 preparation patch like was suggested by Michael Ruhl. The scope of reservation locking is smaller now.
v4: - Added dma_buf_mmap() to the "locking convention" documentation,
which was missed by accident in v3.
- Added acks from Christian König, Tomasz Figa and Hans Verkuil that they gave to couple v3 patches.
- Dropped the "_unlocked" postfix from function names that don't have the locked variant, as was requested by Christian König.
- Factored out the per-driver preparations into separate patches to ease reviewing of the changes, which is now doable without the global dma-buf functions renaming.
- Factored out the dynamic locking convention enforcements into separate patches which add the final dma_resv_assert_held(dmabuf->resv) to the dma-buf API functions.
v3: - Factored out dma_buf_mmap_unlocked() and attachment functions
into aseparate patches, like was suggested by Christian König.
- Corrected and factored out dma-buf locking documentation into a separate patch, like was suggested by Christian König.
- Intel driver dropped the reservation locking fews days ago from its BO-release code path, but we need that locking for the imported GEMs because in the end that code path unmaps the imported GEM. So I added back the locking needed by the imported GEMs, updating the "dma-buf attachment locking specification" patch appropriately.
- Tested Nouveau+Intel dma-buf import/export combo.
- Tested udmabuf import to i915/Nouveau/AMDGPU.
- Fixed few places in Etnaviv, Panfrost and Lima drivers that I missed to switch to locked dma-buf vmapping in the drm/gem: Take reservation lock for vmap/vunmap operations" patch. In a result invalidated the Christian's r-b that he gave to v2.
- Added locked dma-buf vmap/vunmap functions that are needed for fixing vmappping of Etnaviv, Panfrost and Lima drivers mentioned above. I actually had this change stashed for the drm-shmem shrinker patchset, but then realized that it's already needed by the dma-buf patches. Also improved my tests to better cover these code paths.
v2: - Changed locking specification to avoid problems with a cross-driver
ww locking, like was suggested by Christian König. Now the attach/detach callbacks are invoked without the held lock and exporter should take the lock.
- Added "locking convention" documentation that explains which dma-buf functions and callbacks are locked/unlocked for importers and exporters, which was requested by Christian König.
- Added ack from Tomasz Figa to the V4L patches that he gave to v1.
Dmitry Osipenko (21):
dma-buf: Add unlocked variant of vmapping functions
dma-buf: Add unlocked variant of attachment-mapping functions drm/gem: Take reservation lock for vmap/vunmap operations drm/prime: Prepare to dynamic dma-buf locking specification drm/armada: Prepare to dynamic dma-buf locking specification drm/i915: Prepare to dynamic dma-buf locking specification drm/omapdrm: Prepare to dynamic dma-buf locking specification drm/tegra: Prepare to dynamic dma-buf locking specification drm/etnaviv: Prepare to dynamic dma-buf locking specification RDMA/umem: Prepare to dynamic dma-buf locking specification
misc: fastrpc: Prepare to dynamic dma-buf locking specification xen/gntdev: Prepare to dynamic dma-buf locking specification
media: videobuf2: Prepare to dynamic dma-buf locking specification
media: tegra-vde: Prepare to dynamic dma-buf locking specification
dma-buf: Move dma_buf_vmap() to dynamic locking specification
dma-buf: Move dma_buf_attach() to dynamic locking specification
dma-buf: Move dma_buf_map_attachment() to dynamic locking
specification
dma-buf: Move dma_buf_mmap() to dynamic locking specification
dma-buf: Document dynamic locking convention
media: videobuf2: Stop using internal dma-buf lock
dma-buf: Remove obsoleted internal lock
Documentation/driver-api/dma-buf.rst | 6 + drivers/dma-buf/dma-buf.c | 211 +++++++++++++++--- drivers/gpu/drm/armada/armada_gem.c | 8 +- drivers/gpu/drm/drm_client.c | 4 +- drivers/gpu/drm/drm_gem.c | 24 ++ drivers/gpu/drm/drm_gem_dma_helper.c | 6 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- drivers/gpu/drm/drm_gem_ttm_helper.c | 9 +- drivers/gpu/drm/drm_prime.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 ++ .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 16 +- drivers/gpu/drm/lima/lima_sched.c | 4 +- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +- drivers/gpu/drm/panfrost/panfrost_dump.c | 4 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- drivers/gpu/drm/qxl/qxl_object.c | 17 +- drivers/gpu/drm/qxl/qxl_prime.c | 4 +- drivers/gpu/drm/tegra/gem.c | 17 +- drivers/infiniband/core/umem_dmabuf.c | 7 +- .../common/videobuf2/videobuf2-dma-contig.c | 22 +- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 +- .../common/videobuf2/videobuf2-vmalloc.c | 17 +- .../platform/nvidia/tegra-vde/dmabuf-cache.c | 6 +- drivers/misc/fastrpc.c | 6 +- drivers/xen/gntdev-dmabuf.c | 8 +- include/drm/drm_gem.h | 3 + include/linux/dma-buf.h | 17 +- 29 files changed, 320 insertions(+), 155 deletions(-)
Signature · 1 line
2.37.3
PATCH v5 1/21 dma-buf: Add unlocked variant of vmapping functions
Add unlocked variant of dma_buf_vmap/vunmap() that will be utilized by drivers that don't take the reservation lock explicitly.
--- drivers/dma-buf/dma-buf.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/dma-buf.h | 2 ++ 2 files changed, 40 insertions(+)
drivers/dma-buf/dma-buf.c +38 -0
@@ -1425,6 +1425,28 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map) }EXPORT_SYMBOL_NS_GPL (dma_buf_vmap,DMA_BUF ); +/** +* dma_buf_vmap_unlocked - Create virtual mapping for the buffer object into kernel +* address space. Same restrictions as for vmap and friends apply. +* @dmabuf: [in] buffer to vmap +* @map: [out] returns the vmap pointer +* +* Unlocked version of dma_buf_vmap() +* +* Returns 0 on success, or a negative errno code otherwise. +*/ +int dma_buf_vmap_unlocked (struct dma_buf *dmabuf,struct iosys_map *map) +{ +int ret; + +dma_resv_lock (dmabuf->resv,NULL ); + ret =dma_buf_vmap (dmabuf, map); +dma_resv_unlock (dmabuf->resv); + +return ret; +} +EXPORT_SYMBOL_NS_GPL (dma_buf_vmap_unlocked,DMA_BUF ); +/** * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap. * @dmabuf: [in] buffer to vunmap
@@ -1449,6 +1471,22 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map) }EXPORT_SYMBOL_NS_GPL (dma_buf_vunmap,DMA_BUF ); +/** +* dma_buf_vunmap_unlocked - Unmap a vmap obtained by dma_buf_vmap. +* @dmabuf: [in] buffer to vunmap +* @map: [in] vmap pointer to vunmap +*/ +void dma_buf_vunmap_unlocked (struct dma_buf *dmabuf,struct iosys_map *map) +{ +if (WARN_ON (!dmabuf)) +return ; + +dma_resv_lock (dmabuf->resv,NULL ); +dma_buf_vunmap (dmabuf, map); +dma_resv_unlock (dmabuf->resv); +} +EXPORT_SYMBOL_NS_GPL (dma_buf_vunmap_unlocked,DMA_BUF ); +#ifdef CONFIG_DEBUG_FS static int dma_buf_debug_show (struct seq_file *s,void *unused) {
include/linux/dma-buf.h +2 -0
@@ -632,4 +632,6 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, unsigned long);int dma_buf_vmap (struct dma_buf *dmabuf,struct iosys_map *map);void dma_buf_vunmap (struct dma_buf *dmabuf,struct iosys_map *map); +int dma_buf_vmap_unlocked (struct dma_buf *dmabuf,struct iosys_map *map); +void dma_buf_vunmap_unlocked (struct dma_buf *dmabuf,struct iosys_map *map);#endif /* __DMA_BUF_H__ */
Signature · 1 line
2.37.3
PATCH v5 2/21 dma-buf: Add unlocked variant of attachment-mapping functions
In reply to Dmitry OsipenkoAdd unlocked variant of dma_buf_map/unmap_attachment() that will be used by drivers that don't take the reservation lock explicitly.
--- drivers/dma-buf/dma-buf.c | 53 +++++++++++++++++++++++++++++++++++++++ include/linux/dma-buf.h | 6 +++++ 2 files changed, 59 insertions(+)
drivers/dma-buf/dma-buf.c +53 -0
@@ -1100,6 +1100,34 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, }EXPORT_SYMBOL_NS_GPL (dma_buf_map_attachment,DMA_BUF ); +/** +* dma_buf_map_attachment_unlocked - Returns the scatterlist table of the attachment; +* mapped into _device_ address space. Is a wrapper for map_dma_buf() of the +* dma_buf_ops. +* @attach: [in] attachment whose scatterlist is to be returned +* @direction: [in] direction of DMA transfer +* +* Unlocked variant of dma_buf_map_attachment(). +*/ +struct sg_table * +dma_buf_map_attachment_unlocked (struct dma_buf_attachment *attach, +enum dma_data_direction direction) +{ +struct sg_table *sg_table; + +might_sleep (); + +if (WARN_ON (!attach || !attach->dmabuf)) +return ERR_PTR (-EINVAL ); + +dma_resv_lock (attach->dmabuf->resv,NULL ); + sg_table =dma_buf_map_attachment (attach, direction); +dma_resv_unlock (attach->dmabuf->resv); + +return sg_table; +} +EXPORT_SYMBOL_NS_GPL (dma_buf_map_attachment_unlocked,DMA_BUF ); +/** * dma_buf_unmap_attachment - unmaps and decreases usecount of the buffer;might * deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of
@@ -1136,6 +1164,31 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, }EXPORT_SYMBOL_NS_GPL (dma_buf_unmap_attachment,DMA_BUF ); +/** +* dma_buf_unmap_attachment_unlocked - unmaps and decreases usecount of the buffer;might +* deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of +* dma_buf_ops. +* @attach: [in] attachment to unmap buffer from +* @sg_table: [in] scatterlist info of the buffer to unmap +* @direction: [in] direction of DMA transfer +* +* Unlocked variant of dma_buf_unmap_attachment(). +*/ +void dma_buf_unmap_attachment_unlocked (struct dma_buf_attachment *attach, +struct sg_table *sg_table, +enum dma_data_direction direction) +{ +might_sleep (); + +if (WARN_ON (!attach || !attach->dmabuf || !sg_table)) +return ; + +dma_resv_lock (attach->dmabuf->resv,NULL ); +dma_buf_unmap_attachment (attach, sg_table, direction); +dma_resv_unlock (attach->dmabuf->resv); +} +EXPORT_SYMBOL_NS_GPL (dma_buf_unmap_attachment_unlocked,DMA_BUF ); +/** * dma_buf_move_notify - notify attachments that DMA-buf is moving *
include/linux/dma-buf.h +6 -0
@@ -627,6 +627,12 @@ int dma_buf_begin_cpu_access(struct dma_buf *dma_buf, enum dma_data_direction dir);int dma_buf_end_cpu_access (struct dma_buf *dma_buf,enum dma_data_direction dir); +struct sg_table * +dma_buf_map_attachment_unlocked (struct dma_buf_attachment *attach, +enum dma_data_direction direction); +void dma_buf_unmap_attachment_unlocked (struct dma_buf_attachment *attach, +struct sg_table *sg_table, +enum dma_data_direction direction);int dma_buf_mmap (struct dma_buf *,struct vm_area_struct *,unsigned long );
Signature · 1 line
2.37.3
PATCH v5 3/21 drm/gem: Take reservation lock for vmap/vunmap operations
In reply to Dmitry OsipenkoThe new common dma-buf locking convention will require buffer importers to hold the reservation lock around mapping operations. Make DRM GEM core to take the lock around the vmapping operations and update DRM drivers to use the locked functions for the case where DRM core now holds the lock. This patch prepares DRM core and drivers to the common dynamic dma-buf locking convention.
--- drivers/gpu/drm/drm_client.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 24 ++++++++++++++++++++ drivers/gpu/drm/drm_gem_dma_helper.c | 6 ++--- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 9 +------- drivers/gpu/drm/lima/lima_sched.c | 4 ++-- drivers/gpu/drm/panfrost/panfrost_dump.c | 4 ++-- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 ++--- drivers/gpu/drm/qxl/qxl_object.c | 17 +++++++------- drivers/gpu/drm/qxl/qxl_prime.c | 4 ++-- include/drm/drm_gem.h | 3 +++ 11 files changed, 54 insertions(+), 33 deletions(-)
drivers/gpu/drm/drm_client.c +2 -2
@@ -323,7 +323,7 @@ drm_client_buffer_vmap(struct drm_client_buffer *buffer,* fd_install step out of the driver backend hooks, to make that * final step optional for internal users. */ - ret =drm_gem_vmap (buffer->gem, map); + ret =drm_gem_vmap_unlocked (buffer->gem, map);if (ret)return ret;
@@ -345,7 +345,7 @@ void drm_client_buffer_vunmap(struct drm_client_buffer *buffer) {struct iosys_map *map = &buffer->map; -drm_gem_vunmap (buffer->gem, map); +drm_gem_vunmap_unlocked (buffer->gem, map); }EXPORT_SYMBOL (drm_client_buffer_vunmap);
drivers/gpu/drm/drm_gem.c +24 -0
@@ -1158,6 +1158,8 @@ int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) {int ret; +dma_resv_assert_held (obj->resv); +if (!obj->funcs->vmap)return -EOPNOTSUPP ;
@@ -1173,6 +1175,8 @@ EXPORT_SYMBOL(drm_gem_vmap);void drm_gem_vunmap (struct drm_gem_object *obj,struct iosys_map *map) { +dma_resv_assert_held (obj->resv); +if (iosys_map_is_null (map))return ;
@@ -1184,6 +1188,26 @@ void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map) }EXPORT_SYMBOL (drm_gem_vunmap); +int drm_gem_vmap_unlocked (struct drm_gem_object *obj,struct iosys_map *map) +{ +int ret; + +dma_resv_lock (obj->resv,NULL ); + ret =drm_gem_vmap (obj, map); +dma_resv_unlock (obj->resv); + +return ret; +} +EXPORT_SYMBOL (drm_gem_vmap_unlocked); + +void drm_gem_vunmap_unlocked (struct drm_gem_object *obj,struct iosys_map *map) +{ +dma_resv_lock (obj->resv,NULL ); +drm_gem_vunmap (obj, map); +dma_resv_unlock (obj->resv); +} +EXPORT_SYMBOL (drm_gem_vunmap_unlocked); +/** * drm_gem_lock_reservations - Sets up the ww context and acquires * the lock on an array of GEM objects.
drivers/gpu/drm/drm_gem_dma_helper.c +3 -3
@@ -230,7 +230,7 @@ void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj)if (gem_obj->import_attach) {if (dma_obj->vaddr) -dma_buf_vunmap (gem_obj->import_attach->dmabuf, &map); +dma_buf_vunmap_unlocked (gem_obj->import_attach->dmabuf, &map);drm_prime_gem_destroy (gem_obj, dma_obj->sgt); }else if (dma_obj->vaddr) {if (dma_obj->map_noncoherent)
@@ -581,7 +581,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_device *dev,struct iosys_map map;int ret; - ret =dma_buf_vmap (attach->dmabuf, &map); + ret =dma_buf_vmap_unlocked (attach->dmabuf, &map);if (ret) {DRM_ERROR ("Failed to vmap PRIME buffer\n" );return ERR_PTR (ret);
@@ -589,7 +589,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_device *dev, obj =drm_gem_dma_prime_import_sg_table (dev, attach, sgt);if (IS_ERR (obj)) { -dma_buf_vunmap (attach->dmabuf, &map); +dma_buf_vunmap_unlocked (attach->dmabuf, &map);return obj; }
drivers/gpu/drm/drm_gem_framebuffer_helper.c +3 -3
@@ -354,7 +354,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map, ret = -EINVAL ; goto err_drm_gem_vunmap; } - ret =drm_gem_vmap (obj, &map[i]); + ret =drm_gem_vmap_unlocked (obj, &map[i]);if (ret) goto err_drm_gem_vunmap; }
@@ -376,7 +376,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map, obj =drm_gem_fb_get_obj (fb, i);if (!obj)continue ; -drm_gem_vunmap (obj, &map[i]); +drm_gem_vunmap_unlocked (obj, &map[i]); }return ret; }
@@ -403,7 +403,7 @@ void drm_gem_fb_vunmap(struct drm_framebuffer *fb, struct iosys_map *map)continue ;if (iosys_map_is_null (&map[i]))continue ; -drm_gem_vunmap (obj, &map[i]); +drm_gem_vunmap_unlocked (obj, &map[i]); } }EXPORT_SYMBOL (drm_gem_fb_vunmap);
drivers/gpu/drm/drm_gem_ttm_helper.c +1 -8
@@ -64,13 +64,8 @@ int drm_gem_ttm_vmap(struct drm_gem_object *gem, struct iosys_map *map) {struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem); -int ret; - -dma_resv_lock (gem->resv,NULL ); - ret =ttm_bo_vmap (bo, map); -dma_resv_unlock (gem->resv); -return ret; +return ttm_bo_vmap (bo, map); }EXPORT_SYMBOL (drm_gem_ttm_vmap);
@@ -87,9 +82,7 @@ void drm_gem_ttm_vunmap(struct drm_gem_object *gem, {struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem); -dma_resv_lock (gem->resv,NULL );ttm_bo_vunmap (bo, map); -dma_resv_unlock (gem->resv); }EXPORT_SYMBOL (drm_gem_ttm_vunmap);
drivers/gpu/drm/lima/lima_sched.c +2 -2
@@ -371,7 +371,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task) }else { buffer_chunk->size =lima_bo_size (bo); - ret =drm_gem_shmem_vmap (&bo->base, &map); + ret =drm_gem_vmap_unlocked (&bo->base.base, &map);if (ret) {kvfree (et); goto out;
@@ -379,7 +379,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task)memcpy (buffer_chunk +1 , map.vaddr, buffer_chunk->size); -drm_gem_shmem_vunmap (&bo->base, &map); +drm_gem_vunmap_unlocked (&bo->base.base, &map); } buffer_chunk = (void *)(buffer_chunk +1 ) + buffer_chunk->size;
drivers/gpu/drm/panfrost/panfrost_dump.c +2 -2
@@ -209,7 +209,7 @@ void panfrost_core_dump(struct panfrost_job *job) goto dump_header; } - ret =drm_gem_shmem_vmap (&bo->base, &map); + ret =drm_gem_vmap_unlocked (&bo->base.base, &map);if (ret) {dev_err (pfdev->dev,"Panfrost Dump: couldn't map Buffer Object\n" ); iter.hdr->bomap.valid =0 ;
@@ -236,7 +236,7 @@ void panfrost_core_dump(struct panfrost_job *job) vaddr = map.vaddr;memcpy (iter.data, vaddr, bo->base.base.size); -drm_gem_shmem_vunmap (&bo->base, &map); +drm_gem_vunmap_unlocked (&bo->base.base, &map); iter.hdr->bomap.valid =cpu_to_le32 (1 );
drivers/gpu/drm/panfrost/panfrost_perfcnt.c +3 -3
@@ -106,7 +106,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, goto err_close_bo; } - ret =drm_gem_shmem_vmap (bo, &map); + ret =drm_gem_vmap_unlocked (&bo->base, &map);if (ret) goto err_put_mapping; perfcnt->buf = map.vaddr;
@@ -165,7 +165,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,return 0 ; err_vunmap: -drm_gem_shmem_vunmap (bo, &map); +drm_gem_vunmap_unlocked (&bo->base, &map); err_put_mapping:panfrost_gem_mapping_put (perfcnt->mapping); err_close_bo:
@@ -195,7 +195,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev, GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); perfcnt->user =NULL ; -drm_gem_shmem_vunmap (&perfcnt->mapping->obj->base, &map); +drm_gem_vunmap_unlocked (&perfcnt->mapping->obj->base.base, &map); perfcnt->buf =NULL ;panfrost_gem_close (&perfcnt->mapping->obj->base.base, file_priv);panfrost_mmu_as_put (pfdev, perfcnt->mapping->mmu);
drivers/gpu/drm/qxl/qxl_object.c +9 -8
@@ -168,9 +168,16 @@ int qxl_bo_vmap_locked(struct qxl_bo *bo, struct iosys_map *map) bo->map_count++; goto out; } - r =ttm_bo_vmap (&bo->tbo, &bo->map); + + r =__qxl_bo_pin (bo);if (r)return r; + + r =ttm_bo_vmap (&bo->tbo, &bo->map); +if (r) { +__qxl_bo_unpin (bo); +return r; + } bo->map_count =1 ;/* TODO: Remove kptr in favor of map everywhere. */
@@ -192,12 +199,6 @@ int qxl_bo_vmap(struct qxl_bo *bo, struct iosys_map *map)if (r)return r; - r =__qxl_bo_pin (bo); -if (r) { -qxl_bo_unreserve (bo); -return r; - } - r =qxl_bo_vmap_locked (bo, map);qxl_bo_unreserve (bo);return r;
@@ -247,6 +248,7 @@ void qxl_bo_vunmap_locked(struct qxl_bo *bo)return ; bo->kptr =NULL ;ttm_bo_vunmap (&bo->tbo, &bo->map); +__qxl_bo_unpin (bo); }int qxl_bo_vunmap (struct qxl_bo *bo)
@@ -258,7 +260,6 @@ int qxl_bo_vunmap(struct qxl_bo *bo)return r;qxl_bo_vunmap_locked (bo); -__qxl_bo_unpin (bo);qxl_bo_unreserve (bo);return 0 ; }
drivers/gpu/drm/qxl/qxl_prime.c +2 -2
@@ -59,7 +59,7 @@ int qxl_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)struct qxl_bo *bo =gem_to_qxl_bo (obj);int ret; - ret =qxl_bo_vmap (bo, map); + ret =qxl_bo_vmap_locked (bo, map);if (ret <0 )return ret;
@@ -71,5 +71,5 @@ void qxl_gem_prime_vunmap(struct drm_gem_object *obj, {struct qxl_bo *bo =gem_to_qxl_bo (obj); -qxl_bo_vunmap (bo); +qxl_bo_vunmap_locked (bo); }
include/drm/drm_gem.h +3 -0
@@ -475,4 +475,7 @@ void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object *obj);unsigned long drm_gem_lru_scan (struct drm_gem_lru *lru,unsigned nr_to_scan,bool (*shrink)(struct drm_gem_object *obj)); +int drm_gem_vmap_unlocked (struct drm_gem_object *obj,struct iosys_map *map); +void drm_gem_vunmap_unlocked (struct drm_gem_object *obj,struct iosys_map *map); +#endif /* __DRM_GEM_H__ */
Signature · 1 line
2.37.3
PATCH v5 4/21 drm/prime: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare DRM prime core to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/gpu/drm/drm_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_prime.c +3 -3
@@ -940,7 +940,7 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,get_dma_buf (dma_buf); - sgt =dma_buf_map_attachment (attach,DMA_BIDIRECTIONAL ); + sgt =dma_buf_map_attachment_unlocked (attach,DMA_BIDIRECTIONAL );if (IS_ERR (sgt)) { ret =PTR_ERR (sgt); goto fail_detach;
@@ -958,7 +958,7 @@ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,return obj; fail_unmap: -dma_buf_unmap_attachment (attach, sgt,DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (attach, sgt,DMA_BIDIRECTIONAL ); fail_detach:dma_buf_detach (dma_buf, attach);dma_buf_put (dma_buf);
@@ -1056,7 +1056,7 @@ void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg) attach = obj->import_attach;if (sg) -dma_buf_unmap_attachment (attach, sg,DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (attach, sg,DMA_BIDIRECTIONAL ); dma_buf = attach->dmabuf;dma_buf_detach (attach->dmabuf, attach);/* remove the reference */
Signature · 1 line
2.37.3
PATCH v5 5/21 drm/armada: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare Armada driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/gpu/drm/armada/armada_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/armada/armada_gem.c +4 -4
@@ -66,8 +66,8 @@ void armada_gem_free_object(struct drm_gem_object *obj)if (dobj->obj.import_attach) {/* We only ever display imported data */ if (dobj->sgt) -dma_buf_unmap_attachment (dobj->obj.import_attach, - dobj->sgt,DMA_TO_DEVICE ); +dma_buf_unmap_attachment_unlocked (dobj->obj.import_attach, + dobj->sgt,DMA_TO_DEVICE );drm_prime_gem_destroy (&dobj->obj,NULL ); }
@@ -539,8 +539,8 @@ int armada_gem_map_import(struct armada_gem_object *dobj) {int ret; - dobj->sgt =dma_buf_map_attachment (dobj->obj.import_attach, -DMA_TO_DEVICE ); + dobj->sgt =dma_buf_map_attachment_unlocked (dobj->obj.import_attach, +DMA_TO_DEVICE );if (IS_ERR (dobj->sgt)) { ret =PTR_ERR (dobj->sgt); dobj->sgt =NULL ;
Signature · 1 line
2.37.3
PATCH v5 6/21 drm/i915: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare i915 driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions and handling cases where importer now holds the reservation lock.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 ++++++++++++++ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 16 ++++++++-------- 3 files changed, 23 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1 -1
@@ -72,7 +72,7 @@ static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf,struct drm_i915_gem_object *obj =dma_buf_to_obj (dma_buf);void *vaddr; - vaddr =i915_gem_object_pin_map_unlocked (obj,I915_MAP_WB ); + vaddr =i915_gem_object_pin_map (obj,I915_MAP_WB );if (IS_ERR (vaddr))return PTR_ERR (vaddr);
drivers/gpu/drm/i915/gem/i915_gem_object.c +14 -0
@@ -290,7 +290,21 @@ void __i915_gem_object_pages_fini(struct drm_i915_gem_object *obj)__i915_gem_object_free_mmaps (obj);atomic_set (&obj->mm.pages_pin_count,0 ); + +/* +* dma_buf_unmap_attachment() requires reservation to be +* locked. The imported GEM shouldn't share reservation lock +* and ttm_bo_cleanup_memtype_use() shouldn't be invoked for +* dma-buf, so it's safe to take the lock. +*/ +if (obj->base.import_attach) +i915_gem_object_lock (obj,NULL ); +__i915_gem_object_put_pages (obj); + +if (obj->base.import_attach) +i915_gem_object_unlock (obj); +GEM_BUG_ON (i915_gem_object_has_pages (obj)); }
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +8 -8
@@ -213,7 +213,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915, goto out_import; } - st =dma_buf_map_attachment (import_attach,DMA_BIDIRECTIONAL ); + st =dma_buf_map_attachment_unlocked (import_attach,DMA_BIDIRECTIONAL );if (IS_ERR (st)) { err =PTR_ERR (st); goto out_detach;
@@ -226,7 +226,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915, timeout = -ETIME ; } err = timeout >0 ?0 : timeout; -dma_buf_unmap_attachment (import_attach, st,DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (import_attach, st,DMA_BIDIRECTIONAL ); out_detach:dma_buf_detach (dmabuf, import_attach); out_import:
@@ -296,7 +296,7 @@ static int igt_dmabuf_import(void *arg) goto out_obj; } - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); dma_map = err ?NULL : map.vaddr;if (!dma_map) {pr_err ("dma_buf_vmap failed\n" );
@@ -337,7 +337,7 @@ static int igt_dmabuf_import(void *arg) err =0 ; out_dma_map: -dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map); out_obj:i915_gem_object_put (obj); out_dmabuf:
@@ -358,7 +358,7 @@ static int igt_dmabuf_import_ownership(void *arg)if (IS_ERR (dmabuf))return PTR_ERR (dmabuf); - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" );
@@ -367,7 +367,7 @@ static int igt_dmabuf_import_ownership(void *arg) }memset (ptr,0xc5 ,PAGE_SIZE ); -dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map); obj =to_intel_bo (i915_gem_prime_import (&i915->drm, dmabuf));if (IS_ERR (obj)) {
@@ -418,7 +418,7 @@ static int igt_dmabuf_export_vmap(void *arg) }i915_gem_object_put (obj); - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" );
@@ -435,7 +435,7 @@ static int igt_dmabuf_export_vmap(void *arg)memset (ptr,0xc5 , dmabuf->size); err =0 ; -dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map); out:dma_buf_put (dmabuf);return err;
Signature · 1 line
2.37.3
RE: [PATCH v5 06/21] drm/i915: Prepare to dynamic dma-buf locking specification
Quoted 82 lines
-----Original Message-----
From: Dmitry Osipenko <[email protected]>
Sent: Tuesday, September 13, 2022 3:28 PM
To: David Airlie <[email protected]>; Gerd Hoffmann <[email protected]>; Gurchetan Singh <[email protected]>; Chia-I Wu <[email protected]>; Daniel Vetter <[email protected]>; Daniel Almeida <[email protected]>; Gert Wollny <[email protected]>; Gustavo Padovan <[email protected]>; Daniel Stone <[email protected]>; Tomeu Vizoso <[email protected]>; Maarten Lankhorst <[email protected]>; Maxime Ripard <[email protected]>; Thomas Zimmermann <[email protected]>; Rob Clark <[email protected]>; Sumit Semwal <[email protected]>; Christian König <[email protected]>; Pan, Xinhui <[email protected]>; Thierry Reding <[email protected]>; Tomasz Figa <[email protected]>; Marek Szyprowski <[email protected]>; Mauro Carvalho Chehab <[email protected]>; Alex Deucher <[email protected]>; Jani Nikula <[email protected]>; Joonas Lahtinen <[email protected]>; Vivi, Rodrigo <[email protected]>; Tvrtko Ursulin <[email protected]>; Thomas Hellström <[email protected]>; Qiang Yu <[email protected]>; Srinivas Kandagatla <[email protected]>; Amol Maheshwari <[email protected]>; Jason Gunthorpe <[email protected]>; Leon Romanovsky <[email protected]>; Gross, Jurgen <[email protected]>; Stefano Stabellini <[email protected]>; Oleksandr Tyshchenko <[email protected]>; Tomi Valkeinen <[email protected]>; Russell King <[email protected]>; Lucas Stach <[email protected]>; Christian Gmeiner <[email protected]>; Ruhl, Michael J <[email protected]>
Cc: [email protected]; [email protected]; Dmitry Osipenko <[email protected]>; [email protected]; linaro-mm- [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected] foundation.org; [email protected]; linux-arm- [email protected]
Subject: [PATCH v5 06/21] drm/i915: Prepare to dynamic dma-buf locking specificationPrepare i915 driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions and handling cases where importer now holds the reservation lock.
Acked-by Christian König <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>---
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 ++++++++++++++ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 16 ++++++++-------- 3 files changed, 23 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1
-1@@ -72,7 +72,7 @@ static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);void *vaddr; - vaddr =i915_gem_object_pin_map_unlocked (obj,I915_MAP_WB ); + vaddr =i915_gem_object_pin_map (obj,I915_MAP_WB );if (IS_ERR (vaddr))return PTR_ERR (vaddr);drivers/gpu/drm/i915/gem/i915_gem_object.c +7
-0@@ -290,7 +290,21 @@ void __i915_gem_object_pages_fini(struct drm_i915_gem_object *obj)__i915_gem_object_free_mmaps (obj );atomic_set (&obj->mm.pages_pin_count,0 ); + +/* +* dma_buf_unmap_attachment() requires reservation to be +* locked. The imported GEM shouldn't share reservation lock +* and ttm_bo_cleanup_memtype_use() shouldn't be invoked for +* dma-buf, so it's safe to take the lock. +*/
drivers/gpu/drm/i915/gem/i915_gem_object.c void __i915_gem_object_pages_fini(struct · line 310
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +7
-0+if (obj->base.import_attach) +i915_gem_object_lock (obj,NULL ); +__i915_gem_object_put_pages (obj); + +if (obj->base.import_attach) +i915_gem_object_unlock (obj); +GEM_BUG_ON (i915_gem_object_has_pages (obj)); }
Hi Dmitry,
I think that this looks correct and reasonable.
m
Quoted 85 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +1
-1@@ -213,7 +213,7 @@ static int igt_dmabuf_import_same_driver(structdrm_i915_private *i915, goto out_import; } - st =dma_buf_map_attachment (import_attach, DMA_BIDIRECTIONAL); + st =dma_buf_map_attachment_unlocked (import_attach,DMA_BIDIRECTIONAL );if (IS_ERR(st)) { err = PTR_ERR(st); goto out_detach;drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +1
-1@@ -226,7 +226,7 @@ static int igt_dmabuf_import_same_driver(structdrm_i915_private *i915, timeout = -ETIME ; } err = timeout >0 ?0 : timeout; -dma_buf_unmap_attachment (import_attach, st, DMA_BIDIRECTIONAL); +dma_buf_unmap_attachment_unlocked (import_attach, st,DMA_BIDIRECTIONAL );
out_detach:dma_buf_detach(dmabuf, import_attach);
out_import:drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +1
-1@@ -296,7 +296,7 @@ static int igt_dmabuf_import(void *arg) goto out_obj; } - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); dma_map = err ?NULL : map.vaddr;if (!dma_map) {pr_err ("dma_buf_vmap failed\n" );@@ -337,7 +337,7 @@ static int igt_dmabuf_import(void *arg) err =0 ;
out_dma_map:drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +1
-1-dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map);
out_obj:i915_gem_object_put(obj);
out_dmabuf:drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +4
-4@@ -358,7 +358,7 @@ static int igt_dmabuf_import_ownership(void *arg)if (IS_ERR (dmabuf))return PTR_ERR (dmabuf); - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" );@@ -367,7 +367,7 @@ static int igt_dmabuf_import_ownership(void *arg) }memset (ptr,0xc5 ,PAGE_SIZE ); -dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map); obj =to_intel_bo (i915_gem_prime_import (&i915->drm, dmabuf));if (IS_ERR (obj)) {@@ -418,7 +418,7 @@ static int igt_dmabuf_export_vmap(void *arg) }i915_gem_object_put (obj); - err =dma_buf_vmap (dmabuf, &map); + err =dma_buf_vmap_unlocked (dmabuf, &map); ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" );@@ -435,7 +435,7 @@ static int igt_dmabuf_export_vmap(void *arg)memset (ptr,0xc5 , dmabuf->size); err =0 ; -dma_buf_vunmap (dmabuf, &map); +dma_buf_vunmap_unlocked (dmabuf, &map);out:
dma_buf_put(dmabuf); return err;--
2.37.3
PATCH v5 7/21 drm/omapdrm: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare OMAP DRM driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +2 -2
@@ -125,7 +125,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,get_dma_buf (dma_buf); - sgt =dma_buf_map_attachment (attach,DMA_TO_DEVICE ); + sgt =dma_buf_map_attachment_unlocked (attach,DMA_TO_DEVICE );if (IS_ERR (sgt)) { ret =PTR_ERR (sgt); goto fail_detach;
@@ -142,7 +142,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,return obj; fail_unmap: -dma_buf_unmap_attachment (attach, sgt,DMA_TO_DEVICE ); +dma_buf_unmap_attachment_unlocked (attach, sgt,DMA_TO_DEVICE ); fail_detach:dma_buf_detach (dma_buf, attach);dma_buf_put (dma_buf);
Signature · 1 line
2.37.3
PATCH v5 8/21 drm/tegra: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare Tegra DRM driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/gpu/drm/tegra/gem.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/tegra/gem.c +9 -8
@@ -84,7 +84,7 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_ goto free; } - map->sgt =dma_buf_map_attachment (map->attach, direction); + map->sgt =dma_buf_map_attachment_unlocked (map->attach, direction);if (IS_ERR (map->sgt)) {dma_buf_detach (buf, map->attach); err =PTR_ERR (map->sgt);
@@ -160,7 +160,8 @@ static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_static void tegra_bo_unpin (struct host1x_bo_mapping *map) {if (map->attach) { -dma_buf_unmap_attachment (map->attach, map->sgt, map->direction); +dma_buf_unmap_attachment_unlocked (map->attach, map->sgt, + map->direction);dma_buf_detach (map->attach->dmabuf, map->attach); }else {dma_unmap_sgtable (map->dev, map->sgt, map->direction,0 );
@@ -181,7 +182,7 @@ static void *tegra_bo_mmap(struct host1x_bo *bo)if (obj->vaddr) {return obj->vaddr; }else if (obj->gem.import_attach) { - ret =dma_buf_vmap (obj->gem.import_attach->dmabuf, &map); + ret =dma_buf_vmap_unlocked (obj->gem.import_attach->dmabuf, &map);return ret ?NULL : map.vaddr; }else { return vmap(obj->pages, obj->num_pages, VM_MAP,
@@ -197,7 +198,7 @@ static void tegra_bo_munmap(struct host1x_bo *bo, void *addr)if (obj->vaddr)return ;else if (obj->gem.import_attach) -dma_buf_vunmap (obj->gem.import_attach->dmabuf, &map); +dma_buf_vunmap_unlocked (obj->gem.import_attach->dmabuf, &map);else vunmap (addr); }
@@ -461,7 +462,7 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm,get_dma_buf (buf); - bo->sgt =dma_buf_map_attachment (attach,DMA_TO_DEVICE ); + bo->sgt =dma_buf_map_attachment_unlocked (attach,DMA_TO_DEVICE );if (IS_ERR (bo->sgt)) { err =PTR_ERR (bo->sgt); goto detach;
@@ -479,7 +480,7 @@ static struct tegra_bo *tegra_bo_import(struct drm_device *drm, detach:if (!IS_ERR_OR_NULL (bo->sgt)) -dma_buf_unmap_attachment (attach, bo->sgt,DMA_TO_DEVICE ); +dma_buf_unmap_attachment_unlocked (attach, bo->sgt,DMA_TO_DEVICE );dma_buf_detach (buf, attach);dma_buf_put (buf);
@@ -508,8 +509,8 @@ void tegra_bo_free_object(struct drm_gem_object *gem)tegra_bo_iommu_unmap (tegra, bo);if (gem->import_attach) { -dma_buf_unmap_attachment (gem->import_attach, bo->sgt, -DMA_TO_DEVICE ); +dma_buf_unmap_attachment_unlocked (gem->import_attach, bo->sgt, +DMA_TO_DEVICE );drm_prime_gem_destroy (gem,NULL ); }else {tegra_bo_free (gem->dev, bo);
Signature · 1 line
2.37.3
PATCH v5 9/21 drm/etnaviv: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare Etnaviv driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -1
@@ -65,7 +65,7 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj)struct iosys_map map =IOSYS_MAP_INIT_VADDR (etnaviv_obj->vaddr);if (etnaviv_obj->vaddr) -dma_buf_vunmap (etnaviv_obj->base.import_attach->dmabuf, &map); +dma_buf_vunmap_unlocked (etnaviv_obj->base.import_attach->dmabuf, &map);/* Don't drop the pages for imported dmabuf, as they are not * ours, just free the array we allocated:
Signature · 1 line
2.37.3
PATCH v5 10/21 RDMA/umem: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare InfiniBand drivers to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/infiniband/core/umem_dmabuf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/core/umem_dmabuf.c +4 -3
@@ -26,7 +26,8 @@ int ib_umem_dmabuf_map_pages(struct ib_umem_dmabuf *umem_dmabuf)if (umem_dmabuf->sgt) goto wait_fence; - sgt =dma_buf_map_attachment (umem_dmabuf->attach,DMA_BIDIRECTIONAL ); + sgt =dma_buf_map_attachment_unlocked (umem_dmabuf->attach, +DMA_BIDIRECTIONAL );if (IS_ERR (sgt))return PTR_ERR (sgt);
@@ -102,8 +103,8 @@ void ib_umem_dmabuf_unmap_pages(struct ib_umem_dmabuf *umem_dmabuf) umem_dmabuf->last_sg_trim =0 ; } -dma_buf_unmap_attachment (umem_dmabuf->attach, umem_dmabuf->sgt, -DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (umem_dmabuf->attach, umem_dmabuf->sgt, +DMA_BIDIRECTIONAL ); umem_dmabuf->sgt =NULL ; }
Signature · 1 line
2.37.3
PATCH v5 11/21 misc: fastrpc: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare fastrpc to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/misc/fastrpc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/misc/fastrpc.c +3 -3
@@ -310,8 +310,8 @@ static void fastrpc_free_map(struct kref *ref)return ; } } -dma_buf_unmap_attachment (map->attach, map->table, -DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (map->attach, map->table, +DMA_BIDIRECTIONAL );dma_buf_detach (map->buf, map->attach);dma_buf_put (map->buf); }
@@ -726,7 +726,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd, goto attach_err; } - map->table =dma_buf_map_attachment (map->attach,DMA_BIDIRECTIONAL ); + map->table =dma_buf_map_attachment_unlocked (map->attach,DMA_BIDIRECTIONAL );if (IS_ERR (map->table)) { err =PTR_ERR (map->table); goto map_err;
Signature · 1 line
2.37.3
PATCH v5 12/21 xen/gntdev: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare gntdev driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/xen/gntdev-dmabuf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/xen/gntdev-dmabuf.c +4 -4
@@ -600,7 +600,7 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev, gntdev_dmabuf->u.imp.attach = attach; - sgt =dma_buf_map_attachment (attach,DMA_BIDIRECTIONAL ); + sgt =dma_buf_map_attachment_unlocked (attach,DMA_BIDIRECTIONAL );if (IS_ERR (sgt)) { ret =ERR_CAST (sgt); goto fail_detach;
@@ -658,7 +658,7 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev, fail_end_access:dmabuf_imp_end_foreign_access (gntdev_dmabuf->u.imp.refs, count); fail_unmap: -dma_buf_unmap_attachment (attach, sgt,DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (attach, sgt,DMA_BIDIRECTIONAL ); fail_detach:dma_buf_detach (dma_buf, attach); fail_free_obj:
@@ -708,8 +708,8 @@ static int dmabuf_imp_release(struct gntdev_dmabuf_priv *priv, u32 fd) attach = gntdev_dmabuf->u.imp.attach;if (gntdev_dmabuf->u.imp.sgt) -dma_buf_unmap_attachment (attach, gntdev_dmabuf->u.imp.sgt, -DMA_BIDIRECTIONAL ); +dma_buf_unmap_attachment_unlocked (attach, gntdev_dmabuf->u.imp.sgt, +DMA_BIDIRECTIONAL ); dma_buf = attach->dmabuf;dma_buf_detach (attach->dmabuf, attach);dma_buf_put (dma_buf);
Signature · 1 line
2.37.3
PATCH v5 13/21 media: videobuf2: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare V4L2 memory allocators to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/media/common/videobuf2/videobuf2-dma-contig.c | 11 ++++++----- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 8 ++++---- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/media/common/videobuf2/videobuf2-dma-contig.c +6 -5
@@ -101,7 +101,7 @@ static void *vb2_dc_vaddr(struct vb2_buffer *vb, void *buf_priv)if (buf->db_attach) {struct iosys_map map; -if (!dma_buf_vmap (buf->db_attach->dmabuf, &map)) +if (!dma_buf_vmap_unlocked (buf->db_attach->dmabuf, &map)) buf->vaddr = map.vaddr;return buf->vaddr;
@@ -711,7 +711,7 @@ static int vb2_dc_map_dmabuf(void *mem_priv) }/* get the associated scatterlist for this buffer */ - sgt =dma_buf_map_attachment (buf->db_attach, buf->dma_dir); + sgt =dma_buf_map_attachment_unlocked (buf->db_attach, buf->dma_dir);if (IS_ERR (sgt)) {pr_err ("Error getting dmabuf scatterlist\n" );return -EINVAL ;
@@ -722,7 +722,8 @@ static int vb2_dc_map_dmabuf(void *mem_priv)if (contig_size < buf->size) {pr_err ("contiguous chunk is too small %lu/%lu\n" , contig_size, buf->size); -dma_buf_unmap_attachment (buf->db_attach, sgt, buf->dma_dir); +dma_buf_unmap_attachment_unlocked (buf->db_attach, sgt, + buf->dma_dir);return -EFAULT ; }
@@ -750,10 +751,10 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv) }if (buf->vaddr) { -dma_buf_vunmap (buf->db_attach->dmabuf, &map); +dma_buf_vunmap_unlocked (buf->db_attach->dmabuf, &map); buf->vaddr =NULL ; } -dma_buf_unmap_attachment (buf->db_attach, sgt, buf->dma_dir); +dma_buf_unmap_attachment_unlocked (buf->db_attach, sgt, buf->dma_dir); buf->dma_addr =0 ; buf->dma_sgt =NULL ;
drivers/media/common/videobuf2/videobuf2-dma-sg.c +4 -4
@@ -309,7 +309,7 @@ static void *vb2_dma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv)if (!buf->vaddr) {if (buf->db_attach) { - ret =dma_buf_vmap (buf->db_attach->dmabuf, &map); + ret =dma_buf_vmap_unlocked (buf->db_attach->dmabuf, &map); buf->vaddr = ret ?NULL : map.vaddr; }else { buf->vaddr =vm_map_ram (buf->pages, buf->num_pages,-1 );
@@ -565,7 +565,7 @@ static int vb2_dma_sg_map_dmabuf(void *mem_priv) }/* get the associated scatterlist for this buffer */ - sgt =dma_buf_map_attachment (buf->db_attach, buf->dma_dir); + sgt =dma_buf_map_attachment_unlocked (buf->db_attach, buf->dma_dir);if (IS_ERR (sgt)) {pr_err ("Error getting dmabuf scatterlist\n" );return -EINVAL ;
@@ -594,10 +594,10 @@ static void vb2_dma_sg_unmap_dmabuf(void *mem_priv) }if (buf->vaddr) { -dma_buf_vunmap (buf->db_attach->dmabuf, &map); +dma_buf_vunmap_unlocked (buf->db_attach->dmabuf, &map); buf->vaddr =NULL ; } -dma_buf_unmap_attachment (buf->db_attach, sgt, buf->dma_dir); +dma_buf_unmap_attachment_unlocked (buf->db_attach, sgt, buf->dma_dir); buf->dma_sgt =NULL ; }
drivers/media/common/videobuf2/videobuf2-vmalloc.c +3 -3
@@ -376,7 +376,7 @@ static int vb2_vmalloc_map_dmabuf(void *mem_priv)struct iosys_map map;int ret; - ret =dma_buf_vmap (buf->dbuf, &map); + ret =dma_buf_vmap_unlocked (buf->dbuf, &map);if (ret)return -EFAULT ; buf->vaddr = map.vaddr;
@@ -389,7 +389,7 @@ static void vb2_vmalloc_unmap_dmabuf(void *mem_priv)struct vb2_vmalloc_buf *buf = mem_priv;struct iosys_map map =IOSYS_MAP_INIT_VADDR (buf->vaddr); -dma_buf_vunmap (buf->dbuf, &map); +dma_buf_vunmap_unlocked (buf->dbuf, &map); buf->vaddr =NULL ; }
@@ -399,7 +399,7 @@ static void vb2_vmalloc_detach_dmabuf(void *mem_priv)struct iosys_map map =IOSYS_MAP_INIT_VADDR (buf->vaddr);if (buf->vaddr) -dma_buf_vunmap (buf->dbuf, &map); +dma_buf_vunmap_unlocked (buf->dbuf, &map);kfree (buf); }
Signature · 1 line
2.37.3
PATCH v5 14/21 media: tegra-vde: Prepare to dynamic dma-buf locking specification
In reply to Dmitry OsipenkoPrepare Tegra video decoder driver to the common dynamic dma-buf locking convention by starting to use the unlocked versions of dma-buf API functions.
--- drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c +3 -3
@@ -38,7 +38,7 @@ static void tegra_vde_release_entry(struct tegra_vde_cache_entry *entry)if (entry->vde->domain)tegra_vde_iommu_unmap (entry->vde, entry->iova); -dma_buf_unmap_attachment (entry->a, entry->sgt, entry->dma_dir); +dma_buf_unmap_attachment_unlocked (entry->a, entry->sgt, entry->dma_dir);dma_buf_detach (dmabuf, entry->a);dma_buf_put (dmabuf);
@@ -102,7 +102,7 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde, goto err_unlock; } - sgt =dma_buf_map_attachment (attachment, dma_dir); + sgt =dma_buf_map_attachment_unlocked (attachment, dma_dir);if (IS_ERR (sgt)) {dev_err (dev,"Failed to get dmabufs sg_table\n" ); err =PTR_ERR (sgt);
@@ -152,7 +152,7 @@ int tegra_vde_dmabuf_cache_map(struct tegra_vde *vde, err_free:kfree (entry); err_unmap: -dma_buf_unmap_attachment (attachment, sgt, dma_dir); +dma_buf_unmap_attachment_unlocked (attachment, sgt, dma_dir); err_detach:dma_buf_detach (dmabuf, attachment); err_unlock:
Signature · 1 line
2.37.3
PATCH v5 15/21 dma-buf: Move dma_buf_vmap() to dynamic locking specification
In reply to Dmitry OsipenkoMove dma_buf_vmap/vunmap_unlocked() functions to the dynamic locking specification by asserting that the reservation lock is held.
--- drivers/dma-buf/dma-buf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma-buf/dma-buf.c +4 -0
@@ -1450,6 +1450,8 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map)if (WARN_ON (!dmabuf))return -EINVAL ; +dma_resv_assert_held (dmabuf->resv); +if (!dmabuf->ops->vmap)return -EINVAL ;
@@ -1510,6 +1512,8 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)if (WARN_ON (!dmabuf))return ; +dma_resv_assert_held (dmabuf->resv); +BUG_ON (iosys_map_is_null (&dmabuf->vmap_ptr));BUG_ON (dmabuf->vmapping_counter ==0 );BUG_ON (!iosys_map_is_equal (&dmabuf->vmap_ptr, map));
Signature · 1 line
2.37.3
Sumit Semwal
maintainerRe: [PATCH v5 15/21] dma-buf: Move dma_buf_vmap() to dynamic locking specification
Hi Dmitry,
Thanks very much for the series.
Quoted 3 lines · Dmitry Osipenko
Move dma_buf_vmap/vunmap_unlocked() functions to the dynamic locking specification by asserting that the reservation lock is held.
Thanks for the patch; just a minor nit - I think you mean dma_buf_vmap / vunmap() here, and not _unlocked?
Best,
Sumit.
Quoted 30 lines
Acked-by Christian König <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/dma-buf/dma-buf.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/dma-buf/dma-buf.c +4
-1@@ -1450,6 +1450,8 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map)if (WARN_ON (!dmabuf))return -EINVAL ; +dma_resv_assert_held (dmabuf->resv); +if (!dmabuf->ops->vmap)return -EINVAL ;@@ -1510,6 +1512,8 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)if (WARN_ON (!dmabuf))return ; +dma_resv_assert_held (dmabuf->resv); +BUG_ON (iosys_map_is_null (&dmabuf->vmap_ptr));BUG_ON (dmabuf->vmapping_counter ==0 );BUG_ON (!iosys_map_is_equal (&dmabuf->vmap_ptr, map)); --
Quoted 2 lines
2.37.3
--
Thanks and regards,
Sumit Semwal (he / him)
Tech Lead - LCG, Vertical Technologies
Linaro.org │ Open source software for ARM SoCs
Re: [PATCH v5 15/21] dma-buf: Move dma_buf_vmap() to dynamic locking specification
Quoted 11 lines · Sumit Semwal
Hi Dmitry,
Thanks very much for the series.
Quoted 3 lines · Dmitry Osipenko
Move dma_buf_vmap/vunmap_unlocked() functions to the dynamic locking specification by asserting that the reservation lock is held.
Thanks for the patch; just a minor nit - I think you mean
dma_buf_vmap/vunmap()here, and not_unlocked?
Yes, the _unlocked should be dropped here. Thank you for the review!
Signature · 2 lines
Best regards, Dmitry
PATCH v5 16/21 dma-buf: Move dma_buf_attach() to dynamic locking specification
In reply to Dmitry OsipenkoMove dma-buf attachment API functions to the dynamic locking specification by taking the reservation lock around the mapping operations. The strict locking convention prevents deadlock situations for dma-buf importers and exporters.
--- drivers/dma-buf/dma-buf.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/dma-buf/dma-buf.c +8 -12
@@ -859,8 +859,8 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev, dma_buf_is_dynamic(dmabuf)) {struct sg_table *sgt; +dma_resv_lock (attach->dmabuf->resv,NULL );if (dma_buf_is_dynamic (attach->dmabuf)) { -dma_resv_lock (attach->dmabuf->resv,NULL ); ret = dmabuf->ops->pin (attach);if (ret) goto err_unlock;
@@ -873,8 +873,7 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev, ret =PTR_ERR (sgt); goto err_unpin; } -if (dma_buf_is_dynamic (attach->dmabuf)) -dma_resv_unlock (attach->dmabuf->resv); +dma_resv_unlock (attach->dmabuf->resv); attach->sgt = sgt; attach->dir =DMA_BIDIRECTIONAL ; }
@@ -890,8 +889,7 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev, dmabuf->ops->unpin (attach); err_unlock: -if (dma_buf_is_dynamic (attach->dmabuf)) -dma_resv_unlock (attach->dmabuf->resv); +dma_resv_unlock (attach->dmabuf->resv);dma_buf_detach (dmabuf, attach);return ERR_PTR (ret);
@@ -937,21 +935,19 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach)if (WARN_ON (!dmabuf || !attach))return ; +dma_resv_lock (attach->dmabuf->resv,NULL ); +if (attach->sgt) { -if (dma_buf_is_dynamic (attach->dmabuf)) -dma_resv_lock (attach->dmabuf->resv,NULL );__unmap_dma_buf (attach, attach->sgt, attach->dir); -if (dma_buf_is_dynamic (attach->dmabuf)) { +if (dma_buf_is_dynamic (attach->dmabuf)) dmabuf->ops->unpin (attach); -dma_resv_unlock (attach->dmabuf->resv); - } } - -dma_resv_lock (dmabuf->resv,NULL );list_del (&attach->node); +dma_resv_unlock (dmabuf->resv); +if (dmabuf->ops->detach) dmabuf->ops->detach (dmabuf, attach);
Signature · 1 line
2.37.3
PATCH v5 17/21 dma-buf: Move dma_buf_map_attachment() to dynamic locking specification
In reply to Dmitry OsipenkoMove dma-buf attachment mapping functions to the dynamic locking specification by asserting that the reservation lock is held.
--- drivers/dma-buf/dma-buf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/dma-buf/dma-buf.c +2 -8
@@ -1038,8 +1038,7 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,if (WARN_ON (!attach || !attach->dmabuf))return ERR_PTR (-EINVAL ); -if (dma_buf_attachment_is_dynamic (attach)) -dma_resv_assert_held (attach->dmabuf->resv); +dma_resv_assert_held (attach->dmabuf->resv);if (attach->sgt) {/*
@@ -1054,7 +1053,6 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, }if (dma_buf_is_dynamic (attach->dmabuf)) { -dma_resv_assert_held (attach->dmabuf->resv);if (!IS_ENABLED (CONFIG_DMABUF_MOVE_NOTIFY )) { r = attach->dmabuf->ops->pin (attach);if (r)
@@ -1143,15 +1141,11 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,if (WARN_ON (!attach || !attach->dmabuf || !sg_table))return ; -if (dma_buf_attachment_is_dynamic (attach)) -dma_resv_assert_held (attach->dmabuf->resv); +dma_resv_assert_held (attach->dmabuf->resv);if (attach->sgt == sg_table)return ; -if (dma_buf_is_dynamic (attach->dmabuf)) -dma_resv_assert_held (attach->dmabuf->resv); -__unmap_dma_buf (attach, sg_table, direction); if (dma_buf_is_dynamic(attach->dmabuf) &&
Signature · 1 line
2.37.3
PATCH v5 18/21 dma-buf: Move dma_buf_mmap() to dynamic locking specification
In reply to Dmitry OsipenkoMove dma_buf_mmap() function to the dynamic locking specification by taking the reservation lock. Neither of the today's drivers take the reservation lock within the mmap() callback, hence it's safe to enforce the locking.
--- drivers/dma-buf/dma-buf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/dma-buf/dma-buf.c +7 -1
@@ -1390,6 +1390,8 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_end_cpu_access, DMA_BUF);int dma_buf_mmap (struct dma_buf *dmabuf,struct vm_area_struct *vma,unsigned long pgoff) { +int ret; +if (WARN_ON (!dmabuf || !vma))return -EINVAL ;
@@ -1410,7 +1412,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,vma_set_file (vma, dmabuf->file); vma->vm_pgoff = pgoff; -return dmabuf->ops->mmap (dmabuf, vma); +dma_resv_lock (dmabuf->resv,NULL ); + ret = dmabuf->ops->mmap (dmabuf, vma); +dma_resv_unlock (dmabuf->resv); + +return ret; }EXPORT_SYMBOL_NS_GPL (dma_buf_mmap,DMA_BUF );
Signature · 1 line
2.37.3
PATCH v5 19/21 dma-buf: Document dynamic locking convention
In reply to Dmitry OsipenkoAdd documentation for the dynamic locking convention. The documentation tells dma-buf API users when they should take the reservation lock and when not.
--- Documentation/driver-api/dma-buf.rst | 6 +++ drivers/dma-buf/dma-buf.c | 64 ++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+)
Documentation/driver-api/dma-buf.rst +6 -0
@@ -119,6 +119,12 @@ DMA Buffer ioctls .. kernel-doc:: include/uapi/linux/dma-buf.h +DMA-BUF locking convention +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. kernel-doc:: drivers/dma-buf/dma-buf.c + :doc: locking convention + Kernel Functions and Structures Reference ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dma-buf/dma-buf.c +64 -0
70 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH v5 20/21 media: videobuf2: Stop using internal dma-buf lock
In reply to Dmitry OsipenkoAll drivers that use dma-bufs have been moved to the updated locking specification and now dma-buf reservation is guaranteed to be locked by importers during the mapping operations. There is no need to take the internal dma-buf lock anymore. Remove locking from the videobuf2 memory allocators.
--- drivers/media/common/videobuf2/videobuf2-dma-contig.c | 11 +---------- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 11 +---------- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 11 +---------- 3 files changed, 3 insertions(+), 30 deletions(-)
drivers/media/common/videobuf2/videobuf2-dma-contig.c +1 -10
@@ -382,18 +382,12 @@ static struct sg_table *vb2_dc_dmabuf_ops_map( struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir) { struct vb2_dc_attachment *attach = db_attach->priv; -/* stealing dmabuf mutex to serialize map/unmap operations */ -struct mutex *lock = &db_attach->dmabuf->lock;struct sg_table *sgt; -mutex_lock (lock); - sgt = &attach->sgt;/* return previously mapped sg table */ -if (attach->dma_dir == dma_dir) { -mutex_unlock (lock); +if (attach->dma_dir == dma_dir)return sgt; - }/* release any previous cache */ if (attach->dma_dir !=DMA_NONE ) {
@@ -409,14 +403,11 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(if (dma_map_sgtable (db_attach->dev, sgt, dma_dir,DMA_ATTR_SKIP_CPU_SYNC )) {pr_err ("failed to map scatterlist\n" ); -mutex_unlock (lock);return ERR_PTR (-EIO ); } attach->dma_dir = dma_dir; -mutex_unlock (lock); -return sgt; }
drivers/media/common/videobuf2/videobuf2-dma-sg.c +1 -10
@@ -424,18 +424,12 @@ static struct sg_table *vb2_dma_sg_dmabuf_ops_map( struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir) { struct vb2_dma_sg_attachment *attach = db_attach->priv; -/* stealing dmabuf mutex to serialize map/unmap operations */ -struct mutex *lock = &db_attach->dmabuf->lock;struct sg_table *sgt; -mutex_lock (lock); - sgt = &attach->sgt;/* return previously mapped sg table */ -if (attach->dma_dir == dma_dir) { -mutex_unlock (lock); +if (attach->dma_dir == dma_dir)return sgt; - }/* release any previous cache */ if (attach->dma_dir !=DMA_NONE ) {
@@ -446,14 +440,11 @@ static struct sg_table *vb2_dma_sg_dmabuf_ops_map(/* mapping to the client with new direction */ if (dma_map_sgtable (db_attach->dev, sgt, dma_dir,0 )) {pr_err ("failed to map scatterlist\n" ); -mutex_unlock (lock);return ERR_PTR (-EIO ); } attach->dma_dir = dma_dir; -mutex_unlock (lock); -return sgt; }
drivers/media/common/videobuf2/videobuf2-vmalloc.c +1 -10
@@ -267,18 +267,12 @@ static struct sg_table *vb2_vmalloc_dmabuf_ops_map( struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir) { struct vb2_vmalloc_attachment *attach = db_attach->priv; -/* stealing dmabuf mutex to serialize map/unmap operations */ -struct mutex *lock = &db_attach->dmabuf->lock;struct sg_table *sgt; -mutex_lock (lock); - sgt = &attach->sgt;/* return previously mapped sg table */ -if (attach->dma_dir == dma_dir) { -mutex_unlock (lock); +if (attach->dma_dir == dma_dir)return sgt; - }/* release any previous cache */ if (attach->dma_dir !=DMA_NONE ) {
@@ -289,14 +283,11 @@ static struct sg_table *vb2_vmalloc_dmabuf_ops_map(/* mapping to the client with new direction */ if (dma_map_sgtable (db_attach->dev, sgt, dma_dir,0 )) {pr_err ("failed to map scatterlist\n" ); -mutex_unlock (lock);return ERR_PTR (-EIO ); } attach->dma_dir = dma_dir; -mutex_unlock (lock); -return sgt; }
Signature · 1 line
2.37.3
PATCH v5 21/21 dma-buf: Remove obsoleted internal lock
In reply to Dmitry OsipenkoThe internal dma-buf lock isn't needed anymore because the updated locking specification claims that dma-buf reservation must be locked by importers, and thus, the internal data is already protected by the reservation lock. Remove the obsoleted internal lock.
--- drivers/dma-buf/dma-buf.c | 14 ++++---------- include/linux/dma-buf.h | 9 --------- 2 files changed, 4 insertions(+), 19 deletions(-)
drivers/dma-buf/dma-buf.c +4 -10
@@ -657,7 +657,6 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) dmabuf->file = file; -mutex_init (&dmabuf->lock);INIT_LIST_HEAD (&dmabuf->attachments);mutex_lock (&db_list.lock);
@@ -1503,7 +1502,7 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_mmap, DMA_BUF);int dma_buf_vmap (struct dma_buf *dmabuf,struct iosys_map *map) {struct iosys_map ptr; -int ret =0 ; +int ret;iosys_map_clear (map);
@@ -1515,28 +1514,25 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map)if (!dmabuf->ops->vmap)return -EINVAL ; -mutex_lock (&dmabuf->lock);if (dmabuf->vmapping_counter) { dmabuf->vmapping_counter++;BUG_ON (iosys_map_is_null (&dmabuf->vmap_ptr)); *map = dmabuf->vmap_ptr; - goto out_unlock; +return 0 ; }BUG_ON (iosys_map_is_set (&dmabuf->vmap_ptr)); ret = dmabuf->ops->vmap (dmabuf, &ptr);if (WARN_ON_ONCE (ret)) - goto out_unlock; +return ret; dmabuf->vmap_ptr = ptr; dmabuf->vmapping_counter =1 ; *map = dmabuf->vmap_ptr; -out_unlock: -mutex_unlock (&dmabuf->lock); -return ret; +return 0 ; }EXPORT_SYMBOL_NS_GPL (dma_buf_vmap,DMA_BUF );
@@ -1578,13 +1574,11 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)BUG_ON (dmabuf->vmapping_counter ==0 );BUG_ON (!iosys_map_is_equal (&dmabuf->vmap_ptr, map)); -mutex_lock (&dmabuf->lock);if (--dmabuf->vmapping_counter ==0 ) {if (dmabuf->ops->vunmap) dmabuf->ops->vunmap (dmabuf, map);iosys_map_clear (&dmabuf->vmap_ptr); } -mutex_unlock (&dmabuf->lock); }EXPORT_SYMBOL_NS_GPL (dma_buf_vunmap,DMA_BUF );
include/linux/dma-buf.h +0 -9
@@ -326,15 +326,6 @@ struct dma_buf {/** @ops: dma_buf_ops associated with this buffer object. */ const struct dma_buf_ops *ops; -/** -* @lock: -* -* Used internally to serialize list manipulation, attach/detach and -* vmap/unmap. Note that in many cases this is superseeded by -* dma_resv_lock() on @resv. -*/ -struct mutex lock; -/** * @vmapping_counter: *
Signature · 1 line
2.37.3
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for Move all drivers to a common dma-buf locking convention
In reply to Dmitry Osipenko== Series Details ==
== Series Details ==
Series: Move all drivers to a common dma-buf locking convention
URL : https://patchwork.freedesktop.org/series/108517/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/108517/revisions/1/mbox/ not applied
Applying: dma-buf: Add unlocked variant of vmapping functions
Applying: dma-buf: Add unlocked variant of attachment-mapping functions
Applying: drm/gem: Take reservation lock for vmap/vunmap operations
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_gem.c
M include/drm/drm_gem.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_gem.h
CONFLICT (content): Merge conflict in include/drm/drm_gem.h
Auto-merging drivers/gpu/drm/drm_gem.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/gem: Take reservation lock for vmap/vunmap operations When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Hi Dmitry,
Quoted 9 lines · Dmitry Osipenko
Hello,
This series moves all drivers to a dynamic dma-buf locking specification. From now on all dma-buf importers are made responsible for holding dma-buf's reservation lock around all operations performed over dma-bufs in accordance to the locking specification. This allows us to utilize reservation lock more broadly around kernel without fearing of a potential deadlocks.
Thank you for the excellent work on this series - apart from a minor nit in patch 15, please feel free to add my:
for the relevant dma-buf patches (1, 2, 15-19, 21).
Best regards,
Sumit.
Quoted 124 lines
This patchset passes all i915 selftests. It was also tested using VirtIO, Panfrost, Lima, Tegra, udmabuf, AMDGPU and Nouveau drivers. I tested cases of display+GPU, display+V4L and GPU+V4L dma-buf sharing (where appropriate), which covers majority of kernel drivers since rest of the drivers share same or similar code paths.
Changelog:
v5: - Added acks and r-bs that were given to v4.
- Changed i915 preparation patch like was suggested by Michael Ruhl. The scope of reservation locking is smaller now.
v4: - Added
dma_buf_mmap()to the "locking convention" documentation,
which was missed by accident in v3.- Added acks from Christian König, Tomasz Figa and Hans Verkuil that they gave to couple v3 patches.
- Dropped the "
_unlocked" postfix from function names that don't have the locked variant, as was requested by Christian König.- Factored out the per-driver preparations into separate patches to ease reviewing of the changes, which is now doable without the global dma-buf functions renaming.
- Factored out the dynamic locking convention enforcements into separate patches which add the final
dma_resv_assert_held(dmabuf->resv)to the dma-buf API functions.v3: - Factored out
dma_buf_mmap_unlocked()and attachment functions
into aseparate patches, like was suggested by Christian König.- Corrected and factored out dma-buf locking documentation into a separate patch, like was suggested by Christian König.
- Intel driver dropped the reservation locking fews days ago from its BO-release code path, but we need that locking for the imported GEMs because in the end that code path unmaps the imported GEM. So I added back the locking needed by the imported GEMs, updating the "dma-buf attachment locking specification" patch appropriately.
- Tested Nouveau+Intel dma-buf import/export combo.
- Tested udmabuf import to i915/Nouveau/AMDGPU.
- Fixed few places in Etnaviv, Panfrost and Lima drivers that I missed to switch to locked dma-buf vmapping in the drm/gem: Take reservation lock for vmap/vunmap operations" patch. In a result invalidated the Christian's r-b that he gave to v2.
- Added locked dma-buf vmap/vunmap functions that are needed for fixing vmappping of Etnaviv, Panfrost and Lima drivers mentioned above. I actually had this change stashed for the drm-shmem shrinker patchset, but then realized that it's already needed by the dma-buf patches. Also improved my tests to better cover these code paths.
v2: - Changed locking specification to avoid problems with a cross-driver
ww locking, like was suggested by Christian König. Now the attach/detach callbacks are invoked without the held lock and exporter should take the lock.- Added "locking convention" documentation that explains which dma-buf functions and callbacks are locked/unlocked for importers and exporters, which was requested by Christian König.
- Added ack from Tomasz Figa to the V4L patches that he gave to v1.
Dmitry Osipenko (21):
dma-buf: Add unlocked variant of vmapping functions
dma-buf: Add unlocked variant of attachment-mapping functions drm/gem: Take reservation lock for vmap/vunmap operations drm/prime: Prepare to dynamic dma-buf locking specification drm/armada: Prepare to dynamic dma-buf locking specification drm/i915: Prepare to dynamic dma-buf locking specification drm/omapdrm: Prepare to dynamic dma-buf locking specification drm/tegra: Prepare to dynamic dma-buf locking specification drm/etnaviv: Prepare to dynamic dma-buf locking specification RDMA/umem: Prepare to dynamic dma-buf locking specification
misc: fastrpc: Prepare to dynamic dma-buf locking specification xen/gntdev: Prepare to dynamic dma-buf locking specification
media: videobuf2: Prepare to dynamic dma-buf locking specification
media: tegra-vde: Prepare to dynamic dma-buf locking specification
dma-buf: Movedma_buf_vmap()to dynamic locking specification
dma-buf: Movedma_buf_attach()to dynamic locking specification
dma-buf: Movedma_buf_map_attachment()to dynamic locking
specification
dma-buf: Movedma_buf_mmap()to dynamic locking specification
dma-buf: Document dynamic locking convention
media: videobuf2: Stop using internal dma-buf lock
dma-buf: Remove obsoleted internal lockDocumentation/driver-api/dma-buf.rst | 6 + drivers/dma-buf/dma-buf.c | 211 +++++++++++++++--- drivers/gpu/drm/armada/armada_gem.c | 8 +- drivers/gpu/drm/drm_client.c | 4 +- drivers/gpu/drm/drm_gem.c | 24 ++ drivers/gpu/drm/drm_gem_dma_helper.c | 6 +- drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- drivers/gpu/drm/drm_gem_ttm_helper.c | 9 +- drivers/gpu/drm/drm_prime.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 ++ .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 16 +- drivers/gpu/drm/lima/lima_sched.c | 4 +- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +- drivers/gpu/drm/panfrost/panfrost_dump.c | 4 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- drivers/gpu/drm/qxl/qxl_object.c | 17 +- drivers/gpu/drm/qxl/qxl_prime.c | 4 +- drivers/gpu/drm/tegra/gem.c | 17 +- drivers/infiniband/core/umem_dmabuf.c | 7 +- .../common/videobuf2/videobuf2-dma-contig.c | 22 +- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 +- .../common/videobuf2/videobuf2-vmalloc.c | 17 +- .../platform/nvidia/tegra-vde/dmabuf-cache.c | 6 +- drivers/misc/fastrpc.c | 6 +- drivers/xen/gntdev-dmabuf.c | 8 +- include/drm/drm_gem.h | 3 + include/linux/dma-buf.h | 17 +- 29 files changed, 320 insertions(+), 155 deletions(-)
Quoted 3 lines
--
2.37.3
--
Thanks and regards,
Sumit Semwal (he / him)
Tech Lead - LCG, Vertical Technologies Linaro.org │ Open source software for ARM SoCs