From patchwork Thu Oct 1 01:21:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 313918 Delivered-To: patches@linaro.org Received: by 2002:a05:6e02:1081:0:0:0:0 with SMTP id r1csp109064ilj; Wed, 30 Sep 2020 18:22:03 -0700 (PDT) X-Received: by 2002:aa7:9592:0:b029:13e:d13d:a054 with SMTP id z18-20020aa795920000b029013ed13da054mr4768454pfj.26.1601515323187; Wed, 30 Sep 2020 18:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601515323; cv=none; d=google.com; s=arc-20160816; b=QLyObsZtkxuRgrScIWWPV5DrqB8IDNSsYe9JuD6guHXNRgAA4UegfSFCqZTqU26guL hsuiKxI3wf0eyKYrY5rNSP9Sh3ZxLlsumzYYIFU7a9U0Rols2J5AJdDM9YJl+ztBJLG1 hVjIl84xYLnKhEX+jnNaGMIrvl9OQTZkz9jWM4vkq5L/CbaOqgABFZixEJ3CAGhdBfDE 06HFiu+NDoDAJj/k9zU4uiRz0oBlYntcptuiFxNvIJTcWvVPxfU9uPwaGeakRbWGLD8U EeBjyTDyZEPZBxdJxlMgul02fmw3de9s81ahvbbCYymAYWqipplsm1FLqpElkdIBanW7 +brQ== 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=qUE/bFNhODNtHNRsHvBXEA45DqCyOEgbacD10q/Sq0U=; b=RsZL6Nq8mZnpIDLwiGoG7p4RFHtmo9pSKHUuYEwJcCXjZoGQ/cCCJDpyvZEjhqyfxa Ggiq44rqx3oqpBDmsg8NLjbXrgU6gw0TLsj2OkLetBysfCC23su8iqOMp+cqtVq40t9E zcFGjSrFalbs1nF1WGopsvP6Aid9IxFUQyIuUVik4WIzqOKVy9E2xThwudwBSxPKU7Rk kjn13MV79DUql8Ji535edoUUOptVRdcSV3deThsaWmMqATZamysFY1BFwK0YsG0s6jjc fvnEIPVienoqT42wb6Kqfc6IGX7Jr9fvjSqw8xGFCb2kPQYT4SPkra0eJZg0KX8AY5jd RHxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Q/wAFM39"; 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 p24sor1827119pjo.1.2020.09.30.18.22.03 for (Google Transport Security); Wed, 30 Sep 2020 18:22:03 -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="Q/wAFM39"; 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=qUE/bFNhODNtHNRsHvBXEA45DqCyOEgbacD10q/Sq0U=; b=Q/wAFM39Rms4Cg6R01+pxD55x29L4ewoWoUZ+S7Z7mxiKyj0RhW8lBRNyebd0Ajsym ZbWsnFfYqThP83i3+/O/No7rhMIGxfFX6rUVBre1ij8ck79HtDUre+cgDGwlT/LebKd7 Z3N6vqdd6ZmYucEAMJrXw+K3tDHLxHrDTyNJVfWV1DLgF+3nMTuE4dzlFKe0dKyXgZ/L +YAOOxe1PoUmw4iwulvRAjtdjroKFzeUaT4zyNguSy9k1VnVUyRr4qZJuGyX9ZzlMCk8 SxRTLFymBz/46QTBHNI0oHkoPII+NSPNBePPKABgP1ToD/AnhtbNl6ONJ8Y5597Es9Hc vLgw== 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=qUE/bFNhODNtHNRsHvBXEA45DqCyOEgbacD10q/Sq0U=; b=Dfm7wIdRGAJ+EDhmDT3nYmQpNn7qSAxWj5oO23cjDhtTGf3LLArkzkA+IBUN1vDou6 OfMiLLoRHeWKg8oJ4R9SbFLTEPKYcdtdJNf0vO1R8SuynK7ErkGnKZMSFH9cnOqVcSRM F12GzV5Dk8l0yDZvl4/6x1N/8sxIEDUPso2ghPqtTJnX/vjYcQwDU3hHWxA0G2vlUC0B 5nRyWSH4fYIwI4kPr/3bs0yoK4fu2wlSNh1zHnZa5Pel+a5n+FryhP/IYOS1wk8wZtNx 7GD2FyzzBG3yCZL04Z0k5hVM8qFN2Ge6FjCdLH/Vz9Np7ztRtwIO9c7RaC0Ckmq2tBSc FRkA== X-Gm-Message-State: AOAM533EnqGMUGuud3Gj8vRtLxKFLlGD8KitttlyQOo0vx6aZiwwGpQ7 Ben0GUZn76btr/F6HzwVNSANtFxl X-Google-Smtp-Source: ABdhPJyJUcXPh+NYEvxLYkahDBmDEif30rbaBRcZGNLXe+O6HphWKSvRYIFKc6clx1LMc0IZE+eKKg== X-Received: by 2002:a17:90b:950:: with SMTP id dw16mr3201939pjb.200.1601515322827; Wed, 30 Sep 2020 18:22:02 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id s187sm4229372pfc.134.2020.09.30.18.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 18:22:02 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Sumit Semwal , Liam Mark , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , =?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 v2 5/6] dma-buf: system_heap: Add pagepool support to system heap Date: Thu, 1 Oct 2020 01:21:50 +0000 Message-Id: <20201001012151.21149-6-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201001012151.21149-1-john.stultz@linaro.org> References: <20201001012151.21149-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: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil 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 | 32 +++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index a5eef06c4226..f13cde4321b1 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,6 +1,7 @@ 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 d18937fa5b18..f30904345cce 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 struct dma_heap *sys_heap; @@ -46,6 +47,7 @@ struct dma_heap_attachment { 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) { @@ -265,13 +267,17 @@ 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; 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); @@ -301,8 +307,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; @@ -407,6 +412,25 @@ 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]; + pp.dma_dir = DMA_BIDIRECTIONAL; + 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;