From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
David Hildenbrand <david@redhat.com>,
William Kucharski <william.kucharski@oracle.com>
Subject: [PATCH v2 03/16] mm/page_alloc: Export free_frozen_pages() instead of free_unref_page()
Date: Tue, 9 Aug 2022 18:18:41 +0100 [thread overview]
Message-ID: <20220809171854.3725722-4-willy@infradead.org> (raw)
In-Reply-To: <20220809171854.3725722-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>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
---
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 785409805ed7..08d0881223cf 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 04260b5a7699..30e7a5974d39 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -761,14 +761,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:
*
@@ -3464,7 +3456,7 @@ static void free_unref_page_commit(struct zone *zone, struct per_cpu_pages *pcp,
/*
* 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 __maybe_unused UP_flags;
@@ -3504,6 +3496,14 @@ void free_unref_page(struct page *page, unsigned int order)
pcp_trylock_finish(UP_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 6525011b715e..647f6f77193f 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -102,7 +102,7 @@ static void __folio_put_small(struct folio *folio)
{
__page_cache_release(folio);
mem_cgroup_uncharge(folio);
- free_unref_page(&folio->page, 0);
+ free_frozen_pages(&folio->page, 0);
}
static void __folio_put_large(struct folio *folio)
--
2.35.1
next prev parent reply other threads:[~2022-08-09 17:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-09 17:18 [PATCH v2 00/16] Allocate and free frozen pages Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 01/16] mm/page_alloc: Cache page_zone() result in free_unref_page() Matthew Wilcox (Oracle)
2022-08-10 1:56 ` Miaohe Lin
2022-08-10 6:31 ` Muchun Song
2022-08-10 15:00 ` Mel Gorman
2022-08-09 17:18 ` [PATCH v2 02/16] mm/page_alloc: Rename free_the_page() to free_frozen_pages() Matthew Wilcox (Oracle)
2022-08-10 6:36 ` Muchun Song
2022-08-09 17:18 ` Matthew Wilcox (Oracle) [this message]
2022-08-10 3:00 ` [PATCH v2 03/16] mm/page_alloc: Export free_frozen_pages() instead of free_unref_page() Miaohe Lin
2022-08-10 6:37 ` Muchun Song
2022-08-09 17:18 ` [PATCH v2 04/16] mm/page_alloc: Move set_page_refcounted() to callers of post_alloc_hook() Matthew Wilcox (Oracle)
2022-08-10 3:30 ` Miaohe Lin
2022-08-09 17:18 ` [PATCH v2 05/16] mm/page_alloc: Move set_page_refcounted() to callers of prep_new_page() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 06/16] mm/page_alloc: Move set_page_refcounted() to callers of get_page_from_freelist() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 07/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_cpuset_fallback() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 08/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_may_oom() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 09/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_direct_compact() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 10/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_direct_reclaim() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 11/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_slowpath() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 12/16] mm/page_alloc: Move set_page_refcounted() to end of __alloc_pages() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 13/16] mm/page_alloc: Add __alloc_frozen_pages() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 14/16] mm/mempolicy: Add alloc_frozen_pages() Matthew Wilcox (Oracle)
2022-08-09 17:18 ` [PATCH v2 15/16] slab: Allocate frozen pages Matthew Wilcox (Oracle)
2022-08-10 12:31 ` Vlastimil Babka
2022-08-10 16:27 ` Mel Gorman
2022-08-09 17:18 ` [PATCH v2 16/16] slub: " Matthew Wilcox (Oracle)
2022-08-11 0:19 ` [PATCH v2 00/16] Allocate and free " Shakeel Butt
2022-08-12 0:13 ` Matthew Wilcox
2022-08-12 16:48 ` Shakeel Butt
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=20220809171854.3725722-4-willy@infradead.org \
--to=willy@infradead.org \
--cc=david@redhat.com \
--cc=linux-mm@kvack.org \
--cc=william.kucharski@oracle.com \
/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