Skip to contentSkip to conversation

mm/page_alloc: Consolidate unlikely handling in page_expected_state

PATCH Superseded Ye Liu 2 participants 5 messages Mar 26, 2025 – Mar 28, 2025

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Ye Liu

author
#0 lore raw

PATCH v3 1/1 mm/page_alloc: Consolidate unlikely handling in page_expected_state

From: Ye Liu <[email protected]>

Consolidates the handling of unlikely conditions in the page_expected_state function, reducing code duplication and improving readability.

Previously, the check_new_page_bad function contained logic to handle __PG_HWPOISON flags, which was called from check_new_page. This patch moves the handling of __PG_HWPOISON flags into the page_expected_state function and removes the check_new_page_bad function. The check_new_page function now directly calls bad_page if the page has unexpected flags.

This change simplifies the code by reducing the number of functions and centralizing the unlikely condition handling in one place.

---
V3: Delete 'This patch'.
V2: return true instead of false in the PageHWPoison branch.
---

---
 mm/page_alloc.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
mm/page_alloc.c +8 -16
index 2842da893eea..e8b95c6a96c2 100644
@@ -903,6 +903,12 @@ static inline bool page_expected_state(struct page *page,
 			(page->flags & check_flags)))
 		return false;
 
+	if (unlikely(PageHWPoison(page))) {
+		/* Don't complain about hwpoisoned pages */
+		if (PageBuddy(page))
+			__ClearPageBuddy(page);
+	}
+
 	return true;
 }
 
@@ -1586,29 +1592,15 @@ static __always_inline void page_del_and_expand(struct zone *zone,
 	account_freepages(zone, -nr_pages, migratetype);
 }
 
-static void check_new_page_bad(struct page *page)
-{
-	if (unlikely(PageHWPoison(page))) {
-		/* Don't complain about hwpoisoned pages */
-		if (PageBuddy(page))
-			__ClearPageBuddy(page);
-		return;
-	}
-
-	bad_page(page,
-		 page_bad_reason(page, PAGE_FLAGS_CHECK_AT_PREP));
-}
-
 /*
  * This page is about to be returned from the page allocator
  */
 static bool check_new_page(struct page *page)
 {
-	if (likely(page_expected_state(page,
-				PAGE_FLAGS_CHECK_AT_PREP|__PG_HWPOISON)))
+	if (likely(page_expected_state(page, PAGE_FLAGS_CHECK_AT_PREP)))
 		return false;
 
-	check_new_page_bad(page);
+	bad_page(page, page_bad_reason(page, PAGE_FLAGS_CHECK_AT_PREP));
 	return true;
 }
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 1 line

Consolidates the handling of

…

Quoted 1 line

This change simplifies

…

Quoted 2 lines

---
V3: Delete 'This patch'.

How good does such information fit to the wording requirement “imperative mood”?
https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14#n94

…

Quoted 3 lines

---

---
 mm/page_alloc.c | 24 ++++++++----------------

How do you think about to omit redundant marker lines?

Regards,
Markus

author
#2 lore raw
Quoted 8 lines · Markus Elfring
Quoted 1 line

Consolidates the handling of

…

Quoted 1 line

This change simplifies

…

Quoted 2 lines

---
V3: Delete 'This patch'.

How good does such information fit to the wording requirement “imperative mood”?
https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14#n94

How about this?

Consolidate the handling of unlikely conditions in the page_expected_state function to reduce code duplication and improve readability.

Move the logic for handling __PG_HWPOISON flags from the check_new_page_bad function to the page_expected_state function, and remove check_new_page_bad.

Call bad_page directly from the check_new_page function if the page has unexpected flags.

Simplify the code by reducing the number of functions and centralizing the handling of unlikely conditions.

Quoted 5 lines

…

Quoted 3 lines

---

---
 mm/page_alloc.c | 24 ++++++++----------------

How do you think about to omit redundant marker lines?

--- delete this one?

---
 mm/page_alloc.c | 24 ++++++++----------------

like this ?

V2: return true instead of false in the PageHWPoison branch.
---
 mm/page_alloc.c | 24 ++++++++----------------

Thanks for pointing out the formatting issue.
I would like to get your approval on the above changes before I send patch v4.

Quoted 2 lines

Regards,
Markus

#3 lore raw
Quoted 3 lines
Quoted 1 line

https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14#n94

How about this?

I hope that such review can trigger improvements in change descriptions for further patch versions.

Quoted 2 lines

Consolidate the handling of unlikely conditions in the page_expected_state function to reduce code duplication and improve readability.

…

Would you like to append parentheses to any function names?

Regards,
Markus

author
#4 lore raw
Quoted 5 lines · Markus Elfring
Quoted 2 lines
Quoted 1 line

https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14#n94

How about this?

I hope that such review can trigger improvements in change descriptions for further patch versions.

Thanks for the review and suggestion! I appreciate the feedback and will improve the change descriptions in future patch versions.

Quoted 5 lines
Quoted 2 lines

Consolidate the handling of unlikely conditions in the page_expected_state function to reduce code duplication and improve readability.

…

Would you like to append parentheses to any function names?

I'll adjust accordingly.

Best regards,
Ye

Quoted 2 lines

Regards,
Markus