From patchwork Tue Mar 5 20:54:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 159714 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5410408jad; Tue, 5 Mar 2019 12:54:48 -0800 (PST) X-Received: by 2002:a63:4607:: with SMTP id t7mr3070397pga.306.1551819288529; Tue, 05 Mar 2019 12:54:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551819288; cv=none; d=google.com; s=arc-20160816; b=HSuIn/Me6NotbX7pmQQvayygBXUhA0Nwk0MSOOzHRroMmJb0F0TyBtJ5QGLeK4u90J XG2ZPlqP/R0AbjyfXfONAXC9KWvtZ1ih+W/DM2c6ssdxFiurYb90GqxAX7cLVZuCtyvf Yw8vdFO1k9C9o1r+fP9f8IkCeMKKrakfnyHz1dWINXO6jJ+5e6YRGYardnqqfNCCtKkr Ka3JyE3+5WmtruluH5MFPTSMxVwDb+cj/ZH7IU5h2w4A6QOYnPEjOWkiK8sWRR5NaB1H FLYKTgliK4iO9aCIHFXLNGpjR0HzNsuxE8TR8IpiGIB/CD3j8tJ4dr6+hAlR7lnq8Ybs L56g== 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=zjNdJq9UTy396FItVuuFMC2moUGC3uBW2PZHwqhq9dk=; b=rRD7VPu7idOGe437BqzTTnyKYNYUzpSoDlbegCla50sF8O6frFXWeyhifLimms3CT5 aXIIOTatPFOx6xNBCOKgl3EVeTc9HfNCpodcwzJG2T352DXYxWN1RWAzZu7htxZGGJXg rbTm4aOBzn2QPD+5FcHv+8W0FOZj0yubwCtaTpfka0x3ZMVhXGrgAMDGSODI4LnPtTTB G3n9rBW685wZSuWPhDi0w+TGLbLMmHEK/EIxAS84p/rEHHuvqYML/141v8CHaF4pjeA0 SZY9jnnoDeaW0zhlWRX6CnscynT4YifoDlJk43p0LtI/itSGx2Jzi3oLokwp4t22IRbA 8HIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JGXEitfW; 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 d33sor9142773pla.12.2019.03.05.12.54.48 for (Google Transport Security); Tue, 05 Mar 2019 12:54: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=JGXEitfW; 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=zjNdJq9UTy396FItVuuFMC2moUGC3uBW2PZHwqhq9dk=; b=JGXEitfWTC2Fx8f/vKAaxDImoKOjNAKc/WUp8LWBS8yzzGJu6Hvqz1ohHTFYRbieZ4 m68weAQQgYdRN2VJoAVodZOyQ5W1bcx6E4gncHyE7EtAcTHSFcDNeP2TxXWxGJZNC/ZH s36M3ziKhwOLNaNCW4TShZcu3qAs48TnDwwHwwAleoNlBnf5rzLayRZjf+oQ/IpuTMrL R0o8zQbdqfUPrZoZ+y1JdeO9oh754Zp3ozNzlhFhjZf8hRb+K6wT7ySImkuG6cdVybf9 wvTBnyAqTwihnTN+4qu0rV7YolTCP/cnBUXDWpjcLX37Vvfb0dDrzLN1L3QN2/+KJgCX alJg== 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=zjNdJq9UTy396FItVuuFMC2moUGC3uBW2PZHwqhq9dk=; b=idY1LlO4fW7gjy4y6TCuW0vcN5hPhcDXsRdbz/5rolBGfpa/YCJV6PuNUthuCUaXBI edEgfePlVGNRkGd2cHVp4e6dNCWjJhdpGU4Mk7e/thRbdBaSOx6PzdT6+WqCqfCg7luX voCFZWyy+EK84p7QJrCZMIKrGoroGxTTcsduwxQdFu6RXQJQs9lrPP1EoecaB+ur2Yog ILsm7A3g4i89s/P8yIMxWpWWqxwF2twrY2jAoVfMDb9wRsvJLSm5wHo+URA82Fb5y4Ii 0bIXLHsw877Bll9EZHDuSPk0VG6UZ0Z4EAAqi6nT8eCPGSZg/oAjZTwTaA9G1pDFOUAr 5QRA== X-Gm-Message-State: APjAAAVuUL+wHHVPHc9U4ogW0nvWotmeE8I/OMP7w1zyXzFdWnIWnB/S IpK55RAhfDeRT3TWvybst+SBnF8+ X-Google-Smtp-Source: APXvYqyCoIwrVw6dklhSs10riFYQ7lAejNtK1w2JcI8ZHD/fdINxXX4t16AcR3LX1QOc3azbJVEYYQ== X-Received: by 2002:a17:902:7613:: with SMTP id k19mr3118077pll.207.1551819288135; Tue, 05 Mar 2019 12:54:48 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id i4sm13411788pfo.158.2019.03.05.12.54.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Mar 2019 12:54:46 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Laura Abbott , Benjamin Gaignard , Greg KH , Sumit Semwal , Liam Mark , Brian Starkey , "Andrew F . Davis" , Chenbo Feng , Alistair Strachan , dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 4/5 v2] dma-buf: heaps: Add CMA heap to dmabuf heapss Date: Tue, 5 Mar 2019 12:54:32 -0800 Message-Id: <1551819273-640-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551819273-640-1-git-send-email-john.stultz@linaro.org> References: <1551819273-640-1-git-send-email-john.stultz@linaro.org> This adds a CMA heap, which allows userspace to allocate a dma-buf of contiguous memory out of a CMA region. This code is an evolution of the Android ION implementation, so thanks to its original author and maintainters: Benjamin Gaignard, Laura Abbott, and others! Cc: Laura Abbott Cc: Benjamin Gaignard Cc: Greg KH Cc: Sumit Semwal Cc: Liam Mark Cc: Brian Starkey Cc: Andrew F. Davis Cc: Chenbo Feng Cc: Alistair Strachan Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- v2: * Switch allocate to return dmabuf fd * Simplify init code * Checkpatch fixups --- drivers/dma-buf/heaps/Kconfig | 8 ++ drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/cma_heap.c | 164 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 drivers/dma-buf/heaps/cma_heap.c -- 2.7.4 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 2050527..a5eef06 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM 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. + +config DMABUF_HEAPS_CMA + bool "DMA-BUF CMA Heap" + depends on DMABUF_HEAPS && DMA_CMA + help + Choose this option to enable dma-buf CMA heap. This heap is backed + by the Contiguous Memory Allocator (CMA). If your system has these + regions, you should say Y here. diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile index d1808ec..6e54cde 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += heap-helpers.o obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o +obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c new file mode 100644 index 0000000..33c18ec --- /dev/null +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * DMABUF CMA heap exporter + * + * Copyright (C) 2012, 2019 Linaro Ltd. + * Author: for ST-Ericsson. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "heap-helpers.h" + +struct cma_heap { + struct dma_heap heap; + struct cma *cma; +}; + + +#define to_cma_heap(x) container_of(x, struct cma_heap, heap) + + +static void cma_heap_free(struct heap_helper_buffer *buffer) +{ + struct cma_heap *cma_heap = to_cma_heap(buffer->heap_buffer.heap); + struct page *pages = buffer->priv_virt; + unsigned long nr_pages; + + nr_pages = PAGE_ALIGN(buffer->heap_buffer.size) >> PAGE_SHIFT; + + /* release memory */ + cma_release(cma_heap->cma, pages, nr_pages); + /* release sg table */ + sg_free_table(buffer->sg_table); + kfree(buffer->sg_table); + kfree(buffer); +} + +/* dmabuf heap CMA operations functions */ +static int cma_heap_allocate(struct dma_heap *heap, + unsigned long len, + unsigned long flags) +{ + struct cma_heap *cma_heap = to_cma_heap(heap); + struct heap_helper_buffer *helper_buffer; + struct sg_table *table; + struct page *pages; + size_t size = PAGE_ALIGN(len); + unsigned long nr_pages = size >> PAGE_SHIFT; + unsigned long align = get_order(size); + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + struct dma_buf *dmabuf; + int ret = -ENOMEM; + + if (align > CONFIG_CMA_ALIGNMENT) + align = CONFIG_CMA_ALIGNMENT; + + helper_buffer = kzalloc(sizeof(*helper_buffer), GFP_KERNEL); + if (!helper_buffer) + return -ENOMEM; + + INIT_HEAP_HELPER_BUFFER(helper_buffer, cma_heap_free); + helper_buffer->heap_buffer.flags = flags; + helper_buffer->heap_buffer.heap = heap; + helper_buffer->heap_buffer.size = len; + + + pages = cma_alloc(cma_heap->cma, nr_pages, align, false); + if (!pages) + goto free_buf; + + if (PageHighMem(pages)) { + unsigned long nr_clear_pages = nr_pages; + struct page *page = pages; + + while (nr_clear_pages > 0) { + void *vaddr = kmap_atomic(page); + + memset(vaddr, 0, PAGE_SIZE); + kunmap_atomic(vaddr); + page++; + nr_clear_pages--; + } + } else { + memset(page_address(pages), 0, size); + } + + table = kmalloc(sizeof(*table), GFP_KERNEL); + if (!table) + goto free_cma; + + ret = sg_alloc_table(table, 1, GFP_KERNEL); + if (ret) + goto free_table; + + sg_set_page(table->sgl, pages, size, 0); + + /* create the dmabuf */ + exp_info.ops = &heap_helper_ops; + exp_info.size = len; + exp_info.flags = O_RDWR; + exp_info.priv = &helper_buffer->heap_buffer; + dmabuf = dma_buf_export(&exp_info); + if (IS_ERR(dmabuf)) { + ret = PTR_ERR(dmabuf); + goto free_table; + } + + helper_buffer->heap_buffer.dmabuf = dmabuf; + helper_buffer->priv_virt = pages; + helper_buffer->sg_table = table; + + ret = dma_buf_fd(dmabuf, O_CLOEXEC); + if (ret < 0) { + dma_buf_put(dmabuf); + /* just return, as put will call release and that will free */ + return ret; + } + + return ret; +free_table: + kfree(table); +free_cma: + cma_release(cma_heap->cma, pages, nr_pages); +free_buf: + kfree(helper_buffer); + return ret; +} + +static struct dma_heap_ops cma_heap_ops = { + .allocate = cma_heap_allocate, +}; + +static int __add_cma_heaps(struct cma *cma, void *data) +{ + struct cma_heap *cma_heap; + + cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL); + + if (!cma_heap) + return -ENOMEM; + + cma_heap->heap.name = cma_get_name(cma); + cma_heap->heap.ops = &cma_heap_ops; + cma_heap->cma = cma; + + dma_heap_add(&cma_heap->heap); + + return 0; +} + +static int add_cma_heaps(void) +{ + cma_for_each_area(__add_cma_heaps, NULL); + return 0; +} +device_initcall(add_cma_heaps);