From patchwork Tue Dec 3 17:26:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 180731 Delivered-To: patches@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1797930ile; Tue, 3 Dec 2019 09:26:48 -0800 (PST) X-Received: by 2002:a62:780d:: with SMTP id t13mr5942000pfc.147.1575394008894; Tue, 03 Dec 2019 09:26:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575394008; cv=none; d=google.com; s=arc-20160816; b=vdzgVWwkXDPWwl+whEWenjL5XMEAxCV2M0GcRjRHPrnPRWEaRw/Ap1EEx0cI0c9wBQ i7pqHG4UA+7C4AZ+b22NYOny0TXBWVcDa9bXgPNTDvZcW/cHTRZQ2mThp3pNZiARjPxt 9NBTt0kWEJZRhBd2l9ZXQ6RoMckrzoeuUOAtrDZ2t2GzdrhgfPB6EblQ8djJ+jcOvkaN GLXDp1XBXCdJwaoZcv+PuRIz/WzwLM0dt2FgVWL61KFWknWwGnDur6VxQm/Lb5rWYtOI 90OPVhSKTUnnj9Vt/LkBWeEHdj2n+irUDQN/pKbabpz+lwLUxreoeBip/wh9VyEJskvl dtHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=62c/6FPwz+q6rvXrG8i3YVfn6MxAXoMreZTxPxOlj5A=; b=ZJsr1MM7/v8xLxgU1cyDCuP39eu/yAtlzYIo+bg6Kmw1dsVsCTfUwIZobW/V5oyHLM sdZsM85MjsHATeOKsMgXYmdJckbglbLDuoSmFOPCMz3KpKhjp9X7X+mk4BalXlcxM7UR yE3AR2bduTLSfK2dbjQiAOoDLojJ4rHqCqnpAvYhZ6agv/kH2PFaGdCeX8aLnkKtzM4C 6QKs7Ll2KVZl3uI1poWjedaJRHXrAnDU7/Ir6sHHQz+U9u+kFzVE1VpcnpdxbURT4mGz d77+UskGQA7O7uEeqY6UD6AQx8zcPVteUx9v8dLhkKnxzxuB1705wWCo2KJ2p9Z1wQbw vR3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TdBRxm93; 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 h1sor4341726pll.21.2019.12.03.09.26.48 for (Google Transport Security); Tue, 03 Dec 2019 09:26:48 -0800 (PST) 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=TdBRxm93; 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:in-reply-to:references; bh=62c/6FPwz+q6rvXrG8i3YVfn6MxAXoMreZTxPxOlj5A=; b=TdBRxm93MWEJzLPG3GFmjGfx9o6FR4Xsykb8BQA7fymlky86MVXEOAUyqGbiasfRD2 C5/BQraHivWT/xoldACd0bT+JhRJITX+L3NUcAufY1tMfIPKmczoXM9ZaUXSo2blvTJD zWwDL3DvZsXytdVuBPD2+EdA9aRupeBkF3lcs/eF4Ee7HqqPAqn/+gT++BF9AL3QaYnp cS5zSGMU2nX0tuSI49Hq4/kcS1SkOCmbv9J1LOBXE/vSuf/BKN1AlKvQMjZTB5PFPAJc BoIV6TA95dalrNmXwSkwmRTbcWnN+pmBqlElNh0oV+sTEVh0xq2gGtmwEakg/ogGPtFz mM5Q== 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:in-reply-to :references; bh=62c/6FPwz+q6rvXrG8i3YVfn6MxAXoMreZTxPxOlj5A=; b=r+qmpnijRWlezA9/C+jr3mHunfLSob1vA6l0xM4+ZsHM63VO7AtLcMgqeQBL5iXlGG qVTW1OVGSE9TWuQtmNVywuNrbAskw6YcOiAjWZEPN7H2tKfn/TI1QI1eQI9BuiSIDCUw u7vVjNLMOZt89JaU5kZVcByYVy+ZF85Ylqd9pndA7+N1dfSuSuKbb7whwtsdR7rlRDjU FU/btS9AQpITprud98NnSLASztfZiokJb7N7ILkjaMZ0ycUwraSDf0NLQHyxbPPDtBE+ wfNsIb/IPP0Y5fsweNEd895VsBHrgxFHmNAym0Hl3QSVKwsrWOsy2L/mOCfd8DRycrr9 Ut/Q== X-Gm-Message-State: APjAAAUAgqPtSyc/5MLbUGfmyaEQCTTIUXJujbAO8pjLe1s17fskMZY7 gA3JQ5pMb2Ve5vnzWF2rPYOQtGeu X-Google-Smtp-Source: APXvYqwTvd+G7j/muP9d4H1LYFWUAYeYC+6TXLm+r+/Ehkl8KbkkauA3iVfSzy2+GF7qEXDIKwBXqA== X-Received: by 2002:a17:902:8d98:: with SMTP id v24mr5841727plo.329.1575394008406; Tue, 03 Dec 2019 09:26:48 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id l9sm4066177pgh.34.2019.12.03.09.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 09:26:47 -0800 (PST) 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 , Sandeep Patil , Hillf Danton , Dave Airlie , dri-devel@lists.freedesktop.org Subject: [RESEND][PATCH v16 3/5] dma-buf: heaps: Add system heap to dmabuf heaps Date: Tue, 3 Dec 2019 17:26:39 +0000 Message-Id: <20191203172641.66642-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203172641.66642-1-john.stultz@linaro.org> References: <20191203172641.66642-1-john.stultz@linaro.org> This patch adds system heap to the dma-buf heaps framework. This allows applications to get a page-allocator backed dma-buf for non-contiguous memory. This code is an evolution of the Android ION implementation, so thanks to its original authors and maintainters: Rebecca Schultz Zavin, Colin Cross, Laura Abbott, and others! 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 Reviewed-by: Benjamin Gaignard Reviewed-by: Brian Starkey Acked-by: Sandeep Patil Acked-by: Laura Abbott Tested-by: Ayan Kumar Halder Signed-off-by: John Stultz --- v2: * Switch allocate to return dmabuf fd * Simplify init code * Checkpatch fixups * Droped dead system-contig code v3: * Whitespace fixups from Benjamin * Make sure we're zeroing the allocated pages (from Liam) * Use PAGE_ALIGN() consistently (suggested by Brian) * Fold in new registration style from Andrew * Avoid needless dynamic allocation of sys_heap (suggested by Christoph) * Minor cleanups * Folded in changes from Andrew to use simplified page list from the heap helpers v4: * Optimization to allocate pages in chunks, similar to old pagepool code * Use fd_flags when creating dmabuf fd (Suggested by Benjamin) v5: * Back out large order page allocations (was leaking memory, as the page array didn't properly track order size) v6: * Minor whitespace change suggested by Brian * Remove unused variable v7: * Use newly lower-cased init_heap_helper_buffer helper * Add system heap DOS avoidance suggested by Laura from ION code * Use new dmabuf export helper v8: * Make struct dma_heap_ops consts (suggested by Christoph) * Get rid of needless struct system_heap (suggested by Christoph) * Condense dma_heap_buffer and heap_helper_buffer (suggested by Christoph) * Add forgotten include file to fix build issue on x86 v12: * Minor tweaks to prep loading heap from module v14: * Fix "redundant assignment to variable ret" issue reported by Colin King and fixed by Andrew Davis v15: * Drop unused heap flag from heap_helper_buffer as suggested by Sandeep Patil --- drivers/dma-buf/Kconfig | 2 + drivers/dma-buf/heaps/Kconfig | 6 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/system_heap.c | 123 ++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 drivers/dma-buf/heaps/Kconfig create mode 100644 drivers/dma-buf/heaps/system_heap.c -- 2.17.1 diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig index bffa58fc3e6e..0613bb7770f5 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -53,4 +53,6 @@ menuconfig DMABUF_HEAPS allows userspace to allocate dma-bufs that can be shared between drivers. +source "drivers/dma-buf/heaps/Kconfig" + endmenu diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig new file mode 100644 index 000000000000..205052744169 --- /dev/null +++ b/drivers/dma-buf/heaps/Kconfig @@ -0,0 +1,6 @@ +config DMABUF_HEAPS_SYSTEM + bool "DMA-BUF System Heap" + depends on DMABUF_HEAPS + help + Choose this option to enable the system dmabuf heap. The system heap + is backed by pages from the buddy allocator. If in doubt, say Y. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile index de49898112db..d1808eca2581 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += heap-helpers.o +obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c new file mode 100644 index 000000000000..1aa01e98c595 --- /dev/null +++ b/drivers/dma-buf/heaps/system_heap.c @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * DMABUF System heap exporter + * + * Copyright (C) 2011 Google, Inc. + * Copyright (C) 2019 Linaro Ltd. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "heap-helpers.h" + +struct dma_heap *sys_heap; + +static void system_heap_free(struct heap_helper_buffer *buffer) +{ + pgoff_t pg; + + for (pg = 0; pg < buffer->pagecount; pg++) + __free_page(buffer->pages[pg]); + kfree(buffer->pages); + kfree(buffer); +} + +static int system_heap_allocate(struct dma_heap *heap, + unsigned long len, + unsigned long fd_flags, + unsigned long heap_flags) +{ + struct heap_helper_buffer *helper_buffer; + struct dma_buf *dmabuf; + int ret = -ENOMEM; + pgoff_t pg; + + helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL); + if (!helper_buffer) + return -ENOMEM; + + init_heap_helper_buffer(helper_buffer, system_heap_free); + helper_buffer->heap = heap; + helper_buffer->size = len; + + helper_buffer->pagecount = len / PAGE_SIZE; + helper_buffer->pages = kmalloc_array(helper_buffer->pagecount, + sizeof(*helper_buffer->pages), + GFP_KERNEL); + if (!helper_buffer->pages) { + ret = -ENOMEM; + goto err0; + } + + for (pg = 0; pg < helper_buffer->pagecount; pg++) { + /* + * Avoid trying to allocate memory if the process + * has been killed by by SIGKILL + */ + if (fatal_signal_pending(current)) + goto err1; + + helper_buffer->pages[pg] = alloc_page(GFP_KERNEL | __GFP_ZERO); + if (!helper_buffer->pages[pg]) + goto err1; + } + + /* create the dmabuf */ + dmabuf = heap_helper_export_dmabuf(helper_buffer, fd_flags); + if (IS_ERR(dmabuf)) { + ret = PTR_ERR(dmabuf); + goto err1; + } + + helper_buffer->dmabuf = dmabuf; + + ret = dma_buf_fd(dmabuf, fd_flags); + if (ret < 0) { + dma_buf_put(dmabuf); + /* just return, as put will call release and that will free */ + return ret; + } + + return ret; + +err1: + while (pg > 0) + __free_page(helper_buffer->pages[--pg]); + kfree(helper_buffer->pages); +err0: + kfree(helper_buffer); + + return ret; +} + +static const struct dma_heap_ops system_heap_ops = { + .allocate = system_heap_allocate, +}; + +static int system_heap_create(void) +{ + struct dma_heap_export_info exp_info; + int ret = 0; + + exp_info.name = "system_heap"; + exp_info.ops = &system_heap_ops; + exp_info.priv = NULL; + + sys_heap = dma_heap_add(&exp_info); + if (IS_ERR(sys_heap)) + ret = PTR_ERR(sys_heap); + + return ret; +} +module_init(system_heap_create); +MODULE_LICENSE("GPL v2");