Skip to contentSkip to conversation

DMA-BUF Heaps (destaging ION)

PATCH Superseded John Stultz 2 participants 7 messages Nov 18, 2019

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

v16 cover DMA-BUF Heaps (destaging ION)

Just wanted to resend v16 with a few minor changes.

This 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 relatively simple system and cma heaps.

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 reviewed (+2'ed) 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, since any such accounting should be implemented by dma-buf core or the heaps themselves.

New in v16:
* Typo fix suggested by Hridya Valsaraju <[email protected]>
* Add extra error and ioctl compatibility testing suggested by Daniel Vetter to the kselftest test

Thanks again for all the reviews and feedback!
-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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[email protected]>

Andrew F. Davis (1):
dma-buf: Add dma-buf heaps framework

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 heaps
kselftests: Add dma-heap test

 MAINTAINERS                                   |  18 +
 drivers/dma-buf/Kconfig                       |  11 +
 drivers/dma-buf/Makefile                      |   2 +
 drivers/dma-buf/dma-heap.c                    | 297 +++++++++++++
 drivers/dma-buf/heaps/Kconfig                 |  14 +
 drivers/dma-buf/heaps/Makefile                |   4 +
 drivers/dma-buf/heaps/cma_heap.c              | 177 ++++++++
 drivers/dma-buf/heaps/heap-helpers.c          | 271 ++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h          |  53 +++
 drivers/dma-buf/heaps/system_heap.c           | 123 ++++++
 include/linux/dma-heap.h                      |  59 +++
 include/uapi/linux/dma-heap.h                 |  53 +++
 tools/testing/selftests/dmabuf-heaps/Makefile |   6 +
 .../selftests/dmabuf-heaps/dmabuf-heap.c      | 396 ++++++++++++++++++
 14 files changed, 1484 insertions(+)
 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-heap.h
 create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile
 create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
Signature · 6 lines
2.17.1

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

PATCH v16 1/5 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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[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 than 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)
v4:
* Folded down dma-heap.h change that was in a following patch
* Added fd_flags entry to allocation structure and pass it through to heap code for use on dma-buf fd creation (suggested by Benjamin)
v5:
* Minor cleanups
v6:
* Improved error path handling, minor whitespace fixes, both suggested by Brian
v7:
* Longer Kconfig description to quiet checkpatch warnings
* Re-add compat_ioctl bits (Hridya noticed 32bit userland wasn't working)
v8:
* Make struct dma_heap_ops consts (Suggested by Christoph)
* Checkpatch whitespace fixups
v9:
* Minor cleanups suggested by Brian Starkey
* Rename dma_heap_get_data->dma_heap_get_drvdata suggested by Hilf Danton
v11:
* Kconfig text improvements suggested by Randy Dunlap v12:
* Add logic to prevent duplicately named heaps being added
* Add symbol exports for heaps as modules
v13:
* Re-remove symbol exports per discussion w/ Brian. Will resubmit in a separte patch for review
v14:
* Reworked ioctl handler to zero fill any difference in structure size, similar to what the DRM core does, as suggested by Dave Airlie
* Removed now unnecessary reserved bits in allocate_data
* Added get_features ioctl as suggested by Dave Airlie
* Removed pr_warn_once messages as requested by Dave Airlie
v15:
* Dropped the get_features ioctl as suggested by Brian Starkey and Daniel Vetter
* Add listhead comment suggested by Sandeep Patil
* Dropped minor value in struct dma_heap as suggested by Sandeep Patil
* Fix grammar typo from Brian Starkey
v16:
* Typo fix suggested by Hridya Valsaraju <[email protected]>

---
 MAINTAINERS                   |  18 +++
 drivers/dma-buf/Kconfig       |   9 ++
 drivers/dma-buf/Makefile      |   1 +
 drivers/dma-buf/dma-heap.c    | 297 ++++++++++++++++++++++++++++++++++
 include/linux/dma-heap.h      |  59 +++++++
 include/uapi/linux/dma-heap.h |  53 ++++++
 6 files changed, 437 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 cba1095547fd..568f94172905 100644
@@ -4940,6 +4940,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 +9 -0
index a23b6752d11a..bffa58fc3e6e 100644
@@ -44,4 +44,13 @@ config DMABUF_SELFTESTS
 	default n
 	depends on DMA_SHARED_BUFFER
 
+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 options creates per heap chardevs in /dev/dma_heap/ which
+	  allows userspace to allocate dma-bufs that can be shared
+	  between drivers.
+
 endmenu
drivers/dma-buf/Makefile +1 -0
index 03479da06422..caee5eb3d351 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
 	 dma-resv.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 +297 -0

297 lines not on this page · raw message

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

59 lines not on this page · raw message

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

53 lines not on this page · raw message

Signature · 1 line
2.17.1
#2 lore raw

PATCH v16 2/5 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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[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
v4:
* Moved dma-heap.h change out to previous patch
v6:
* Minor cleanups and typo fixes suggested by Brian
v7:
* Removed stray ;
* Make init_heap_helper_buffer lowercase, as suggested by Christoph
* Add dmabuf export helper to reduce boilerplate code v8:
* Remove unused private_flags value
* Condense dma_heap_buffer and heap_helper_buffer (suggested by Christoph)
* Fix indentation by using shorter argument names (suggested by Christoph)
* Add flush_kernel_vmap_range/invalidate_kernel_vmap_range calls (suggested by Christoph)
* Checkpatch whitespace fixups
v9:
* Minor cleanups suggested by Brian Starkey
v10:
* Fix missing vmalloc.h inclusion in heap helpers (found by kbuild test robot <[email protected]>)
v12:
* Add symbol exports for heaps as modules
v13:
* Re-remove symbol exports, per discussion with Brian, as I'll resubmit the change for review independently.
v14:
* Fix missing argment to WARN() in dma_heap_buffer_destroy() found and fixed by Dan Carpenter <[email protected]>
* Add check in fault hanlder that pgoff isn't larger then pagecount, reported by Dan Carpenter
v15:
* Drop unused flags field from heap_helper_buffer as suggested by Sandeep Patil

---
 drivers/dma-buf/Makefile             |   1 +
 drivers/dma-buf/heaps/Makefile       |   2 +
 drivers/dma-buf/heaps/heap-helpers.c | 271 +++++++++++++++++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h |  53 ++++++
 4 files changed, 327 insertions(+)
 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 caee5eb3d351..9c190026bfab 100644
@@ -2,6 +2,7 @@
 obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
 	 dma-resv.o seqno-fence.o
 obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
+obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/
 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/heaps/Makefile new file +2 -0
new file mode 100644
index 000000000000..de49898112db
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y					+= heap-helpers.o
drivers/dma-buf/heaps/heap-helpers.c new file +271 -0

271 lines not on this page · raw message

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

53 lines not on this page · raw message

Signature · 6 lines
2.17.1

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

PATCH v16 3/5 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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[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
v4:
* Optimization to allocate pages in chunks, similar to old pagepool code
* Use fd_flags when creating dmabuf fd (Suggested by Benjamin) v5:
* Back out large order page allocations (was leaking memory, as the page array didn't properly track order size)
v6:
* Minor whitespace change suggested by Brian
* Remove unused variable
v7:
* Use newly lower-cased init_heap_helper_buffer helper
* Add system heap DOS avoidance suggested by Laura from ION code
* Use new dmabuf export helper
v8:
* Make struct dma_heap_ops consts (suggested by Christoph)
* Get rid of needless struct system_heap (suggested by Christoph)
* Condense dma_heap_buffer and heap_helper_buffer (suggested by Christoph)
* Add forgotten include file to fix build issue on x86 v12:
* Minor tweaks to prep loading heap from module
v14:
* Fix "redundant assignment to variable ret" issue reported by Colin King and fixed by Andrew Davis
v15:
* Drop unused heap flag from heap_helper_buffer as suggested by Sandeep Patil

---
 drivers/dma-buf/Kconfig             |   2 +
 drivers/dma-buf/heaps/Kconfig       |   6 ++
 drivers/dma-buf/heaps/Makefile      |   1 +
 drivers/dma-buf/heaps/system_heap.c | 123 ++++++++++++++++++++++++++++
 4 files changed, 132 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 bffa58fc3e6e..0613bb7770f5 100644
@@ -53,4 +53,6 @@ menuconfig DMABUF_HEAPS
 	  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 000000000000..205052744169
@@ -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 de49898112db..d1808eca2581 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 +123 -0

123 lines not on this page · raw message

Signature · 6 lines
2.17.1

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

PATCH v16 4/5 dma-buf: heaps: Add CMA heap to dmabuf heaps

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!

NOTE: This patch only adds the default CMA heap. We will enable selectively adding other CMA memory regions to the dmabuf heaps interface with a later patch (which requires a dt binding)

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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[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
v4:
* Use the fd_flags when creating dmabuf fd (Suggested by Benjamin)
* Use precalculated pagecount (Suggested by Andrew) v6:
* Changed variable names to improve clarity, as suggested by Brian
v7:
* Use newly lower-cased init_heap_helper_buffer helper
* Use new dmabuf export helper
v8:
* Make struct dma_heap_ops const (Suggested by Christoph)
* Condense dma_heap_buffer and heap_helper_buffer (suggested by Christoph)
* Checkpatch whitespace fixups
v9:
* Removing needless check noted by Brian Starkey
* Rename dma_heap_get_data->dma_heap_get_drvdata suggested by Hilf Danton
* Check signals after clearing memory pages to avoid doing needless work if the task is killed as suggested by Hilf
v12:
* Rework to only add the default CMA heap
v15:
* Drop unused flags field from heap_helper_buffer as suggested by Sandeep Patil

---
 drivers/dma-buf/heaps/Kconfig    |   8 ++
 drivers/dma-buf/heaps/Makefile   |   1 +
 drivers/dma-buf/heaps/cma_heap.c | 177 +++++++++++++++++++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
index 205052744169..a5eef06c4226 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 d1808eca2581..6e54cdec3da0 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 +177 -0

177 lines not on this page · raw message

Signature · 6 lines
2.17.1

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

PATCH v16 5/5 kselftests: Add dma-heap test

In reply to John Stultz

Add very trivial allocation and import test for dma-heaps, utilizing the vgem driver as a test importer.

A good chunk of this code taken from:
tools/testing/selftests/android/ion/ionmap_test.c Originally by 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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[email protected]>

---
v2:
* Switched to use reworked dma-heap apis
v3:
* Add simple mmap
* Utilize dma-buf testdev to test importing
v4:
* Rework to use vgem
* Pass in fd_flags to match interface changes
* Skip . and .. dirs
v6:
* Number of style/cleanups suggested by Brian v7:
* Whitespace fixup for checkpatch
v8:
* More checkpatch whitespace fixups
v9:
* Better handling error returns out to main, suggested by Brian Starkey
* Switch to using snprintf, suggested by Brian v14:
* Fix a missing return value
* Add calls to test the GET_FEATURES ioctl
* Build fix reported by kernel test robot <[email protected]> and fixed by Xiao Yang <[email protected]>
* Minor Makefile cleanups
v15:
* Remove usage of dropped get_features ioctl v16:
* Add extra ioctl compatibility testing suggested by Daniel Vetter

---
 tools/testing/selftests/dmabuf-heaps/Makefile |   6 +
 .../selftests/dmabuf-heaps/dmabuf-heap.c      | 396 ++++++++++++++++++
 2 files changed, 402 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 +6 -0
new file mode 100644
index 000000000000..607c2acd2082
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+CFLAGS += -static -O3 -Wl,-no-as-needed -Wall -I../../../../usr/include
+
+TEST_GEN_PROGS = dmabuf-heap
+
+include ../lib.mk
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c new file +396 -0

396 lines not on this page · raw message

Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#6 lore raw
In reply to John Stultz
Quoted 15 lines · John Stultz

Just wanted to resend v16 with a few minor changes.

This 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 relatively simple system and cma heaps.

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

Quoted 5 lines

And the reviewed (+2'ed) 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

ION's Carveout and Chunk heaps got dropped from upstream, so no gap there. :)

Andrew

Quoted 62 lines

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, since any such accounting should be implemented by dma-buf core or the heaps themselves.

New in v16:
* Typo fix suggested by Hridya Valsaraju <[email protected]>
* Add extra error and ioctl compatibility testing suggested by Daniel Vetter to the kselftest test

Thanks again for all the reviews and feedback!
-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 Christoph Hellwig <[email protected]>
Cc Chenbo Feng <[email protected]>
Cc Alistair Strachan <[email protected]>
Cc Hridya Valsaraju <[email protected]>
Cc Sandeep Patil <[email protected]>
Cc Hillf Danton <[email protected]>
Cc Dave Airlie <[email protected]>

Andrew F. Davis (1):
dma-buf: Add dma-buf heaps framework

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 heaps
kselftests: Add dma-heap test

 MAINTAINERS                                   |  18 +
 drivers/dma-buf/Kconfig                       |  11 +
 drivers/dma-buf/Makefile                      |   2 +
 drivers/dma-buf/dma-heap.c                    | 297 +++++++++++++
 drivers/dma-buf/heaps/Kconfig                 |  14 +
 drivers/dma-buf/heaps/Makefile                |   4 +
 drivers/dma-buf/heaps/cma_heap.c              | 177 ++++++++
 drivers/dma-buf/heaps/heap-helpers.c          | 271 ++++++++++++
 drivers/dma-buf/heaps/heap-helpers.h          |  53 +++
 drivers/dma-buf/heaps/system_heap.c           | 123 ++++++
 include/linux/dma-heap.h                      |  59 +++
 include/uapi/linux/dma-heap.h                 |  53 +++
 tools/testing/selftests/dmabuf-heaps/Makefile |   6 +
 .../selftests/dmabuf-heaps/dmabuf-heap.c      | 396 ++++++++++++++++++
 14 files changed, 1484 insertions(+)
 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
Quoted 9 lines
 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-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