Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1633061pxb; Thu, 4 Mar 2021 17:02:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9W/4ojVQtfP1RvzO+wxD/6PU6xTvwuSG47Au434uGTOMBfxQ0TIXbzjRL6ycHrNeVEpPZ X-Received: by 2002:a92:c5c6:: with SMTP id s6mr6507548ilt.168.1614906160288; Thu, 04 Mar 2021 17:02:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614906160; cv=none; d=google.com; s=arc-20160816; b=bv2r1HUOn/JN26WiraZhGYu+FpGEZ+aOZBazJZi/+qItYZWreD5GkT8A/20IA1oPWP wULmBUg1uc4ufBtfBDknFA+cPGP3T1MdDCY338TlFqYqZzW0PT3bSDq8wqdMrRTLbgmv EMeJrSKf5eGYEtr1okN4lEf6j8X/Hj3TxQgUOTVl1y1g4dHqImV8K1R3fUPfmSh8vtVP J621zJ8yrSG0TmwaAfs3f+B8ItM7j6iXp3IRXZAD/3kRxACRf7MyNJHWsgx7Gn4PJL6B +iNQJa3SskDbaQqFofzTOgn5IdVD8DlgrkS2FrsAcHXh+koV0il0v9XI3buqAPo+ktmW 2T+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ii5pLXD2o0NGRI7J9va73Vq97pj3xACBVXZkTcA+ReU=; b=Xjdi0xrd0y/hll6LmC3rMFotAhzmNjemBI+ldReDxql29cXqSL0znH91Jb2oPWOohW IDVzzUojOPDzUjDsZkqGRCZlqs7vfY5LXKiOpxV9p6nnZ6jy8knUQHoC1SLDvf9pu8KE HrBCNaPH6mVgkt6KQzhX466naRbtxlQZY/tdXO5Zng6im3aTouSUBV9dMNOPJJs/RQqv LTIAgNt8FiQRS68y/HfMiF24p/8OqjkAtyN/TkzNONt6Id6BgU+dtHWOIlr9sPWsZrP4 ztBT/W+K5RMDI6wbmMgF/DGODCOBbR2k7ouuID4PrXD2QHRyP6fr4/2J4+76krswiQp9 6WxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yQjXwBLc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a8si833834jam.14.2021.03.04.17.02.27; Thu, 04 Mar 2021 17:02:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yQjXwBLc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233098AbhCDXUY (ORCPT + 99 others); Thu, 4 Mar 2021 18:20:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233085AbhCDXUW (ORCPT ); Thu, 4 Mar 2021 18:20:22 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12E8DC061574 for ; Thu, 4 Mar 2021 15:20:22 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id o6so413519pjf.5 for ; Thu, 04 Mar 2021 15:20:22 -0800 (PST) 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=ii5pLXD2o0NGRI7J9va73Vq97pj3xACBVXZkTcA+ReU=; b=yQjXwBLc0O4odFqDIudXA0hwporccTe8AyopoQfYsvVJKuGq0mcsgQWYmabazWIQgG fP9zW5mFbccE6zRbj9xVs2DO5SqdaZ4tWxIihuCpm3T02yFIC6xtJsHWKU9qe1q0aNJy atfP525A+hA7ukkDjpvlx3MFGyYIPjd2UDjxR8drxMoxEiu4szP6fhvtbQZ4XXM/qWok nwKOVKMx6n6okVWrD8xOkcLwPFb7d4Kl9FMnqVBo+2ov44mVwftnF9HW0Bkbt8727Wod LqQcFwdx95lajJOBgJHUpi3CiDIvQ1BFWmKGvrElNBpnql8K/lucVrDh4Ad5mF9hgdp8 fQWQ== 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=ii5pLXD2o0NGRI7J9va73Vq97pj3xACBVXZkTcA+ReU=; b=eUO5SMCOHlBSAW7Cu9WIAC5hZqVAuB2AyqJENaNQOzt9OK/ovYIFptB2eikZyIySAE 1OSsL3hNvUFsDo2H9iMv+zOHPCZdWf2FPHF+liPsfN9i7TkO9bx8ZlYr2Z4I0FLtybuM QLcnoy678pueJob6pKfEN0CwR33AyGTmImYPapKEEkxGuYDzTtSBwFYHZXd/95NJKotR HIgtfK2KkpuNcCx9XMqD3Rr8ZlLUTjtPOVTKam+DieIqixZ4UWlBUyAEmQI7rAkbuhlE +bL1DNRDCCGEf7rHr29aB1DFa3DHJH10KfWONSUS4AnGNOWFc5EJ4h0rc49pNKYV2Va3 01iA== X-Gm-Message-State: AOAM532xQAbTyXbiaW7u86FH0Cyd0jzorv8oLOnGBGLI+LPwzFSbndPX fNvv9NCEDUZ9rmo3xaEsvYL3BvfyTCUtXA== X-Received: by 2002:a17:902:124:b029:e3:fe16:fdf5 with SMTP id 33-20020a1709020124b02900e3fe16fdf5mr6361806plb.1.1614900021199; Thu, 04 Mar 2021 15:20:21 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id u66sm429290pfc.72.2021.03.04.15.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 15:20:20 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , Christian Koenig , Sumit Semwal , Liam Mark , Chris Goldsworthy , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , Daniel Mentz , =?UTF-8?q?=C3=98rjan=20Eide?= , Robin Murphy , Ezequiel Garcia , Simon Ser , James Jones , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v8 4/5] dma-buf: system_heap: Add drm pagepool support to system heap Date: Thu, 4 Mar 2021 23:20:10 +0000 Message-Id: <20210304232011.1479036-5-john.stultz@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304232011.1479036-1-john.stultz@linaro.org> References: <20210304232011.1479036-1-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Utilize the drm pagepool 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: Daniel Vetter Cc: Christian Koenig 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 --- v2: * Fix build issue caused by selecting PAGE_POOL w/o NET as Reported-by: kernel test robot v3: * Simplify the page zeroing logic a bit by using kmap_atomic instead of vmap as suggested by Daniel Mentz v5: * Shift away from networking page pool completely to dmabuf page pool implementation v6: * Switch again to using the drm_page_pool code shared w/ ttm_pool v7: * Slight rework for drm_page_pool changes v8: * Rework to use the rewritten drm_page_pool logic * Drop explicit buffer zeroing, as the drm_page_pool handles that --- drivers/dma-buf/heaps/Kconfig | 1 + drivers/dma-buf/heaps/system_heap.c | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index f7aef8bc7119..7e28934e0def 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 DRM_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 29e49ac17251..006271881d85 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -21,6 +21,8 @@ #include #include +#include + static struct dma_heap *sys_heap; struct system_heap_buffer { @@ -53,6 +55,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 drm_page_pool pools[NUM_ORDERS]; static struct sg_table *dup_sg_table(struct sg_table *table) { @@ -281,18 +284,28 @@ static void system_heap_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map) dma_buf_map_clear(map); } +static unsigned long system_heap_free_pages(struct drm_page_pool *pool, struct page *p) +{ + __free_pages(p, pool->order); + return 1 << pool->order; +} + 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; + } + drm_page_pool_add(&pools[j], page); } sg_free_table(table); kfree(buffer); @@ -323,7 +336,9 @@ static struct page *alloc_largest_available(unsigned long size, if (max_order < orders[i]) continue; - page = alloc_pages(order_flags[i], orders[i]); + page = drm_page_pool_remove(&pools[i]); + if (!page) + page = alloc_pages(order_flags[i], orders[i]); if (!page) continue; return page; @@ -423,6 +438,12 @@ 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++) { + drm_page_pool_init(&pools[i], orders[i], + system_heap_free_pages); + } exp_info.name = "system"; exp_info.ops = &system_heap_ops; -- 2.25.1