From patchwork Fri Nov 1 21:42:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 178336 Delivered-To: patches@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp1071998ill; Fri, 1 Nov 2019 14:42:45 -0700 (PDT) X-Received: by 2002:a17:90a:5286:: with SMTP id w6mr18043889pjh.76.1572644565609; Fri, 01 Nov 2019 14:42:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572644565; cv=none; d=google.com; s=arc-20160816; b=iFO8fah7hCSPZd22r/evH2qpuLTWQCcoC1DaGT7l2XWaTlnE2s77kXbk3Q/y47IREC tu7h1zRmLvWpXOJ5vI8ESkcaA08Drm92i22S9wI6c1A5aHYP5NJ7bd541vR0E1TvY45+ B+vyrVIRBn61NPod4dBuIVinkPYElVVa5Z9En0GL0X3QxxlHxlFFs9F9Q+qSByoAPnH+ RtlF2xIz1rY/YmMkKSimbUAOFsCNNSutuBrK9pN5JQWY0I2WNOiZdd4nJR6bVGgg5FRD Lxi9QoKfh2gPTXkGS85Qdgu0SdvU3Xe3TJKlkTYnHCNj041suT7XDaxzC5hyEpY90k8E +BuQ== 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=zsyNUtxc9hXZeSAhIQe7CJ4uz0AseevIwmkwC456WIM=; b=a++RgG5Ltdry74REp4i5+edJdWGn5szIsjjNWaKrRXqtCEPbnHmkP9QW2w9iv2vJbX GM9EoNO9MIC64IjNoP3ScPVUKXShysGostTDhOb00MKS4NLj1vMCV4JGr/k6yGsuT4gL grcjAsNjZT1cnIz9m6tSpk0BZp+yxr3Y5UxiEgVa8r4ufk8nO6ABqiFyppc7PV+il796 o6UkHV2mGQInpcfBudU2b7CrQE8DTGhNJIDnp+vBlUdXhJaEbshoOT1PJi/vtDJPl2xP TfiI+rTk4VOHuUMQF5C/JDpzNoB56HXadckkLjbEJxpUZ21a84Je6uuVbZm18DqgwiB8 w6lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FottNfCa; 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 a13sor12325701pfn.19.2019.11.01.14.42.45 for (Google Transport Security); Fri, 01 Nov 2019 14:42:45 -0700 (PDT) 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=FottNfCa; 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=zsyNUtxc9hXZeSAhIQe7CJ4uz0AseevIwmkwC456WIM=; b=FottNfCa6Y2ifojb04XiQ4QD7BavbugchST44Gitb/q4wPFyuBg0HpoteYS6zSLrgS B0/t6BxerfwYT4VQ9maXk88FF1jPqJFAWh2zasRJgbwaZOKMFIccZ4VtXVo7rNDnelQc 6ZwnXWDoSbJ0baqNQTmEHIM29AnTHTLyExB0Rcq6uCHa/zxgyJxFHfDrG5qutGPMOyJI Mbz7x9uAmoSpEvXLXrDQeK3FazRx5HhQpJA9EIghuoL2P3CuxyN35Cxl1vD9zfd+HBiP FaDWuOQmdDuU9KsKbN9BPrTbp4ejlSMqXCkscxdZm2kat/Ij+8cf8NoD2TYX4S1fN/oV KSGg== 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=zsyNUtxc9hXZeSAhIQe7CJ4uz0AseevIwmkwC456WIM=; b=lhOInpt6hdInqeOGX9YaFaFu1cIDyptA0XMfDhxREjYPTNyYnhgFuN5HT3VIPWlRjQ 8g2Q0HrtYIVuLYy7M8dcYAKWXdoaY7xh+MEl3K8q3nux1hhufMxWW8FRhasLjqJW0lqL SO7UgLrolxOtcZB9Xx1VvsV1F4JL3zPiJiJLMpQOMqEH9RK65IMJaN+1BUi2WnREADhp Bk4eWkoQxz6PKuL38kjHlLrFYJSw9I1x1GtfwHguPuU3asIWM22aWB82MVG+TTCgCPEe Exglf0JbxgBRSM7cP8NbfSvjqGwvZJobqx6hxWOPokVRUrsUy5K9ToUQJdzIn/AgWawZ fYug== X-Gm-Message-State: APjAAAXEY8OKkFCTs4TDqweH6DZcNsqd6FckCiGSI2ffohCS3ywKLF6S BF19d8uk0yqhqKR4d8KSouOs//Ud X-Google-Smtp-Source: APXvYqzD05OeotubP9D6EuYseumR2DT41+TpoL69H5vG+rcqcfKHVj/jrqYz5iZrdLfnH93q2/977w== X-Received: by 2002:a62:108:: with SMTP id 8mr16120307pfb.53.1572644565180; Fri, 01 Nov 2019 14:42:45 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id u36sm8299058pgn.29.2019.11.01.14.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 14:42:44 -0700 (PDT) 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: [PATCH v14 3/5] dma-buf: heaps: Add system heap to dmabuf heaps Date: Fri, 1 Nov 2019 21:42:36 +0000 Message-Id: <20191101214238.78015-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191101214238.78015-1-john.stultz@linaro.org> References: <20191101214238.78015-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: 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 --- drivers/dma-buf/Kconfig | 2 + drivers/dma-buf/heaps/Kconfig | 6 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/system_heap.c | 124 ++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 drivers/dma-buf/heaps/Kconfig create mode 100644 drivers/dma-buf/heaps/system_heap.c -- 2.17.1 Acked-by: Sandeep Patil 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..9a56393e40b4 --- /dev/null +++ b/drivers/dma-buf/heaps/system_heap.c @@ -0,0 +1,124 @@ +// 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->flags = heap_flags; + 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");