From: Nilay Vaish <nilayvaish@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Wilcox <willy@infradead.org>,
David Hildenbrand <david@kernel.org>,
Greg Thelen <gthelen@google.com>,
Roman Gushchin <kfree@google.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Nilay Vaish <nilayvaish@google.com>
Subject: [PATCH 13/15] mm/page_alloc, folio: use folio_page() when freeing folios
Date: Tue, 29 Sep 2026 14:52:04 -0700 [thread overview]
Message-ID: <20260929215206.516490-14-nilayvaish@google.com> (raw)
In-Reply-To: <20260929215206.516490-1-nilayvaish@google.com>
As part of the memdescs effort, struct folio will be allocated
separately from struct page and will no longer overlay the head page.
Replace &folio->page with folio_page(folio, 0) in __folio_put() and
free_unref_folios().
No functional change intended.
Assisted-by: LLM
Signed-off-by: Nilay Vaish <nilayvaish@google.com>
---
mm/folio.c | 2 +-
mm/page_alloc.c | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/mm/folio.c b/mm/folio.c
index 35e242b48870..978565add078 100644
--- a/mm/folio.c
+++ b/mm/folio.c
@@ -103,7 +103,7 @@ void __folio_put(struct folio *folio)
page_cache_release(folio);
folio_unqueue_deferred_split(folio);
mem_cgroup_uncharge(folio);
- free_frozen_pages(&folio->page, folio_order(folio));
+ free_frozen_pages(folio_page(folio, 0), folio_order(folio));
}
EXPORT_SYMBOL(__folio_put);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 07e03c7c7771..2f8cd3da199d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3006,17 +3006,18 @@ void free_unref_folios(struct folio_batch *folios)
/* Prepare folios for freeing */
for (i = 0, j = 0; i < folios->nr; i++) {
struct folio *folio = folios->folios[i];
+ struct page *page = folio_page(folio, 0);
unsigned long pfn = folio_pfn(folio);
unsigned int order = folio_order(folio);
- if (!__free_pages_prepare(&folio->page, order, FPI_NONE))
+ if (!__free_pages_prepare(page, order, FPI_NONE))
continue;
/*
* Free orders not handled on the PCP directly to the
* allocator.
*/
if (!pcp_allowed_order(order)) {
- free_one_page(folio_zone(folio), &folio->page,
+ free_one_page(folio_zone(folio), page,
pfn, order, FPI_NONE);
continue;
}
@@ -3029,13 +3030,14 @@ void free_unref_folios(struct folio_batch *folios)
for (i = 0; i < folios->nr; i++) {
struct folio *folio = folios->folios[i];
+ struct page *page = folio_page(folio, 0);
struct zone *zone = folio_zone(folio);
unsigned long pfn = folio_pfn(folio);
unsigned int order = (unsigned long)folio->private;
int migratetype;
folio->private = NULL;
- migratetype = get_pfnblock_migratetype(&folio->page, pfn);
+ migratetype = get_pfnblock_migratetype(page, pfn);
/* Different zone requires a different pcp lock */
if (zone != locked_zone ||
@@ -3051,7 +3053,7 @@ void free_unref_folios(struct folio_batch *folios)
* allocator, see comment in free_frozen_pages.
*/
if (is_migrate_isolate(migratetype)) {
- free_one_page(zone, &folio->page, pfn,
+ free_one_page(zone, page, pfn,
order, FPI_NONE);
continue;
}
@@ -3062,7 +3064,7 @@ void free_unref_folios(struct folio_batch *folios)
*/
pcp = pcp_spin_trylock(zone->per_cpu_pageset);
if (unlikely(!pcp)) {
- free_one_page(zone, &folio->page, pfn,
+ free_one_page(zone, page, pfn,
order, FPI_NONE);
continue;
}
@@ -3076,9 +3078,9 @@ void free_unref_folios(struct folio_batch *folios)
if (unlikely(migratetype >= MIGRATE_PCPTYPES))
migratetype = MIGRATE_MOVABLE;
- trace_mm_page_free_batched(&folio->page);
- if (!free_frozen_page_commit(zone, pcp, &folio->page,
- migratetype, order, FPI_NONE)) {
+ trace_mm_page_free_batched(page);
+ if (!free_frozen_page_commit(zone, pcp, page,
+ migratetype, order, FPI_NONE)) {
pcp = NULL;
locked_zone = NULL;
}
--
2.56.0.rc1.315.gc6ed9934b7-goog
next prev parent reply other threads:[~2026-09-29 21:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-29 21:51 [PATCH 00/15] mm: eliminate &folio->page references in mm/ Nilay Vaish
2026-09-29 21:51 ` [PATCH 01/15] mm/khugepaged: drop redundant page parameter from set_huge_pmd() Nilay Vaish
2026-09-29 21:51 ` [PATCH 02/15] mm/huge_memory: use folio_page() in PMD/PUD rmap, zap, and migration Nilay Vaish
2026-09-29 21:51 ` [PATCH 03/15] mm/huge_memory: use folio_page() in THP split paths Nilay Vaish
2026-09-29 21:51 ` [PATCH 04/15] mm/hugetlb_vmemmap: use folio_page() for vmemmap address arithmetic Nilay Vaish
2026-09-29 21:51 ` [PATCH 05/15] mm/hugetlb_cma: use folio_page() in hugetlb_cma_free_frozen_folio() Nilay Vaish
2026-09-29 21:51 ` [PATCH 06/15] mm/hugetlb: replace &folio->page with folio_page() and VM_BUG_ON_FOLIO() Nilay Vaish
2026-09-29 21:51 ` [PATCH 07/15] mm/page_isolation: use folio_page() in page_is_unmovable() Nilay Vaish
2026-09-29 21:51 ` [PATCH 08/15] mm/compaction: stop casting free pages to struct folio Nilay Vaish
2026-09-29 21:52 ` [PATCH 09/15] mm/migrate, vmscan: use folio_page() for movable_ops helpers Nilay Vaish
2026-09-29 21:52 ` [PATCH 10/15] mm/memory: use folio_page() in fault and CoW paths Nilay Vaish
2026-09-29 21:52 ` [PATCH 11/15] mm/rmap, gup: use folio_page() for PageAnonExclusive and gup_must_unshare Nilay Vaish
2026-09-29 21:52 ` [PATCH 12/15] mm/ksm, userfaultfd: replace &folio->page with folio_page() Nilay Vaish
2026-09-29 21:52 ` Nilay Vaish [this message]
2026-09-29 21:52 ` [PATCH 14/15] mm/page_owner, alloc_tag: use folio_page() for page_ext and codetag Nilay Vaish
2026-09-29 21:52 ` [PATCH 15/15] mm: replace remaining &folio->page uses with folio_page() and helpers Nilay Vaish
2026-09-30 10:17 ` [PATCH 00/15] mm: eliminate &folio->page references in mm/ David Hildenbrand (Arm)
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=20260929215206.516490-14-nilayvaish@google.com \
--to=nilayvaish@google.com \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=gthelen@google.com \
--cc=kfree@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.