From patchwork Sat Jan 23 03:46:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 369442 Delivered-To: patches@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2054875jam; Fri, 22 Jan 2021 19:46:59 -0800 (PST) X-Received: by 2002:a17:902:ce81:b029:de:6b3c:fcd2 with SMTP id f1-20020a170902ce81b02900de6b3cfcd2mr2168757plg.67.1611373619393; Fri, 22 Jan 2021 19:46:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611373619; cv=none; d=google.com; s=arc-20160816; b=YOpxzvtuYfaw39btz0U3OVYOmoHmLWFsn1dnbRrrE5ZDI+EU4ZMtHYIpLhh6z45o6A 8K5z5Ve369iFCdVQcqJue9JgI0V2WVYGAaTGg5YTtnDklaR265VXLTQKACuO09eouF1U Yyu+RPsqsYULtardxtLq/9zQv8AlipPb5ANebw8gyOwIo8bV/hXjNtaxrMPhGWUVS7Lk Yt9ZOJEf0u+mXnb9cjY2H1f2C2IlWmR/pttXgHtEBLU5liekDcxe06xYGuvQd17VVvsj pak3KKFhsy8V4jmT/OXSK7aPzXceT1nv+g/kqTvkSrqAwrW94YFCnxox1bcE2K5aPYiS 5eGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=eIz9eJyJXu6/ISVcKuUKV1kcYEIU0apdr0c0xGF5L5U=; b=zrJ53iIM7oDDGiYHsR5CgAxh12eCgqct8TgJudIhQ7Opdza1fNg6yBFt4v0fHxZbdD +zUjvYY78srGoueBGfViuf/f9AQOdlFpJMVZ0ulYmFNP667vdEe047Nc1jnpCQmRG98r S7PBA0aDDqdlYLlB0hXsukXTc5nek8ALGzm+IyTM2cD8dwKDEPVphSrJi2AuID8QF3ue ipQNbuo5mgin/yShBoVrhC9DNWMoMo2eE28+pE2p7JhAjlkLFRci68CQHw4Q64wmz7z0 uAScr3y88nRcql63PKY88OZeCJ3140MN76QIe0rYe/f1hcIJTPzZgZJkUGTauLR7cIQi c0AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RGwi+fv1; 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 t17sor6139509plg.41.2021.01.22.19.46.59 for (Google Transport Security); Fri, 22 Jan 2021 19:46:59 -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=RGwi+fv1; 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:mime-version :content-transfer-encoding; bh=eIz9eJyJXu6/ISVcKuUKV1kcYEIU0apdr0c0xGF5L5U=; b=RGwi+fv1NarV2ZM6xQ+X21bRSEmjjk4eiUnXtb/gHQmz5mMHsRsRXIFC1ohCkSAP+J nj4R/rCahRIwqPtzPJiwfKqoQqk4if+BEuNedvNKmgid26s6j8HTZM/T7okk4OVUtIbW RJQWtJ/auKyw80D8sW8dTlWNKlH5ROO5YKPKXR8VQeVC40pCGYuygBUPU+NboVchJA9A EKNffm8ORPSDms5QPEiSfMNvs9XfElOyuz7uhBQlNyt2LZxxh12ngW8ve/9B7ih+2RjE KinawOYjllp4WNwiYlp2pMGpylQcc3Mo7Phgk0gP4DMPopHu95dLVSgaFBkIO5HVEwP5 pX8w== 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:mime-version :content-transfer-encoding; bh=eIz9eJyJXu6/ISVcKuUKV1kcYEIU0apdr0c0xGF5L5U=; b=mJfYcGbXehGtD9QWch0fDYlt+94fr09Olo6f+KaZLIT78n/HPY3e1R8DgQlOdMjd/2 y3nMnLaPwKTd9k061CIZvK7UjToOiMhcmDIb/T1i7S8tnI4ZywJgZE6HvgsRBYgX6A3e z334nc46oZlxzFoQADWejnndK0ugCmRCjcGXjHoAALDiKJ2oWDYKx3ps5073VLiq93wD BAO/tf41BXP3YMhRG3kufculr6J1F2rge5X5l64DXI3uHdbKy3y30pDLAyjKsOstiP9i EZnBACSAiW+vINR1MOTZNsHa3JWspQZMj1mNGdbfDC1ht9nCnW1tqW6XffA5svv69sbV zIUg== X-Gm-Message-State: AOAM531/6II6fEcCmWJtrRqZW8RPPxUO0S0Aw6lvIy/nvyD05XnQmXs8 8cf6QYe2Yxy/sWhCwIuVS3HKmB3F X-Google-Smtp-Source: ABdhPJzFwHqWNibOM8QkDfSdDyW+abv1bOirYGBMtzRZOcLfTODA0Wb+Knw6EcR7GPu5xcpXmpq+2Q== X-Received: by 2002:a17:902:edcd:b029:df:d2b1:ecf0 with SMTP id q13-20020a170902edcdb02900dfd2b1ecf0mr7810310plk.15.1611373618954; Fri, 22 Jan 2021 19:46:58 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q24sm10316702pfs.72.2021.01.22.19.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 19:46:58 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , 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: [PATCH v2 1/3] dma-buf: heaps: Add deferred-free-helper library code Date: Sat, 23 Jan 2021 03:46:53 +0000 Message-Id: <20210123034655.102813-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 This patch provides infrastructure for deferring buffer frees. This is a feature ION provided which when used with some form of a page pool, provides a nice performance boost in an allocation microbenchmark. The reason it helps is it allows the page-zeroing to be done out of the normal allocation/free path, and pushed off to a kthread. As not all heaps will find this useful, its implemented as a optional helper library that heaps can utilize. Cc: Daniel Vetter 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 sleep in atomic issue from using a mutex, by switching to a spinlock as Reported-by: kernel test robot * Cleanup API to use a reason enum for clarity and add some documentation comments as suggested by Suren Baghdasaryan. --- drivers/dma-buf/heaps/Kconfig | 3 + drivers/dma-buf/heaps/Makefile | 1 + drivers/dma-buf/heaps/deferred-free-helper.c | 136 +++++++++++++++++++ drivers/dma-buf/heaps/deferred-free-helper.h | 55 ++++++++ 4 files changed, 195 insertions(+) create mode 100644 drivers/dma-buf/heaps/deferred-free-helper.c create mode 100644 drivers/dma-buf/heaps/deferred-free-helper.h -- 2.17.1 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index a5eef06c4226..ecf65204f714 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,3 +1,6 @@ +config DMABUF_HEAPS_DEFERRED_FREE + bool + config DMABUF_HEAPS_SYSTEM bool "DMA-BUF System Heap" depends on DMABUF_HEAPS diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile index 974467791032..4e7839875615 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_DMABUF_HEAPS_DEFERRED_FREE) += deferred-free-helper.o obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/deferred-free-helper.c b/drivers/dma-buf/heaps/deferred-free-helper.c new file mode 100644 index 000000000000..cf04148167a2 --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.c @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Deferred dmabuf freeing helper + * + * Copyright (C) 2020 Linaro, Ltd. + * + * Based on the ION page pool code + * Copyright (C) 2011 Google, Inc. + */ + +#include +#include +#include +#include +#include + +#include "deferred-free-helper.h" + +static LIST_HEAD(free_list); +static size_t list_size; +wait_queue_head_t freelist_waitqueue; +struct task_struct *freelist_task; +static DEFINE_SPINLOCK(free_list_lock); + +void deferred_free(struct deferred_freelist_item *item, + void (*free)(struct deferred_freelist_item*, + enum df_reason), + size_t size) +{ + unsigned long flags; + + INIT_LIST_HEAD(&item->list); + item->size = size; + item->free = free; + + spin_lock_irqsave(&free_list_lock, flags); + list_add(&item->list, &free_list); + list_size += size; + spin_unlock_irqrestore(&free_list_lock, flags); + wake_up(&freelist_waitqueue); +} + +static size_t free_one_item(enum df_reason reason) +{ + unsigned long flags; + size_t size = 0; + struct deferred_freelist_item *item; + + spin_lock_irqsave(&free_list_lock, flags); + if (list_empty(&free_list)) { + spin_unlock_irqrestore(&free_list_lock, flags); + return 0; + } + item = list_first_entry(&free_list, struct deferred_freelist_item, list); + list_del(&item->list); + size = item->size; + list_size -= size; + spin_unlock_irqrestore(&free_list_lock, flags); + + item->free(item, reason); + return size; +} + +static unsigned long get_freelist_size(void) +{ + unsigned long size; + unsigned long flags; + + spin_lock_irqsave(&free_list_lock, flags); + size = list_size; + spin_unlock_irqrestore(&free_list_lock, flags); + return size; +} + +static unsigned long freelist_shrink_count(struct shrinker *shrinker, + struct shrink_control *sc) +{ + return get_freelist_size(); +} + +static unsigned long freelist_shrink_scan(struct shrinker *shrinker, + struct shrink_control *sc) +{ + int total_freed = 0; + + if (sc->nr_to_scan == 0) + return 0; + + while (total_freed < sc->nr_to_scan) { + int freed = free_one_item(DF_UNDER_PRESSURE); + + if (!freed) + break; + + total_freed += freed; + } + + return total_freed; +} + +static struct shrinker freelist_shrinker = { + .count_objects = freelist_shrink_count, + .scan_objects = freelist_shrink_scan, + .seeks = DEFAULT_SEEKS, + .batch = 0, +}; + +static int deferred_free_thread(void *data) +{ + while (true) { + wait_event_freezable(freelist_waitqueue, + get_freelist_size() > 0); + + free_one_item(DF_NORMAL); + } + + return 0; +} + +static int deferred_freelist_init(void) +{ + list_size = 0; + + init_waitqueue_head(&freelist_waitqueue); + freelist_task = kthread_run(deferred_free_thread, NULL, + "%s", "dmabuf-deferred-free-worker"); + if (IS_ERR(freelist_task)) { + pr_err("%s: creating thread for deferred free failed\n", + __func__); + return -1; + } + sched_set_normal(freelist_task, 19); + + return register_shrinker(&freelist_shrinker); +} +device_initcall(deferred_freelist_init); diff --git a/drivers/dma-buf/heaps/deferred-free-helper.h b/drivers/dma-buf/heaps/deferred-free-helper.h new file mode 100644 index 000000000000..2c43dd5a3eda --- /dev/null +++ b/drivers/dma-buf/heaps/deferred-free-helper.h @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef DEFERRED_FREE_HELPER_H +#define DEFERRED_FREE_HELPER_H + +/** + * df_reason - enum for reason why item was freed + * + * This provides a reason for why the free funciton was called + * on the item. This is useful when deferred_free is used in + * combination with a pagepool, so under pressure the page can + * be immediately freed. + * + * DF_NORMAL: Normal deferred free + * + * DF_UNDER_PRESSURE: Free was called because the system + * is under memory pressure. Usually + * from a shrinker. Avoid allocating + * memory in the free call, as it may + * fail. + */ +enum df_reason { + DF_NORMAL, + DF_UNDER_PRESSURE, +}; + +/** + * deferred_freelist_item - item structure for deferred freelist + * + * This is to be added to the structure for whatever you want to + * defer freeing on. + * + * @size: size of the item to be freed + * @free: function pointer to be called when freeing the item + * @list: list entry for the deferred list + */ +struct deferred_freelist_item { + size_t size; + void (*free)(struct deferred_freelist_item *i, + enum df_reason reason); + struct list_head list; +}; + +/** + * deferred_free - call to add item to the deferred free list + * + * @item: Pointer to deferred_freelist_item field of a structure + * @free: Function pointer to the free call + * @size: Size of the item to be freed + */ +void deferred_free(struct deferred_freelist_item *item, + void (*free)(struct deferred_freelist_item *i, + enum df_reason reason), + size_t size); +#endif From patchwork Sat Jan 23 03:46:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 369443 Delivered-To: patches@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2054889jam; Fri, 22 Jan 2021 19:47:01 -0800 (PST) X-Received: by 2002:a63:6e8f:: with SMTP id j137mr3024867pgc.416.1611373621079; Fri, 22 Jan 2021 19:47:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611373621; cv=none; d=google.com; s=arc-20160816; b=AN1g7jRaXTDtQ1r7RkjCdOWfmgmnxnxeoQg5+CIlSLCvmEoO7Cl7AYysbZItAkkIx6 0dYxbqLohMjQMYZXlmk9tbIBznDzktJIjgxxpdQKy4IrYnAvpzbX0rze8jyzS/956QpQ eMjNHGEcpwoGlkMGTct015b7YTS5CtvzRB93PoftqBu43DGGpib24wSRn2XgC+gfS3yY DD4RoH919UaXNVtC68n8di0DR2uxbOwgXhUgsBvcO4+SA3+8L99aX61WGrtb8WF13T9S YlhU/gYMI0z8pu3zH9PB8Ufly0/tMEsOEx2DkRku9hSHI6UOW1qnnhJBObf9yYcMm2SA mKwA== 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=h/R7WJXx2yBQ6X+1N6Z+Yf8F4SerrZkQy0BygNc6vpE=; b=ZbV1SraJFip1HdiBFTg56tjSDffKUOvzLMkWy2qCe3Yes8g5aLWKUK/xSEK/xKLIVD g9nNyV8edtC0UFF/XtaL2ph5ovw5lQmUYMVSD89oOKWvExaIJ3EMHMed7Pdj0YrCozSp m0MLV+3Sk/1j4ksbwTHRZ3ae06pN8njcSaHdi+GsqIUcemmFSgyeME203zek2zTu4jdE PrWjhdgd12iIK3Df871+VGdoDBdw6tMnIKfQ7NeWJTW7s0AzT1NIH93rvRguEpVpQlAn +ZEqlv51si63ApjWENy6sdRdMOFmHSUhPkJjB4Q2mXK3kYdurZaZS6WsLvLmbhbfXXIG hLOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vpEYOxpR; 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 h7sor1483124pls.56.2021.01.22.19.47.01 for (Google Transport Security); Fri, 22 Jan 2021 19:47:01 -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=vpEYOxpR; 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=h/R7WJXx2yBQ6X+1N6Z+Yf8F4SerrZkQy0BygNc6vpE=; b=vpEYOxpR8Y/Oem4gX5RpQq2v98GT324JwoxUNrJx9PtgK5ZucfAWkMZnaQUNRs/nEb mASnX4KvGuLesOhAG8dpOYFBgOr9KQ/xjMf7kUcZ7fF0TA6wK//9QTuiz9hamom6PdUF XN7p5JIw/Lqu1/VMI0A59PKOPwwiie6hPblFjrvqywR0z5cK3RWjKiSWsX+b29qXAZFx V5f6FBI3QT1RSsQ8U++DxRDXVhYYANiWDaIAr897fVTJv+3gMPdGNda2LOloEtQsbPN9 UdezgFSS3kaGQ/dbMPcC2ey+RnczdgFRYreLve2gbDOshI9Mu7XQ80RqByQLcXUm0ZCv v1ag== 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=h/R7WJXx2yBQ6X+1N6Z+Yf8F4SerrZkQy0BygNc6vpE=; b=bCZqasn1sBHDtcpxYm7jOqdp5QWkAuHLSHpn7UZAUPzful5FpoTKyr2CyXaE0MF6z3 IF56/phzK5yGElmVqmoHvGmuSq5Fsg+PM1ATC9s1GBY+gJO9wHmhDxdH6p5nQ7zEK60f ubd48OhJBQiEoy8+7HPQu8/LMVlYRDi72vuDlET7p/lOAp1S03JyBCcYea8GPNtyzXOg 28ncFMewDzKnceYMP4yV/Kj9tk3e+5M+tSNG5xSQj9QuOg7EOWf52z3X/HvG8xWFZ0r+ Zfnc92yJUYPwPetlfjzQqcIc1o84XdLEEY+ROZxdNigfm8GPOJFRept3ay8PpcDDL+hG /XIw== X-Gm-Message-State: AOAM533HX1ZsqfrVl2zdOv7YIN9Lwt/vdMRsEon1kVoDbhPkqJVZdDzC KpXTrXhv7IdwZudaMLwydyUypXKL X-Google-Smtp-Source: ABdhPJzar9M76uw2JJgl51y1Mh8wsVNOiW/hoHOoNIN+8H5SVsn0OMu+AFzEWQB+IfdwIgvmGNPFvA== X-Received: by 2002:a17:902:9b90:b029:de:76e8:ee4b with SMTP id y16-20020a1709029b90b02900de76e8ee4bmr7862362plp.20.1611373620760; Fri, 22 Jan 2021 19:47:00 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q24sm10316702pfs.72.2021.01.22.19.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 19:46:59 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , 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: [PATCH v2 2/3] dma-buf: system_heap: Add pagepool support to system heap Date: Sat, 23 Jan 2021 03:46:54 +0000 Message-Id: <20210123034655.102813-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210123034655.102813-1-john.stultz@linaro.org> References: <20210123034655.102813-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: Daniel Vetter 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 --- drivers/dma-buf/heaps/Kconfig | 2 + drivers/dma-buf/heaps/system_heap.c | 68 +++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index ecf65204f714..748e840e6edd 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -4,6 +4,8 @@ config DMABUF_HEAPS_DEFERRED_FREE config DMABUF_HEAPS_SYSTEM bool "DMA-BUF System Heap" depends on DMABUF_HEAPS + select NET + 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; From patchwork Sat Jan 23 03:46:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 369444 Delivered-To: patches@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2054895jam; Fri, 22 Jan 2021 19:47:03 -0800 (PST) X-Received: by 2002:a17:90a:a502:: with SMTP id a2mr9086420pjq.218.1611373622878; Fri, 22 Jan 2021 19:47:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611373622; cv=none; d=google.com; s=arc-20160816; b=xC8k48B0E/IjeYsMFvzj0cwzrIcOkki9ff/Ww45iFarvIQZYZgEwo4yZwxscIZSbqg 9C5pLPGT/Dnr5aAMs119ilklxvAM1Fm2RlICuRazeEm7a6Msz8onevhClBHL7+DO+APr 5xOfCR/hk2f9Zf/+1H1ZADzfUkrrJR7VCNoZ7XLTLZD6I4momNR1joWuloGLLhzYp+KL l0m+4wHfdzMckYctBzWv//GnmtAsRCCUJ1uh22QRLcd680TEX072ftLL3yLvQM0XNcz4 ZCVAsG9HCHDt8Dqg/I8tgGrf4be4a/LOzvVZaI3uvPw1cKQXhiUX2g73c49rqeU0lMVj d6Fw== 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=NeU+sbXmljaYFeP3l6UlIJg8urIJG4eKqAQWq4YMm7Q=; b=iDyASYIDiUNgsUKKBDF8+OJm/JcTXyyZW9y/iH04ioqy762ZuLCol5SOr2MZRlRJMH seP3xWzXjTEV4e2XdVohJf0WVP7HCSAag+F2Fl4KbTcRsJOLwkxOGWTL5SUv4O6VnbuI icanro4z0AZz8m0+D4yrndc/gx/EWJFldhRAqkR2qEdX342IZC0+FwDFjKpIie10HpQs pFVilK2aobx1v1DeFh8v7M+MFixFnZI8kIjhOKb/zIXijYHCpXccMlhuFrYyfWzs+fBi qJxDSQQ4thEYR7biRsoB/zmnTuaroWIZO+KUlhCYt+4v8e6ob7/ycRjL3UsDuxMk1yfO 0EJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WnxuHG+5; 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 z1sor5824294pje.43.2021.01.22.19.47.02 for (Google Transport Security); Fri, 22 Jan 2021 19:47:02 -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=WnxuHG+5; 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=NeU+sbXmljaYFeP3l6UlIJg8urIJG4eKqAQWq4YMm7Q=; b=WnxuHG+58B7ObL97OX1lcKW9Hk6NeIHCjNLj+Ln4wJsoDeIQbBP+2ByXlvfZxdp6xM ZHm3dS++P7X/juDRpoRnVOs0+6P0DE/MLFMnFT+oG23Y2K+iDsKR1IqSXz50WqwNLXrW kc8oy2ktygL6toj6sEVnLbt/YzPbduFQAvMvfJWGL9Y19Os79LYUZkD+vum4PHTIZ9f9 LawLrkgE7NuSJ9/Pmb2fkpeWzn3k2SIDnK1MsF3/sHRAvqXGygs4L1hd7DocUguZpid5 cnYdR20sbtKRuHIyD3eTOjXgWNMHabLZkKYmh20fZBkdsFl6m0tC8YWSw9nyfLchkhQu S8yA== 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=NeU+sbXmljaYFeP3l6UlIJg8urIJG4eKqAQWq4YMm7Q=; b=edx/9di6s19L/FS3vaIdkVjHhFYzcCaupjLu0irL2+9SnUHJ+T32ohE9G2MJn/Zg3k V6YHpLcw7Ik/6sO2EGg1w+vj6ltdPJgEr13yHrYk7qqVF5AAJ7FloUxQH9FHiMedAFNp Gy5hzDhxEg1YLnR+P+rlu/VIYOwc0RMb+1kBWC7T3xtGsNrCiuJOJdzpxrjb1J5qyBzg X9vF9krSf9jF1Q6CmcBy+lqQ2ex1CwMjPghJKHSt/l/NSZLlDyYSUK/gA6+6CLAruSi2 eyfRIZgPdCrg+NhVZ/DyR6V0tGpjVKN22mIQgp+aO86KyLGIpnouUVsaio6LvG2rmxVV mhiw== X-Gm-Message-State: AOAM530oplhLBXS0egr3Vvccyd2hp6b4//b2vO0TdLw9Dz2LXQfmOv4j JxMbWUoidh9tpiz+LIG7DpXqCtqK X-Google-Smtp-Source: ABdhPJxIYWGLWs4iE8DbmMqeyBbwTuBXL43v1z7ZqgX+FHaaaJjZZAx1y0u7UHKgbJEkz+l0gMljOA== X-Received: by 2002:a17:90b:4c0b:: with SMTP id na11mr2604106pjb.45.1611373622594; Fri, 22 Jan 2021 19:47:02 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q24sm10316702pfs.72.2021.01.22.19.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 19:47:01 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Daniel Vetter , 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: [PATCH v2 3/3] dma-buf: system_heap: Add deferred freeing to the system heap Date: Sat, 23 Jan 2021 03:46:55 +0000 Message-Id: <20210123034655.102813-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210123034655.102813-1-john.stultz@linaro.org> References: <20210123034655.102813-1-john.stultz@linaro.org> MIME-Version: 1.0 Utilize the deferred free helper library in the system heap. This provides a nice performance bump and puts the system heap performance on par with ION. Cc: Daniel Vetter 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: * Rework deferred-free api to use reason enum as suggested by Suren Baghdasaryan --- drivers/dma-buf/heaps/Kconfig | 1 + drivers/dma-buf/heaps/system_heap.c | 32 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 748e840e6edd..3f4d7b949301 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -6,6 +6,7 @@ config DMABUF_HEAPS_SYSTEM depends on DMABUF_HEAPS select NET select PAGE_POOL + select DMABUF_HEAPS_DEFERRED_FREE 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 885e30894b77..747fa2250e84 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -22,6 +22,8 @@ #include #include +#include "deferred-free-helper.h" + static struct dma_heap *sys_heap; struct system_heap_buffer { @@ -32,6 +34,7 @@ struct system_heap_buffer { struct sg_table sg_table; int vmap_cnt; void *vaddr; + struct deferred_freelist_item deferred_free; }; struct dma_heap_attachment { @@ -317,30 +320,45 @@ static int system_heap_zero_buffer(struct system_heap_buffer *buffer) return ret; } -static void system_heap_dma_buf_release(struct dma_buf *dmabuf) +static void system_heap_buf_free(struct deferred_freelist_item *item, + enum df_reason reason) { - struct system_heap_buffer *buffer = dmabuf->priv; + struct system_heap_buffer *buffer; struct sg_table *table; struct scatterlist *sg; int i, j; + buffer = container_of(item, struct system_heap_buffer, deferred_free); /* Zero the buffer pages before adding back to the pool */ - system_heap_zero_buffer(buffer); + if (reason == DF_NORMAL) + if (system_heap_zero_buffer(buffer)) + reason = DF_UNDER_PRESSURE; // On failure, just free table = &buffer->sg_table; for_each_sg(table->sgl, sg, table->nents, i) { struct page *page = sg_page(sg); - for (j = 0; j < NUM_ORDERS; j++) { - if (compound_order(page) == orders[j]) - break; + if (reason == DF_UNDER_PRESSURE) { + __free_pages(page, compound_order(page)); + } else { + for (j = 0; j < NUM_ORDERS; j++) { + if (compound_order(page) == orders[j]) + break; + } + page_pool_put_full_page(pools[j], page, false); } - page_pool_put_full_page(pools[j], page, false); } sg_free_table(table); kfree(buffer); } +static void system_heap_dma_buf_release(struct dma_buf *dmabuf) +{ + struct system_heap_buffer *buffer = dmabuf->priv; + + deferred_free(&buffer->deferred_free, system_heap_buf_free, buffer->len); +} + static const struct dma_buf_ops system_heap_buf_ops = { .attach = system_heap_attach, .detach = system_heap_detach,