Skip to contentSkip to conversation

DMA-BUF Heaps (destaging ION)

RFC PATCH Superseded John Stultz 4 participants 16 messages Mar 29, 2019 – Apr 1, 2019

Subsystems (3)

v3 of 16 Superseded Latest is v16 →

lore
Share & tools
lore
#0 lore raw

v3 cover DMA-BUF Heaps (destaging ION)

Here is another RFC of the dma-buf heaps patchset Andrew and I have been working on which tries to destage a fair chunk of ION functionality.

The patchset implements per-heap devices which can be opened directly and then an ioctl is used to allocate a dmabuf from the heap.

The interface is similar, but much simpler then IONs, only providing an ALLOC ioctl.

Also, I've provided simple system and cma heaps. The system heap in particular is missing the page-pool optimizations ION had, but works well enough to validate the interface.

I've booted and tested these patches with AOSP on the HiKey960 using the kernel tree here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap

And the userspace changes here:
https://android-review.googlesource.com/c/device/linaro/hikey/+/909436

Compared to ION, this patchset is missing the system-contig, carveout and chunk heaps, as I don't have a device that uses those, so I'm unable to do much useful validation there. Additionally we have no upstream users of chunk or carveout, and the system-contig has been deprecated in the common/andoid-* kernels, so this should be ok.

I've also removed the stats accounting for now, since it should be implemented by the heaps themselves.

