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: 176759 Delivered-To: patches@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp362105ill; Thu, 17 Oct 2019 22:23:28 -0700 (PDT) X-Received: by 2002:a63:9d47:: with SMTP id i68mr7488570pgd.28.1571376208034; Thu, 17 Oct 2019 22:23:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571376208; cv=none; d=google.com; s=arc-20160816; b=SsY3/Miq93qSCW8o3MQ5hiy0a4A1Mzk75cVSqKS2XS8F928T2roXZOLml1joNxNQjt fcRBh+67gHBV4UGaMjvtfRjJI8yrXmdYGwWZKiEIGiLqC1W4hwMzj6dAH9ohaWEqFOjW yhhbxyOJ+OxCiZEXbTdWazfWBK59VVV7H2kUkJs6rp1vagSdosZ3MHqDRe2s3KDGUFO+ Z/vXk9cwhJM0VacVXAPVB8IX/mA7CFgzwJaoDoMMJQLz3JIHvpTjKloisgI+z3Vp+8/5 zgz1okdjel9U/yHUOSALpssqQaraxpFUjdmR/jcNFlzZYtCbm/IqRInh3h9wTKBp3/T7 rXEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=DXKps7/0UTC6N/waL44YFVSLkuti5RrXPqcBWv8KQbQ=; b=xxBstMfgiZY1fwOHABaoKj+GU4aE11VY7lb+UTJiugW5227wScjIYQU6hzvcChSjUY rIyrW3FnLsUsb/L8nxiXPrugPcQqOf/hgaIKhAf1HR6XauOkLISeumagtUJxLAiz/Al5 7uW93QCF/Q+fvslfk2pKauTP7RHAgmVb+/LLhDSnd7Yj3WZD+Lnc0h9bXpVEKnSR6BwI k/vrBuXOUUNKuj1ki8GQSZMy5xnZcIDD/Bg6/ZnRyOeDXqavASKQY6GDSVfnN1TX80Yc YJHZFcZyKsH7pbjysCkwibcBm0LAAcOiiyhAYsV0VlisX+B8t7ZcLhTkpVY0RRd5tG2u lL7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gamFheCD; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z123sor4253417pgz.61.2019.10.17.22.23.27 for (Google Transport Security); Thu, 17 Oct 2019 22:23:27 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gamFheCD; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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-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=hv3+I9PZ4c/fWMjCt9G8jKe46hWvR22CoPPmLDL9zQwJX2Mtm6iaVlY1y0/XlAbNtN sRMa70uwf24oA4wBw6jHyNVc8hgoYIeFidt0JQtPdaUviM7G4pUWlsRISV2zMfK1tZyU CmTB7oS7j6ibqz4ykZlbBE5REk94zYJDGZ3oWPkYItTAqC2eixLbs793EkvrXcYgB6MN plZQwWTRmD8F4boczw5DdXeb4Zz/uWziWan6F+zbuteW700x/YT1TVeTXbpkdklhRXHo O6Uv6GPgVpaL3qJvO8JXE1UFaHsKsKXyUKrgZH5L8m/pw121rojXQT821RSJI6J3qGhw wBRg== X-Gm-Message-State: APjAAAXWKV+p3Ig518XljfVPcKuDrbPv6WKG1VL0y1AR+YNpompf6SlY bQaBSKzdZVA/v4BAnzbxN7cKNaW2 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) Return-Path: 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 Cc: John Stultz , Laura Abbott , Benjamin Gaignard , Sumit Semwal , Liam Mark , Pratik Patel , Brian Starkey , Vincent Donnefort , Sudipto Paul , "Andrew F . Davis" , Christoph Hellwig , Chenbo Feng , Alistair Strachan , Hridya Valsaraju , Hillf Danton , dri-devel@lists.freedesktop.org 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 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 -- 2.17.1