On 3/28/19 7:15 PM, John Stultz wrote:
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...
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'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/Foundati... [1] https://patchwork.kernel.org/patch/10863957/
Thanks, Andrew
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 labbott@redhat.com Cc: Benjamin Gaignard benjamin.gaignard@linaro.org Cc: Sumit Semwal sumit.semwal@linaro.org Cc: Liam Mark lmark@codeaurora.org Cc: Pratik Patel pratikp@codeaurora.org Cc: Brian Starkey Brian.Starkey@arm.com Cc: Vincent Donnefort Vincent.Donnefort@arm.com Cc: Sudipto Paul Sudipto.Paul@arm.com Cc: Andrew F. Davis afd@ti.com Cc: Xu YiPing xuyiping@hisilicon.com Cc: "Chenfeng (puck)" puck.chen@hisilicon.com Cc: butao butao@hisilicon.com Cc: "Xiaqing (A)" saberlily.xia@hisilicon.com Cc: Yudongbin yudongbin@hisilicon.com Cc: Christoph Hellwig hch@infradead.org Cc: Chenbo Feng fengc@google.com Cc: Alistair Strachan astrachan@google.com Cc: dri-devel@lists.freedesktop.org
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