From patchwork Mon Nov 18 20:23:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11250247 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 C6A74138C for ; Mon, 18 Nov 2019 20:23:38 +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 A54F3208D4 for ; Mon, 18 Nov 2019 20:23:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A54F3208D4 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 EBCE26E81F; Mon, 18 Nov 2019 20:23:36 +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 170396E81F for ; Mon, 18 Nov 2019 20:23:36 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id n13so10934911pff.1 for ; Mon, 18 Nov 2019 12:23:36 -0800 (PST) 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=XAQisB4dl7aAbIG9o/3Fhs9EnGFzGUZ+Rh3JFJPeyUo=; b=biHzHn/OVgPWNnyt56LR+2b1ODFeElkAsL85+9bc6GqJKMBWZ00tIaAhWVxObRnAxe JLKuMRyqrYNdx6VpSg9+SvQIj4RGFj1q3kMMjK90/HHFVMJP79sdZxdGlrVBSLqR66qx EYc7Xe7C+MO7MjNiYw/M8GnN5cXwPs/ycYIRtsxae4ujB1b/7quhvQ7CmwQciT18bRx3 Wwrf5tHS7HNn3Bjx7V6CGCVzR2WloGkKshMlvTEZvhzIurvCVEknNI+L6TNXUMvBhKJ2 QS00nsBxnWjRO3xJveprcUL7SYU0UkPeSv586Uip4PsIee4pCBBxpXB4N5qnw1tK5OBg U7jw== X-Gm-Message-State: APjAAAWa/77P5qs8uo+a+p+Z/fY0FxFupOaPC4hShGXUVnEcMllPNvSu ooNzqyuh499j2pIKRcitu8llzw== X-Google-Smtp-Source: APXvYqzszKweGiIVWPVEYmvVa4MfrnoT/NXciccAdxnbe9x2+dCK8nky7DqCpR/Q+xoBIN4KAiMfzQ== X-Received: by 2002:a63:5246:: with SMTP id s6mr1260904pgl.349.1574108615429; Mon, 18 Nov 2019 12:23:35 -0800 (PST) Received: from localhost.localdomain (c-67-170-172-113.hsd1.or.comcast.net. [67.170.172.113]) by smtp.gmail.com with ESMTPSA id 7sm11021871pgk.25.2019.11.18.12.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 12:23:34 -0800 (PST) From: John Stultz To: lkml Subject: [PATCH v16 0/5] DMA-BUF Heaps (destaging ION) Date: Mon, 18 Nov 2019 20:23:27 +0000 Message-Id: <20191118202332.109172-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=XAQisB4dl7aAbIG9o/3Fhs9EnGFzGUZ+Rh3JFJPeyUo=; b=fnKkNnpKHlNbmv516hbcaEVWV22ATAFpClGc5Mdu+VVOigCtBLxcu6J5CNtzvEghSM POZZtYYNU5wABbzevm8CUIdywLovEthS4H95eRLUYEFNQ4gJwmyX/G8C+t4QtRwkh4Ko EE5RcRpBRcAFa9w+g/xgOr8zRRPVCaus9YPRdsbxtTBFPhlzUHyqImODxk7ySg3BqoIx Wz1uMJ7Vc1ySCOJZKskur+Uyp+wEz2sUjacf/Tq7j7JGZpHlEwcZ7OLvWa1F78LEgnms LiVhHaw11wI9VHIZSqGjTiKlRIExquPZVj0X2xCSAIQNk4l22x+k8LJM310TV2eg56oc b7Pg== 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 , Sandeep Patil , 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" Just wanted to resend v16 with a few minor changes. This 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 reviewed (+2'ed) 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 v16: * Typo fix suggested by Hridya Valsaraju * Add extra error and ioctl compatibility testing suggested by Daniel Vetter to the kselftest test Thanks again for all the reviews and feedback! -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: Sandeep Patil Cc: Hillf Danton Cc: Dave Airlie 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 | 297 +++++++++++++ drivers/dma-buf/heaps/Kconfig | 14 + drivers/dma-buf/heaps/Makefile | 4 + drivers/dma-buf/heaps/cma_heap.c | 177 ++++++++ drivers/dma-buf/heaps/heap-helpers.c | 271 ++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 53 +++ drivers/dma-buf/heaps/system_heap.c | 123 ++++++ include/linux/dma-heap.h | 59 +++ include/uapi/linux/dma-heap.h | 53 +++ tools/testing/selftests/dmabuf-heaps/Makefile | 6 + .../selftests/dmabuf-heaps/dmabuf-heap.c | 396 ++++++++++++++++++ 14 files changed, 1484 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