New in v3:
* Proper /dev/heap/* names on both Android and classic Linux environments
* Major rework of the helper code from Andrew
* Dummy test device added to test importing
* *Lots* of cleanups suggested by many (thank you for all the input)!

Outstanding concerns:
* Potential need for private flags in interface for secure heaps. Need to better understand secure heap usage.
* Making sure the performance issues from potentially unnecessary cache-management operations can be resolved properly for system and cma heaps (outstanding issue from ION).

Eventual TODOS:
* Sanity filtering for heap names
* Reimplement performance optimizations for system heap
* Add stats accounting to system/cma heaps
* Make the kselftest more useful
* Add other heaps folks see as useful (would love to get some help from actual carveout/chunk users)!

That said, the main user-interface is shaping up and I wanted to get some input on the device model (particularly from GreKH) and any other API/ABI specific input.

thanks
-john

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

Andrew F. Davis (2):
dma-buf: Add dma-buf heaps framework
dma-buf: Add Dummy Importer Test Device

John Stultz (4):
dma-buf: heaps: Add heap helpers
dma-buf: heaps: Add system heap to dmabuf heaps
dma-buf: heaps: Add CMA heap to dmabuf heapss
kselftests: Add dma-heap test

 MAINTAINERS                                        |  18 ++
 drivers/dma-buf/Kconfig                            |  16 ++
 drivers/dma-buf/Makefile                           |   3 +
 drivers/dma-buf/dma-buf-testdev.c                  | 239 +++++++++++++++++++
 drivers/dma-buf/dma-heap.c                         | 234 ++++++++++++++++++
 drivers/dma-buf/heaps/Kconfig                      |  14 ++
 drivers/dma-buf/heaps/Makefile                     |   4 +
 drivers/dma-buf/heaps/cma_heap.c                   | 170 ++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.c               | 261 +++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h               |  55 +++++
 drivers/dma-buf/heaps/system_heap.c                | 120 ++++++++++
 include/linux/dma-heap.h                           |  58 +++++
 include/uapi/linux/dma-buf-testdev.h               |  37 +++
 include/uapi/linux/dma-heap.h                      |  52 ++++
 tools/testing/selftests/dmabuf-heaps/Makefile      |  11 +
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 169 +++++++++++++
 16 files changed, 1461 insertions(+)
 create mode 100644 drivers/dma-buf/dma-buf-testdev.c
 create mode 100644 drivers/dma-buf/dma-heap.c
 create mode 100644 drivers/dma-buf/heaps/Kconfig
 create mode 100644 drivers/dma-buf/heaps/Makefile
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
 create mode 100644 drivers/dma-buf/heaps/system_heap.c
 create mode 100644 include/linux/dma-heap.h
 create mode 100644 include/uapi/linux/dma-buf-testdev.h
 create mode 100644 include/uapi/linux/dma-heap.h
 create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile
 create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
Signature · 1 line
2.7.4
#1 lore raw

RFC PATCH v3 1/6 dma-buf: Add dma-buf heaps framework

From: "Andrew F. Davis" <[email protected]>

This framework allows a unified userspace interface for dma-buf exporters, allowing userland to allocate specific types of memory for use in dma-buf sharing.

Each heap is given its own device node, which a user can allocate a dma-buf fd from using the DMA_HEAP_IOC_ALLOC.

This code is an evoluiton of the Android ION implementation, and a big thanks is due to its authors/maintainers over time for their effort:
Rebecca Schultz Zavin, Colin Cross, Benjamin Gaignard, Laura Abbott, and many other contributors!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Folded down fixes I had previously shared in implementing heaps
* Make flags a u64 (Suggested by Laura)
* Add PAGE_ALIGN() fix to the core alloc funciton
* IOCTL fixups suggested by Brian
* Added fixes suggested by Benjamin
* Removed core stats mgmt, as that should be implemented by per-heap code
* Changed alloc to return a dma-buf fd, rather then a buffer (as it simplifies error handling)
v3:
* Removed scare-quotes in MAINTAINERS email address
* Get rid of .release function as it didn't do anything (from Christoph)
* Renamed filp to file (suggested by Christoph)
* Split out ioctl handling to separate function (suggested by Christoph)
* Add comment documenting PAGE_ALIGN usage (suggested by Brian)
* Switch from idr to Xarray (suggested by Brian)
* Fixup cdev creation (suggested by Brian)
* Avoid EXPORT_SYMBOL until we finalize modules (suggested by Brian)
* Make struct dma_heap internal only (folded in from Andrew)
* Small cleanups suggested by GregKH
* Provide class->devnode callback to get consistent /dev/ subdirectory naming (Suggested by Bjorn)

---
 MAINTAINERS                   |  18 ++++
 drivers/dma-buf/Kconfig       |   8 ++
 drivers/dma-buf/Makefile      |   1 +
 drivers/dma-buf/dma-heap.c    | 234 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/dma-heap.h      |  70 +++++++++++++
 include/uapi/linux/dma-heap.h |  52 ++++++++++
 6 files changed, 383 insertions(+)
 create mode 100644 drivers/dma-buf/dma-heap.c
 create mode 100644 include/linux/dma-heap.h
 create mode 100644 include/uapi/linux/dma-heap.h
MAINTAINERS +18 -0
index c0057dd..cd9c495 100644
@@ -4719,6 +4719,24 @@ F:	include/linux/*fence.h
 F:	Documentation/driver-api/dma-buf.rst
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 
+DMA-BUF HEAPS FRAMEWORK
+M:	Sumit Semwal <[email protected]>
+R:	Andrew F. Davis <[email protected]>
+R:	Benjamin Gaignard <[email protected]>
+R:	Liam Mark <[email protected]>
+R:	Laura Abbott <[email protected]>
+R:	Brian Starkey <[email protected]>
+R:	John Stultz <[email protected]>
+S:	Maintained
+L:	[email protected]
+L:	[email protected]
+L:	[email protected] (moderated for non-subscribers)
+F:	include/uapi/linux/dma-heap.h
+F:	include/linux/dma-heap.h
+F:	drivers/dma-buf/dma-heap.c
+F:	drivers/dma-buf/heaps/*
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:	Vinod Koul <[email protected]>
 L:	[email protected]
drivers/dma-buf/Kconfig +8 -0
index 2e5a0fa..09c61db 100644
@@ -39,4 +39,12 @@ config UDMABUF
 	  A driver to let userspace turn memfd regions into dma-bufs.
 	  Qemu can use this to create host dmabufs for guest framebuffers.
 
+menuconfig DMABUF_HEAPS
+	bool "DMA-BUF Userland Memory Heaps"
+	select DMA_SHARED_BUFFER
+	help
+	  Choose this option to enable the DMA-BUF userland memory heaps,
+	  this allows userspace to allocate dma-bufs that can be shared between
+	  drivers.
+
 endmenu
drivers/dma-buf/Makefile +1 -0
index 0913a6c..b0332f1 100644
@@ -1,4 +1,5 @@
 obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
+obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
 obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
 obj-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
 obj-$(CONFIG_UDMABUF)		+= udmabuf.o
drivers/dma-buf/dma-heap.c new file +234 -0

234 lines not on this page · raw message

include/linux/dma-heap.h new file +70 -0

70 lines not on this page · raw message

include/uapi/linux/dma-heap.h new file +52 -0

52 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

RFC PATCH v3 2/6 dma-buf: heaps: Add heap helpers

In reply to John Stultz

Add generic helper dmabuf ops for dma heaps, so we can reduce the amount of duplicative code for the exported dmabufs.

This code is an evolution of the Android ION implementation, so thanks to its original authors and maintainters:
Rebecca Schultz Zavin, Colin Cross, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Removed cache management performance hack that I had accidentally folded in.
* Removed stats code that was in helpers
* Lots of checkpatch cleanups

v3:
* Uninline INIT_HEAP_HELPER_BUFFER (suggested by Christoph)
* Switch to WARN on buffer destroy failure (suggested by Brian)
* buffer->kmap_cnt decrementing cleanup (suggested by Christoph)
* Extra buffer->vaddr checking in dma_heap_dma_buf_kmap (suggested by Brian)
* Switch to_helper_buffer from macro to inline function (suggested by Benjamin)
* Rename kmap->vmap (folded in from Andrew)
* Use vmap for vmapping - not begin_cpu_access (folded in from Andrew)
* Drop kmap for now, as its optional (folded in from Andrew)
* Fold dma_heap_map_user into the single caller (foled in from Andrew)
* Folded in patch from Andrew to track page list per heap not sglist, which simplifies the tracking logic

---
 drivers/dma-buf/Makefile             |   1 +
 drivers/dma-buf/heaps/Makefile       |   2 +
 drivers/dma-buf/heaps/heap-helpers.c | 261 +++++++++++++++++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h |  55 ++++++++
 include/linux/dma-heap.h             |  14 +-
 5 files changed, 320 insertions(+), 13 deletions(-)
 create mode 100644 drivers/dma-buf/heaps/Makefile
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
drivers/dma-buf/Makefile +1 -0
index b0332f1..09c2f2d 100644
@@ -1,4 +1,5 @@
 obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
+obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/
 obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
 obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
 obj-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
drivers/dma-buf/heaps/Makefile new file +2 -0
new file mode 100644
index 0000000..de49898
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y					+= heap-helpers.o
drivers/dma-buf/heaps/heap-helpers.c new file +261 -0

261 lines not on this page · raw message

drivers/dma-buf/heaps/heap-helpers.h new file +55 -0

55 lines not on this page · raw message

include/linux/dma-heap.h +1 -13
index d7bf624..d17b839 100644
@@ -12,19 +12,7 @@
 #include <linux/cdev.h>
 #include <linux/types.h>
 
-/**
- * struct dma_heap_buffer - metadata for a particular buffer
- * @heap:		back pointer to the heap the buffer came from
- * @dmabuf:		backing dma-buf for this buffer
- * @size:		size of the buffer
- * @flags:		buffer specific flags
- */
-struct dma_heap_buffer {
-	struct dma_heap *heap;
-	struct dma_buf *dmabuf;
-	size_t size;
-	unsigned long flags;
-};
+struct dma_heap;
 
 /**
  * struct dma_heap_ops - ops to operate on a given heap
Signature · 1 line
2.7.4
#3 lore raw

Re: [RFC][PATCH 2/6 v3] dma-buf: heaps: Add heap helpers

Quoted 419 lines · John Stultz

Add generic helper dmabuf ops for dma heaps, so we can reduce the amount of duplicative code for the exported dmabufs.

This code is an evolution of the Android ION implementation, so thanks to its original authors and maintainters:
Rebecca Schultz Zavin, Colin Cross, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Removed cache management performance hack that I had accidentally folded in.
* Removed stats code that was in helpers
* Lots of checkpatch cleanups

v3:
* Uninline INIT_HEAP_HELPER_BUFFER (suggested by Christoph)
* Switch to WARN on buffer destroy failure (suggested by Brian)
* buffer->kmap_cnt decrementing cleanup (suggested by Christoph)
* Extra buffer->vaddr checking in dma_heap_dma_buf_kmap (suggested by Brian)
* Switch to_helper_buffer from macro to inline function (suggested by Benjamin)
* Rename kmap->vmap (folded in from Andrew)
* Use vmap for vmapping - not begin_cpu_access (folded in from Andrew)
* Drop kmap for now, as its optional (folded in from Andrew)
* Fold dma_heap_map_user into the single caller (foled in from Andrew)
* Folded in patch from Andrew to track page list per heap not sglist, which simplifies the tracking logic

---
 drivers/dma-buf/Makefile             |   1 +
 drivers/dma-buf/heaps/Makefile       |   2 +
 drivers/dma-buf/heaps/heap-helpers.c | 261 +++++++++++++++++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h |  55 ++++++++
 include/linux/dma-heap.h             |  14 +-
 5 files changed, 320 insertions(+), 13 deletions(-)
 create mode 100644 drivers/dma-buf/heaps/Makefile
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
drivers/dma-buf/Makefile +1 -0
index b0332f1..09c2f2d 100644
@@ -1,4 +1,5 @@
 obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o
+obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/
 obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
 obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
 obj-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
drivers/dma-buf/heaps/Makefile new file +2 -0
new file mode 100644
index 0000000..de49898
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y					+= heap-helpers.o
drivers/dma-buf/heaps/heap-helpers.c new file +261 -0
new file mode 100644
index 0000000..00cbdbb
@@ -0,0 +1,261 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/err.h>
+#include <linux/idr.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+#include <uapi/linux/dma-heap.h>
+
+#include "heap-helpers.h"
+
+void INIT_HEAP_HELPER_BUFFER(struct heap_helper_buffer *buffer,
+			     void (*free)(struct heap_helper_buffer *))
+{
+	buffer->private_flags = 0;
+	buffer->priv_virt = NULL;
+	mutex_init(&buffer->lock);
+	buffer->vmap_cnt = 0;
+	buffer->vaddr = NULL;
+	INIT_LIST_HEAD(&buffer->attachments);
+	buffer->free = free;
+}
+
+
+static void *dma_heap_map_kernel(struct heap_helper_buffer *buffer)
+{
+	void *vaddr;
+
+	vaddr = vmap(buffer->pages, buffer->pagecount, VM_MAP, PAGE_KERNEL);
+	if (!vaddr)
+		return ERR_PTR(-ENOMEM);
+
+	return vaddr;
+}
+
+void dma_heap_buffer_destroy(struct dma_heap_buffer *heap_buffer)
+{
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+
+	if (buffer->vmap_cnt > 0) {
+		WARN("%s: buffer still mapped in the kernel\n",
+			     __func__);
+		vunmap(buffer->vaddr);
+	}
+
+	buffer->free(buffer);
+}
+
+static void *dma_heap_buffer_vmap_get(struct dma_heap_buffer *heap_buffer)
+{
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+	void *vaddr;
+
+	if (buffer->vmap_cnt) {
+		buffer->vmap_cnt++;
+		return buffer->vaddr;
+	}
+	vaddr = dma_heap_map_kernel(buffer);
+	if (WARN_ONCE(!vaddr,
+		      "heap->ops->map_kernel should return ERR_PTR on error"))
+		return ERR_PTR(-EINVAL);
+	if (IS_ERR(vaddr))
+		return vaddr;
+	buffer->vaddr = vaddr;
+	buffer->vmap_cnt++;
+	return vaddr;
+}
+
+static void dma_heap_buffer_vmap_put(struct dma_heap_buffer *heap_buffer)
+{
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+
+	if (!--buffer->vmap_cnt) {
+		vunmap(buffer->vaddr);
+		buffer->vaddr = NULL;
+	}
+}
+
+struct dma_heaps_attachment {
+	struct device *dev;
+	struct sg_table table;
+	struct list_head list;
+};
+
+static int dma_heap_attach(struct dma_buf *dmabuf,
+			      struct dma_buf_attachment *attachment)
+{
+	struct dma_heaps_attachment *a;
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+	int ret;
+
+	a = kzalloc(sizeof(*a), GFP_KERNEL);
+	if (!a)
+		return -ENOMEM;
+
+	ret = sg_alloc_table_from_pages(&a->table, buffer->pages,
+					buffer->pagecount, 0,
+					buffer->pagecount << PAGE_SHIFT,
+					GFP_KERNEL);
+	if (ret) {
+		kfree(a);
+		return ret;
+	}
+
+	a->dev = attachment->dev;
+	INIT_LIST_HEAD(&a->list);
+
+	attachment->priv = a;
+
+	mutex_lock(&buffer->lock);
+	list_add(&a->list, &buffer->attachments);
+	mutex_unlock(&buffer->lock);
+
+	return 0;
+}
+
+static void dma_heap_detatch(struct dma_buf *dmabuf,
+				struct dma_buf_attachment *attachment)
+{
+	struct dma_heaps_attachment *a = attachment->priv;
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+
+	mutex_lock(&buffer->lock);
+	list_del(&a->list);
+	mutex_unlock(&buffer->lock);
+
+	sg_free_table(&a->table);
+	kfree(a);
+}
+
+static struct sg_table *dma_heap_map_dma_buf(
+					struct dma_buf_attachment *attachment,
+					enum dma_data_direction direction)
+{
+	struct dma_heaps_attachment *a = attachment->priv;
+	struct sg_table *table;
+
+	table = &a->table;
+
+	if (!dma_map_sg(attachment->dev, table->sgl, table->nents,
+			direction))
+		table = ERR_PTR(-ENOMEM);
+	return table;
+}
+
+static void dma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment,
+			      struct sg_table *table,
+			      enum dma_data_direction direction)
+{
+	dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction);
+}
+
+static vm_fault_t dma_heap_vm_fault(struct vm_fault *vmf)
+{
+	struct vm_area_struct *vma = vmf->vma;
+	struct heap_helper_buffer *buffer = vma->vm_private_data;
+
+	vmf->page = buffer->pages[vmf->pgoff];
+	get_page(vmf->page);
+
+	return 0;
+}
+
+static const struct vm_operations_struct dma_heap_vm_ops = {
+	.fault = dma_heap_vm_fault,
+};
+
+static int dma_heap_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
+{
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+
+	if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0)
+		return -EINVAL;
+
+	vma->vm_ops = &dma_heap_vm_ops;
+	vma->vm_private_data = buffer;
+
+	return 0;
+}
+
+static void dma_heap_dma_buf_release(struct dma_buf *dmabuf)
+{
+	struct dma_heap_buffer *buffer = dmabuf->priv;
+
+	dma_heap_buffer_destroy(buffer);
+}
+
+static int dma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
+					enum dma_data_direction direction)
+{
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+	struct dma_heaps_attachment *a;
+	int ret = 0;
+
+	mutex_lock(&buffer->lock);
+	list_for_each_entry(a, &buffer->attachments, list) {
+		dma_sync_sg_for_cpu(a->dev, a->table.sgl, a->table.nents,
+				    direction);
+	}
+	mutex_unlock(&buffer->lock);
+
+	return ret;
+}
+
+static int dma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
+				      enum dma_data_direction direction)
+{
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+	struct dma_heaps_attachment *a;
+
+	mutex_lock(&buffer->lock);
+	list_for_each_entry(a, &buffer->attachments, list) {
+		dma_sync_sg_for_device(a->dev, a->table.sgl, a->table.nents,
+				       direction);
+	}
+	mutex_unlock(&buffer->lock);
+
+	return 0;
+}
+
+void *dma_heap_dma_buf_vmap(struct dma_buf *dmabuf)
+{
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+	void *vaddr;
+
+	mutex_lock(&buffer->lock);
+	vaddr = dma_heap_buffer_vmap_get(heap_buffer);
+	mutex_unlock(&buffer->lock);
+
+	return vaddr;
+}
+
+void dma_heap_dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
+{
+	struct dma_heap_buffer *heap_buffer = dmabuf->priv;
+	struct heap_helper_buffer *buffer = to_helper_buffer(heap_buffer);
+
+	mutex_lock(&buffer->lock);
+	dma_heap_buffer_vmap_put(heap_buffer);
+	mutex_unlock(&buffer->lock);
+}
+
+const struct dma_buf_ops heap_helper_ops = {
+	.map_dma_buf = dma_heap_map_dma_buf,
+	.unmap_dma_buf = dma_heap_unmap_dma_buf,
+	.mmap = dma_heap_mmap,
+	.release = dma_heap_dma_buf_release,
+	.attach = dma_heap_attach,
+	.detach = dma_heap_detatch,
+	.begin_cpu_access = dma_heap_dma_buf_begin_cpu_access,
+	.end_cpu_access = dma_heap_dma_buf_end_cpu_access,
+	.vmap = dma_heap_dma_buf_vmap,
+	.vunmap = dma_heap_dma_buf_vunmap,
+};
drivers/dma-buf/heaps/heap-helpers.h new file +55 -0
new file mode 100644
index 0000000..a17502d
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * DMABUF Heaps helper code
+ *
+ * Copyright (C) 2011 Google, Inc.
+ * Copyright (C) 2019 Linaro Ltd.
+ */
+
+#ifndef _HEAP_HELPERS_H
+#define _HEAP_HELPERS_H
+
+#include <linux/dma-heap.h>
+#include <linux/list.h>
+
+/**
+ * struct dma_heap_buffer - metadata for a particular buffer
+ * @heap:		back pointer to the heap the buffer came from
+ * @dmabuf:		backing dma-buf for this buffer
+ * @size:		size of the buffer
+ * @flags:		buffer specific flags
+ */
+struct dma_heap_buffer {
+	struct dma_heap *heap;
+	struct dma_buf *dmabuf;
+	size_t size;
+	unsigned long flags;
+};
+
+struct heap_helper_buffer {
+	struct dma_heap_buffer heap_buffer;
+
+	unsigned long private_flags;
+	void *priv_virt;
+	struct mutex lock;
+	int vmap_cnt;
+	void *vaddr;
+	pgoff_t pagecount;
+	struct page **pages;
+	struct list_head attachments;
+
+	void (*free)(struct heap_helper_buffer *buffer);
+
+};
+
+static inline struct heap_helper_buffer *to_helper_buffer(
+						struct dma_heap_buffer *h)
+{
+	return container_of(h, struct heap_helper_buffer, heap_buffer);
+}
+
+void INIT_HEAP_HELPER_BUFFER(struct heap_helper_buffer *buffer,
+				 void (*free)(struct heap_helper_buffer *));
+extern const struct dma_buf_ops heap_helper_ops;
+
+#endif /* _HEAP_HELPERS_H */
include/linux/dma-heap.h +0 -5
index d7bf624..d17b839 100644
@@ -12,19 +12,7 @@
 #include <linux/cdev.h>
 #include <linux/types.h>
 
