From patchwork Fri Aug 25 13:59:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13365804 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DFCBC88CB2 for ; Fri, 25 Aug 2023 13:59:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC3FC2800C1; Fri, 25 Aug 2023 09:59:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D23A2800C8; Fri, 25 Aug 2023 09:59:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8E7A2800C7; Fri, 25 Aug 2023 09:59:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BD4708E0017 for ; Fri, 25 Aug 2023 09:59:26 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8CF22A06E9 for ; Fri, 25 Aug 2023 13:59:26 +0000 (UTC) X-FDA: 81162784332.09.639BA30 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 0548040006 for ; Fri, 25 Aug 2023 13:59:22 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="kmX/bgzv"; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692971964; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Uw/NH5iJzGksgzQyF3Y5iZkOcZVEYA15Wf8gjLzbAnU=; b=qPd7qVaR9nyjgshr16LhprEKKyItXH20Rsk5SNpDoIk79m6DGfhyfpDKb0O3W7rzN9zciv IDu/ZQEN0Va6zXZsYBVjuVPqC1sueab1B50Bk3fmmrAcS10hY1ngux7uTsbd3jHw9IPOu0 cXLRu8PzokFV9nQyaJuVftXj1bJxbO4= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="kmX/bgzv"; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692971964; a=rsa-sha256; cv=none; b=KOIpzYC+6PjhHUyKL2f+lKGrDlEIMOdTWaaLE+CSS6qhsHbJFsx6GVmW8z4fJWJi37pOSv rP9tiAWSE5XVEbJ0/5KpjTedDBvpjLgLVbbLWNJRLmk3I7glcXHroZYThndSwzifImxRbq /pXZ3yTrLPIFHUurrQ+c+FKq8cepBIA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Uw/NH5iJzGksgzQyF3Y5iZkOcZVEYA15Wf8gjLzbAnU=; b=kmX/bgzv5G50PlMppO4cSG9SGO joQOgQD/tPRvRpB5jZMRiOFCXp4qoheyElp9kFKRsPVRbIAWCdD/rRG7D894OmnvQMsw1WWJhn0UR BWWGkDRb8aow3qkkLhGd2N9iPsrjMQ3jj0zz6QH6Aa67tnJE5DmL3g9w/WH4rQFCzRMc1ElCcq2b2 iUZRvY0ctQOT/hQSYBnTPrR4htJXF67uc4ATbPKKE9g172E2IxJcBPMc9fOSctAnjY9ClkncAaK5j bDTPuYDWeKPlX9eM/S6w5kT+WIO8RijTKJ/MTFAmA17AJUWtepK504fUo76ADji4uZKgt44kLeOVh VWkrWoFA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qZXLM-00HTQT-VH; Fri, 25 Aug 2023 13:59:21 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [RFC PATCH 01/14] mm: Make folios_put() the basis of release_pages() Date: Fri, 25 Aug 2023 14:59:05 +0100 Message-Id: <20230825135918.4164671-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230825135918.4164671-1-willy@infradead.org> References: <20230825135918.4164671-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0548040006 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: x4wty4u3ktypgw9wi9mpqxmb7ztzf3ri X-HE-Tag: 1692971962-223671 X-HE-Meta: U2FsdGVkX1/UeJ6xcMCVGBu3L6d3uu6wbanj8dc15LjV8aNUUgz39gEc6gTWGNOmdXr4mvZnHJvDjUo7ulhxVH6oDatrWK8O1Pfhyk77mXahW7lG3jXqtMNGSMAE2dNRgdI8ClPAUyvAw53Gw3gY0zsjQkZAAeHTMXF0F7Q6YZHQg3qyrKxVEVa8fIKeDWh1lOl+XfEAIkjDiPbDx654VL1wFAEi6CX9kqt6uACoCOswj9BxtItFqKNA6Fb0OL87xDYMM7ob4TZYZhDrj8s1klNN2ycLzlnuSWAm9dL1AIatlfEozthL9AgvsHJNO47s0ZBDiahZuUSJLUbzq1rZ6jFNYBXd1Wjx0+wXRQfG5gk5bGGm1Uvx8GKM4f/iYmQqk03ZZlUY54VJ+qWMVBrETJW3tgZ5ve4M8OwRwZNW8OIWsRQ+OdOHR1UAGHvLq0PqkLWNPH1W2nbiCisyVmVJ+bYU0flDyy9FJNS1Xe0P43nPmsSh6eWVd4Qy4N42cWYG+j8qCJRcy4hMYLjhlJuQJt1jvwNOQ5b+WfvziFiiPoFke+TxbDFToJx5uq4dKvAAd2wO841Oh41NuXrREFcJTy4Sed5bIE40493mz/Y+mCBXKX7zLUZMJT6TEtR0nhTFBXifY60qiwZP9g6o6oHBAS78aXhoRdgrw6B1FDEaigpRpCJ9zZeLH0ZDUNV0YOJncH3Q74Yrc3g3y/5/YK9iocEhX7yMafs+yvv+wF2Is/29vLhrcLG5qj1E7f7m95Sd8mUjGsM/64XnLt8HnvBFU6WeBUTb7L7ZZovxutWGCC1qgO9sa7RHuiGKxfmlOPoCmXAhzYyTe7bOgiaabwMHTp/C5T5F93qXT9V04/fsZs45fs6AoOpFESUs/rXeWb8kxtRbYracBKe5rQ+x2ORXdXf3mIe8/MX5N6Bj0sZh4DDCwo2aWMuFcSQWcOrMgFmSp07rbpq55/1L8t+CT80 hcSCLw/G EJ3g6l28+xHhCpbHBJKLzGpjEJiQdl375WvZXOuBmnbBqK5gaEnF9mhBowas7k6fd6LWskkwite8YJnJQ7cJZfDAmkvWujH79dw4grURleFEFPaFM4+OoIMvgMzq7i0X7lu5JJRg/WRBEeRY0khMeaqqYJdAyujoo03BGAgAwbDdBHfwDFbfXTP5WsIzBv43MqtP/hFzXagnVHRb//vFiQ+ux2yJyWfiYm9b5 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: By making release_pages() call folios_put(), we can get rid of the calls to compound_head() for the callers that already know they have folios. We can also get rid of the lock_batch tracking as we know the size of the batch is limited by folio_batch. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 19 ++--------- mm/mlock.c | 3 +- mm/swap.c | 84 +++++++++++++++++++++++++++------------------- 3 files changed, 52 insertions(+), 54 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 2c6b54b5506a..7d1d96b75d11 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -36,6 +36,7 @@ struct anon_vma; struct anon_vma_chain; struct user_struct; struct pt_regs; +struct folio_batch; extern int sysctl_page_lock_unfairness; @@ -1521,23 +1522,7 @@ typedef union { } release_pages_arg __attribute__ ((__transparent_union__)); void release_pages(release_pages_arg, int nr); - -/** - * folios_put - Decrement the reference count on an array of folios. - * @folios: The folios. - * @nr: How many folios there are. - * - * Like folio_put(), but for an array of folios. This is more efficient - * than writing the loop yourself as it will optimise the locks which - * need to be taken if the folios are freed. - * - * Context: May be called in process or interrupt context, but not in NMI - * context. May be called while holding a spinlock. - */ -static inline void folios_put(struct folio **folios, unsigned int nr) -{ - release_pages(folios, nr); -} +void folios_put(struct folio_batch *folios); static inline void put_page(struct page *page) { diff --git a/mm/mlock.c b/mm/mlock.c index 06bdfab83b58..67bd74a6268a 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -206,8 +206,7 @@ static void mlock_folio_batch(struct folio_batch *fbatch) if (lruvec) unlock_page_lruvec_irq(lruvec); - folios_put(fbatch->folios, folio_batch_count(fbatch)); - folio_batch_reinit(fbatch); + folios_put(fbatch); } void mlock_drain_local(void) diff --git a/mm/swap.c b/mm/swap.c index cd8f0150ba3a..7bdc63b56859 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -89,7 +89,7 @@ static void __page_cache_release(struct folio *folio) __folio_clear_lru_flags(folio); unlock_page_lruvec_irqrestore(lruvec, flags); } - /* See comment on folio_test_mlocked in release_pages() */ + /* See comment on folio_test_mlocked in folios_put() */ if (unlikely(folio_test_mlocked(folio))) { long nr_pages = folio_nr_pages(folio); @@ -175,7 +175,7 @@ static void lru_add_fn(struct lruvec *lruvec, struct folio *folio) * while the LRU lock is held. * * (That is not true of __page_cache_release(), and not necessarily - * true of release_pages(): but those only clear the mlocked flag after + * true of folios_put(): but those only clear the mlocked flag after * folio_put_testzero() has excluded any other users of the folio.) */ if (folio_evictable(folio)) { @@ -221,8 +221,7 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn) if (lruvec) unlock_page_lruvec_irqrestore(lruvec, flags); - folios_put(fbatch->folios, folio_batch_count(fbatch)); - folio_batch_reinit(fbatch); + folios_put(fbatch); } static void folio_batch_add_and_move(struct folio_batch *fbatch, @@ -946,41 +945,27 @@ void lru_cache_disable(void) } /** - * release_pages - batched put_page() - * @arg: array of pages to release - * @nr: number of pages + * folios_put - Decrement the reference count on a batch of folios. + * @folios: The folios. * - * Decrement the reference count on all the pages in @arg. If it - * fell to zero, remove the page from the LRU and free it. + * Like folio_put(), but for a batch of folios. This is more efficient + * than writing the loop yourself as it will optimise the locks which need + * to be taken if the folios are freed. The folios batch is returned + * empty and ready to be reused for another batch; there is no need to + * reinitialise it. * - * Note that the argument can be an array of pages, encoded pages, - * or folio pointers. We ignore any encoded bits, and turn any of - * them into just a folio that gets free'd. + * Context: May be called in process or interrupt context, but not in NMI + * context. May be called while holding a spinlock. */ -void release_pages(release_pages_arg arg, int nr) +void folios_put(struct folio_batch *folios) { int i; - struct encoded_page **encoded = arg.encoded_pages; LIST_HEAD(pages_to_free); struct lruvec *lruvec = NULL; unsigned long flags = 0; - unsigned int lock_batch; - for (i = 0; i < nr; i++) { - struct folio *folio; - - /* Turn any of the argument types into a folio */ - folio = page_folio(encoded_page_ptr(encoded[i])); - - /* - * Make sure the IRQ-safe lock-holding time does not get - * excessive with a continuous string of pages from the - * same lruvec. The lock is held only if lruvec != NULL. - */ - if (lruvec && ++lock_batch == SWAP_CLUSTER_MAX) { - unlock_page_lruvec_irqrestore(lruvec, flags); - lruvec = NULL; - } + for (i = 0; i < folios->nr; i++) { + struct folio *folio = folios->folios[i]; if (is_huge_zero_page(&folio->page)) continue; @@ -1010,13 +995,8 @@ void release_pages(release_pages_arg arg, int nr) } if (folio_test_lru(folio)) { - struct lruvec *prev_lruvec = lruvec; - lruvec = folio_lruvec_relock_irqsave(folio, lruvec, &flags); - if (prev_lruvec != lruvec) - lock_batch = 0; - lruvec_del_folio(lruvec, folio); __folio_clear_lru_flags(folio); } @@ -1040,6 +1020,40 @@ void release_pages(release_pages_arg arg, int nr) mem_cgroup_uncharge_list(&pages_to_free); free_unref_page_list(&pages_to_free); + folios->nr = 0; +} +EXPORT_SYMBOL(folios_put); + +/** + * release_pages - batched put_page() + * @arg: array of pages to release + * @nr: number of pages + * + * Decrement the reference count on all the pages in @arg. If it + * fell to zero, remove the page from the LRU and free it. + * + * Note that the argument can be an array of pages, encoded pages, + * or folio pointers. We ignore any encoded bits, and turn any of + * them into just a folio that gets free'd. + */ +void release_pages(release_pages_arg arg, int nr) +{ + struct folio_batch fbatch; + struct encoded_page **encoded = arg.encoded_pages; + int i; + + folio_batch_init(&fbatch); + for (i = 0; i < nr; i++) { + /* Turn any of the argument types into a folio */ + struct folio *folio = page_folio(encoded_page_ptr(encoded[i])); + + if (folio_batch_add(&fbatch, folio) > 0) + continue; + folios_put(&fbatch); + } + + if (fbatch.nr) + folios_put(&fbatch); } EXPORT_SYMBOL(release_pages);