From 3eccd908230ffab0f93333714cce2415505a82fc Mon Sep 17 00:00:00 2001

From: Mike Rapoport <rppt@kernel.org>

Date: Tue, 7 Sep 2021 19:54:55 -0700

Subject: [PATCH] mm: memory_hotplug: cleanup after removal of

 pfn_valid_within()

References: bsc#1190208 (MM functional and performance backports)

Patch-mainline: v5.15-rc1

Git-commit: 673d40c82eb2200da32ae9cc9cac8c584b66b5a9

When test_pages_in_a_zone() used pfn_valid_within() is has some logic

surrounding pfn_valid_within() checks.

Since pfn_valid_within() is gone, this logic can be removed.

Link: https://lkml.kernel.org/r/20210713080035.7464-3-rppt@kernel.org

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>

Acked-by: David Hildenbrand <david@redhat.com>

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Cc: "Rafael J. Wysocki" <rafael@kernel.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Mel Gorman <mgorman@suse.de>

---

 mm/memory_hotplug.c | 9 +++------

 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c

index 3bbe50d08760..6ea62efe2a8f 100644

--- a/mm/memory_hotplug.c

+++ b/mm/memory_hotplug.c

@@ -1298,7 +1298,7 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,

 	unsigned long pfn, sec_end_pfn;

 	struct zone *zone = NULL;

 	struct page *page;

-	int i;

+

 	for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn + 1);

 	     pfn < end_pfn;

 	     pfn = sec_end_pfn, sec_end_pfn += PAGES_PER_SECTION) {

@@ -1307,13 +1307,10 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,

 			continue;

 		for (; pfn < sec_end_pfn && pfn < end_pfn;

 		     pfn += MAX_ORDER_NR_PAGES) {

-			i = 0;

-			if (i == MAX_ORDER_NR_PAGES || pfn + i >= end_pfn)

-				continue;

 			/* Check if we got outside of the zone */

-			if (zone && !zone_spans_pfn(zone, pfn + i))

+			if (zone && !zone_spans_pfn(zone, pfn))

 				return NULL;

-			page = pfn_to_page(pfn + i);

+			page = pfn_to_page(pfn);

 			if (zone && page_zone(page) != zone)

 				return NULL;

 			zone = page_zone(page);