From patchwork Wed Oct 2 18:22:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11171759 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 4DDA213BD for ; Wed, 2 Oct 2019 18:23:05 +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 2E11C218DE for ; Wed, 2 Oct 2019 18:23:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E11C218DE 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 6BF956E167; Wed, 2 Oct 2019 18:23:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 567FE6E182 for ; Wed, 2 Oct 2019 18:23:01 +0000 (UTC) Received: by mail-pf1-x441.google.com with SMTP id v4so10897533pff.6 for ; Wed, 02 Oct 2019 11:23:01 -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=LeMz4C7dT0FzcwRqNC1m/9wgqjTMC7TmzNEWTD1jfe8=; b=ZcQF9W1g71msH1QCS44a1AoNRSp2UhcF2E8i+YZIcfm/q+x2w2yP5WQfB43LQHWT2R 5H7couD6yzmqNpRrw4K37NAWtr4jt/o+tlwoc++RsTC5g3eJUADvIZdOdJzvsKVyj0a5 428vhh5v7t8ta//kInXgLHB4Y0VfhNHxfuvtyv/GXViGwrSjfFc8Qg8d8dUKjGD9g706 ClOlDZYxs8vdLjgWbZ+IHDoYQumQXyq7/WJY5UGVEyo5CDIoGBw1tXIA10NiUnAurAye 4JBqajeE3vSy4uAWrayFFuG7r8e3k2sHOdt5bhjPQBPiZp7ybVDk4WBOgag+AXKMmi1b 2PGA== X-Gm-Message-State: APjAAAU0RGhkvUFDmCr1twqn+zhc2z2irLM+dxP46S0yqtKMchoc5wny 5jbF6EtPmVMvNY4ZU+5lEYBFTQ== X-Google-Smtp-Source: APXvYqxynvK0ZEj9IPwHaLbnXMAtSrlJJVuvwJ+TPBsbwOVAwDgxvOrrbOZpfQjUUShTKSwcjfoYqQ== X-Received: by 2002:a63:6b49:: with SMTP id g70mr5005563pgc.92.1570040579862; Wed, 02 Oct 2019 11:22:59 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q132sm171102pfq.16.2019.10.02.11.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 11:22:59 -0700 (PDT) From: John Stultz To: lkml Subject: [PATCH v9 0/5] DMA-BUF Heaps (destaging ION) Date: Wed, 2 Oct 2019 18:22:50 +0000 Message-Id: <20191002182255.21808-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=LeMz4C7dT0FzcwRqNC1m/9wgqjTMC7TmzNEWTD1jfe8=; b=yZuZNwU1Or5FVFpnm3rvPr6m2yw5OShjzOQomikgnNau24dgAB6sTtH4aUi7QS2Ogf Y8mooeE2eSY0D1fR26Z90RuqERzp46LzSIuRUOUENo42IMx5fGXwYbtQ2QpltO2FzVXx oHJgItEY0BRuxwVNj+ExfKMGsKIfvwUcWqc+KPQK9wtZVFSkLnfRR0e6l8CtJVh1iRDh ZbS5vmtuoHYN+J5X+qhSSOVzTa6grE1dDlihf+J6TI4yB4ULSs3bUHU6z9kysBxQdWMu 4NNty/sfPf9ZQZp69uS6dmTzLQwyrDOkHWpDkmgxAYZMk7thg7sWniWbKP3x5Z5R8kQi Wf9g== 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 v9: * Removing needless check in cma heap (noted by Brian Starkey) * Rename dma_heap_get_data->dma_heap_get_drvdata (suggested by Hilf Danton) * Check signals after clearing memory pages to avoid doing needless work if the task is killed (suggested by Hilf) * Better test error reporting (suggested d by Brian) * Other minor cleanups (suggested by Brian) Thoughts and feedback would be greatly appreciated! 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 | 266 ++++++++++++++++++ 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, 1272 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