From patchwork Mon Oct 21 19:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11202885 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 4E25A13BD for ; Mon, 21 Oct 2019 19:03:17 +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 357D02086D for ; Mon, 21 Oct 2019 19:03:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 357D02086D 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 E912E6E1ED; Mon, 21 Oct 2019 19:03:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 879016E0BA for ; Mon, 21 Oct 2019 19:03:13 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id b4so71017pfr.12 for ; Mon, 21 Oct 2019 12:03:13 -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=jJ5jwtEtZvz3RKTAhKxTqC3TqPRBane8BbT7Fv1RJW8=; b=Kz+LN4dvJD9cSot+9soikdHu5pW6UZgO26oQTEKWSzCP2p1qZ+PF4nLGdmmNBXkBeE djzRq7FR7HT7RaFxh0LDTUHo95mM7fckvuy5RZVvw1U9tAb0WKQd2eVsT/J0mP/M9yhZ j0AdWCvMlAm5UTkzGEyc0Z9J9Pj6KPheCvBmMYN5M8LOD/sDGRWtR1qH7qositGUdq8v 05OZbe5fzcoEjcmpZXQqf6qrtIZYWmSaTLuitlTj/nnrLm0HDqJ9etGqbECBn3GhIoYI tc20ydzmHOnzKQdR/yF/FSjMAth9gPGaJiEmfhLhyBzTcrZ4iQdMymPHFNmdiq6Pnmvc jr/A== X-Gm-Message-State: APjAAAXwZzdlDV0ZtDYxLquU7WlP3dIg9NW/HwO36NWTq5FifBWUuFuc aheEB9OpI1S7r8rOlGbfHvhOxg== X-Google-Smtp-Source: APXvYqyTxiGSUWeYPGBn1NS7PIVC/jrrrhYoJpYqEd42zW4SoPqkKsN9p0nK2EnaXEJfoULDWS5CuQ== X-Received: by 2002:a62:6842:: with SMTP id d63mr24242194pfc.16.1571684592819; Mon, 21 Oct 2019 12:03:12 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id 127sm16223673pfy.56.2019.10.21.12.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 12:03:12 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH v13 0/5] DMA-BUF Heaps (destaging ION) Date: Mon, 21 Oct 2019 19:03:05 +0000 Message-Id: <20191021190310.85221-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=jJ5jwtEtZvz3RKTAhKxTqC3TqPRBane8BbT7Fv1RJW8=; b=hOZYCqXHqLC3n/MXyVtTmVRpZnPhQox7vXpqyfiWUOSxFNESfl7BJbI5z7n718hGfv +SqpxbTaH8IK/C8WlH1ldbzr0hXhYFj8W/DyfAj9XpFWFGTEjuvCVQH57EJuLW8Wae97 CuSrqpRnahvLph3SP0hlhbQ0ui3dyhNCUKYZGd9m4XHvoX+luJo39SBp7goWzNtEDBNR aft7fRiF/YRgIBEEeEK5/7AVK9UHtMY2IotFkc1BJXono6yiwCRV84AgjaK/oAQzB1ax pKfUOm0u/ZZe7Rwddo+wNwfJtY+hWxgEwFV88yFj1xHlTy7fau8HHxXpl+pRHAi8ga4n 9zQQ== 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" Lucky number 13! :) Last week in v12 I had re-added some symbol exports to support later patches I have pending to enable loading heaps from modules. He reminded me that back around v3 (its been awhile!) I had removed those exports due to concerns about the fact that we don't support module removal. So I'm respinning the patches, removing the exports again. I'll submit a patch to re-add them in a later series enabling moduels which can be reviewed indepently. With that done, lets get on to the boilerplate! 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 v13: * Re-remove symbol exports, per discussion with Brian. I'll resubmit these separately in a later patch so they can be independently reviewed 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 | 269 ++++++++++++++++++ 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 | 268 +++++++++++++++++ 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, 1304 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