-/**
- * struct dma_heap_buffer - metadata for a particular buffer
- * @heap:		back pointer to the heap the buffer came from
- * @dmabuf:		backing dma-buf for this buffer
- * @size:		size of the buffer

include/linux/dma-heap.h line 16

Quoted 10 lines
include/linux/dma-heap.h +1 -8
- * @flags:		buffer specific flags
- */
-struct dma_heap_buffer {
-	struct dma_heap *heap;
-	struct dma_buf *dmabuf;
-	size_t size;
-	unsigned long flags;
-};
+struct dma_heap;
 

This change can get squashed into the first patch.

Andrew

include/linux/dma-heap.h line 18

Quoted 3 lines
include/linux/dma-heap.h +0 -0
 /**
  * struct dma_heap_ops - ops to operate on a given heap

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

#4 lore raw

RFC PATCH v3 3/6 dma-buf: heaps: Add system heap to dmabuf heaps

In reply to John Stultz

This patch adds system heap to the dma-buf heaps framework.

This allows applications to get a page-allocator backed dma-buf for non-contiguous memory.

This code is an evolution of the Android ION implementation, so thanks to its original authors and maintainters:
Rebecca Schultz Zavin, Colin Cross, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
* Droped dead system-contig code
v3:
* Whitespace fixups from Benjamin
* Make sure we're zeroing the allocated pages (from Liam)
* Use PAGE_ALIGN() consistently (suggested by Brian)
* Fold in new registration style from Andrew
* Avoid needless dynamic allocation of sys_heap (suggested by Christoph)
* Minor cleanups
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/Kconfig             |   2 +
 drivers/dma-buf/heaps/Kconfig       |   6 ++
 drivers/dma-buf/heaps/Makefile      |   1 +
 drivers/dma-buf/heaps/system_heap.c | 120 ++++++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/Kconfig
 create mode 100644 drivers/dma-buf/heaps/system_heap.c
drivers/dma-buf/Kconfig +2 -0
index 09c61db..63c139d 100644
@@ -47,4 +47,6 @@ menuconfig DMABUF_HEAPS
 	  this allows userspace to allocate dma-bufs that can be shared between
 	  drivers.
 
+source "drivers/dma-buf/heaps/Kconfig"
+
 endmenu
drivers/dma-buf/heaps/Kconfig new file +6 -0
new file mode 100644
index 0000000..2050527
@@ -0,0 +1,6 @@
+config DMABUF_HEAPS_SYSTEM
+	bool "DMA-BUF System Heap"
+	depends on DMABUF_HEAPS
+	help
+	  Choose this option to enable the system dmabuf heap. The system heap
+	  is backed by pages from the buddy allocator. If in doubt, say Y.
drivers/dma-buf/heaps/Makefile +1 -0
index de49898..d1808ec 100644
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y					+= heap-helpers.o
+obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
drivers/dma-buf/heaps/system_heap.c new file +120 -0

120 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

RFC PATCH v3 4/6 dma-buf: heaps: Add CMA heap to dmabuf heapss

In reply to John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
 	help
 	  Choose this option to enable the system dmabuf heap. The system heap
 	  is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+	bool "DMA-BUF CMA Heap"
+	depends on DMABUF_HEAPS && DMA_CMA
+	help
+	  Choose this option to enable dma-buf CMA heap. This heap is backed
+	  by the Contiguous Memory Allocator (CMA). If your system has these
+	  regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y					+= heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +170 -0

170 lines not on this page · raw message

Signature · 1 line
2.7.4
#6 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

Quoted 173 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
        help
          Choose this option to enable the system dmabuf heap. The system heap
          is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+       bool "DMA-BUF CMA Heap"
+       depends on DMABUF_HEAPS && DMA_CMA
+       help
+         Choose this option to enable dma-buf CMA heap. This heap is backed
+         by the Contiguous Memory Allocator (CMA). If your system has these
+         regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y                                  += heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)      += system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)         += cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +97 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+       struct dma_heap *heap;
+       struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+       struct page *pages = buffer->priv_virt;
+       unsigned long nr_pages;
+
+       nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;
+
+       /* free page list */
+       kfree(buffer->pages);
+       /* release memory */
+       cma_release(cma_heap->cma, pages, nr_pages);
+       kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+                               unsigned long len,
+                               unsigned long flags)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(heap);
+       struct heap_helper_buffer *helper_buffer;
+       struct page *pages;
+       size_t size = PAGE_ALIGN(len);
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       unsigned long align = get_order(size);
+       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+       struct dma_buf *dmabuf;
+       int ret = -ENOMEM;
+       pgoff_t pg;
+
+       if (align > CONFIG_CMA_ALIGNMENT)
+               align = CONFIG_CMA_ALIGNMENT;
+
+       helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+       if (!helper_buffer)
+               return -ENOMEM;
+
+       INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+       helper_buffer->heap_buffer.flags = flags;
+       helper_buffer->heap_buffer.heap = heap;
+       helper_buffer->heap_buffer.size = len;
+
+       pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+       if (!pages)
+               goto free_buf;
+
+       if (PageHighMem(pages)) {
+               unsigned long nr_clear_pages = nr_pages;
+               struct page *page = pages;
+
+               while (nr_clear_pages > 0) {
+                       void *vaddr = kmap_atomic(page);
+
+                       memset(vaddr, 0, PAGE_SIZE);
+                       kunmap_atomic(vaddr);
+                       page++;
+                       nr_clear_pages--;
+               }
+       } else {
+               memset(page_address(pages), 0, size);
+       }
+
+       helper_buffer->pagecount = nr_pages;
+       helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+                                            sizeof(*helper_buffer->pages),
+                                            GFP_KERNEL);
+       if (!helper_buffer->pages) {
+               ret = -ENOMEM;
+               goto free_cma;
+       }
+

drivers/dma-buf/heaps/cma_heap.c line 107

Quoted 10 lines
drivers/dma-buf/heaps/cma_heap.c new file +10 -0
+       for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+               helper_buffer->pages[pg] = &pages[pg];
+               if (!helper_buffer->pages[pg])
+                       goto free_pages;
+       }
+
+       /* create the dmabuf */
+       exp_info.ops = &heap_helper_ops;
+       exp_info.size = len;
+       exp_info.flags = O_RDWR;

