From nobody Sun Feb 8 13:53:33 2026 Received: from out203-205-221-231.mail.qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65CE91B6D08 for ; Mon, 29 Dec 2025 13:52:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.205.221.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767016361; cv=none; b=LY2gUmjk5+LZ+9i8+6BKAIPviqpLuI+zJI1yscx5Jpq5nr4GSK7oxW2GqF7AbRnk0++1TqPp+5wlejGRcwX0fx23ziTAxlbJ2T5Y3JJHoHTp9Xmm63dkZsaW7UIRhJmN6UeHvww1eKsNsZ87NAMXhjKRPOgpz3LKAoTULv8ZoLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767016361; c=relaxed/simple; bh=nWViOYG5nQtBSh3p8ODsoW76RNAZ8UQcf6TMM443Gu0=; h=From:To:Cc:Subject:Mime-Version:Content-Type:Date:Message-ID; b=FlgAkACbfhBcJpQBdO/EmdUP6iGWK7JvAzeGMDos8wkezKWzARTLxaSgZ+gERWBrIn/lR3aupXznl4RqKN9xBPrWGpqikY7TTis73bDNlj3TcOlnUK7cXNDwsLQmkLSJ2ARXaWZXKYl9tYsS+rlOB7uTqIJDBlFKhR8pMXFWZcQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com; spf=pass smtp.mailfrom=qq.com; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=EhU8n3C9; arc=none smtp.client-ip=203.205.221.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qq.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="EhU8n3C9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1767016348; bh=nWViOYG5nQtBSh3p8ODsoW76RNAZ8UQcf6TMM443Gu0=; h=From:To:Cc:Subject:Date; b=EhU8n3C9vZl4lN04sG0aNpSVXTCuuSzKLF0OjpiuTG4r2A6sJdGYw48kauk8oWAqj SpftIRXsu7jA3WTgnzp9YkDlE+ONqbPKX9SIp7odOp0tDMp8JGy6NWTYDQMDD2Gtur +yhnBHAY0gDA0a1h+Ov03Y/uD905wd+O0zXtFKS0= X-QQ-XMRINFO: M/715EihBoGS47X28/vv4NpnfpeBLnr4Qg== X-QQ-XMAILINFO: MnT+Yx1vzy5SFmSrmdJxtWxI82SioVl9zGF6EDaZdkuwtTFrHkdcUeDwcvBw8e 0m03cYyyoHJ9WDJwDeves081lc4jvyQjKB0ZDMnc9hYIC6/LaL6DSkQ7SREXsHY6MJWygm6sIaWm9 3v7VAUkOunqJkP+h0RvqU8BOxocWEU4GKSUX7RUY8+KBaEmT8THkIsfcHdOxM6iCa+47yDOZ5C8e5 Dc+4mJN+0Sz1AXNISg/Dj+It75XQWVGLKCXngxj9XL+5LklXByfTnlyVTdj0B0iqBrC1BJl0Qw/Al Bxx6Hg6oQCFmUnK3Ygp0U0uj4NISDZOcweKegxbc0abPohTkK5EYw7V3E+4Ut6knQe7LwMMmuWv8f P4qa2pm3FGoFYaazZohU49RjhwUKy0YslMdkXnm//ue1ZHqdnZ8XN47RI3OqTx1qG80Edb+krRV0Z L+nfwommQ/0I7iIbyRLi9l5Dh0d5bc0uVJaiRbGsOA6EzS0sYfJCe3qdKaYJbM/nnNbOySkk1hwi6 uPEGOaBGfXmSUmXha9vq4PsysKB1tQWgYokHJ+KjbHJUUd6GLLsbql7H/9CDjDctEEpFtbkEG3tqG /mLzULKyyJ0Cp0JHHLh572VTAO2feAgKFjopyVgCOoeJr1fA3P0rnsKhHeJYxnd4phezGBW9RtST3 JW1CNpMFNAc+oETENHzLqaabMHIpSFs7mssasIvy4Sm/8XrmMacjlPW23D0O2NJboNs6rJKb1efdZ hhTEQnzSg+aaMzNWqIcI5v3v5cKGAIWkMOpmKqDTirnBgqId025Oc9JsPPp7Z2uEJlQm+fvOCuaO1 YG7eq9q4eRo5aJP28LnIhHBfZxcSrLEdcmXL57xbQIHYZX0aIkyDBYYSlZ4yiuIGgAe4rbt679uhX 6KEuLt6S0MDweb1bJ0/u7v5dFZSZoIZua8TuqsF+4u7Z5Tx8L+gcOwWwYQHA6aG5+vh0qNYsZGqSw m8paVugFZYZHIKn5er8M9DoSsSFfaRiH51y51QRGEOIb91nQHk1yuz9tELu8BxMb4AMcchAGe8544 zMC9ncDx0WaQqfRVzglA39Z3nwmEQGttSbw12++9K4izU5lVEmL0FI85DXGZ4WkUI5K6sPtP5LkS+ hdfSJNZgUEJmAeBL/JMY5EmtiQnYyJcw9T5azRmk0o1Zlg== From: "=?utf-8?B?c2hlbmdtaW5naHU1MTI=?=" To: "=?utf-8?B?YWtwbQ==?=" , "=?utf-8?B?ZGF2aWQ=?=" , "=?utf-8?B?cnBwdA==?=" Cc: "=?utf-8?B?bG9yZW56by5zdG9ha2Vz?=" , "=?utf-8?B?TGlhbS5Ib3dsZXR0?=" , "=?utf-8?B?dmJhYmth?=" , "=?utf-8?B?c3VyZW5i?=" , "=?utf-8?B?bWhvY2tv?=" , "=?utf-8?B?bGludXgtbW0=?=" , "=?utf-8?B?bGludXgta2VybmVs?=" , "=?utf-8?B?aHUuc2hlbmdtaW5n?=" , "=?utf-8?B?emhhbmcucnVu?=" Subject: [PATCH v2] mm/memblock: drop redundant 'struct page *' argument from memblock_free_pages() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Date: Mon, 29 Dec 2025 21:52:27 +0800 X-Priority: 3 Message-ID: X-QQ-MIME: TCMime 1.0 by Tencent X-Mailer: QQMail 2.x X-QQ-Mailer: QQMail 2.x X-QQ-mid: xmsepub7-0t1767016347tomwbdp83 Content-Type: text/plain; charset="utf-8" From: Shengming Hu memblock_free_pages() currently takes both a struct page * and the corresponding PFN. The page pointer is always derived from the PFN at call sites (pfn_to_page(pfn)), making the parameter redundant and also allowing accidental mismatches between the two arguments. Simplify the interface by removing the struct page * argument and deriving the page locally from the PFN, after the deferred struct page initialization check. This keeps the behavior unchanged while making the helper harder to misuse. Signed-off-by: Shengming Hu Reviewed-by: David Hildenbrand (Red Hat) --- Changes from v1: https://lore.kernel.org/all/tencent_600D1BCC5E1B5DB4DDD98679DA7DC3123C06@qq= .com/ - Initialize the page variable at declaration mm/internal.h | 3 +-- mm/memblock.c | 4 ++-- mm/mm_init.c | 5 +++-- tools/testing/memblock/internal.h | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index e430da900..5f93ee145 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -742,8 +742,7 @@ static inline void clear_zone_contiguous(struct zone *z= one) extern int __isolate_free_page(struct page *page, unsigned int order); extern void __putback_isolated_page(struct page *page, unsigned int order, int mt); -extern void memblock_free_pages(struct page *page, unsigned long pfn, - unsigned int order); +extern void memblock_free_pages(unsigned long pfn, unsigned int order); extern void __free_pages_core(struct page *page, unsigned int order, enum meminit_context context); =20 diff --git a/mm/memblock.c b/mm/memblock.c index 905d06b16..6e11f81c4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1771,7 +1771,7 @@ void __init memblock_free_late(phys_addr_t base, phys= _addr_t size) end =3D PFN_DOWN(base + size); =20 for (; cursor < end; cursor++) { - memblock_free_pages(pfn_to_page(cursor), cursor, 0); + memblock_free_pages(cursor, 0); totalram_pages_inc(); } } @@ -2216,7 +2216,7 @@ static void __init __free_pages_memory(unsigned long = start, unsigned long end) while (start + (1UL << order) > end) order--; =20 - memblock_free_pages(pfn_to_page(start), start, order); + memblock_free_pages(start, order); =20 start +=3D (1UL << order); } diff --git a/mm/mm_init.c b/mm/mm_init.c index fc2a6f1e5..d5b91602f 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2480,9 +2480,10 @@ void *__init alloc_large_system_hash(const char *tab= lename, return table; } =20 -void __init memblock_free_pages(struct page *page, unsigned long pfn, - unsigned int order) +void __init memblock_free_pages(unsigned long pfn, unsigned int order) { + struct page *page =3D pfn_to_page(pfn); + if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { int nid =3D early_pfn_to_nid(pfn); =20 diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/int= ernal.h index 0ab4b53bb..009b97bbd 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -15,8 +15,7 @@ bool mirrored_kernelcore =3D false; =20 struct page {}; =20 -void memblock_free_pages(struct page *page, unsigned long pfn, - unsigned int order) +void memblock_free_pages(unsigned long pfn, unsigned int order) { } =20 --=20 2.25.1