From: David Woodhouse <dwmw@amazon.co.uk>
Date: Fri, 4 Apr 2025 14:00:25 +0000 (+0100)
Subject: mm: Use for_each_valid_pfn() in memory_hotplug
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=362f0d216f8dbc1347ca7d0b3f88dadef9709848;p=users%2Fdwmw2%2Flinux.git

mm: Use for_each_valid_pfn() in memory_hotplug

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: David Hildenbrand <david@redhat.com>
---

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 8305483de38bb..b1caedbade5b1 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1756,12 +1756,10 @@ static int scan_movable_pages(unsigned long start, unsigned long end,
 {
 	unsigned long pfn;
 
-	for (pfn = start; pfn < end; pfn++) {
+	for_each_valid_pfn(pfn, start, end) {
 		struct page *page;
 		struct folio *folio;
 
-		if (!pfn_valid(pfn))
-			continue;
 		page = pfn_to_page(pfn);
 		if (PageLRU(page))
 			goto found;
@@ -1805,11 +1803,9 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 	static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL,
 				      DEFAULT_RATELIMIT_BURST);
 
-	for (pfn = start_pfn; pfn < end_pfn; pfn++) {
+	for_each_valid_pfn(pfn, start_pfn, end_pfn) {
 		struct page *page;
 
-		if (!pfn_valid(pfn))
-			continue;
 		page = pfn_to_page(pfn);
 		folio = page_folio(page);