From patchwork Tue Feb 25 08:30:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13989507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 747E3C021B8 for ; Tue, 25 Feb 2025 08:30:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2682280001; Tue, 25 Feb 2025 03:30:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EAE756B0085; Tue, 25 Feb 2025 03:30:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4F8F280001; Tue, 25 Feb 2025 03:30:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B1A636B0082 for ; Tue, 25 Feb 2025 03:30:32 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6D7B5B21F5 for ; Tue, 25 Feb 2025 08:30:32 +0000 (UTC) X-FDA: 83157795504.19.2F2041C Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf17.hostedemail.com (Postfix) with ESMTP id A0CFC40016 for ; Tue, 25 Feb 2025 08:30:30 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=uFNygbvr; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740472230; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8vjVu3QDIkeYqSfPs/d8VnIh26W/xL7oGhOReMdpTmY=; b=FNZE+NHeuxiwhf8gLCAhbkB3ItMkJWIKHYc8z0/xY04sYoQLZjrJ3SVEb4gwAhoFc6uRkZ m+o4uBq29qZ0AqyNAsOaE+GwMQ5KFPooOAFL4FMoyIyzuP35lB7CN4HyEJm3csSjlggK1/ Vps/4dWtFEeBBQi7//14gIbWT81q7bY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=uFNygbvr; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740472230; a=rsa-sha256; cv=none; b=KGqQ6QIDq7wLT//h2QsX7vA4Bkf49Dj+wVmyQWCyguhQPqyMSLCdZaMY7cWFcauM5kQhAl iag9+JH9n1O8Q+aCPAK8tyofEm9IVsoMQsFcEf8aaYOeliRn02csia0Tb/TizHuQtMuIKP /airCvixC+jc1ZV790995rT2ROc4e20= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8271361135; Tue, 25 Feb 2025 08:30:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C163BC4CEE7; Tue, 25 Feb 2025 08:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740472229; bh=y8ff9ry3eCNa0zxLgjbjNuPaHO5Pr9a2HPBF1IduA2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uFNygbvru2Ail2mhT9GAZ4lcaiF9sGKpxvTXGJS+8Obo5vPhB2auqrITYx9h47YjM osZfbsQmrNs8grDGLfnO9MJq/DZXm/OAp55qB1f8cv+GMMFWm/He3TCO/q1ayt30E3 wQ9/HlHpxTK0dl6wv9++6zExnjCabR0wjoCzwMKyr3oGYBHCADKHexYf/P/aiF5Fg1 3KpX5Rhf4110ooqzcDXDfHlW9GDOGuXwLAv83+svXXMy9tUODOBKfNFThT6FPiYm/4 RVVPxm37niLHlxjyx/qCDmujpR0985PFtHfCTI2FCX/WpYq19Wr9KZ0wFmchVDkteq 4W0VR638u333w== From: Mike Rapoport To: Andrew Morton Cc: Frank van der Linden , Mike Rapoport , Muchun Song , Wei Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH mm-unstable 1/2] mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid Date: Tue, 25 Feb 2025 10:30:16 +0200 Message-ID: <20250225083017.567649-2-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250225083017.567649-1-rppt@kernel.org> References: <20250225083017.567649-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A0CFC40016 X-Stat-Signature: 3rbmhjba3sp7todt3y4rdza4a3jnc4gb X-Rspam-User: X-HE-Tag: 1740472230-478378 X-HE-Meta: U2FsdGVkX1/iVH1Xoi59v91SiXkCBFH8zohH2N+kT/r11ZrJdi7BQwU3Hs75Vx7rk1NJGB/EDngX6QyTwwGY/TyGgu93b9sICc/6sQwbzhAgmXfgBQm6Xk6M/nXZd6GbMXvqI6Bv04eaVA6PK9gTl9M6qimbHWrstv8pl0fhrA0MrvD4pFJAmEyh2oGGKZODR8EOwuzrLUZyZq+YCTFuKPkq+MGw+8P9Nysn1/WgNaAuchbC+vZcPlE5qLUCJduBHtptUxwBpjaBuA+rckhERtLHWGoghDIzDUehqlNMocVrypbmhnmaai2ttnJrSCT4tm7GuY5WyGTK480NG1oq45x+8WUXz0Room0LpfJI6eYHts9l4wl3cMO8qhoRX3PXoML/RTpt0B6XoHSjS4/iKv8X3j/MUOu5mHnI/kXg3HEPXiPPk7OOiK4J3ixK3FQuJ4Jyi/1MBF98JKFypKCq0TgX/rbvPfqC+aHxThIikld8IL4b4mgIGRE/Q6YsYkhbQ7IQVQAK719qscr/qTYfsjjaNCp51j1JbFxCM1XSxTuNR8HeWCQR/7XsbY/joDA7GQvGF5bs9Xwu2kpbO72M9bwGAsBGn3/hOGIbtfaKnuCN9w3Fy3jY/6EzMz8jvQs1lcRV/UYfeSZRgiGDFsEB9iDzN8zm4hGoe2iAEVhbS+OaFIQyrAezvIDnAtdOeUGeslDg5VUZdRHxvnRqAfxQBCfx/gu4sstXAUuUHs0SEz3tBrjyscrAW0wU3xSkj0HR7YqtD67vwG9MK9Z+RanGL/ScdwbWDF7m0odZxQkiAq4DRB4ghL2EMB772UR7/O4JGVDjkRjaGkUbxJ7l858MGh2BcVt7Hwqlt9BT1DlRQAr0/WjeaVxuqrCnSMUcliMgodXg5doeMinhFoJGUA1D1TqncT3LxbREm3hrr4udrJKfwcwvGhp3/zdwwbR1/IyflcEMJLvB9B68SJ4iMQe gslJak2G oVlISu+ry54Yf48UzUIJg5+JkB1dJA3WYii8NZy3VNxjliAz96ehjhYtawBrUirttLwxPab4n7SCb1e9zSa7SbjbkqBZ8LOcP1ak61UHku3YNnHijYMoY3ywbGj0iZcfd0gsRghtYE6FHcCGOUvNQo0sWlZ3xqnnh7x9jZoBi48poAv8ZOx6+kT3Ql7n68gP0kCFOiSJvxB60yZSPpigNvqSnWDHGdWz5AAXqqKDOxHThT9kxFgcA68IHofOGOGaJUU15XJbr+aIcSNQvLFa8QXw0vD8mEFMYJvA+UE/nFp8FyxKh48g2xnTpZ/yDLJwAf84Javr5EWjUDe723SB7fAzIXWw4iUvgvY2h X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" __init_reserved_page_zone() function finds the zone for pfn and nid and performs initialization of a struct page with that zone and nid. There is nothing in that function about reserved pages and it is misnamed. Rename it to __init_page_from_nid() to better reflect what the function does. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Wei Yang --- mm/hugetlb.c | 2 +- mm/internal.h | 2 +- mm/mm_init.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9faa1034704f..778c21da22f0 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3392,7 +3392,7 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, while (npages--) { pfn = page_to_pfn(page); - __init_reserved_page_zone(pfn, nid); + __init_page_from_nid(pfn, nid); free_reserved_page(page); page++; } diff --git a/mm/internal.h b/mm/internal.h index b07550db2bfd..5c0b81abbc1b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1465,7 +1465,7 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); -void __meminit __init_reserved_page_zone(unsigned long pfn, int nid); +void __meminit __init_page_from_nid(unsigned long pfn, int nid); /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, diff --git a/mm/mm_init.c b/mm/mm_init.c index 133640a93d1d..f9a02b1e2fce 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -653,7 +653,7 @@ static inline void fixup_hashdist(void) {} /* * Initialize a reserved page unconditionally, finding its zone first. */ -void __meminit __init_reserved_page_zone(unsigned long pfn, int nid) +void __meminit __init_page_from_nid(unsigned long pfn, int nid) { pg_data_t *pgdat; int zid; @@ -733,7 +733,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) if (early_page_initialised(pfn, nid)) return; - __init_reserved_page_zone(pfn, nid); + __init_page_from_nid(pfn, nid); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} From patchwork Tue Feb 25 08:30:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13989508 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41FD9C021B2 for ; Tue, 25 Feb 2025 08:30:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8D80280002; Tue, 25 Feb 2025 03:30:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3E2D6B0088; Tue, 25 Feb 2025 03:30:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2D18280002; Tue, 25 Feb 2025 03:30:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 93E056B0085 for ; Tue, 25 Feb 2025 03:30:35 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4687B120A9C for ; Tue, 25 Feb 2025 08:30:35 +0000 (UTC) X-FDA: 83157795630.24.FC11E53 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 959B040017 for ; Tue, 25 Feb 2025 08:30:33 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jAs03blF; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740472233; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0KJOxv5kVNmG7b9r5PQTaTmEV0lt2D+DCpMEENAVm5Y=; b=INusaivJq+kPcFLh69ZT/qEfso1tZJ6NvB+LCyR8mhSsZlqHwlDGNFP/AtjVHfdPnYMZox fhJVclaoDjbB/1IsEXbKbzzDqX31EyYluBa49pAWnqxRTStkkuCBMU/CrMRo9RQmjhpaWu fKUDq+5/0LDgzhi4ZOjiQPFHMmEYSHs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740472233; a=rsa-sha256; cv=none; b=iAaGPOctjy9avzWioJYNry6H+vSdYAc59Kb/RVETAABUudJuNmdjG/bzAq3Zr9eoz1gKKa N49L5IMtTbXDhOQ5m3uOzVvY6gPVRJ61SwO8CHljzHEw4bWdEkHjH3WozYwHa8T+6DPeKC SuIuitQCVcQa9xb+L/n5f9nTM/pkLDw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jAs03blF; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8C3F85C690C; Tue, 25 Feb 2025 08:29:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D414C4CEE2; Tue, 25 Feb 2025 08:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740472232; bh=AAsNuK5nv3eH0sJUjtIB0mTHxICDEJB7+Uae9QMRJNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAs03blF3cHVISSpwL8rWqGn0w/ZuV+xGqkRkyr6MTxtmGIZXn2rW6uzfAaE95Maf AIZLeIqEHUkZ7jDls5g7lyfUu1Kn6BGcE/xi4qq/TSra8JPKzZDgfkHf0nIbrBeoih kfmV6hidZ+dafXIl+4ByiJ5lUZNfSSwzoV2MISsljPHM2XdNnV5jWoYGP7c+9EMIZ4 T/+ajmNmTBsVbCNX8jkPJdCrpleqy3V0ig8x/n0b8V937GccvdW6XSANUjeocIINd6 Hvu2AtBWJ0Crc7TdDsQnOlpQsJTrqEqgKA+UpCRWSV0fqyz2wm/5SOhPKwBmomDxR9 JtFXpS0ZVCk2g== From: Mike Rapoport To: Andrew Morton Cc: Frank van der Linden , Mike Rapoport , Muchun Song , Wei Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH mm-unstable 2/2] mm/mm_init: rename init_reserved_page to init_deferred_page Date: Tue, 25 Feb 2025 10:30:17 +0200 Message-ID: <20250225083017.567649-3-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250225083017.567649-1-rppt@kernel.org> References: <20250225083017.567649-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 959B040017 X-Rspamd-Server: rspam07 X-Stat-Signature: skracp374skusibofjno5aonwa9qryoa X-HE-Tag: 1740472233-778279 X-HE-Meta: U2FsdGVkX1+j+47YROlrjUgviL7Okip6MwBA6Z+u8+CC0cZiMsrCvj94tnUgrJIqLo7NVxw9XVqNrQ0wAESL/NMM0gLbDsbjWGEMGivUffZHIPEkBJk2BR8LFCseYttFUCH4fduX/gH9Y6/z6fP3tpmwXHWqU3hniHiqdxBwoCuMOXPU4SBRKFu6QCrld6GAXeHeFkTJSzQXat1wASLCXVUtudXFUtz2noQ4pINwvzWfKUKgItCsNg9Bb3puIsuFTwmEryocRozlsMRFxIWsFolCP9jkaGJH/nkt+TX37pWn4DN/2kVZjUeUrlxiMmANyGkArioQ/phzKA5hn9BlzIgLcjwEDGAymxjeZRkn/kqjCP6/pr/58VheNBFj0SA79ZoZ7HOON32NVMYUMmeT0N5LTejOmnA5QOEJ3wghFIDsgjPtpKLJbSNIDCyu6IYVU06SRAyGzycLNR0HHc5rqJK4I94BZ5dtB0imZlygTlF7HsStUzJ3WkaPe9qDTmeMExsPep2zKIJvbODwVoMy0t4DABpwR65ievwU1xe+Vh4Epl7Md8ZP3U4tF6RxYw/rdf0DNnJlVU68vhxuREay3J3A4zNHWYXoXpiKEMyN5JBekblHGB32qDnMqW6As+wPUIhKxk1PIKJQS3hcEP37qXN+I7ocFDVSUY9CMKis71rFtnYkWYGliVh3iCwLAaZPMlc28GUYPNu4NC3gXN+r5tDzHn3mWTGiuywyJM0qB0IkG1wNAg7sp6AgzciazuSexoYDofRCZmSmTaM6JJh5mdHh8on3G4YlvVMQJCTfGinLLFVLBJfXwMcN+WrQ/r/PLlfMpcZqLJp7W/tkPqvTOq6SMUWweqtzxktMGGzSDfEiYt2oh3+n3w3dUGkDXD+tUDxT1cdxlJSvsaei4tuzcibWfvXpwmUXD04MYOfuLquf106BiEMLymmA2Rz4FjMZkn/cNk9nSPNpkXwBWfU WaYQQvW+ +46iQ8ZKDloFIDn4ODpZKufce36xFrC7rklW7l3i5Vldl7ZQI4cwCc5BiqQvgcbt/g+T++Bzb+OMbfvJO/D2S2Jxeur3srLZzoq6uVAu2MAzXXgTBAZIAoZlINIy3bNEr9gbpnYka4C87tQC4lBkhKQrx3UBtmEHLrix34JboMbRWbsl+wXSansJuv+/a57XNTX7zO9oTI5+w9M7DIUuacTFmAXFFmTNPIYrT+hRQ5luAGLnibCv7I04Yc5C+xXvDiYwphS+9c4YGDOE3e6FseJkrmBqvDpdKIHuTtuBhd59T5gdEJcPk0ZrMkX3sB95lBc6V++2FNw8nsrXaszBU+hVwY7D6dJpqgp0p X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" When CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, init_reserved_page() function performs initialization of a struct page that would have been deferred normally. Rename it to init_deferred_page() to better reflect what the function does. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Wei Yang --- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index f9a02b1e2fce..abb24aedfc96 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -728,7 +728,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static void __meminit init_reserved_page(unsigned long pfn, int nid) +static void __meminit init_deferred_page(unsigned long pfn, int nid) { if (early_page_initialised(pfn, nid)) return; @@ -748,7 +748,7 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static inline void init_reserved_page(unsigned long pfn, int nid) +static inline void init_deferred_page(unsigned long pfn, int nid) { } #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ @@ -769,7 +769,7 @@ void __meminit reserve_bootmem_region(phys_addr_t start, if (pfn_valid(start_pfn)) { struct page *page = pfn_to_page(start_pfn); - init_reserved_page(start_pfn, nid); + init_deferred_page(start_pfn, nid); /* * no need for atomic set_bit because the struct