From patchwork Mon Oct 7 21:18:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11178529 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 4B3A113BD for ; Mon, 7 Oct 2019 21:18:39 +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 336B720867 for ; Mon, 7 Oct 2019 21:18:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 336B720867 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 0C9946E111; Mon, 7 Oct 2019 21:18:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 573AB6E111 for ; Mon, 7 Oct 2019 21:18:35 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id t3so3136485pga.8 for ; Mon, 07 Oct 2019 14:18:35 -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=VbBm6b8WwaHoBx4mFTOrc4Z9KlFyur8to2u/o2RBPeM=; b=TxLpAnS7OnaL3EZ+rcEkskAY/sknMrxs/sZTHlOqb8WxWj51/ai1Nv0uBCYibB/9wi XjKzTJNdy/v1GFU3bgoTm+46SrQfDPOEYkcziq9GuQuTapO7n02rQifWvzLNF4JEZo1b jCUdH7AxCMzn/TJMe/i/MBywWWf7M+JUF6UrmEynCfP8JqNzhCbcb8Xy/s/ovgc1Rdqg Eyxkwqj1QABu8IuUCImKVBgWthYTHPRwQnMXsNJhlIXwwg4uyxdwH8pkQTfpmpyUmjhz 63JA4jhwsAENDyJ9qATKpJp5DrgDTcupCcCCVx+1Pq+gWFU5GSfBe+F59MgFivl+H4A/ Do/A== X-Gm-Message-State: APjAAAUCis8/aC3TJl+B4YqcUzDg2vkT/Aq9k9AH7GlgOnzU/vtpTwke xPjhWbW6j5DVxlLSiuLy7DmRhQ== X-Google-Smtp-Source: APXvYqzWtRA48S5+8dtm1saMMpkG0nG8yJMzSy8QmRFTTFL8Wy3mDXxu4fLDVKrbBhQKSLhFDwcxJA== X-Received: by 2002:aa7:90c7:: with SMTP id k7mr375558pfk.39.1570483113892; Mon, 07 Oct 2019 14:18:33 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id t3sm353100pje.7.2019.10.07.14.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 14:18:33 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH v10 0/5] DMA-BUF Heaps (destaging ION) Date: Mon, 7 Oct 2019 21:18:25 +0000 Message-Id: <20191007211830.42838-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=VbBm6b8WwaHoBx4mFTOrc4Z9KlFyur8to2u/o2RBPeM=; b=GcE47NBP9I7BB7+gClNGLixzNmqWME4k2afteOmwTWznkSGQO0GqiehqhqFiY9Lknu Fccp1WxLaC3E80fCPCGvJND9UcK5g1e2tpRI9QJP/7Yd1LYLY7oG9z8Ba1cvpG7n/KOt YW3tXHPrjGMKfd8zxSeEjhm0lnorpoxKR59GDpZ5NDud5QAmVdEHC85kNT9mMclerUot fywbpJmQa6SkU3EdQn1jSApp8aEZDBq44EyBAEDDGF3yaFz4+zU1fC9+1vsLeyOpD0h1 LeXcZKHOOx+sPJT+DfVBlYm/4o4v8aPJ0i61cm9ggUCK90qRFDRdstiEbrwfz9cEGZlI Opmw== 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" 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 v10: * Fixed missing vmalloc.h include that was causing trouble on mips and sh (Reported-by: kbuild test robot ) 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 | 250 ++++++++++++++++ drivers/dma-buf/heaps/Kconfig | 14 + drivers/dma-buf/heaps/Makefile | 4 + drivers/dma-buf/heaps/cma_heap.c | 169 +++++++++++ drivers/dma-buf/heaps/heap-helpers.c | 267 ++++++++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 55 ++++ drivers/dma-buf/heaps/system_heap.c | 122 ++++++++ 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, 1273 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