I think that the flags should be provided when requesting the allocation like it is done in DRM or V4L2.
For me DMA_HEAP_VALID_FLAGS = (O_CLOEXEC | O_ACCMODE).

Benjamin

Benjamin

Quoted 66 lines
drivers/dma-buf/heaps/cma_heap.c new file +63 -1
+       exp_info.priv = &helper_buffer->heap_buffer;
+       dmabuf = dma_buf_export(&exp_info);
+       if (IS_ERR(dmabuf)) {
+               ret = PTR_ERR(dmabuf);
+               goto free_pages;
+       }
+
+       helper_buffer->heap_buffer.dmabuf = dmabuf;
+       helper_buffer->priv_virt = pages;
+
+       ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+       if (ret < 0) {
+               dma_buf_put(dmabuf);
+               /* just return, as put will call release and that will free */
+               return ret;
+       }
+
+       return ret;
+
+free_pages:
+       kfree(helper_buffer->pages);
+free_cma:
+       cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+       kfree(helper_buffer);
+       return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+       .allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+       struct cma_heap *cma_heap;
+       struct dma_heap_export_info exp_info;
+
+       cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+       if (!cma_heap)
+               return -ENOMEM;
+       cma_heap->cma = cma;
+
+       exp_info.name = cma_get_name(cma);
+       exp_info.ops = &cma_heap_ops;
+       exp_info.priv = cma_heap;
+
+       cma_heap->heap = dma_heap_add(&exp_info);
+       if (IS_ERR(cma_heap->heap)) {
+               int ret = PTR_ERR(cma_heap->heap);
+
+               kfree(cma_heap);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int add_cma_heaps(void)
+{
+       cma_for_each_area(__add_cma_heap, NULL);
+       return 0;
+}
+device_initcall(add_cma_heaps);
--

2.7.4

#7 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

Quoted 180 lines · Benjamin Gaignard
Quoted 179 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
        help
          Choose this option to enable the system dmabuf heap. The system heap
          is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+       bool "DMA-BUF CMA Heap"
+       depends on DMABUF_HEAPS && DMA_CMA
+       help
+         Choose this option to enable dma-buf CMA heap. This heap is backed
+         by the Contiguous Memory Allocator (CMA). If your system has these
+         regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y                                  += heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)      += system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)         += cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +103 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+       struct dma_heap *heap;
+       struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+       struct page *pages = buffer->priv_virt;
+       unsigned long nr_pages;
+
+       nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;
+
+       /* free page list */
+       kfree(buffer->pages);
+       /* release memory */
+       cma_release(cma_heap->cma, pages, nr_pages);
+       kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+                               unsigned long len,
+                               unsigned long flags)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(heap);
+       struct heap_helper_buffer *helper_buffer;
+       struct page *pages;
+       size_t size = PAGE_ALIGN(len);
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       unsigned long align = get_order(size);
+       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+       struct dma_buf *dmabuf;
+       int ret = -ENOMEM;
+       pgoff_t pg;
+
+       if (align > CONFIG_CMA_ALIGNMENT)
+               align = CONFIG_CMA_ALIGNMENT;
+
+       helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+       if (!helper_buffer)
+               return -ENOMEM;
+
+       INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+       helper_buffer->heap_buffer.flags = flags;
+       helper_buffer->heap_buffer.heap = heap;
+       helper_buffer->heap_buffer.size = len;
+
+       pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+       if (!pages)
+               goto free_buf;
+
+       if (PageHighMem(pages)) {
+               unsigned long nr_clear_pages = nr_pages;
+               struct page *page = pages;
+
+               while (nr_clear_pages > 0) {
+                       void *vaddr = kmap_atomic(page);
+
+                       memset(vaddr, 0, PAGE_SIZE);
+                       kunmap_atomic(vaddr);
+                       page++;
+                       nr_clear_pages--;
+               }
+       } else {
+               memset(page_address(pages), 0, size);
+       }
+
+       helper_buffer->pagecount = nr_pages;
+       helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+                                            sizeof(*helper_buffer->pages),
+                                            GFP_KERNEL);
+       if (!helper_buffer->pages) {
+               ret = -ENOMEM;
+               goto free_cma;
+       }
+
+       for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+               helper_buffer->pages[pg] = &pages[pg];
+               if (!helper_buffer->pages[pg])
+                       goto free_pages;
+       }
+
Quoted 9 lines

drivers/dma-buf/heaps/cma_heap.c line 107

Quoted 4 lines
drivers/dma-buf/heaps/cma_heap.c new file +4 -0
+       /* create the dmabuf */
+       exp_info.ops = &heap_helper_ops;
+       exp_info.size = len;
+       exp_info.flags = O_RDWR;

I think that the flags should be provided when requesting the allocation like it is done in DRM or V4L2.
For me DMA_HEAP_VALID_FLAGS = (O_CLOEXEC | O_ACCMODE).

So something like done in udmabuf?

https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/linux/udmabuf.h#L8

I think that can be arranged.

John,

This might be a good reason to move the dma_buf_fd() call below out of the heap and back into the core. That way the file exporting flags can be common and core handled. I don't think it would complicate the error handling any as we only need to dma_buf_put(dmabuf) in the core on failure and the heap specific cleanup will happen for us.

Andrew

Quoted 62 lines

Benjamin

Benjamin

Quoted 58 lines
drivers/dma-buf/heaps/cma_heap.c new file +58 -0
+       exp_info.priv = &helper_buffer->heap_buffer;
+       dmabuf = dma_buf_export(&exp_info);
+       if (IS_ERR(dmabuf)) {
+               ret = PTR_ERR(dmabuf);
+               goto free_pages;
+       }
+
+       helper_buffer->heap_buffer.dmabuf = dmabuf;
+       helper_buffer->priv_virt = pages;
+
+       ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+       if (ret < 0) {
+               dma_buf_put(dmabuf);
+               /* just return, as put will call release and that will free */
+               return ret;
+       }
+
+       return ret;
+
+free_pages:
+       kfree(helper_buffer->pages);
+free_cma:
+       cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+       kfree(helper_buffer);
+       return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+       .allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+       struct cma_heap *cma_heap;
+       struct dma_heap_export_info exp_info;
+
+       cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+       if (!cma_heap)
+               return -ENOMEM;
+       cma_heap->cma = cma;
+
+       exp_info.name = cma_get_name(cma);
+       exp_info.ops = &cma_heap_ops;
+       exp_info.priv = cma_heap;
+
+       cma_heap->heap = dma_heap_add(&exp_info);
+       if (IS_ERR(cma_heap->heap)) {
+               int ret = PTR_ERR(cma_heap->heap);
+
+               kfree(cma_heap);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int add_cma_heaps(void)
Quoted 8 lines
Quoted 8 lines
drivers/dma-buf/heaps/cma_heap.c new file +5 -1
+{
+       cma_for_each_area(__add_cma_heap, NULL);
+       return 0;
+}
+device_initcall(add_cma_heaps);
--

2.7.4

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

#8 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

Quoted 193 lines · Andrew F. Davis
Quoted 180 lines · Benjamin Gaignard
Quoted 179 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
        help
          Choose this option to enable the system dmabuf heap. The system heap
          is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+       bool "DMA-BUF CMA Heap"
+       depends on DMABUF_HEAPS && DMA_CMA
+       help
+         Choose this option to enable dma-buf CMA heap. This heap is backed
+         by the Contiguous Memory Allocator (CMA). If your system has these
+         regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y                                  += heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)      += system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)         += cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +103 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+       struct dma_heap *heap;
+       struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+       struct page *pages = buffer->priv_virt;
+       unsigned long nr_pages;
+
+       nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;
+
+       /* free page list */
+       kfree(buffer->pages);
+       /* release memory */
+       cma_release(cma_heap->cma, pages, nr_pages);
+       kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+                               unsigned long len,
+                               unsigned long flags)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(heap);
+       struct heap_helper_buffer *helper_buffer;
+       struct page *pages;
+       size_t size = PAGE_ALIGN(len);
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       unsigned long align = get_order(size);
+       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+       struct dma_buf *dmabuf;
+       int ret = -ENOMEM;
+       pgoff_t pg;
+
+       if (align > CONFIG_CMA_ALIGNMENT)
+               align = CONFIG_CMA_ALIGNMENT;
+
+       helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+       if (!helper_buffer)
+               return -ENOMEM;
+
+       INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+       helper_buffer->heap_buffer.flags = flags;
+       helper_buffer->heap_buffer.heap = heap;
+       helper_buffer->heap_buffer.size = len;
+
+       pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+       if (!pages)
+               goto free_buf;
+
+       if (PageHighMem(pages)) {
+               unsigned long nr_clear_pages = nr_pages;
+               struct page *page = pages;
+
+               while (nr_clear_pages > 0) {
+                       void *vaddr = kmap_atomic(page);
+
+                       memset(vaddr, 0, PAGE_SIZE);
+                       kunmap_atomic(vaddr);
+                       page++;
+                       nr_clear_pages--;
+               }
+       } else {
+               memset(page_address(pages), 0, size);
+       }
+
+       helper_buffer->pagecount = nr_pages;
+       helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+                                            sizeof(*helper_buffer->pages),
+                                            GFP_KERNEL);
+       if (!helper_buffer->pages) {
+               ret = -ENOMEM;
+               goto free_cma;
+       }
+
+       for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+               helper_buffer->pages[pg] = &pages[pg];
+               if (!helper_buffer->pages[pg])
+                       goto free_pages;
+       }
+
Quoted 9 lines

drivers/dma-buf/heaps/cma_heap.c line 107

Quoted 4 lines
drivers/dma-buf/heaps/cma_heap.c new file +4 -0
+       /* create the dmabuf */
+       exp_info.ops = &heap_helper_ops;
+       exp_info.size = len;
+       exp_info.flags = O_RDWR;

