From patchwork Fri Oct 18 05:23:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11197531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 986DF913 for ; Fri, 18 Oct 2019 05:23:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8067F222C6 for ; Fri, 18 Oct 2019 05:23:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8067F222C6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19B606E03C; Fri, 18 Oct 2019 05:23:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C7F06E03C for ; Fri, 18 Oct 2019 05:23:28 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id q10so3131248pfl.0 for ; Thu, 17 Oct 2019 22:23:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DXKps7/0UTC6N/waL44YFVSLkuti5RrXPqcBWv8KQbQ=; b=md7CkA5xGoK/KzdAy3uiRmXizGRaLlUXV+kxLRwU3BZ80fkLK2KizLCiOUJFv7HVrp tK0J8O0v0Xx8cv8ddyVzfoKBgCl71rw+BPUrQpomOupZ8KFSYCSzjmXk2nzkha0kKwH4 whK4yHocg/DLHidhgOgXYL7B6tiOZCgzPNxS77l2yADDGiepK+y1tbacrXG415Ml0FO+ dMAjliaMTXMbJihkDjQMzTiwSTsvcwMSRykmYbywrrtdCjLbXW/9xTZ+zs65HDCRsya9 GWizvOhHAFPi1Xyy7xa64DLccnjvUbqljabkOAXj/hGYY7aSdMBGNLc00YClrdoZajyN mN7w== X-Gm-Message-State: APjAAAWCEUyCFIBVWGOgX2n6wyAYSXAKkTrDaIfT+6iPCxV5DiN2OU4T GsrdgBBSgA6uoKStYmYYQvWmmg== X-Google-Smtp-Source: APXvYqyqi7P3EgkAazgQczeDmVqJ1d/iYzFd3A4qEMOl6Sl00Jl2WrFk363AGlQfVaxWSAIHUHH7pA== X-Received: by 2002:a65:564b:: with SMTP id m11mr3970970pgs.133.1571376207362; Thu, 17 Oct 2019 22:23:27 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id g202sm4729336pfb.155.2019.10.17.22.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 22:23:26 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH v12 0/5] DMA-BUF Heaps (destaging ION) Date: Fri, 18 Oct 2019 05:23:18 +0000 Message-Id: <20191018052323.21659-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=DXKps7/0UTC6N/waL44YFVSLkuti5RrXPqcBWv8KQbQ=; b=gamFheCDtldh8w0DIQwjkJQvPpQ8fVyjLzcl2Bnce55vZageN2p4ZFmfA77Hrfg3vi IIuX81DfKF1sY9uChHRvpH+LqRDY4esOj4H4NmjK1xqGdgAvDKplrYujdUncFZabA2W7 CV1YHJWuWyoVtELxZ+dxIj4b75l46weQlcnVMPvJNBT1EqPmylnAAz7N4pHj5+/DR+eV US8Ysm9QoAyka+OTUptCBv9qihjrUN/x/S2a+Rv0ri00g9uAUwkhQF4mXumMLqQysELt sHbZk+4eFpXIimqCgWN0A5mLvPcTbg6LSUuyWtJHJwvTQ2CHEklWcly6eFL1SaJ9Vqsw MCcg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hillf Danton , Sudipto Paul , Vincent Donnefort , Chenbo Feng , Alistair Strachan , Liam Mark , Christoph Hellwig , dri-devel@lists.freedesktop.org, "Andrew F . Davis" , Hridya Valsaraju , Pratik Patel MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Cc: Laura Abbott Cc: Benjamin Gaignard Cc: Sumit Semwal Cc: Liam Mark Cc: Pratik Patel Cc: Brian Starkey Cc: Vincent Donnefort Cc: Sudipto Paul Cc: Andrew F. Davis Cc: Christoph Hellwig Cc: Chenbo Feng Cc: Alistair Strachan Cc: Hridya Valsaraju Cc: Hillf Danton Cc: dri-devel@lists.freedesktop.org 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