linux-kernel - [RFC 1/1] mm: Convert is_migrate_isolate_page() to is_migrate_isolate

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250506184155.587070-2-nifan.cxl@gmail.com>
Date: Tue,  6 May 2025 11:38:29 -0700
From: nifan.cxl@...il.com
To: muchun.song@...ux.dev,
	willy@...radead.org,
	osalvador@...e.de
Cc: mcgrof@...nel.org,
	a.manzanares@...sung.com,
	dave@...olabs.net,
	akpm@...ux-foundation.org,
	david@...hat.com,
	linux-mm@...ck.org,
	linux-kernel@...r.kernel.org,
	nifan.cxl@...il.com,
	Fan Ni <fan.ni@...sung.com>
Subject: [RFC 1/1] mm: Convert is_migrate_isolate_page() to is_migrate_isolate_folio()

From: Fan Ni <fan.ni@...sung.com>

Convert is_migrate_isolate_page() to is_migrate_isolate_folio() to take
folio directly.

Signed-off-by: Fan Ni <fan.ni@...sung.com>
---
 include/linux/page-isolation.h |  6 +++---
 mm/hugetlb.c                   |  2 +-
 mm/page_isolation.c            | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index 898bb788243b..74d6a8cf4960 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -3,16 +3,16 @@
 #define __LINUX_PAGEISOLATION_H
 
 #ifdef CONFIG_MEMORY_ISOLATION
-static inline bool is_migrate_isolate_page(struct page *page)
+static inline bool is_migrate_isolate_folio(struct folio *folio)
 {
-	return get_pageblock_migratetype(page) == MIGRATE_ISOLATE;
+	return folio_migratetype(folio) == MIGRATE_ISOLATE;
 }
 static inline bool is_migrate_isolate(int migratetype)
 {
 	return migratetype == MIGRATE_ISOLATE;
 }
 #else
-static inline bool is_migrate_isolate_page(struct page *page)
+static inline bool is_migrate_isolate_folio(struct folio *folio)
 {
 	return false;
 }
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 0057d1f1dc9a..1e712dc4783a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1306,7 +1306,7 @@ static struct folio *dequeue_hugetlb_folio_node_exact(struct hstate *h,
 		if (folio_test_hwpoison(folio))
 			continue;
 
-		if (is_migrate_isolate_page(&folio->page))
+		if (is_migrate_isolate_folio(folio))
 			continue;
 
 		list_move(&folio->lru, &h->hugepage_activelist);
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index b2fc5266e3d2..540d2add4834 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -169,7 +169,7 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_
 	 * If it is already set, then someone else must have raced and
 	 * set it before us.
 	 */
-	if (is_migrate_isolate_page(page)) {
+	if (is_migrate_isolate_folio(page_folio(page))) {
 		spin_unlock_irqrestore(&zone->lock, flags);
 		return -EBUSY;
 	}
@@ -219,7 +219,7 @@ static void unset_migratetype_isolate(struct page *page, int migratetype)
 
 	zone = page_zone(page);
 	spin_lock_irqsave(&zone->lock, flags);
-	if (!is_migrate_isolate_page(page))
+	if (!is_migrate_isolate_folio(page_folio(page)))
 		goto out;
 
 	/*
@@ -235,7 +235,7 @@ static void unset_migratetype_isolate(struct page *page, int migratetype)
 		if (order >= pageblock_order && order < MAX_PAGE_ORDER) {
 			buddy = find_buddy_page_pfn(page, page_to_pfn(page),
 						    order, NULL);
-			if (buddy && !is_migrate_isolate_page(buddy)) {
+			if (buddy && !is_migrate_isolate_folio(page_folio(buddy))) {
 				isolated_page = !!__isolate_free_page(page, order);
 				/*
 				 * Isolating a free page in an isolated pageblock
@@ -546,7 +546,7 @@ void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
 	     pfn < isolate_end;
 	     pfn += pageblock_nr_pages) {
 		page = __first_valid_page(pfn, pageblock_nr_pages);
-		if (!page || !is_migrate_isolate_page(page))
+		if (!page || !is_migrate_isolate_folio(page_folio(page)))
 			continue;
 		unset_migratetype_isolate(page, migratetype);
 	}
@@ -631,7 +631,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
 	 */
 	for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
 		page = __first_valid_page(pfn, pageblock_nr_pages);
-		if (page && !is_migrate_isolate_page(page))
+		if (page && !is_migrate_isolate_folio(page_folio(page)))
 			break;
 	}
 	page = __first_valid_page(start_pfn, end_pfn - start_pfn);
-- 
2.47.2