I think that the flags should be provided when requesting the allocation like it is done in DRM or V4L2.
For me DMA_HEAP_VALID_FLAGS = (O_CLOEXEC | O_ACCMODE).

Quoted 5 lines

So something like done in udmabuf?

https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/linux/udmabuf.h#L8

I think that can be arranged.

I have in mind what is done by DRM:
https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/drm/drm.h#L707

V4L2 does the same but without redefine the flags (which is better)

Benjamin

Quoted 82 lines

John,

This might be a good reason to move the dma_buf_fd() call below out of the heap and back into the core. That way the file exporting flags can be common and core handled. I don't think it would complicate the error handling any as we only need to dma_buf_put(dmabuf) in the core on failure and the heap specific cleanup will happen for us.

Andrew

Quoted 70 lines

Benjamin

Benjamin

Quoted 66 lines
drivers/dma-buf/heaps/cma_heap.c new file +63 -1
+       exp_info.priv = &helper_buffer->heap_buffer;
+       dmabuf = dma_buf_export(&exp_info);
+       if (IS_ERR(dmabuf)) {
+               ret = PTR_ERR(dmabuf);
+               goto free_pages;
+       }
+
+       helper_buffer->heap_buffer.dmabuf = dmabuf;
+       helper_buffer->priv_virt = pages;
+
+       ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+       if (ret < 0) {
+               dma_buf_put(dmabuf);
+               /* just return, as put will call release and that will free */
+               return ret;
+       }
+
+       return ret;
+
+free_pages:
+       kfree(helper_buffer->pages);
+free_cma:
+       cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+       kfree(helper_buffer);
+       return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+       .allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+       struct cma_heap *cma_heap;
+       struct dma_heap_export_info exp_info;
+
+       cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+       if (!cma_heap)
+               return -ENOMEM;
+       cma_heap->cma = cma;
+
+       exp_info.name = cma_get_name(cma);
+       exp_info.ops = &cma_heap_ops;
+       exp_info.priv = cma_heap;
+
+       cma_heap->heap = dma_heap_add(&exp_info);
+       if (IS_ERR(cma_heap->heap)) {
+               int ret = PTR_ERR(cma_heap->heap);
+
+               kfree(cma_heap);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int add_cma_heaps(void)
+{
+       cma_for_each_area(__add_cma_heap, NULL);
+       return 0;
+}
+device_initcall(add_cma_heaps);
--

2.7.4

#9 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

Quoted 196 lines · Benjamin Gaignard
Quoted 195 lines · Andrew F. Davis
Quoted 180 lines · Benjamin Gaignard
Quoted 179 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
        help
          Choose this option to enable the system dmabuf heap. The system heap
          is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+       bool "DMA-BUF CMA Heap"
+       depends on DMABUF_HEAPS && DMA_CMA
+       help
+         Choose this option to enable dma-buf CMA heap. This heap is backed
+         by the Contiguous Memory Allocator (CMA). If your system has these
+         regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y                                  += heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)      += system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)         += cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +103 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+       struct dma_heap *heap;
+       struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+       struct page *pages = buffer->priv_virt;
+       unsigned long nr_pages;
+
+       nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;
+
+       /* free page list */
+       kfree(buffer->pages);
+       /* release memory */
+       cma_release(cma_heap->cma, pages, nr_pages);
+       kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+                               unsigned long len,
+                               unsigned long flags)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(heap);
+       struct heap_helper_buffer *helper_buffer;
+       struct page *pages;
+       size_t size = PAGE_ALIGN(len);
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       unsigned long align = get_order(size);
+       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+       struct dma_buf *dmabuf;
+       int ret = -ENOMEM;
+       pgoff_t pg;
+
+       if (align > CONFIG_CMA_ALIGNMENT)
+               align = CONFIG_CMA_ALIGNMENT;
+
+       helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+       if (!helper_buffer)
+               return -ENOMEM;
+
+       INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+       helper_buffer->heap_buffer.flags = flags;
+       helper_buffer->heap_buffer.heap = heap;
+       helper_buffer->heap_buffer.size = len;
+
+       pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+       if (!pages)
+               goto free_buf;
+
+       if (PageHighMem(pages)) {
+               unsigned long nr_clear_pages = nr_pages;
+               struct page *page = pages;
+
+               while (nr_clear_pages > 0) {
+                       void *vaddr = kmap_atomic(page);
+
+                       memset(vaddr, 0, PAGE_SIZE);
+                       kunmap_atomic(vaddr);
+                       page++;
+                       nr_clear_pages--;
+               }
+       } else {
+               memset(page_address(pages), 0, size);
+       }
+
+       helper_buffer->pagecount = nr_pages;
+       helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+                                            sizeof(*helper_buffer->pages),
+                                            GFP_KERNEL);
+       if (!helper_buffer->pages) {
+               ret = -ENOMEM;
+               goto free_cma;
+       }
+
+       for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+               helper_buffer->pages[pg] = &pages[pg];
+               if (!helper_buffer->pages[pg])
+                       goto free_pages;
+       }
+
Quoted 9 lines

drivers/dma-buf/heaps/cma_heap.c line 107

Quoted 4 lines
drivers/dma-buf/heaps/cma_heap.c new file +4 -0
+       /* create the dmabuf */
+       exp_info.ops = &heap_helper_ops;
+       exp_info.size = len;
+       exp_info.flags = O_RDWR;

I think that the flags should be provided when requesting the allocation like it is done in DRM or V4L2.
For me DMA_HEAP_VALID_FLAGS = (O_CLOEXEC | O_ACCMODE).

So something like done in udmabuf?

Quoted 9 lines
Quoted 3 lines

https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/linux/udmabuf.h#L8

I think that can be arranged.

I have in mind what is done by DRM:
https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/drm/drm.h#L707

V4L2 does the same but without redefine the flags (which is better)

That would mean we would need a whole flag word passed in just for file flags when I only ever see one bit being useful(O_CLOEXEC or not). Do you see any situation where we need more than default O_RDWR and optional O_CLOEXEC for a dma-buf file?

Andrew

Quoted 76 lines

Benjamin

Quoted 74 lines

John,

This might be a good reason to move the dma_buf_fd() call below out of the heap and back into the core. That way the file exporting flags can be common and core handled. I don't think it would complicate the error handling any as we only need to dma_buf_put(dmabuf) in the core on failure and the heap specific cleanup will happen for us.

Andrew

Quoted 62 lines

Benjamin

Benjamin

Quoted 58 lines
drivers/dma-buf/heaps/cma_heap.c new file +58 -0
+       exp_info.priv = &helper_buffer->heap_buffer;
+       dmabuf = dma_buf_export(&exp_info);
+       if (IS_ERR(dmabuf)) {
+               ret = PTR_ERR(dmabuf);
+               goto free_pages;
+       }
+
+       helper_buffer->heap_buffer.dmabuf = dmabuf;
+       helper_buffer->priv_virt = pages;
+
+       ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+       if (ret < 0) {
+               dma_buf_put(dmabuf);
+               /* just return, as put will call release and that will free */
+               return ret;
+       }
+
+       return ret;
+
+free_pages:
+       kfree(helper_buffer->pages);
+free_cma:
+       cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+       kfree(helper_buffer);
+       return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+       .allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+       struct cma_heap *cma_heap;
+       struct dma_heap_export_info exp_info;
+
+       cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+       if (!cma_heap)
+               return -ENOMEM;
+       cma_heap->cma = cma;
+
+       exp_info.name = cma_get_name(cma);
+       exp_info.ops = &cma_heap_ops;
+       exp_info.priv = cma_heap;
+
+       cma_heap->heap = dma_heap_add(&exp_info);
+       if (IS_ERR(cma_heap->heap)) {
+               int ret = PTR_ERR(cma_heap->heap);
+
+               kfree(cma_heap);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int add_cma_heaps(void)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/dma-buf/heaps/cma_heap.c new file +5 -1
+{
+       cma_for_each_area(__add_cma_heap, NULL);
+       return 0;
+}
+device_initcall(add_cma_heaps);
--

2.7.4

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

#10 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

Quoted 205 lines · Andrew F. Davis
Quoted 203 lines · Benjamin Gaignard
Quoted 193 lines · Andrew F. Davis
Quoted 180 lines · Benjamin Gaignard
Quoted 179 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
        help
          Choose this option to enable the system dmabuf heap. The system heap
          is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+       bool "DMA-BUF CMA Heap"
+       depends on DMABUF_HEAPS && DMA_CMA
+       help
+         Choose this option to enable dma-buf CMA heap. This heap is backed
+         by the Contiguous Memory Allocator (CMA). If your system has these
+         regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y                                  += heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)      += system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)         += cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +103 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+       struct dma_heap *heap;
+       struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+       struct page *pages = buffer->priv_virt;
+       unsigned long nr_pages;
+
+       nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;
+
+       /* free page list */
+       kfree(buffer->pages);
+       /* release memory */
+       cma_release(cma_heap->cma, pages, nr_pages);
+       kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+                               unsigned long len,
+                               unsigned long flags)
+{
+       struct cma_heap *cma_heap = dma_heap_get_data(heap);
+       struct heap_helper_buffer *helper_buffer;
+       struct page *pages;
+       size_t size = PAGE_ALIGN(len);
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       unsigned long align = get_order(size);
+       DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+       struct dma_buf *dmabuf;
+       int ret = -ENOMEM;
+       pgoff_t pg;
+
+       if (align > CONFIG_CMA_ALIGNMENT)
+               align = CONFIG_CMA_ALIGNMENT;
+
+       helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+       if (!helper_buffer)
+               return -ENOMEM;
+
+       INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+       helper_buffer->heap_buffer.flags = flags;
+       helper_buffer->heap_buffer.heap = heap;
+       helper_buffer->heap_buffer.size = len;
+
+       pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+       if (!pages)
+               goto free_buf;
+
+       if (PageHighMem(pages)) {
+               unsigned long nr_clear_pages = nr_pages;
+               struct page *page = pages;
+
+               while (nr_clear_pages > 0) {
+                       void *vaddr = kmap_atomic(page);
+
+                       memset(vaddr, 0, PAGE_SIZE);
+                       kunmap_atomic(vaddr);
+                       page++;
+                       nr_clear_pages--;
+               }
+       } else {
+               memset(page_address(pages), 0, size);
+       }
+
+       helper_buffer->pagecount = nr_pages;
+       helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+                                            sizeof(*helper_buffer->pages),
+                                            GFP_KERNEL);
+       if (!helper_buffer->pages) {
+               ret = -ENOMEM;
+               goto free_cma;
+       }
+
+       for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+               helper_buffer->pages[pg] = &pages[pg];
+               if (!helper_buffer->pages[pg])
+                       goto free_pages;
+       }
+
Quoted 9 lines

