From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A490C49EBB for ; Fri, 18 Dec 2020 14:37:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 215E123AAA for ; Fri, 18 Dec 2020 14:37:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729161AbgLROhF (ORCPT ); Fri, 18 Dec 2020 09:37:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729141AbgLROhC (ORCPT ); Fri, 18 Dec 2020 09:37:02 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 759E1C0617A7 for ; Fri, 18 Dec 2020 06:36:21 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id y23so2803654wmi.1 for ; Fri, 18 Dec 2020 06:36:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=YWmqcLqIz38MWpPJhReutWXbyy1oVWYK/A38RJq0qsI=; b=lZhtw4YVxqpHai4JdTeB2XrEhV07UVXh4y06cpjxeZXmu0zybW6wx/zJTsTei8FO8Y yqNOOxnpygr6dwpi2uMVNgYRv/lcmczfh2IpIqToLi2GT9xxuycSKDH2UplkwMTMfYn1 WI4iNR58MRcmQv8P3hEOIAOF9kDiKSQ62FLPY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=YWmqcLqIz38MWpPJhReutWXbyy1oVWYK/A38RJq0qsI=; b=g/dWlGKG35CbrnQ32miLDkOWuQWzt3862kym+LZPR9uowQYFIbxiVNomt35cMm9dyX W7C0EqhND5iecE7dHMr/fqU8eGQiEjMKIIRXxjv7LgDdaQu27epF1Vf4J/nqmLo1B54N RWdGdDTxVtRyuR9uaYhaeeyEFT3SR9fuGvQLiqUWsKwRsRAOuBBsPETEs9oAx7VF9DNt mUPx/bpTDUHWeFX/h6z73UojrJ52gFTFDEQjhpzDRDA30Sl4KqaDpOtRg/CEUbK61+jF ZghaGBB90mmg8IwqODy0Q+hhTvp3Yh3L6HsPQcfgqDeP70V7jxZTuXkFg8G+I+txnI/W ZmHQ== X-Gm-Message-State: AOAM531dtZDizvbViWbrclEqN3isOJqep4uqNBIlljGceO7vW7kulKSr CO1CD6xgfUEkFBUgUkulWuFJVw== X-Google-Smtp-Source: ABdhPJyqSRESDqSGQsY84t7M09sfQ8lcUyY2DVr2zPqGMIH/QznauwStZ8c9xSk3OEOK/jBzpLA9Jw== X-Received: by 2002:a1c:7d94:: with SMTP id y142mr4537787wmc.105.1608302180213; Fri, 18 Dec 2020 06:36:20 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id t1sm14644464wro.27.2020.12.18.06.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 06:36:19 -0800 (PST) Date: Fri, 18 Dec 2020 15:36:17 +0100 From: Daniel Vetter To: John Stultz Cc: lkml , Sandeep Patil , dri-devel@lists.freedesktop.org, Ezequiel Garcia , Robin Murphy , James Jones , Liam Mark , Laura Abbott , Chris Goldsworthy , Hridya Valsaraju , =?iso-8859-1?Q?=D8rjan?= Eide , linux-media@vger.kernel.org, Suren Baghdasaryan , Daniel Mentz Subject: Re: [RFC][PATCH 2/3] dma-buf: system_heap: Add pagepool support to system heap Message-ID: Mail-Followup-To: John Stultz , lkml , Sandeep Patil , dri-devel@lists.freedesktop.org, Ezequiel Garcia , Robin Murphy , James Jones , Liam Mark , Laura Abbott , Chris Goldsworthy , Hridya Valsaraju , =?iso-8859-1?Q?=D8rjan?= Eide , linux-media@vger.kernel.org, Suren Baghdasaryan , Daniel Mentz References: <20201217230612.32397-1-john.stultz@linaro.org> <20201217230612.32397-2-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201217230612.32397-2-john.stultz@linaro.org> X-Operating-System: Linux phenom 5.7.0-1-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 17, 2020 at 11:06:11PM +0000, John Stultz wrote: > 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 We also have one of these in ttm. I think we should have at most one of these for the gpu ecosystem overall, maybe as a helper that can be plugged into all the places. Or I'm kinda missing something, which could be since I only glanced at yours for a bit. But it's also called page pool for buffer allocations, and I don't think there's that many ways to implement that really :-) -Daniel > --- > drivers/dma-buf/heaps/Kconfig | 1 + > drivers/dma-buf/heaps/system_heap.c | 68 +++++++++++++++++++++++++++-- > 2 files changed, 65 insertions(+), 4 deletions(-) > > 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; > -- > 2.17.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch