From patchwork Fri Sep 6 18:47:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 173284 Delivered-To: patches@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp1107649ilq; Fri, 6 Sep 2019 11:47:23 -0700 (PDT) X-Received: by 2002:a17:90a:1b46:: with SMTP id q64mr11360920pjq.97.1567795643808; Fri, 06 Sep 2019 11:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567795643; cv=none; d=google.com; s=arc-20160816; b=lUoG78EMEJ/pnUYAyoOn+J5fWi9xUtVPppEi21iALHw4EMzo3JWFTpt2NU8I86XlxR ggzdnrfGDjX0IxgdgSavH2dQSAd0XIhyNwEhU/+NkkiyAlgN4Jw+6+5ArFtHtOlxPLvC vJsyA7lyRAHNLcfTPpzeRrxV+E0lICMS6YK+gKy2YtCE7kdXLC0tPxZCc0LD7dgJsk7l tpQnFOEu3SqKKdgcbb5e0BeyCbBPTciAY5eoueoaUuYK0BiH+P4r5xmyi/QEs/2aW/Zc UBbvdCdg9ffaerz2oREvhGJIdb/H4g8JKI9wuJGqqCt4+MSwgAnuubK+TSPcZSmmxOhB 9YJA== 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=bteUBRSovqxiREZAaKxuf2P5GWKtzttCSC6EU+uFSpU=; b=OP47XssVI3XiPwkeER+tBBPO+AuWxCVttpzzkm3CFqz5W6PrdJqywJ8TBZ8SeZ+TBk qf2zYcfYUWh3KN+Ly27wCAQZozU1RWtkNioIGS7iPhKSGxpg/2Gk8fW4z5QJU3OEgJx4 mCNh1rYKag5UOte/zCs9ISh1WvUntV3fspdpgyC0VYkoL/GYoNF5mFqzmAhTcUoHLkTn 03I5DXV+vtj5qhklpSOXf+3ESdp/yY/XR/w7llK/J168JPWCCNtc6JaZL3lW3s0V+R4r LjxJmMAkQwcvjNgfQcSkg4ZeUBS27vxxCsCJGE24ScEVqHbQFvC/EMZwHKd7QP6xcFDi Er8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wYHHvwbq; 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 f126sor7754845pfa.1.2019.09.06.11.47.23 for (Google Transport Security); Fri, 06 Sep 2019 11:47:23 -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=wYHHvwbq; 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=bteUBRSovqxiREZAaKxuf2P5GWKtzttCSC6EU+uFSpU=; b=wYHHvwbqJ7HaMYcTkWb2dYNF4W2+NAqxn7tlNQMBrJzw+tTBU6H5R9G6RnJQJFH6H1 sVWcPG9rLnl62rIBoCi1Bk4PTKr9Txy1+7IhcQAg6e3xBSqWL1WGu11uTpxhucPx2btq D0QZXCOOIdJFrC0gNZJt1ggOelOxRtbQHNV4NIw2mtD9y0hIWfPoZHGaKQa5RDCJU+QI BgUAD6CatfeW/Vu4B5chs2KMblYoqxMkJ2WIhUB0gAKnkJAt8P/MVLSguRdBqHAir4u0 bbVxTjr3UL/d8HhvkIL6RDmNU/A+jJl4Ob/P8dTJ5agRZYYFlmunQxMFRXLO3/syO1Ch 29sw== 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=bteUBRSovqxiREZAaKxuf2P5GWKtzttCSC6EU+uFSpU=; b=Av0QNQjNGvkY/sVCPN4zePdxcaShsvUWjagRT/7PuoB3yhhcRm+APlErQqToQdGsUB bW+ghIlBWjHDFtL4wupF0LWkjKRoU5AJxpTFwi4Jms9iao1U4+pJ2xLM2mVxUlgXwRXK C4w/TXyoKb3rcpCgGk/NfZPWJ0Q/Zj3EXh2uawr3CSOVoZv5tY5JDqm5h7wIU6m/wEv3 sf9h1Y64GeHyJy7hYrhmjYsgtv9NZTSjv3U8usR+MFeS1K5Tk2c6FI+gI6DocAcsQH90 plqfFfHzliUm7vKm9XQu0lCcuXnvfRjZ1yEe3Uzst/Uxp4WPRGA3zUOzx8PAh/h3sruy UKVg== X-Gm-Message-State: APjAAAWpXIr/U9XE+CGyttWeF8UUeKsrr0dLw7RjB6A0Za8B5Gmrnoz6 WmS7sf+BijEkSwb+GskA2Ot7Jf+w X-Google-Smtp-Source: APXvYqxUd7CeOske7s7rKJ5qenySNBiLKVhOtGGcx2JVBT5NDIDkolf3oDezDlaXOrdICm2PTDjaqg== X-Received: by 2002:a62:1b0c:: with SMTP id b12mr12281895pfb.17.1567795643355; Fri, 06 Sep 2019 11:47:23 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id o35sm4889462pgm.29.2019.09.06.11.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 11:47:22 -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 , dri-devel@lists.freedesktop.org Subject: [RESEND][PATCH v8 3/5] dma-buf: heaps: Add system heap to dmabuf heaps Date: Fri, 6 Sep 2019 18:47:10 +0000 Message-Id: <20190906184712.91980-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190906184712.91980-1-john.stultz@linaro.org> References: <20190906184712.91980-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: dri-devel@lists.freedesktop.org Reviewed-by: Benjamin Gaignard 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 --- drivers/dma-buf/Kconfig | 2 + drivers/dma-buf/heaps/Kconfig | 6 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/system_heap.c | 122 ++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 drivers/dma-buf/heaps/Kconfig create mode 100644 drivers/dma-buf/heaps/system_heap.c -- 2.17.1 Reviewed-by: Brian Starkey diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig index 162e24e1e429..657ce743abda 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -48,4 +48,6 @@ menuconfig DMABUF_HEAPS allows userspace to use 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..5db4ef9b4afc --- /dev/null +++ b/drivers/dma-buf/heaps/system_heap.c @@ -0,0 +1,122 @@ +// 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 "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 -ENOMEM; +} + +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; +} +device_initcall(system_heap_create);