From patchwork Thu Jan 28 06:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 373575 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=-18.7 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, USER_AGENT_GIT 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 E4F73C433E6 for ; Thu, 28 Jan 2021 06:23:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFE2E6146D for ; Thu, 28 Jan 2021 06:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231383AbhA1GWy (ORCPT ); Thu, 28 Jan 2021 01:22:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231148AbhA1GWg (ORCPT ); Thu, 28 Jan 2021 01:22:36 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9F10C0613D6 for ; Wed, 27 Jan 2021 22:21:56 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id 11so3346067pfu.4 for ; Wed, 27 Jan 2021 22:21:56 -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=yF9oYLwsZ1KojzzdMIJNFHTIF6r0NLzbmizzA10msek=; b=hsKEFCeDBPBnnkjBCVVbIShSoY9OmkyTebKHBfnRXysY8Aciy3zWs6gv4DGrah5AUR Kgk8GtE3VPMyZIfJC9GLOdFwr3cweevE95L8zAHI7w4jMh4XLM4INu6IyB+g+HJLBlmF 2VWmU9oDGSV48vRWYea9wgobgBN6PblZwrnvU08P8TWMIYyx2gE9KhZdeMIyUI6XERvf j4dM1keHxZSwBKHwQUvhgDpo6Knar8Q2d9DayeTfN08fkaezIs8XMJVj3etyG/QRb8sf DgbmVmJeCKRP5RLfjnoXiQHvZ6grT/ji6IS60unxI8Gt4+3+IQANaXu07ZV5fCkrWKq1 bLTQ== 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=yF9oYLwsZ1KojzzdMIJNFHTIF6r0NLzbmizzA10msek=; b=icZlID/t+Gd53GT+uFw9VyDltT3CpegmrC0UdDKyVleXs+6LvWNY0ez/wIMBQpv/G1 2wniMLOn5dL7wKaD06ALAIqTv97y9RFJQ0aW+nQi3Xnn539mdwIk1uLRSDvSVwGP9q30 eWMwxpR31VPyuPkNJOR1/kiFMOa6GY1H8DvodlKOnSh2Qv3DQmQ2V/NBrF+zibfrY+22 qPcwRb5fhoOUrt6SLreLqbpti6pDAKgsSxtOfhy3n7klKe9JjtCa1izMP+5Y5qKMUfy8 o6JH62/CWwetVKQYYRVd1mTwnWnXUL1mtzAQN6PQaGH1klS0aRQdCMtmte4+ZxE3h1ya xyzw== X-Gm-Message-State: AOAM5328QywX8MdWlCpLAqIlupUUtFm+yOQBfTJ99FBKlrTeozX3Z2Og p+lK/gNMpSI2/+zo8/f5H4gSdg== X-Google-Smtp-Source: ABdhPJwxi586eEw48AejdKr0BVFHkCaeosEKpbkmcBQcanrMo5ek4fcHdf/tem0eB/as7f/hJ5B26g== X-Received: by 2002:a63:1220:: with SMTP id h32mr15123978pgl.309.1611814916310; Wed, 27 Jan 2021 22:21:56 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id s9sm4477765pfd.38.2021.01.27.22.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 22:21:55 -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 v3 3/3] dma-buf: system_heap: Add deferred freeing to the system heap Date: Thu, 28 Jan 2021 06:21:47 +0000 Message-Id: <20210128062147.438413-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210128062147.438413-1-john.stultz@linaro.org> References: <20210128062147.438413-1-john.stultz@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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(-) diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 45c7d277448b..2276420ae905 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 2addb6d832e0..fe122b5eff10 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 { @@ -301,30 +304,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,