From patchwork Thu Oct 29 00:16:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 319296 Delivered-To: patches@linaro.org Received: by 2002:a17:906:3bd4:0:0:0:0 with SMTP id v20csp25987ejf; Wed, 28 Oct 2020 17:16:37 -0700 (PDT) X-Received: by 2002:a63:f502:: with SMTP id w2mr1637059pgh.186.1603930597389; Wed, 28 Oct 2020 17:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603930597; cv=none; d=google.com; s=arc-20160816; b=dmt/2jQSiUqSwC+ihA3/HJhCGiWlNFI+E7buKHl0TxgCl8DaJLAnH7wpBDSw+BaYad B5CWBY77okMJEmguhsOnti2vp92MxOrmlU+nXX3ApVAg1QVlTMiM2BwITQasnyPbGFdA 6DoAFvblOiA+xglVNE0Mts/rmWuZslq7lSx89R9VddIzXtdQD/TgUmo5WP/lBNajdl1v cvy+VZrvAcJ775TxfnRgc3qIHiWQVcfBtYXoMx71/QtSVDZU20/S4JijCK/T23fW5k27 QOdOguIbnfgNqOwUhFnnu13gmGz+y6VOdSDnjJrM58Ix756rCTb4ZDUnpuVOklCpbi5j 0bGA== 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=rVjH5kAWpZ89/EmydrKRHj8zSjZ6vFxUYPy5820x7gY=; b=sneI7Ty8/a9N+OwQre1yNx2Yb48njQQXFNqgRaBw0oyQhbRiV3h+cuRKGb0rlycUPE +WnyZifU09VqVhWgFc4HDrZTbn5Uo6Rw39SNdNS8lWjdm6iubd+Wmg3HOrtK5v4pFd3G UCd4ypE72P5lVSEhjUnkW46kEuHNpY4fpBR3yXFtKose9Kk4CW3QKAOWsGYGlNEiDhuf WIC+ORDDl76W+ZpPwroLUQADYvN1+a4f5vpexE0p4DJQLECklv3jc8p+CfSu0DJNHewT /eWqf3nMwKYVXfZu1FeZrJ0iPQDh7AQPuKXWKgxdqHIDmas/qpYfwX93G2t2CtV3MTMa teWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P+jjwLWr; 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 s11sor345081pjr.39.2020.10.28.17.16.36 for (Google Transport Security); Wed, 28 Oct 2020 17:16:37 -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=P+jjwLWr; 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 :mime-version:content-transfer-encoding; bh=rVjH5kAWpZ89/EmydrKRHj8zSjZ6vFxUYPy5820x7gY=; b=P+jjwLWrqBCCbLNR4qb6EqqJJTe5pzAlv9ANeDfjOTyASyInu/EbNZ4mClcZDxglf6 xOWGsPZTE1eeDCKhjHs+Llb7ueRM9gWtdQpGxyKHKq6jdoFFcYU/EP3Guo1YPhqx6mIT VfDuRi11MWRB+tqf2hnSdBaHGCPPzz+8Hkkf5JUTq9g33JUGfRiEag2IkzAE8WQdQznY 2RS1oOZpcwp+i3X6uCT9UMGjHUuxLrHCPFScwouuHVI5zbSaxOHGj8+saxznlO7pRccD Egn7Up7+heaUm70vppZHTmm9EVk/gyr01uKpMmc7pRF+zQPzBv+Gf4ItA72yETtWJNS6 i/BQ== 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=rVjH5kAWpZ89/EmydrKRHj8zSjZ6vFxUYPy5820x7gY=; b=DOMJuYH3rm5NIBAxLxfHpUeZ91wwjSI9Cwe5Jf1CcqtNXnLQVQ6rERh/Huyncer/+H fotErPXrYkq1GPNFCDBlD/QN3B2s4TEKpLzh7Q9+A3wUXwCtLX2dKutcOpiMYbKS64yh ehcEat2NL1hxKqjGX6fInGEtdr03xZ/gC4vGhF7M5ZMcmQnNB1PVHdz1wTD3jZslBgSq 4xP3BBOrqbhVnnNipeJddiYeJXbTaYrxjODHNwsIkvbUFpjzNFZlr6aaahbfDwEoqI5I 7UCiq9sYXexJwpDYP1+6i1cz5fkGyg+60GLLGASA+UtgDQc1pzVb8JcMoj0TjNQP5vLA ckhg== X-Gm-Message-State: AOAM531jFZAv9f8kAaGz5rHiMfK5b4RSj5/dm3WfTD6bSuda9w9ZeeMg Q0eWqfaMnYqpk7EaX0uOKyi7jIHO X-Google-Smtp-Source: ABdhPJyfLfvvtsd4sG4p5+VWzJBypi7Up03gLJMcUMLE5Cs3xkgCRKYR2kmDcLX8ori0m3oLSqZqqQ== X-Received: by 2002:a17:90a:8c:: with SMTP id a12mr1394656pja.155.1603930596489; Wed, 28 Oct 2020 17:16:36 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id u13sm727407pfl.162.2020.10.28.17.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 17:16:35 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Sumit Semwal , Liam Mark , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , Daniel Mentz , Chris Goldsworthy , =?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: [PATCH v4 5/7] dma-buf: system_heap: Allocate higher order pages if available Date: Thu, 29 Oct 2020 00:16:22 +0000 Message-Id: <20201029001624.17513-6-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201029001624.17513-1-john.stultz@linaro.org> References: <20201029001624.17513-1-john.stultz@linaro.org> MIME-Version: 1.0 While the system heap can return non-contiguous pages, try to allocate larger order pages if possible. This will allow slight performance gains and make implementing page pooling easier. Cc: Sumit Semwal Cc: Liam Mark Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: Chris Goldsworthy 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 Reviewed-by: Brian Starkey Signed-off-by: John Stultz --- v3: * Use page_size() rather then opencoding it --- drivers/dma-buf/heaps/system_heap.c | 83 ++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 18 deletions(-) -- 2.17.1 diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 15b36bc862b1..ef4b2c1032df 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -40,6 +40,14 @@ struct dma_heap_attachment { bool mapped; }; +#define HIGH_ORDER_GFP (((GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN \ + | __GFP_NORETRY) & ~__GFP_RECLAIM) \ + | __GFP_COMP) +#define LOW_ORDER_GFP (GFP_HIGHUSER | __GFP_ZERO | __GFP_COMP) +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) + static struct sg_table *dup_sg_table(struct sg_table *table) { struct sg_table *new_table; @@ -270,8 +278,11 @@ static void system_heap_dma_buf_release(struct dma_buf *dmabuf) int i; table = &buffer->sg_table; - for_each_sgtable_sg(table, sg, i) - __free_page(sg_page(sg)); + for_each_sg(table->sgl, sg, table->nents, i) { + struct page *page = sg_page(sg); + + __free_pages(page, compound_order(page)); + } sg_free_table(table); kfree(buffer); } @@ -289,6 +300,26 @@ static const struct dma_buf_ops system_heap_buf_ops = { .release = system_heap_dma_buf_release, }; +static struct page *alloc_largest_available(unsigned long size, + unsigned int max_order) +{ + struct page *page; + int i; + + for (i = 0; i < NUM_ORDERS; i++) { + if (size < (PAGE_SIZE << orders[i])) + continue; + if (max_order < orders[i]) + continue; + + page = alloc_pages(order_flags[i], orders[i]); + if (!page) + continue; + return page; + } + return NULL; +} + static int system_heap_allocate(struct dma_heap *heap, unsigned long len, unsigned long fd_flags, @@ -296,11 +327,13 @@ static int system_heap_allocate(struct dma_heap *heap, { struct system_heap_buffer *buffer; DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + unsigned long size_remaining = len; + unsigned int max_order = orders[0]; struct dma_buf *dmabuf; struct sg_table *table; struct scatterlist *sg; - pgoff_t pagecount; - pgoff_t pg; + struct list_head pages; + struct page *page, *tmp_page; int i, ret = -ENOMEM; buffer = kzalloc(sizeof(*buffer), GFP_KERNEL); @@ -312,25 +345,35 @@ static int system_heap_allocate(struct dma_heap *heap, buffer->heap = heap; buffer->len = len; - table = &buffer->sg_table; - pagecount = len / PAGE_SIZE; - if (sg_alloc_table(table, pagecount, GFP_KERNEL)) - goto free_buffer; - - sg = table->sgl; - for (pg = 0; pg < pagecount; pg++) { - struct page *page; + INIT_LIST_HEAD(&pages); + i = 0; + while (size_remaining > 0) { /* * Avoid trying to allocate memory if the process * has been killed by SIGKILL */ if (fatal_signal_pending(current)) - goto free_pages; - page = alloc_page(GFP_KERNEL | __GFP_ZERO); + goto free_buffer; + + page = alloc_largest_available(size_remaining, max_order); if (!page) - goto free_pages; + goto free_buffer; + + list_add_tail(&page->lru, &pages); + size_remaining -= page_size(page); + max_order = compound_order(page); + i++; + } + + table = &buffer->sg_table; + if (sg_alloc_table(table, i, GFP_KERNEL)) + goto free_buffer; + + sg = table->sgl; + list_for_each_entry_safe(page, tmp_page, &pages, lru) { sg_set_page(sg, page, page_size(page), 0); sg = sg_next(sg); + list_del(&page->lru); } /* create the dmabuf */ @@ -350,14 +393,18 @@ static int system_heap_allocate(struct dma_heap *heap, /* just return, as put will call release and that will free */ return ret; } - return ret; free_pages: - for_each_sgtable_sg(table, sg, i) - __free_page(sg_page(sg)); + for_each_sgtable_sg(table, sg, i) { + struct page *p = sg_page(sg); + + __free_pages(p, compound_order(p)); + } sg_free_table(table); free_buffer: + list_for_each_entry_safe(page, tmp_page, &pages, lru) + __free_pages(page, compound_order(page)); kfree(buffer); return ret;