drivers/dma-buf/heaps/cma_heap.c line 107

Quoted 4 lines
drivers/dma-buf/heaps/cma_heap.c new file +4 -0
+       /* create the dmabuf */
+       exp_info.ops = &heap_helper_ops;
+       exp_info.size = len;
+       exp_info.flags = O_RDWR;

I think that the flags should be provided when requesting the allocation like it is done in DRM or V4L2.
For me DMA_HEAP_VALID_FLAGS = (O_CLOEXEC | O_ACCMODE).

Quoted 5 lines

So something like done in udmabuf?

https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/linux/udmabuf.h#L8

I think that can be arranged.

I have in mind what is done by DRM:
https://elixir.bootlin.com/linux/v5.1-rc1/source/include/uapi/drm/drm.h#L707

Quoted 7 lines
Quoted 2 lines

V4L2 does the same but without redefine the flags (which is better)

That would mean we would need a whole flag word passed in just for file flags when I only ever see one bit being useful(O_CLOEXEC or not). Do you see any situation where we need more than default O_RDWR and optional O_CLOEXEC for a dma-buf file?

Yes I really want a whole flag word because distinguish RD/WR only cases could be useful to optimize cache maintenance (and later for secure heaps).

An other argument is that, few years ago, DRM doesn't allow at all O_RDWR flag, but we manage to change this and make it possible.
So you believe that O_RDWR is mandatory will others O_RDWR is useless, put it into a flag will make everybody happy :-)

Benjamin

Quoted 79 lines

Andrew

Quoted 76 lines

Benjamin

Quoted 74 lines

John,

This might be a good reason to move the dma_buf_fd() call below out of the heap and back into the core. That way the file exporting flags can be common and core handled. I don't think it would complicate the error handling any as we only need to dma_buf_put(dmabuf) in the core on failure and the heap specific cleanup will happen for us.

Andrew

Quoted 62 lines

Benjamin

Benjamin

Quoted 58 lines
drivers/dma-buf/heaps/cma_heap.c new file +58 -0
+       exp_info.priv = &helper_buffer->heap_buffer;
+       dmabuf = dma_buf_export(&exp_info);
+       if (IS_ERR(dmabuf)) {
+               ret = PTR_ERR(dmabuf);
+               goto free_pages;
+       }
+
+       helper_buffer->heap_buffer.dmabuf = dmabuf;
+       helper_buffer->priv_virt = pages;
+
+       ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+       if (ret < 0) {
+               dma_buf_put(dmabuf);
+               /* just return, as put will call release and that will free */
+               return ret;
+       }
+
+       return ret;
+
+free_pages:
+       kfree(helper_buffer->pages);
+free_cma:
+       cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+       kfree(helper_buffer);
+       return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+       .allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+       struct cma_heap *cma_heap;
+       struct dma_heap_export_info exp_info;
+
+       cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+       if (!cma_heap)
+               return -ENOMEM;
+       cma_heap->cma = cma;
+
+       exp_info.name = cma_get_name(cma);
+       exp_info.ops = &cma_heap_ops;
+       exp_info.priv = cma_heap;
+
+       cma_heap->heap = dma_heap_add(&exp_info);
+       if (IS_ERR(cma_heap->heap)) {
+               int ret = PTR_ERR(cma_heap->heap);
+
+               kfree(cma_heap);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int add_cma_heaps(void)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/dma-buf/heaps/cma_heap.c new file +5 -1
+{
+       cma_for_each_area(__add_cma_heap, NULL);
+       return 0;
+}
+device_initcall(add_cma_heaps);
--

2.7.4

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

#11 lore raw

Re: [RFC][PATCH 4/6 v3] dma-buf: heaps: Add CMA heap to dmabuf heapss

In reply to John Stultz
Quoted 97 lines · John Stultz

This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.

This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters:
Benjamin Gaignard, Laura Abbott, and others!

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2:
* Switch allocate to return dmabuf fd
* Simplify init code
* Checkpatch fixups
v3:
* Switch to inline function for to_cma_heap()
* Minor cleanups suggested by Brian
* Fold in new registration style from Andrew
* Folded in changes from Andrew to use simplified page list from the heap helpers

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 170 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 2050527..a5eef06 100644
@@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
 	help
 	  Choose this option to enable the system dmabuf heap. The system heap
 	  is backed by pages from the buddy allocator. If in doubt, say Y.
+
+config DMABUF_HEAPS_CMA
+	bool "DMA-BUF CMA Heap"
+	depends on DMABUF_HEAPS && DMA_CMA
+	help
+	  Choose this option to enable dma-buf CMA heap. This heap is backed
+	  by the Contiguous Memory Allocator (CMA). If your system has these
+	  regions, you should say Y here.
drivers/dma-buf/heaps/Makefile +1 -0
index d1808ec..6e54cde 100644
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y					+= heap-helpers.o
 obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
+obj-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
drivers/dma-buf/heaps/cma_heap.c new file +22 -0
new file mode 100644
index 0000000..f4485c60
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * DMABUF CMA heap exporter
+ *
+ * Copyright (C) 2012, 2019 Linaro Ltd.
+ * Author: <[email protected]> for ST-Ericsson.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/cma.h>
+#include <linux/scatterlist.h>
+#include <linux/highmem.h>
+
+#include "heap-helpers.h"
+
+struct cma_heap {
+	struct dma_heap *heap;

drivers/dma-buf/heaps/cma_heap.c line 32

Quoted 10 lines
drivers/dma-buf/heaps/cma_heap.c new file +10 -0
+	struct cma *cma;
+};
+
+static void cma_heap_free(struct heap_helper_buffer *buffer)
+{
+	struct cma_heap *cma_heap = dma_heap_get_data(buffer->heap_buffer.heap);
+	struct page *pages = buffer->priv_virt;
+	unsigned long nr_pages;
+
+	nr_pages = buffer->heap_buffer.size >> PAGE_SHIFT;

Could also use the count in helper_buffer->pagecount.

Quoted 31 lines
drivers/dma-buf/heaps/cma_heap.c new file +31 -0
+
+	/* free page list */
+	kfree(buffer->pages);
+	/* release memory */
+	cma_release(cma_heap->cma, pages, nr_pages);
+	kfree(buffer);
+}
+
+/* dmabuf heap CMA operations functions */
+static int cma_heap_allocate(struct dma_heap *heap,
+				unsigned long len,
+				unsigned long flags)
+{
+	struct cma_heap *cma_heap = dma_heap_get_data(heap);
+	struct heap_helper_buffer *helper_buffer;
+	struct page *pages;
+	size_t size = PAGE_ALIGN(len);
+	unsigned long nr_pages = size >> PAGE_SHIFT;
+	unsigned long align = get_order(size);
+	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
+	struct dma_buf *dmabuf;
+	int ret = -ENOMEM;
+	pgoff_t pg;
+
+	if (align > CONFIG_CMA_ALIGNMENT)
+		align = CONFIG_CMA_ALIGNMENT;
+
+	helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL);
+	if (!helper_buffer)
+		return -ENOMEM;
+

drivers/dma-buf/heaps/cma_heap.c line 73

Quoted 10 lines
drivers/dma-buf/heaps/cma_heap.c new file +10 -0
+	INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free);
+	helper_buffer->heap_buffer.flags = flags;
+	helper_buffer->heap_buffer.heap = heap;
+	helper_buffer->heap_buffer.size = len;
+
+	pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
+	if (!pages)
+		goto free_buf;
+
+	if (PageHighMem(pages)) {

Can the allocated pages list cross the high mem line?

If so then:

foreach(nr_pages) {
	if (PageHighMem(page))
		clear_highpage(page);
	else
		clear_page(page_address(page));
}

If not still should use clear_highpage() below.

Andrew

Quoted 88 lines
drivers/dma-buf/heaps/cma_heap.c new file +87 -0
+		unsigned long nr_clear_pages = nr_pages;
+		struct page *page = pages;
+
+		while (nr_clear_pages > 0) {
+			void *vaddr = kmap_atomic(page);
+
+			memset(vaddr, 0, PAGE_SIZE);
+			kunmap_atomic(vaddr);
+			page++;
+			nr_clear_pages--;
+		}
+	} else {
+		memset(page_address(pages), 0, size);
+	}
+
+	helper_buffer->pagecount = nr_pages;
+	helper_buffer->pages = kmalloc_array(helper_buffer->pagecount,
+					     sizeof(*helper_buffer->pages),
+					     GFP_KERNEL);
+	if (!helper_buffer->pages) {
+		ret = -ENOMEM;
+		goto free_cma;
+	}
+
+	for (pg = 0; pg < helper_buffer->pagecount; pg++) {
+		helper_buffer->pages[pg] = &pages[pg];
+		if (!helper_buffer->pages[pg])
+			goto free_pages;
+	}
+
+	/* create the dmabuf */
+	exp_info.ops = &heap_helper_ops;
+	exp_info.size = len;
+	exp_info.flags = O_RDWR;
+	exp_info.priv = &helper_buffer->heap_buffer;
+	dmabuf = dma_buf_export(&exp_info);
+	if (IS_ERR(dmabuf)) {
+		ret = PTR_ERR(dmabuf);
+		goto free_pages;
+	}
+
+	helper_buffer->heap_buffer.dmabuf = dmabuf;
+	helper_buffer->priv_virt = pages;
+
+	ret = dma_buf_fd(dmabuf, O_CLOEXEC);
+	if (ret < 0) {
+		dma_buf_put(dmabuf);
+		/* just return, as put will call release and that will free */
+		return ret;
+	}
+
+	return ret;
+
+free_pages:
+	kfree(helper_buffer->pages);
+free_cma:
+	cma_release(cma_heap->cma, pages, nr_pages);
+free_buf:
+	kfree(helper_buffer);
+	return ret;
+}
+
+static struct dma_heap_ops cma_heap_ops = {
+	.allocate = cma_heap_allocate,
+};
+
+static int __add_cma_heap(struct cma *cma, void *data)
+{
+	struct cma_heap *cma_heap;
+	struct dma_heap_export_info exp_info;
+
+	cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
+	if (!cma_heap)
+		return -ENOMEM;
+	cma_heap->cma = cma;
+
+	exp_info.name = cma_get_name(cma);
+	exp_info.ops = &cma_heap_ops;
+	exp_info.priv = cma_heap;
+
+	cma_heap->heap = dma_heap_add(&exp_info);
+	if (IS_ERR(cma_heap->heap)) {
+		int ret = PTR_ERR(cma_heap->heap);
+
+		kfree(cma_heap);
+		return ret;
+	}

drivers/dma-buf/heaps/cma_heap.c line 170

Quoted 10 lines
drivers/dma-buf/heaps/cma_heap.c new file +10 -0
+
+	return 0;
+}
+
+static int add_cma_heaps(void)
+{
+	cma_for_each_area(__add_cma_heap, NULL);
+	return 0;
+}
+device_initcall(add_cma_heaps);

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

#12 lore raw

RFC PATCH v3 5/6 dma-buf: Add Dummy Importer Test Device

In reply to John Stultz

From: "Andrew F. Davis" <[email protected]>

This dummy test driver lets us do some very basic testing of importing dma-bufs.

It is based originally on TI's out of tree "DMA-BUF physical address user-space exporter" originally by
Andrew F. Davis <[email protected]>

Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
[Renamed and refactored dma_buf_phys driver, rewote commitlog]
---
 drivers/dma-buf/Kconfig              |   6 +
 drivers/dma-buf/Makefile             |   1 +
 drivers/dma-buf/dma-buf-testdev.c    | 239 +++++++++++++++++++++++++++++++++++
 include/uapi/linux/dma-buf-testdev.h |  37 ++++++
 4 files changed, 283 insertions(+)
 create mode 100644 drivers/dma-buf/dma-buf-testdev.c
 create mode 100644 include/uapi/linux/dma-buf-testdev.h
drivers/dma-buf/Kconfig +6 -0
index 63c139d..3cbcbe0 100644
@@ -49,4 +49,10 @@ menuconfig DMABUF_HEAPS
 
 source "drivers/dma-buf/heaps/Kconfig"
 
+config DMABUF_TESTDEV
+	bool "DMA-BUF Dummy Test Device"
+	depends on DMA_SHARED_BUFFER
+	help
+	  This provides a dummy test device that can be used to test
+	  importing dma-bufs.
 endmenu
drivers/dma-buf/Makefile +1 -0
index 09c2f2d..69bf45d 100644
@@ -4,3 +4,4 @@ obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
 obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
 obj-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
 obj-$(CONFIG_UDMABUF)		+= udmabuf.o
+obj-$(CONFIG_DMABUF_TESTDEV)	+= dma-buf-testdev.o
drivers/dma-buf/dma-buf-testdev.c new file +239 -0

239 lines not on this page · raw message

include/uapi/linux/dma-buf-testdev.h new file +37 -0
new file mode 100644
index 0000000..b9706b8
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * DMA-BUF Dummy Importer Test Device
+ *
+ * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+ *	Andrew F. Davis <[email protected]>
+ */
+
+#ifndef DMA_BUF_TESTDEV_H
+#define DMA_BUF_TESTDEV_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct dma_buf_testdev_data - metadata passed from userspace for conversion
+ * @fd:		DMA-BUF fd for conversion
+ * @phys:	populated with CPU physical address of DMA-BUF
+ */
+struct dma_buf_testdev_data {
+	__u32 fd;
+	__u64 phys;
+};
+
+#define DMA_BUF_TESTDEV_IOC_MAGIC 'D'
+
+/**
+ * DOC: DMA_BUF_TESTDEV_IOC_CONVERT - Convert DMA-BUF to physical address
+ *
+ * Takes a dma_buf_testdev_data struct containing a fd for a
+ * physicaly contigous buffer. Pins this buffer and populates
+ * phys field with the CPU physical address.
+ */
+#define DMA_BUF_TESTDEV_IOC_CONVERT _IOWR(DMA_BUF_TESTDEV_IOC_MAGIC, 0, \
+					  struct dma_buf_testdev_data)
+
+#endif /* DMA_BUF_PHYS_H */
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#13 lore raw

RFC PATCH v3 6/6 kselftests: Add dma-heap test

In reply to John Stultz

Add very trivial allocation and import test for dma-heaps.

TODO: Still needs improvements

Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

---
v2: Switched to use reworked dma-heap apis

v3:
* Add simple mmap
* Utilize dma-buf testdev to test importing

---
 tools/testing/selftests/dmabuf-heaps/Makefile      |  11 ++
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 169 +++++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile
 create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
tools/testing/selftests/dmabuf-heaps/Makefile new file +11 -0
new file mode 100644
index 0000000..c414ad3
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+CFLAGS += -static -O3 -Wl,-no-as-needed -Wall
+#LDLIBS += -lrt -lpthread -lm
+
+# these are all "safe" tests that don't modify
+# system time or require escalated privileges
+TEST_GEN_PROGS = dmabuf-heap
+
+
+include ../lib.mk
+
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c new file +169 -0

169 lines not on this page · raw message

Signature · 1 line
2.7.4
#14 lore raw
In reply to John Stultz
Quoted 23 lines · John Stultz

Here is another RFC of the dma-buf heaps patchset Andrew and I have been working on which tries to destage a fair chunk of ION functionality.

The patchset implements per-heap devices which can be opened directly and then an ioctl is used to allocate a dmabuf from the heap.

The interface is similar, but much simpler then IONs, only providing an ALLOC ioctl.

Also, I've provided simple system and cma heaps. The system heap in particular is missing the page-pool optimizations ION had, but works well enough to validate the interface.

I've booted and tested these patches with AOSP on the HiKey960 using the kernel tree here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap

And the userspace changes here:
https://android-review.googlesource.com/c/device/linaro/hikey/+/909436

Quoted 7 lines

Compared to ION, this patchset is missing the system-contig, carveout and chunk heaps, as I don't have a device that uses those, so I'm unable to do much useful validation there. Additionally we have no upstream users of chunk or carveout, and the system-contig has been deprecated in the common/andoid-* kernels, so this should be ok.

I'd like to go over my use-cases for a moment to see if we can get some agreement on what to do with the carveout/chunk heaps.

We used DRM (omapdrm) to get buffers for display, GPU, and multi-media. Our out-of-tree CMEM driver[0] for remote processing (OpenCL/CV/VX) buffers. And for secure heaps we use what are basically slightly modified ION carveout heaps.

Now with the DMA-Heap framework what we can do is for sub-systems with IOMMUs use 'system' heap (GPU). For those that need contiguous memory (display, MM) we have 'cma' heap (and maybe 'system-contig' at some point). For our SRAM areas used in remote processing I've posted an RFC for a heap[1] to provide allocations from those areas.

The above leaves one last gap for us, uncached/unmapped areas from regular memory. I propose this is where we use the 'carveout' heap. Right now to get some contiguous/cached memory with DT you can:

reserved-memory {
	[...]
	cma_memory {
		compatible = "shared-dma-pool";
		reg = <0x79000000 0x400000>;
		reusable;
	};

	coherent_memory@78000000 {
		reg = <0x78000000 0x800000>;
		no-map;
	};
};

'cma_memory' will show up as a 'cma' heap, so all good there.

Looking at 'coherent_memory' it will not have valid backing 'struct page' and so cannot be given cached mappings as the standard dma memory ops would fail. This would give this area the right properties for both users who don't want to do all the cache maintenance ops (Liam?) and for secure heaps that have restrictions on access from Linux running CPU.

The question then is how to mark these areas for export with DMA-Heaps? Maybe a cma_for_each_area() like function but for dma coherent areas?

Anyway for now this is not super important and I can post a patchset at some later point for this when I get it working and tested internally.

[0]
http://software-dl.ti.com/processor-sdk-linux/esd/docs/latest/linux/Foundational_Components_CMEM.html
[1] https://patchwork.kernel.org/patch/10863957/

Thanks,
Andrew

Quoted 87 lines

I've also removed the stats accounting for now, since it should be implemented by the heaps themselves.

