From patchwork Tue May 31 15:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12865815 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 7C87EC433FE for ; Tue, 31 May 2022 15:06:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D5066B0075; Tue, 31 May 2022 11:06:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 587D16B0078; Tue, 31 May 2022 11:06:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FDAC6B007B; Tue, 31 May 2022 11:06:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2AF736B0075 for ; Tue, 31 May 2022 11:06:22 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A522A3444E for ; Tue, 31 May 2022 15:06:21 +0000 (UTC) X-FDA: 79526364162.05.08540A8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id 4B07118004D for ; Tue, 31 May 2022 15:06:17 +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=U21F7mEdCIyeLJkhpDaUduZ+OYTD90bWKWNzs0G7FtI=; b=Iw4qhUE/q1Gn5lLvoLzQL8MQvE hYv8eCAG9fSrrY+iiJCz/AaLP0fv9Vdu12ZJGYHPfZQ2ySr3Mc/hAbrIWYx2ArW6vUCPrRXYjBs39 NNiDXcM37SqMvH8OOkILVicyOHeSBgeGidTggH1Ae9Yd2aeHr/J/Mdx1p2hI78zOup2lHhNizkRcn 09yTV/pPS2vn1vN5Q5glPA4vqVCOV1047WP1spTLVwoovd8ohBcP235j6pgpM0+uPuug9cHYoWP7a 9Z2+R1ZzNddcTpHQN19BvCucpHy7PEefw5cqS8ROxgBD+DNfztDSzbd9oQUp2yYJ9SZuwyJLJ5LWt yRf49RPg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nw3Rl-005T1U-Bw; Tue, 31 May 2022 15:06:13 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 2/6] mm/page_alloc: Rename free_the_page() to free_frozen_pages() Date: Tue, 31 May 2022 16:06:07 +0100 Message-Id: <20220531150611.1303156-3-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 X-Rspamd-Queue-Id: 4B07118004D X-Stat-Signature: osac6uuo4sc71knqrrow6jx1iwmyrkfk Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="Iw4qhUE/"; dmarc=none; spf=none (imf06.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: rspam11 X-HE-Tag: 1654009577-816466 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: In preparation for making this function available outside page_alloc, rename it to free_frozen_pages(), which fits better with the other memory allocation/free functions. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand Reviewed-by: Miaohe Lin --- mm/page_alloc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 68bb77900f67..6a8676cb69db 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -687,7 +687,7 @@ static inline bool pcp_allowed_order(unsigned int order) return false; } -static inline void free_the_page(struct page *page, unsigned int order) +static inline void free_frozen_pages(struct page *page, unsigned int order) { if (pcp_allowed_order(order)) /* Via pcp? */ free_unref_page(page, order); @@ -713,7 +713,7 @@ static inline void free_the_page(struct page *page, unsigned int order) void free_compound_page(struct page *page) { mem_cgroup_uncharge(page_folio(page)); - free_the_page(page, compound_order(page)); + free_frozen_pages(page, compound_order(page)); } static void prep_compound_head(struct page *page, unsigned int order) @@ -5507,10 +5507,10 @@ EXPORT_SYMBOL(get_zeroed_page); void __free_pages(struct page *page, unsigned int order) { if (put_page_testzero(page)) - free_the_page(page, order); + free_frozen_pages(page, order); else if (!PageHead(page)) while (order-- > 0) - free_the_page(page + (1 << order), order); + free_frozen_pages(page + (1 << order), order); } EXPORT_SYMBOL(__free_pages); @@ -5561,7 +5561,7 @@ void __page_frag_cache_drain(struct page *page, unsigned int count) VM_BUG_ON_PAGE(page_ref_count(page) == 0, page); if (page_ref_sub_and_test(page, count)) - free_the_page(page, compound_order(page)); + free_frozen_pages(page, compound_order(page)); } EXPORT_SYMBOL(__page_frag_cache_drain); @@ -5602,7 +5602,7 @@ void *page_frag_alloc_align(struct page_frag_cache *nc, goto refill; if (unlikely(nc->pfmemalloc)) { - free_the_page(page, compound_order(page)); + free_frozen_pages(page, compound_order(page)); goto refill; } @@ -5634,7 +5634,7 @@ void page_frag_free(void *addr) struct page *page = virt_to_head_page(addr); if (unlikely(put_page_testzero(page))) - free_the_page(page, compound_order(page)); + free_frozen_pages(page, compound_order(page)); } EXPORT_SYMBOL(page_frag_free);