From patchwork Thu Dec 17 23:06:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 344963 Delivered-To: patches@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp1610914jai; Thu, 17 Dec 2020 15:06:20 -0800 (PST) X-Received: by 2002:a62:3:0:b029:160:d92:2680 with SMTP id 3-20020a6200030000b02901600d922680mr1475680pfa.44.1608246379951; Thu, 17 Dec 2020 15:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608246379; cv=none; d=google.com; s=arc-20160816; b=U9yyeUwIQjQoDV0grD97F90LF1uzqWo3kkYDNRmGsxpVr7blf6jRy8ga5KnqTuFlbx 02R+mW4T7AubJt7nCoNnXQBRtSFvLPocEHw6ihVnrxxotIa0sXazZkgmymW4VFC2aF8l k6snGuhFMBrvCk90th6EqNX4vth/frp448/txAeXyUXWsXEqYtz76l+Usp6ewxzJnAQV YYPrNeQBRMTTAd12P8StyiE9K/bNP60pIpJTEHGKw1JwY/LOizuJug/O4WYCtG8VvSYk Vk4kFV/NaKYELWUmChXwvffSQUUilODzA/jJ0uwu0Lnz+xn8Hxn6j78MvEK9+SzWQJbX h8TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=uAZMFvhVb6Eal/4evY++sNk0jscaxGLqs718IzEgtfA=; b=q/WbNXwpEXQSzOsBpzBhqteG+oK1caPnm6PfRWbP+0MwHJTgkmTZ2aRyX7vqGnVnQ5 W4NQQiXk5xqZbuZs84X16rXWXU2gkEmS+SJhBGeT4hVVEmZeXPsOa1kuxoKghQELYswT E+oxtVloghbhM7Uiv+U4dDewK1lwjGNSnpQUfgOSDlkS2agmP+1tdtigd0yaYb8yrnQ0 44CiCs7ua1njvMNLwI5hzztSoX1fgN1eOkb3Ggqv4z11qH1xHw/bQjlQva5qua7tqXRt HC5jgVLOpv/H5RFm1rx0FhFWSgMrKuSHSbEHdv9c9atq7+2aJEOKZ6ex0C12v+Pw2G9/ 585w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v83XWYa2; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id x10sor3392179pga.61.2020.12.17.15.06.19 for (Google Transport Security); Thu, 17 Dec 2020 15:06:19 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v83XWYa2; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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 :mime-version:content-transfer-encoding; bh=uAZMFvhVb6Eal/4evY++sNk0jscaxGLqs718IzEgtfA=; b=v83XWYa2YNnPD7aec5PNdxseR1Y/sUisiPYfR8FyqDAFb2zErOKxJgtsQUmOqyjedz NGiZ+FhC+mwAcIfB2l2m9WN7be9bU+vNtCNDiKnjvMFk5vZQaGF1mkSLePMo+oepC9Cn IFk7GlCNU5CfZ5ux4nzNStixNyFV5EDh/qEvSv+y6+1Sqw/THn1pc4kTu79MZA0pQsLz Dla5S7ftQ5RrH0hpPgrfoLldX9wzx/Vq92GVt8J+TvwFWKboHOOyiP9R7RsZZ6kS+vOn 3NB+xMDwPW7mVzTt6i8ll05ptaILp7GY1I5t0aAtjZKJnKUQ/KUpSQdpA7MEZmpe9B21 vxug== 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:mime-version:content-transfer-encoding; bh=uAZMFvhVb6Eal/4evY++sNk0jscaxGLqs718IzEgtfA=; b=oaJljTqJhbfqebCHJsRrvCfnnH1/G3qSHQ8MfpVbWO/OBuH87o/EZAESSKv1+Z0twy FsfCvm2b/rrScRKSltMCurb9ORh4Ud1RLsmC7UFBcrqDdQGaEA2AdpezFTQAL8GjgG/S 6VPjEWtm2CdXrGyf1XEbM7XZixjhm8gKfIqhvis5bzkznm7dMnC0CNs7e05cOKyB11tQ HHHR+KHF5RL9W25db1P5z5PTN8m7w0dQQYEu/psYiZOMAaIKHwkvQ+FYFoJmSinvfJ3r C//dFO+we3vr8ugVsmRxfRYGjablejxKvNMg0W86NUycZG05XkA7bfeeusyQBsWEh0zS Cr5g== X-Gm-Message-State: AOAM530Gj/9FOxBmEjT5DIdnCA1ywJKsq69gUEbBmMPuyrpDoV0+Ynlo wk1su4hzSeN0/n8TnjsJXi5YOdjX X-Google-Smtp-Source: ABdhPJwymKjQzvxQu0BjSpaG0P1NH7tVHLKT/pmV+W4uevA6LHyp/eohg7UcoVWSSb/68o0OizIdXQ== X-Received: by 2002:a63:1b58:: with SMTP id b24mr1505551pgm.38.1608246379486; Thu, 17 Dec 2020 15:06:19 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q9sm7074036pgb.82.2020.12.17.15.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 15:06:18 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Sumit Semwal , Liam Mark , Chris Goldsworthy , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , Daniel Mentz , =?utf-8?q?=C3=98rjan_Eide?= , Robin Murphy , Ezequiel Garcia , Simon Ser , James Jones , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 2/3] dma-buf: system_heap: Add pagepool support to system heap Date: Thu, 17 Dec 2020 23:06:11 +0000 Message-Id: <20201217230612.32397-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201217230612.32397-1-john.stultz@linaro.org> References: <20201217230612.32397-1-john.stultz@linaro.org> MIME-Version: 1.0 Reuse/abuse the pagepool code from the network code to speed up allocation performance. This is similar to the ION pagepool usage, but tries to utilize generic code instead of a custom implementation. Cc: Sumit Semwal Cc: Liam Mark Cc: Chris Goldsworthy Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: Ørjan Eide Cc: Robin Murphy Cc: Ezequiel Garcia Cc: Simon Ser Cc: James Jones Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- drivers/dma-buf/heaps/Kconfig | 1 + drivers/dma-buf/heaps/system_heap.c | 68 +++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index ecf65204f714..fa5e1c330cce 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -4,6 +4,7 @@ config DMABUF_HEAPS_DEFERRED_FREE config DMABUF_HEAPS_SYSTEM bool "DMA-BUF System Heap" depends on DMABUF_HEAPS + select PAGE_POOL 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/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 17e0e9a68baf..885e30894b77 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -20,6 +20,7 @@ #include #include #include +#include static struct dma_heap *sys_heap; @@ -53,6 +54,7 @@ static gfp_t order_flags[] = {HIGH_ORDER_GFP, LOW_ORDER_GFP, LOW_ORDER_GFP}; */ static const unsigned int orders[] = {8, 4, 0}; #define NUM_ORDERS ARRAY_SIZE(orders) +struct page_pool *pools[NUM_ORDERS]; static struct sg_table *dup_sg_table(struct sg_table *table) { @@ -281,18 +283,59 @@ static void system_heap_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map) dma_buf_map_clear(map); } +static int system_heap_clear_pages(struct page **pages, int num, pgprot_t pgprot) +{ + void *addr = vmap(pages, num, VM_MAP, pgprot); + + if (!addr) + return -ENOMEM; + memset(addr, 0, PAGE_SIZE * num); + vunmap(addr); + return 0; +} + +static int system_heap_zero_buffer(struct system_heap_buffer *buffer) +{ + struct sg_table *sgt = &buffer->sg_table; + struct sg_page_iter piter; + struct page *pages[32]; + int p = 0; + int ret = 0; + + for_each_sgtable_page(sgt, &piter, 0) { + pages[p++] = sg_page_iter_page(&piter); + if (p == ARRAY_SIZE(pages)) { + ret = system_heap_clear_pages(pages, p, PAGE_KERNEL); + if (ret) + return ret; + p = 0; + } + } + if (p) + ret = system_heap_clear_pages(pages, p, PAGE_KERNEL); + + return ret; +} + static void system_heap_dma_buf_release(struct dma_buf *dmabuf) { struct system_heap_buffer *buffer = dmabuf->priv; struct sg_table *table; struct scatterlist *sg; - int i; + int i, j; + + /* Zero the buffer pages before adding back to the pool */ + system_heap_zero_buffer(buffer); table = &buffer->sg_table; for_each_sg(table->sgl, sg, table->nents, i) { struct page *page = sg_page(sg); - __free_pages(page, compound_order(page)); + for (j = 0; j < NUM_ORDERS; j++) { + if (compound_order(page) == orders[j]) + break; + } + page_pool_put_full_page(pools[j], page, false); } sg_free_table(table); kfree(buffer); @@ -322,8 +365,7 @@ static struct page *alloc_largest_available(unsigned long size, continue; if (max_order < orders[i]) continue; - - page = alloc_pages(order_flags[i], orders[i]); + page = page_pool_alloc_pages(pools[i], order_flags[i]); if (!page) continue; return page; @@ -428,6 +470,24 @@ static const struct dma_heap_ops system_heap_ops = { static int system_heap_create(void) { struct dma_heap_export_info exp_info; + int i; + + for (i = 0; i < NUM_ORDERS; i++) { + struct page_pool_params pp; + + memset(&pp, 0, sizeof(pp)); + pp.order = orders[i]; + pools[i] = page_pool_create(&pp); + + if (IS_ERR(pools[i])) { + int j; + + pr_err("%s: page pool creation failed!\n", __func__); + for (j = 0; j < i; j++) + page_pool_destroy(pools[j]); + return PTR_ERR(pools[i]); + } + } exp_info.name = "system"; exp_info.ops = &system_heap_ops;