From nobody Mon Feb 9 01:47:27 2026 Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) (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 7F89F24167F for ; Sun, 28 Dec 2025 11:40:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.62.58.216 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766922020; cv=none; b=Pv0XP9Bc6YX7bJ+pJ/14Eh/B4Mm40VfroNerQUr0WOHeZJ6kTSria7DH9kE0pw05x2rmmC4XCdpL6YnnuEWlZfZRmHnwGt4PabNFt/IHIkYaVsxw0scvOD2BAPXLaNYVipbNkwd5DjwIanR9t4mI5xBpGFYfIcNUmjBwXLDzrF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766922020; c=relaxed/simple; bh=JBiEhZG23nF7rzr99o5QrN66XJYyhdsq5looOF7JCQc=; h=From:To:Cc:Subject:Mime-Version:Content-Type:Date:Message-ID; b=T7ir+va96hdh4NzPP2MtDuT11kig8qNILBWbT/syk3ouKRVj40kFgDPAmRsamgdy/PdxHwfkqd9BLU5gl6L8Uk+dThA4ndvVL7I74b56nA6U74XPTCT0A2z/mL9XP3MXVv8Sv3ZOCGa2DcGoSBaAaq2i+GuvABPmC4BgMFuDDPg= 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=jov76QOr; arc=none smtp.client-ip=162.62.58.216 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="jov76QOr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1766922007; bh=JBiEhZG23nF7rzr99o5QrN66XJYyhdsq5looOF7JCQc=; h=From:To:Cc:Subject:Date; b=jov76QOrwanIzEghZW139maPWeFSMwO0pMoQNlddFlqHuOiG+YI9OjwBCmWigVCOH B4P0L8mzFESzzdJArHs7XEw5p5aY3A2exUHDzIRa/V80IttNdqi7WxG4j1W/Wz73kK 2LhOFBH5fCAhKiNY3o31hNSIXIRJKdeqLBF8J1aE= X-QQ-XMRINFO: MSVp+SPm3vtSI1QTLgDHQqIV1w2oNKDqfg== X-QQ-XMAILINFO: NWDimQkHKFPbycjKJXGP9kqLJa0gSkvOigl5hTQJ9KEjwJ9VxRTYFbrIr2n11m 0khQ+ahtYdkcu7eKobY0VAqFo5A68PD/ugaDZBLXI6N70I5S+QELSdz7VTaxuuCTmRBhV/bvWHOsE 2Zavv35NNsUiQaPeqq8qavLkp4vVzbJ2LH96DCozqGSCj6vU01Qgln6OPNdDTkh/xFoUOYyiP39vr xZnmQiyDPM/6mkd6h/aicd8e0PRQDitm4nIrZB+2DYKJJ+exnw3jRgKabbgGsRrLXVqrr+xaBV824 wks3FIFD1CSsfrkCmp8Zhx/wPL0IOMMafDkVg26XHBCiASmjD8wfUmsfam3dWrfIe40zx3ix5hnO+ ke5vAK/vbwXI2B56JjOY3pIlo8Qw8cdwM6iTQVArJ/ErJX33rU1hDhQ2HVyFFNNXSCYG067Empq5H lZ2OqN4xwbS1k0ul2+pHblCalxDGwu3tjLfQQsTtfr7Jm4zslny0nRWl6B5I1Sga3j+3G6b9ZjhYy 6bUgE5oEFcB47u01bsjHrpBG+zQhOnD8uwde69JzKCawvrmRORBSDEPeymmG64AFrpwNqgerE24Pc hg4+tPAvGlG4gJsOwW8ZAWBDldVDjtGLln1fouDCzJFWIGLnRiUc3bHVHQ/84lAugo9Nc/edOjlqT huIFOryPqa6173uKSFK+kzj4F4vtaz2uCgiAkUz7J4h4Y+fuHupe3jtSHOKxsgkjGDcmL2Za9yvln rUvj1plMCTkt3yaKWnUe5it4/YwCWZO33PG46v/Oalg0ck4oSfcE+yPD/qapsGIQMhax5uB4U+Ijs I7wKdt8vA4UnQYuypMxQsUNR0t308sb2tkEfL2HZUtIxzz2Gq2tI2/wvAIvCw7DCqt1yT3FmbjYG5 hbgpXMnlb02zGOmBJb/w1QbGNr5Nhh5MlPag+NP9AIJ7JUbT1FqJ3pM41m1TsJDaSupPZwH7RzndZ NEpLVVHyShghFueBocKNO0+c5xqL3J3SHKkKB7T4imq5ez72b/XvA1+oWK4mhaP6uFMorV76KUuQ4 VBuIP0KEKbAQGoX3JLhyr9HwXFh3pgD+vodmNyIiBoX50mVPj1kU7SMChHqBIkf+h8AcfbD2PeH2l 2Ri1RHNaP+ruMA== From: "=?utf-8?B?c2hlbmdtaW5naHU1MTI=?=" To: "=?utf-8?B?YWtwbQ==?=" , "=?utf-8?B?ZGF2aWQ=?=" Cc: "=?utf-8?B?bG9yZW56by5zdG9ha2Vz?=" , "=?utf-8?B?TGlhbS5Ib3dsZXR0?=" , "=?utf-8?B?dmJhYmth?=" , "=?utf-8?B?cnBwdA==?=" , "=?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] 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: Sun, 28 Dec 2025 19:38:50 +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-0t1766921930t1ujyp4gm 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 --- mm/internal.h | 3 +-- mm/memblock.c | 4 ++-- mm/mm_init.c | 7 +++++-- tools/testing/memblock/internal.h | 3 +-- 4 files changed, 9 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..8e95d65cf 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; + if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { int nid =3D early_pfn_to_nid(pfn); =20 @@ -2490,6 +2491,8 @@ void __init memblock_free_pages(struct page *page, un= signed long pfn, return; } =20 + page =3D pfn_to_page(pfn); + if (!kmsan_memblock_free_pages(page, order)) { /* KMSAN will take care of these pages. */ return; 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