New in v3:
* Proper /dev/heap/* names on both Android and classic Linux environments
* Major rework of the helper code from Andrew
* Dummy test device added to test importing
* *Lots* of cleanups suggested by many (thank you for all the input)!

Outstanding concerns:
* Potential need for private flags in interface for secure heaps. Need to better understand secure heap usage.
* Making sure the performance issues from potentially unnecessary cache-management operations can be resolved properly for system and cma heaps (outstanding issue from ION).

Eventual TODOS:
* Sanity filtering for heap names
* Reimplement performance optimizations for system heap
* Add stats accounting to system/cma heaps
* Make the kselftest more useful
* Add other heaps folks see as useful (would love to get some help from actual carveout/chunk users)!

That said, the main user-interface is shaping up and I wanted to get some input on the device model (particularly from GreKH) and any other API/ABI specific input.

thanks
-john

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

Andrew F. Davis (2):
dma-buf: Add dma-buf heaps framework
dma-buf: Add Dummy Importer Test Device

John Stultz (4):
dma-buf: heaps: Add heap helpers
dma-buf: heaps: Add system heap to dmabuf heaps
dma-buf: heaps: Add CMA heap to dmabuf heapss
kselftests: Add dma-heap test

 MAINTAINERS                                        |  18 ++
 drivers/dma-buf/Kconfig                            |  16 ++
 drivers/dma-buf/Makefile                           |   3 +
 drivers/dma-buf/dma-buf-testdev.c                  | 239 +++++++++++++++++++
 drivers/dma-buf/dma-heap.c                         | 234 ++++++++++++++++++
 drivers/dma-buf/heaps/Kconfig                      |  14 ++
 drivers/dma-buf/heaps/Makefile                     |   4 +
 drivers/dma-buf/heaps/cma_heap.c                   | 170 ++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.c               | 261 +++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h               |  55 +++++
 drivers/dma-buf/heaps/system_heap.c                | 120 ++++++++++
 include/linux/dma-heap.h                           |  58 +++++
 include/uapi/linux/dma-buf-testdev.h               |  37 +++
 include/uapi/linux/dma-heap.h                      |  52 ++++
 tools/testing/selftests/dmabuf-heaps/Makefile      |  11 +
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 169 +++++++++++++
 16 files changed, 1461 insertions(+)
 create mode 100644 drivers/dma-buf/dma-buf-testdev.c
 create mode 100644 drivers/dma-buf/dma-heap.c
 create mode 100644 drivers/dma-buf/heaps/Kconfig
 create mode 100644 drivers/dma-buf/heaps/Makefile
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
Quoted 9 lines
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
 create mode 100644 drivers/dma-buf/heaps/system_heap.c
 create mode 100644 include/linux/dma-heap.h
 create mode 100644 include/uapi/linux/dma-buf-testdev.h
 create mode 100644 include/uapi/linux/dma-heap.h
 create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile
 create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

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

#15 lore raw
Quoted 65 lines · Andrew F. Davis
Quoted 23 lines · John Stultz

Here is another RFC of the dma-buf heaps patchset Andrew and I have been working on which tries to destage a fair chunk of ION functionality.

The patchset implements per-heap devices which can be opened directly and then an ioctl is used to allocate a dmabuf from the heap.

The interface is similar, but much simpler then IONs, only providing an ALLOC ioctl.

Also, I've provided simple system and cma heaps. The system heap in particular is missing the page-pool optimizations ION had, but works well enough to validate the interface.

I've booted and tested these patches with AOSP on the HiKey960 using the kernel tree here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap

And the userspace changes here:
https://android-review.googlesource.com/c/device/linaro/hikey/+/909436

Quoted 7 lines

Compared to ION, this patchset is missing the system-contig, carveout and chunk heaps, as I don't have a device that uses those, so I'm unable to do much useful validation there. Additionally we have no upstream users of chunk or carveout, and the system-contig has been deprecated in the common/andoid-* kernels, so this should be ok.

I'd like to go over my use-cases for a moment to see if we can get some agreement on what to do with the carveout/chunk heaps.

We used DRM (omapdrm) to get buffers for display, GPU, and multi-media. Our out-of-tree CMEM driver[0] for remote processing (OpenCL/CV/VX) buffers. And for secure heaps we use what are basically slightly modified ION carveout heaps.

Now with the DMA-Heap framework what we can do is for sub-systems with IOMMUs use 'system' heap (GPU). For those that need contiguous memory (display, MM) we have 'cma' heap (and maybe 'system-contig' at some point). For our SRAM areas used in remote processing I've posted an RFC for a heap[1] to provide allocations from those areas.

The above leaves one last gap for us, uncached/unmapped areas from regular memory. I propose this is where we use the 'carveout' heap. Right now to get some contiguous/cached memory with DT you can:

reserved-memory {
	[...]
	cma_memory {
		compatible = "shared-dma-pool";
		reg = <0x79000000 0x400000>;
		reusable;
	};

	coherent_memory@78000000 {
		reg = <0x78000000 0x800000>;
		no-map;
	};
};
Quoted 8 lines

'cma_memory' will show up as a 'cma' heap, so all good there.

Looking at 'coherent_memory' it will not have valid backing 'struct page' and so cannot be given cached mappings as the standard dma memory ops would fail. This would give this area the right properties for both users who don't want to do all the cache maintenance ops (Liam?) and for secure heaps that have restrictions on access from Linux running CPU.

So our main use case in which we use uncached memory to avoid cache maintenance is for multimedia memory (which is generally only accessed by devices), there can be both a lot of this memory allocated for these use cases and the amount varies so a carveout wouldn't work for us. However I am still holding out hope that we will be able to drop this requirement for uncached memory through changes to both Android and ION/dma-buf heaps, such as the proposal where Android keeps devices attached and ION/dma-buf heaps track of which buffers are 'dirty'. Investigations still ongoing...

We have a number of use cases which use uncached memory, the major reason that our clients use uncached is for the performance benefit above. I am currently doing a review of client use cases to determine all our uncached requirements, for example if CMA heaps will need to support uncached allocations, once that is done I will be able to better articulate our requirements.

One use case where I have seen carveouts uses which doesn't sound like it would be supported under the current proposals is when clients need to allocate a lot of cached memory quickly.
I have seen cases where a large carveout is used for camera use cases. Basically they allocate cached memory from the carveout and any extra memory they need (after the carveout is full) is allocated from the system heap.

This allows for memory heavy performance sensitive apps, such as camera, to be launched quickly.

Quoted 3 lines

The question then is how to mark these areas for export with DMA-Heaps? Maybe a cma_for_each_area() like function but for dma coherent areas?

That sounds reasonable to me.

Quoted 108 lines

Anyway for now this is not super important and I can post a patchset at some later point for this when I get it working and tested internally.

[0]
http://software-dl.ti.com/processor-sdk-linux/esd/docs/latest/linux/Foundational_Components_CMEM.html
[1] https://patchwork.kernel.org/patch/10863957/

Thanks,
Andrew

Quoted 96 lines

I've also removed the stats accounting for now, since it should be implemented by the heaps themselves.

New in v3:
* Proper /dev/heap/* names on both Android and classic Linux environments
* Major rework of the helper code from Andrew
* Dummy test device added to test importing
* *Lots* of cleanups suggested by many (thank you for all the input)!

Outstanding concerns:
* Potential need for private flags in interface for secure heaps. Need to better understand secure heap usage.
* Making sure the performance issues from potentially unnecessary cache-management operations can be resolved properly for system and cma heaps (outstanding issue from ION).

Eventual TODOS:
* Sanity filtering for heap names
* Reimplement performance optimizations for system heap
* Add stats accounting to system/cma heaps
* Make the kselftest more useful
* Add other heaps folks see as useful (would love to get some help from actual carveout/chunk users)!

That said, the main user-interface is shaping up and I wanted to get some input on the device model (particularly from GreKH) and any other API/ABI specific input.

thanks
-john

Cc Laura Abbott <[email protected]>
Cc Benjamin Gaignard <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc Liam Mark <[email protected]>
Cc Pratik Patel <[email protected]>
Cc Brian Starkey <[email protected]>
Cc Vincent Donnefort <[email protected]>
Cc Sudipto Paul <[email protected]>
Cc Andrew F. Davis <[email protected]>
Cc Xu YiPing <[email protected]>
Cc "Chenfeng (puck)" <[email protected]>
Cc "Xiaqing (A)" <[email protected]>
Cc Yudongbin <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>

Andrew F. Davis (2):
dma-buf: Add dma-buf heaps framework
dma-buf: Add Dummy Importer Test Device

John Stultz (4):
dma-buf: heaps: Add heap helpers
dma-buf: heaps: Add system heap to dmabuf heaps
dma-buf: heaps: Add CMA heap to dmabuf heapss
kselftests: Add dma-heap test

 MAINTAINERS                                        |  18 ++
 drivers/dma-buf/Kconfig                            |  16 ++
 drivers/dma-buf/Makefile                           |   3 +
 drivers/dma-buf/dma-buf-testdev.c                  | 239 +++++++++++++++++++
 drivers/dma-buf/dma-heap.c                         | 234 ++++++++++++++++++
 drivers/dma-buf/heaps/Kconfig                      |  14 ++
 drivers/dma-buf/heaps/Makefile                     |   4 +
 drivers/dma-buf/heaps/cma_heap.c                   | 170 ++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.c               | 261 +++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h               |  55 +++++
 drivers/dma-buf/heaps/system_heap.c                | 120 ++++++++++
 include/linux/dma-heap.h                           |  58 +++++
 include/uapi/linux/dma-buf-testdev.h               |  37 +++
 include/uapi/linux/dma-heap.h                      |  52 ++++
 tools/testing/selftests/dmabuf-heaps/Makefile      |  11 +
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 169 +++++++++++++
 16 files changed, 1461 insertions(+)
 create mode 100644 drivers/dma-buf/dma-buf-testdev.c
 create mode 100644 drivers/dma-buf/dma-heap.c
 create mode 100644 drivers/dma-buf/heaps/Kconfig
 create mode 100644 drivers/dma-buf/heaps/Makefile
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.c
 create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
 create mode 100644 drivers/dma-buf/heaps/system_heap.c
 create mode 100644 include/linux/dma-heap.h
 create mode 100644 include/uapi/linux/dma-buf-testdev.h
 create mode 100644 include/uapi/linux/dma-heap.h
 create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile
 create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project