Skip to contentSkip to conversation

dma-buf: heap-helpers: Set dma-buf exporter name

PATCH In review Ezequiel Garcia 3 participants 3 messages Aug 14, 2020 – Aug 15, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-buf: heap-helpers: Set dma-buf exporter name

Currently the heap helper uses DEFINE_DMA_BUF_EXPORT_INFO, which uses KBUILD_MODNAME for the dma_buf_export_info.exp_name.

This effectively makes all dma-bufs exported by the heap helper as coming from "heap-helpers", instead of the actual heap name (cma, system, etc).

Fix this by adding a dma-heap name getter, and then setting dma_buf_export_info.exp_name.

---
 drivers/dma-buf/dma-heap.c           | 5 +++++
 drivers/dma-buf/heaps/heap-helpers.c | 1 +
 include/linux/dma-heap.h             | 2 ++
 3 files changed, 8 insertions(+)
drivers/dma-buf/dma-heap.c +5 -0
index afd22c9dbdcf..13d001ee381a 100644
@@ -190,6 +190,11 @@ void *dma_heap_get_drvdata(struct dma_heap *heap)
 	return heap->priv;
 }
 
+const char *dma_heap_get_name(struct dma_heap *heap)
+{
+	return heap->name;
+}
+
 struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
 {
 	struct dma_heap *heap, *h, *err_ret;
drivers/dma-buf/heaps/heap-helpers.c +1 -0
index 9f964ca3f59c..47ecf9518442 100644
@@ -30,6 +30,7 @@ struct dma_buf *heap_helper_export_dmabuf(struct heap_helper_buffer *buffer,
 {
 	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
 
+	exp_info.exp_name = dma_heap_get_name(buffer->heap);
 	exp_info.ops = &heap_helper_ops;
 	exp_info.size = buffer->size;
 	exp_info.flags = fd_flags;
include/linux/dma-heap.h +2 -0
index 454e354d1ffb..0acf7e71afb5 100644
@@ -50,6 +50,8 @@ struct dma_heap_export_info {
  */
 void *dma_heap_get_drvdata(struct dma_heap *heap);
 
+const char *dma_heap_get_name(struct dma_heap *heap);
+
 /**
  * dma_heap_add - adds a heap to dmabuf heaps
  * @exp_info:		information needed to register this heap
Signature · 1 line
2.27.0
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Ezequiel Garcia

Currently the heap helper uses DEFINE_DMA_BUF_EXPORT_INFO, which uses KBUILD_MODNAME for the dma_buf_export_info.exp_name.

Quoted 8 lines

This effectively makes all dma-bufs exported by the heap helper as coming from "heap-helpers", instead of the actual heap name (cma, system, etc).

Fix this by adding a dma-heap name getter, and then setting dma_buf_export_info.exp_name.

Untested, but looks sane to me.

On a slightly related note, I'm starting to regret the current heap-helpers approach (Andrew probably gets an "I told you so" there :). While it avoids a lot of duplication, it's really an all or nothing approach, and doesn't really compare well to other drm style helper functions. I may eventually try to break the system and cma implementations out of the helper code and try to consider a different approach to avoid the duplication.

thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 10 lines · John Stultz
Quoted 8 lines · Ezequiel Garcia

Currently the heap helper uses DEFINE_DMA_BUF_EXPORT_INFO, which uses KBUILD_MODNAME for the dma_buf_export_info.exp_name.

This effectively makes all dma-bufs exported by the heap helper as coming from "heap-helpers", instead of the actual heap name (cma, system, etc).

Quoted 9 lines
Quoted 4 lines

Fix this by adding a dma-heap name getter, and then setting dma_buf_export_info.exp_name.

Untested, but looks sane to me.

Cool.

Quoted 8 lines

On a slightly related note, I'm starting to regret the current heap-helpers approach (Andrew probably gets an "I told you so" there :). While it avoids a lot of duplication, it's really an all or nothing approach, and doesn't really compare well to other drm style helper functions. I may eventually try to break the system and cma implementations out of the helper code and try to consider a different approach to avoid the duplication.

Fully agreed :-) It definitely looks too rigid right now.

Cheers,
Ezequiel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel