From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
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 [thread overview]
Message-ID: <20220531150611.1303156-4-willy@infradead.org> (raw)
In-Reply-To: <20220531150611.1303156-1-willy@infradead.org>
This API makes more sense for slab to use and it works perfectly
well for swap.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
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)
--
2.34.1
next prev parent reply other threads:[~2022-05-31 15:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-31 15:06 [PATCH 0/6] Allocate and free frozen pages Matthew Wilcox (Oracle)
2022-05-31 15:06 ` [PATCH 1/6] mm/page_alloc: Remove zone parameter from free_one_page() Matthew Wilcox (Oracle)
2022-05-31 16:59 ` David Hildenbrand
2022-06-01 6:53 ` Miaohe Lin
2022-05-31 15:06 ` [PATCH 2/6] mm/page_alloc: Rename free_the_page() to free_frozen_pages() Matthew Wilcox (Oracle)
2022-05-31 17:02 ` David Hildenbrand
2022-06-01 6:58 ` Miaohe Lin
2022-06-01 12:23 ` Matthew Wilcox
2022-06-02 7:45 ` Miaohe Lin
2022-05-31 15:06 ` Matthew Wilcox (Oracle) [this message]
2022-05-31 17:09 ` [PATCH 3/6] mm/page_alloc: Export free_frozen_pages() instead of free_unref_page() David Hildenbrand
2022-05-31 17:11 ` Matthew Wilcox
2022-05-31 15:06 ` [PATCH 4/6] mm/page_alloc: Add alloc_frozen_pages() Matthew Wilcox (Oracle)
2022-05-31 15:06 ` [PATCH 5/6] slab: Allocate frozen pages Matthew Wilcox (Oracle)
2022-05-31 17:15 ` David Hildenbrand
2022-05-31 17:33 ` Matthew Wilcox
2022-06-01 12:14 ` David Hildenbrand
2022-08-09 10:37 ` Vlastimil Babka (SUSE)
2022-05-31 15:06 ` [PATCH 6/6] slub: " Matthew Wilcox (Oracle)
2022-06-01 3:31 ` [PATCH 0/6] Allocate and free " William Kucharski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220531150611.1303156-4-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox