DMA-BUF Heaps (destaging ION)
Subsystems (3)
v12 cover DMA-BUF Heaps (destaging ION)
Andrew brought up a reasonable concern with the CMA heap enumeration in the previous patch set, and I had a few other minor cleanups to add, so here is yet another pass at 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 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 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 v12:
* To address Andrew's concern about adding all CMA areas, the CMA heap only adds the default CMA region for now.
* Minor cleanups and prep for loading heaps from modules
* I have patches to add other specified CMA regions, as well as loading heaps from modules in my WIP tree, which I will submit once this set is queued, here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap-WIP
thanks
-john
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 | 271 ++++++++++++++++++ drivers/dma-buf/heaps/Kconfig | 14 + drivers/dma-buf/heaps/Makefile | 4 + drivers/dma-buf/heaps/cma_heap.c | 178 ++++++++++++ drivers/dma-buf/heaps/heap-helpers.c | 270 +++++++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 55 ++++ drivers/dma-buf/heaps/system_heap.c | 124 ++++++++ include/linux/dma-heap.h | 59 ++++ include/uapi/linux/dma-heap.h | 55 ++++ tools/testing/selftests/dmabuf-heaps/Makefile | 9 + .../selftests/dmabuf-heaps/dmabuf-heap.c | 238 +++++++++++++++ 14 files changed, 1308 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 · 1 line
2.17.1
PATCH v12 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!
---
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
--- MAINTAINERS | 18 +++ drivers/dma-buf/Kconfig | 9 ++ drivers/dma-buf/Makefile | 1 + drivers/dma-buf/dma-heap.c | 271 ++++++++++++++++++++++++++++++++++ include/linux/dma-heap.h | 59 ++++++++ include/uapi/linux/dma-heap.h | 55 +++++++ 6 files changed, 413 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
@@ -4939,6 +4939,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
@@ -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
@@ -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 +271 -0
271 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 +55 -0
55 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
Brian Starkey
reviewerRe: [PATCH v12 1/5] dma-buf: Add dma-buf heaps framework
Hi John,
Quoted 82 lines · John Stultz
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 Hillf Danton <[email protected]>Reviewed-by Benjamin Gaignard <[email protected]>Reviewed-by Brian Starkey <[email protected]>Acked-by Laura Abbott <[email protected]>Tested-by Ayan Kumar Halder <[email protected]>Signed-off-by Andrew F. Davis <[email protected]>Signed-off-by John Stultz <[email protected]>---
v2:
* Folded down fixes I had previously shared in implementing heaps
* Make flags a u64 (Suggested by Laura)
* AddPAGE_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 inMAINTAINERSemail 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 documentingPAGE_ALIGNusage (suggested by Brian)
* Switch from idr to Xarray (suggested by Brian)
* Fixup cdev creation (suggested by Brian)
* AvoidEXPORT_SYMBOLuntil we finalize modules (suggested by Brian)
* Make structdma_heapinternal only (folded in from Andrew)
* Small cleanups suggested by GregKH
* Provideclass->devnodecallback to get consistent/dev/subdirectory naming (Suggested by Bjorn)
v4:
* Folded downdma-heap.hchange that was in a following patch
* Addedfd_flagsentry 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:
* LongerKconfigdescription to quiet checkpatch warnings
* Re-addcompat_ioctlbits (Hridya noticed 32bit userland wasn't working)
v8:
* Make structdma_heap_opsconsts (Suggested by Christoph)
* Checkpatch whitespace fixups
v9:
Quoted 8 lines
* Minor cleanups suggested by Brian Starkey
* Renamedma_heap_get_data->dma_heap_get_drvdatasuggested by Hilf Danton
v11:
*Kconfigtext improvements suggested by Randy Dunlap v12:
* Add logic to prevent duplicately named heaps being added
* Add symbol exports for heaps as modules
As in v3:
* Avoid EXPORT_SYMBOL until we finalize modules (suggested by Brian)
Did something change in that regard? I still think letting modules register heaps without a way to remove them is a recipe for issues.
Thanks,
-Brian
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v12 1/5] dma-buf: Add dma-buf heaps framework
Quoted 6 lines · Brian Starkey
On Fri, Oct 18, 2019 at 05:23:19AM +0000, John Stultz wrote:
As in v3:
* Avoid
EXPORT_SYMBOLuntil we finalize modules (suggested by Brian)
Heh. I guess it has been awhile. :)
Quoted 2 lines
Did something change in that regard? I still think letting modules register heaps without a way to remove them is a recipe for issues.
So yea, in recent months, work around Android with their GKI effort has made it necessary for ION heaps to be loadable from modules. I had some patches in WIP tree to enable this, and in the rework I did yesterday for the CMA module trivially collided with parts, and forgetting the discussion back in v3, I figured I'd just fold those bits in before I resubmitted for v12.
If it's an issue, I can pull it out, but I'm going to be submitting module enablement for review as soon as the core bits are queued, as its going to be important to support for Android to switch to this from ION.
thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Brian Starkey
reviewerRe: [PATCH v12 1/5] dma-buf: Add dma-buf heaps framework
Quoted 13 lines · John Stultz
Quoted 6 lines · Brian Starkey
On Fri, Oct 18, 2019 at 05:23:19AM +0000, John Stultz wrote:
As in v3:
* Avoid
EXPORT_SYMBOLuntil we finalize modules (suggested by Brian)Heh. I guess it has been awhile. :)
Quoted 2 lines
Did something change in that regard? I still think letting modules register heaps without a way to remove them is a recipe for issues.
Quoted 6 lines
So yea, in recent months, work around Android with their GKI effort has made it necessary for ION heaps to be loadable from modules. I had some patches in WIP tree to enable this, and in the rework I did yesterday for the CMA module trivially collided with parts, and forgetting the discussion back in v3, I figured I'd just fold those bits in before I resubmitted for v12.
Ah yes, I can see that would be needed.
Quoted 6 lines
If it's an issue, I can pull it out, but I'm going to be submitting module enablement for review as soon as the core bits are queued, as its going to be important to support for Android to switch to this from ION.
I don't know how to decide if it's an issue. My understanding is that if you rmmod something which has exported buffers, various Bad Things might happen; I believe including data leaks, corruption or crashing the kernel. There's probably plenty of scope for that with dma-buf exporters already, so it's not exactly "new" but it is a bit unfortunate.
If "people" are OK with adding new code which has the same issue, then I'm not going to make any more of a fuss, because perfection is the enemy of progress. Perhaps an obvious comment pointing out the issue would be prudent, though - as a reminder to people that add heaps from their code (and wonder why there's no "dma_heap_remove" function).
Cheers,
-Brian
Quoted 2 lines
thanks
-john
Re: [PATCH v12 1/5] dma-buf: Add dma-buf heaps framework
Quoted 37 lines · Brian Starkey
Quoted 13 lines · John Stultz
Quoted 6 lines · Brian Starkey
On Fri, Oct 18, 2019 at 05:23:19AM +0000, John Stultz wrote:
As in v3:
* Avoid
EXPORT_SYMBOLuntil we finalize modules (suggested by Brian)Heh. I guess it has been awhile. :)
Quoted 2 lines
Did something change in that regard? I still think letting modules register heaps without a way to remove them is a recipe for issues.
Quoted 6 lines
So yea, in recent months, work around Android with their GKI effort has made it necessary for ION heaps to be loadable from modules. I had some patches in WIP tree to enable this, and in the rework I did yesterday for the CMA module trivially collided with parts, and forgetting the discussion back in v3, I figured I'd just fold those bits in before I resubmitted for v12.
Ah yes, I can see that would be needed.
Quoted 6 lines
If it's an issue, I can pull it out, but I'm going to be submitting module enablement for review as soon as the core bits are queued, as its going to be important to support for Android to switch to this from ION.
I don't know how to decide if it's an issue. My understanding is that if you rmmod something which has exported buffers, various Bad Things might happen; I believe including data leaks, corruption or crashing the kernel. There's probably plenty of scope for that with dma-buf exporters already, so it's not exactly "new" but it is a bit unfortunate.
Quoted 5 lines
If "people" are OK with adding new code which has the same issue, then I'm not going to make any more of a fuss, because perfection is the enemy of progress. Perhaps an obvious comment pointing out the issue would be prudent, though - as a reminder to people that add heaps from their code (and wonder why there's no "
dma_heap_remove" function).
Eh. If I need to respin anyway, I'll just remove the exports for now.
It's really just my fault for getting impatient and trying to squeeze some extra changes in.
I'll then submit the module enablement patches separately.
Thanks again for the review, I really appreciate your sharp eye! -john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 2/5 dma-buf: heaps: Add heap helpers
In reply to John StultzAdd 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!
---
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
--- drivers/dma-buf/Makefile | 1 + drivers/dma-buf/heaps/Makefile | 2 + drivers/dma-buf/heaps/heap-helpers.c | 270 +++++++++++++++++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 55 ++++++ 4 files changed, 328 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
@@ -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
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += heap-helpers.o
drivers/dma-buf/heaps/heap-helpers.c new file +270 -0
270 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
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 3/5 dma-buf: heaps: Add system heap to dmabuf heaps
In reply to John StultzThis 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!
---
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
--- drivers/dma-buf/Kconfig | 2 + drivers/dma-buf/heaps/Kconfig | 6 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/system_heap.c | 124 ++++++++++++++++++++++++++++ 4 files changed, 133 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
@@ -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
@@ -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
@@ -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 +124 -0
124 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v12 4/5 dma-buf: heaps: Add CMA heap to dmabuf heaps
In reply to John StultzThis 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)
---
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
--- drivers/dma-buf/heaps/Kconfig | 8 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/cma_heap.c | 178 +++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 drivers/dma-buf/heaps/cma_heap.c
drivers/dma-buf/heaps/Kconfig +8 -0
@@ -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
@@ -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 +178 -0
178 lines not on this page · raw message
Signature · 1 line
2.17.1
Brian Starkey
reviewerRe: [PATCH v12 4/5] dma-buf: heaps: Add CMA heap to dmabuf heaps
Quoted 10 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!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)
That'll teach me for reading my email in FIFO order.
This approach makes sense to me.
-Brian
Re: [PATCH v12 4/5] dma-buf: heaps: Add CMA heap to dmabuf heaps
Quoted 5 lines · Brian Starkey
Quoted 3 lines · John Stultz
This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region.
Quoted 7 lines
Quoted 7 lines
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)
Maybe we can use "no-map" DT property to trigger that. If set do not expose the cma heap.
Benjamin
Quoted 7 lines
That'll teach me for reading my email in FIFO order.
This approach makes sense to me.
-Brian
Re: [PATCH v12 4/5] dma-buf: heaps: Add CMA heap to dmabuf heaps
Quoted 10 lines · Benjamin Gaignard
Quoted 9 lines · Brian Starkey
Quoted 7 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!
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
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)
Maybe we can use "no-map" DT property to trigger that. If set do not expose the cma heap.
"no-map" means it can't be used as a regular CMA either, we want some way to both have it as a device usable CMA but also not be exposed to userspace if needed.
Andrew
Quoted 9 lines
Benjamin
Quoted 7 lines
That'll teach me for reading my email in FIFO order.
This approach makes sense to me.
-Brian
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v12 4/5] dma-buf: heaps: Add CMA heap to dmabuf heaps
In reply to Benjamin GaignardQuoted 10 lines · Benjamin Gaignard
Quoted 9 lines · Brian Starkey
Quoted 7 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!
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
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)
Maybe we can use "no-map" DT property to trigger that. If set do not expose the cma heap.
I don't think that's a good plan. See my WIP tree for the approach I'm planning:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap-WIP
thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v12 5/5 kselftests: Add dma-heap test
In reply to John StultzAdd 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]>
---
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
--- tools/testing/selftests/dmabuf-heaps/Makefile | 9 + .../selftests/dmabuf-heaps/dmabuf-heap.c | 238 ++++++++++++++++++ 2 files changed, 247 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 +9 -0
@@ -0,0 +1,9 @@ +# 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 +238 -0
238 lines not on this page · raw message
Signature · 1 line
2.17.1
Sumit Semwal
maintainerHi John, Andrews,
Quoted 6 lines · John Stultz
Andrew brought up a reasonable concern with the CMA heap enumeration in the previous patch set, and I had a few other minor cleanups to add, so here is yet another pass at the dma-buf heaps patchset Andrew and I have been working on which tries to destage a fair chunk of ION functionality.
Thanks much for all your hardwork in getting these patches ready. It looks like a sane approach to me to first just add the default cma heap and work out the selection of other heaps later on.
I will wait out this weekend for any objections from others, and if I hear none, will merge this series on Monday.
Hope that sounds reasonable?
Quoted 37 lines
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 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-heapAnd the userspace changes here:
https://android-review.googlesource.com/c/device/linaro/hikey/+/909436Compared 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 v12:
* To address Andrew's concern about adding all CMA areas, the CMA heap only adds the default CMA region for now.
* Minor cleanups and prep for loading heaps from modules
* I have patches to add other specified CMA regions, as well as loading heaps from modules in my WIP tree, which I will submit once this set is queued, here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-buf-heap-WIP
Quoted 2 lines
thanks
-john
<snip>
Best,
Sumit.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel