From patchwork Tue May 31 15:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12865816 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 635E0C433EF for ; Tue, 31 May 2022 15:06:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2F906B0078; Tue, 31 May 2022 11:06:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD9BC6B007B; Tue, 31 May 2022 11:06:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A794D6B007D; Tue, 31 May 2022 11:06:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 94A686B0078 for ; Tue, 31 May 2022 11:06:24 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 69F2281281 for ; Tue, 31 May 2022 15:06:24 +0000 (UTC) X-FDA: 79526364288.20.0DACEAC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 425174005C for ; Tue, 31 May 2022 15:06:20 +0000 (UTC) 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=62ABkmOOgORMI+bm0hKB0xxnAyhzK/P1vkVkvs5jI+o=; b=EhNulFSHHx6F4EI0eiU6dBA9/s 4mBuBAzozDcafhVRJwolO376xS2oEoGqyoSgRnADwfD13H/i5kSLz1q1IdMYwZsKLg/dJSAuhvKKE Z69+h7mKFuZguSKd9YiIg4JJO5QwH6GSey2fuTIX6cKq+uyGAmjx3RzqTFUcCSiNzhDgI//EWFpxy 6JcgGk46OSY3PtNS19pMSMomJIPmMgkYLUlTxiVXPcWO0N8Khit6mClGAfGgL2mr/v3LepkF3jFsL yeKu8Qz1+KmJwCqeomhmWDsQFDHHfr3ITVizxxOAysbFCGXrHjMaKEWDIgKCoa1XVBNh9NshKSsHu r/5te+lg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw3Rl-005T1W-EK; Tue, 31 May 2022 15:06:13 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 3/6] mm/page_alloc: Export free_frozen_pages() instead of free_unref_page() Date: Tue, 31 May 2022 16:06:08 +0100 Message-Id: <20220531150611.1303156-4-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220531150611.1303156-1-willy@infradead.org> References: <20220531150611.1303156-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EhNulFSH; dmarc=none; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 425174005C X-Stat-Signature: 8xtgkhef4xxja3twu4jmbxki6y6qj86u X-HE-Tag: 1654009580-853696 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: This API makes more sense for slab to use and it works perfectly well for swap. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand --- mm/internal.h | 4 ++-- mm/page_alloc.c | 18 +++++++++--------- mm/swap.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index c0f8fbe0445b..f1c0dab2b98e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -362,8 +362,8 @@ extern void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); extern int user_min_free_kbytes; -extern void free_unref_page(struct page *page, unsigned int order); -extern void free_unref_page_list(struct list_head *list); +void free_frozen_pages(struct page *, unsigned int order); +void free_unref_page_list(struct list_head *list); extern void zone_pcp_update(struct zone *zone, int cpu_online); extern void zone_pcp_reset(struct zone *zone); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6a8676cb69db..825922000781 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -687,14 +687,6 @@ static inline bool pcp_allowed_order(unsigned int order) return false; } -static inline void free_frozen_pages(struct page *page, unsigned int order) -{ - if (pcp_allowed_order(order)) /* Via pcp? */ - free_unref_page(page, order); - else - __free_pages_ok(page, order, FPI_NONE); -} - /* * Higher-order pages are called "compound pages". They are structured thusly: * @@ -3428,7 +3420,7 @@ static void free_unref_page_commit(struct page *page, int migratetype, /* * Free a pcp page */ -void free_unref_page(struct page *page, unsigned int order) +static void free_unref_page(struct page *page, unsigned int order) { unsigned long flags; unsigned long pfn = page_to_pfn(page); @@ -3458,6 +3450,14 @@ void free_unref_page(struct page *page, unsigned int order) local_unlock_irqrestore(&pagesets.lock, flags); } +void free_frozen_pages(struct page *page, unsigned int order) +{ + if (pcp_allowed_order(order)) /* Via pcp? */ + free_unref_page(page, order); + else + __free_pages_ok(page, order, FPI_NONE); +} + /* * Free a list of 0-order pages */ diff --git a/mm/swap.c b/mm/swap.c index f3922a96b2e9..c474bdf838e3 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -103,7 +103,7 @@ static void __put_single_page(struct page *page) { __page_cache_release(page); mem_cgroup_uncharge(page_folio(page)); - free_unref_page(page, 0); + free_frozen_pages(page, 0); } static void __put_compound_page(struct page *page)