Skip to contentSkip to conversation

mm/memory-failure: Fix redundant updates for already poisoned pages

PATCH Applied Kyle Meyer 5 participants 5 messages Aug 28, 2025 – Aug 29, 2025

Subsystems (3)
Memory management EDAC-core HWPoison memory failure handling
lore
Share & tools
lore

Kyle Meyer

author
#0 lore raw

PATCH v2 1/1 mm/memory-failure: Fix redundant updates for already poisoned pages

Duplicate memory errors can be reported by multiple sources.

Passing an already poisoned page to action_result() causes issues:

* The amount of hardware corrupted memory is incorrectly updated.
* Per NUMA node MF stats are incorrectly updated.
* Redundant "already poisoned" messages are printed.

Avoid those issues by:

* Skipping hardware corrupted memory updates for already poisoned pages.
* Skipping per NUMA node MF stats updates for already poisoned pages.
* Dropping redundant "already poisoned" messages.

Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages.

Fixes b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages")
Signed-off-by Kyle Meyer <[email protected]>

---

v1 -> v2:
* Continue passing poisoned pages to action_result() with MF_FAILED but don't
update anything.
* https://lore.kernel.org/all/[email protected]

---
 mm/memory-failure.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
mm/memory-failure.c +6 -7
index fc30ca4804bf..10b3c281c2ae 100644
@@ -956,7 +956,7 @@ static const char * const action_page_types[] = {
 	[MF_MSG_BUDDY]			= "free buddy page",
 	[MF_MSG_DAX]			= "dax page",
 	[MF_MSG_UNSPLIT_THP]		= "unsplit thp",
-	[MF_MSG_ALREADY_POISONED]	= "already poisoned",
+	[MF_MSG_ALREADY_POISONED]	= "already poisoned page",
 	[MF_MSG_UNKNOWN]		= "unknown page",
 };
 

@@ -1349,9 +1349,10 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
 {
 	trace_memory_failure_event(pfn, type, result);
 
-	num_poisoned_pages_inc(pfn);
-
-	update_per_node_mf_stats(pfn, result);
+	if (type != MF_MSG_ALREADY_POISONED) {
+		num_poisoned_pages_inc(pfn);
+		update_per_node_mf_stats(pfn, result);
+	}
 
 	pr_err("%#lx: recovery action for %s: %s\n",
 		pfn, action_page_types[type], action_name[result]);

@@ -2094,12 +2095,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 		*hugetlb = 0;
 		return 0;
 	} else if (res == -EHWPOISON) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
 		if (flags & MF_ACTION_REQUIRED) {
 			folio = page_folio(p);
 			res = kill_accessing_process(current, folio_pfn(folio), flags);
-			action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
 		}
+		action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
 		return res;
 	} else if (res == -EBUSY) {
 		if (!(flags & MF_NO_RETRY)) {

@@ -2285,7 +2285,6 @@ int memory_failure(unsigned long pfn, int flags)
 		goto unlock_mutex;
 
 	if (TestSetPageHWPoison(p)) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
 		res = -EHWPOISON;
 		if (flags & MF_ACTION_REQUIRED)
 			res = kill_accessing_process(current, pfn, flags);
Signature · 1 line
2.50.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 46 lines · Kyle Meyer

Duplicate memory errors can be reported by multiple sources.

Passing an already poisoned page to action_result() causes issues:

* The amount of hardware corrupted memory is incorrectly updated.
* Per NUMA node MF stats are incorrectly updated.
* Redundant "already poisoned" messages are printed.

Avoid those issues by:

* Skipping hardware corrupted memory updates for already poisoned pages.
* Skipping per NUMA node MF stats updates for already poisoned pages.
* Dropping redundant "already poisoned" messages.

Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages.

Fixes b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages")
Signed-off-by Kyle Meyer <[email protected]>

---

v1 -> v2:
* Continue passing poisoned pages to action_result() with MF_FAILED but don't
update anything.
* https://lore.kernel.org/all/[email protected]

---
 mm/memory-failure.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
mm/memory-failure.c +1 -1
index fc30ca4804bf..10b3c281c2ae 100644
@@ -956,7 +956,7 @@ static const char * const action_page_types[] = {
        [MF_MSG_BUDDY]                  = "free buddy page",
        [MF_MSG_DAX]                    = "dax page",
        [MF_MSG_UNSPLIT_THP]            = "unsplit thp",
-       [MF_MSG_ALREADY_POISONED]       = "already poisoned",
+       [MF_MSG_ALREADY_POISONED]       = "already poisoned page",
        [MF_MSG_UNKNOWN]                = "unknown page",
 };

mm/memory-failure.c static int action_result(unsigned long pfn, enum mf_action_page_type type, · line 1355

Quoted 10 lines
mm/memory-failure.c +4 -3
@@ -1349,9 +1349,10 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
 {
        trace_memory_failure_event(pfn, type, result);
 
-       num_poisoned_pages_inc(pfn);
-
-       update_per_node_mf_stats(pfn, result);
+       if (type != MF_MSG_ALREADY_POISONED) {
+               num_poisoned_pages_inc(pfn);
+               update_per_node_mf_stats(pfn, result);
+       }

Thanks Kyle, the code looks good to me. While you wait for Miaohe's review/ack...

Reviewed-by Jiaqi Yan <[email protected]>
Quoted 28 lines
mm/memory-failure.c +1 -4
        pr_err("%#lx: recovery action for %s: %s\n",
                pfn, action_page_types[type], action_name[result]);

@@ -2094,12 +2095,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
                *hugetlb = 0;
                return 0;
        } else if (res == -EHWPOISON) {
-               pr_err("%#lx: already hardware poisoned\n", pfn);
                if (flags & MF_ACTION_REQUIRED) {
                        folio = page_folio(p);
                        res = kill_accessing_process(current, folio_pfn(folio), flags);
-                       action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
                }
+               action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
                return res;
        } else if (res == -EBUSY) {
                if (!(flags & MF_NO_RETRY)) {

@@ -2285,7 +2285,6 @@ int memory_failure(unsigned long pfn, int flags)
                goto unlock_mutex;
 
        if (TestSetPageHWPoison(p)) {
-               pr_err("%#lx: already hardware poisoned\n", pfn);
                res = -EHWPOISON;
                if (flags & MF_ACTION_REQUIRED)
                        res = kill_accessing_process(current, pfn, flags);
--

2.50.1

Acked-by on v2 1/1
#2 lore raw
In reply to Kyle Meyer
Quoted 59 lines · Kyle Meyer

Duplicate memory errors can be reported by multiple sources.

Passing an already poisoned page to action_result() causes issues:

* The amount of hardware corrupted memory is incorrectly updated.
* Per NUMA node MF stats are incorrectly updated.
* Redundant "already poisoned" messages are printed.

Avoid those issues by:

* Skipping hardware corrupted memory updates for already poisoned pages.
* Skipping per NUMA node MF stats updates for already poisoned pages.
* Dropping redundant "already poisoned" messages.

Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages.

Fixes b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages")
Signed-off-by Kyle Meyer <[email protected]>

---

v1 -> v2:
* Continue passing poisoned pages to action_result() with MF_FAILED but don't
update anything.
* https://lore.kernel.org/all/[email protected]

---
  mm/memory-failure.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
mm/memory-failure.c +5 -4
index fc30ca4804bf..10b3c281c2ae 100644
@@ -956,7 +956,7 @@ static const char * const action_page_types[] = {
  	[MF_MSG_BUDDY]			= "free buddy page",
  	[MF_MSG_DAX]			= "dax page",
  	[MF_MSG_UNSPLIT_THP]		= "unsplit thp",
-	[MF_MSG_ALREADY_POISONED]	= "already poisoned",
+	[MF_MSG_ALREADY_POISONED]	= "already poisoned page",
  	[MF_MSG_UNKNOWN]		= "unknown page",
  };
 

@@ -1349,9 +1349,10 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
  {
  	trace_memory_failure_event(pfn, type, result);
 
-	num_poisoned_pages_inc(pfn);
-
-	update_per_node_mf_stats(pfn, result);
+	if (type != MF_MSG_ALREADY_POISONED) {
+		num_poisoned_pages_inc(pfn);
+		update_per_node_mf_stats(pfn, result);
+	}
 
  	pr_err("%#lx: recovery action for %s: %s\n",
  		pfn, action_page_types[type], action_name[result]);

mm/memory-failure.c static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb · line 2102

Quoted 10 lines
mm/memory-failure.c +1 -2
@@ -2094,12 +2095,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
  		*hugetlb = 0;
  		return 0;
  	} else if (res == -EHWPOISON) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
  		if (flags & MF_ACTION_REQUIRED) {
  			folio = page_folio(p);
  			res = kill_accessing_process(current, folio_pfn(folio), flags);
-			action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
  		}
+		action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);

Was briefly confused by that change, but action_result() now essentially only traces + pr_err() with MF_MSG_ALREADY_POISONED.

Acked-by David Hildenbrand <[email protected]>
Signature · 3 lines
Cheers

David / dhildenb
Reviewed-by on v2 1/1
#3 lore raw
In reply to Kyle Meyer
Quoted 73 lines · Kyle Meyer

Duplicate memory errors can be reported by multiple sources.

Passing an already poisoned page to action_result() causes issues:

* The amount of hardware corrupted memory is incorrectly updated.
* Per NUMA node MF stats are incorrectly updated.
* Redundant "already poisoned" messages are printed.

Avoid those issues by:

* Skipping hardware corrupted memory updates for already poisoned pages.
* Skipping per NUMA node MF stats updates for already poisoned pages.
* Dropping redundant "already poisoned" messages.

Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages.

Fixes b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages")
Signed-off-by Kyle Meyer <[email protected]>

---

v1 -> v2:
* Continue passing poisoned pages to action_result() with MF_FAILED but don't
update anything.
* https://lore.kernel.org/all/[email protected]

---
  mm/memory-failure.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
mm/memory-failure.c +6 -6
index fc30ca4804bf..10b3c281c2ae 100644
@@ -956,7 +956,7 @@ static const char * const action_page_types[] = {
  	[MF_MSG_BUDDY]			= "free buddy page",
  	[MF_MSG_DAX]			= "dax page",
  	[MF_MSG_UNSPLIT_THP]		= "unsplit thp",
-	[MF_MSG_ALREADY_POISONED]	= "already poisoned",
+	[MF_MSG_ALREADY_POISONED]	= "already poisoned page",
  	[MF_MSG_UNKNOWN]		= "unknown page",
  };
 

@@ -1349,9 +1349,10 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
  {
  	trace_memory_failure_event(pfn, type, result);
 
-	num_poisoned_pages_inc(pfn);
-
-	update_per_node_mf_stats(pfn, result);
+	if (type != MF_MSG_ALREADY_POISONED) {
+		num_poisoned_pages_inc(pfn);
+		update_per_node_mf_stats(pfn, result);
+	}
 
  	pr_err("%#lx: recovery action for %s: %s\n",
  		pfn, action_page_types[type], action_name[result]);

@@ -2094,12 +2095,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
  		*hugetlb = 0;
  		return 0;
  	} else if (res == -EHWPOISON) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
  		if (flags & MF_ACTION_REQUIRED) {
  			folio = page_folio(p);
  			res = kill_accessing_process(current, folio_pfn(folio), flags);
-			action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
  		}
+		action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
  		return res;
  	} else if (res == -EBUSY) {
  		if (!(flags & MF_NO_RETRY)) {

mm/memory-failure.c int memory_failure(unsigned long pfn, int flags) · line 2290

Quoted 7 lines
mm/memory-failure.c +0 -1
@@ -2285,7 +2285,6 @@ int memory_failure(unsigned long pfn, int flags)
  		goto unlock_mutex;
 
  	if (TestSetPageHWPoison(p)) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
  		res = -EHWPOISON;
  		if (flags & MF_ACTION_REQUIRED)
  			res = kill_accessing_process(current, pfn, flags);

Looks good, thanks!

Reviewed-by Jane Chu <[email protected]>

-jane

maintainer Acked-by on v2 1/1
#4 lore raw
In reply to Kyle Meyer
Quoted 14 lines · Kyle Meyer

Duplicate memory errors can be reported by multiple sources.

Passing an already poisoned page to action_result() causes issues:

* The amount of hardware corrupted memory is incorrectly updated.
* Per NUMA node MF stats are incorrectly updated.
* Redundant "already poisoned" messages are printed.

Avoid those issues by:

* Skipping hardware corrupted memory updates for already poisoned pages.
* Skipping per NUMA node MF stats updates for already poisoned pages.
* Dropping redundant "already poisoned" messages.

Quoted 6 lines

Make MF_MSG_ALREADY_POISONED consistent with other action_page_types and make calls to action_result() consistent for already poisoned normal pages and huge pages.

Fixes b8b9488d50b7 ("mm/memory-failure: improve memory failure action_result messages")
Signed-off-by Kyle Meyer <[email protected]>

Thanks for your patch. This patch looks good to me.

Acked-by Miaohe Lin <[email protected]>

Thanks.
.

Quoted 61 lines

---

v1 -> v2:
* Continue passing poisoned pages to action_result() with MF_FAILED but don't
update anything.
* https://lore.kernel.org/all/[email protected]

---
 mm/memory-failure.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
mm/memory-failure.c +6 -7
index fc30ca4804bf..10b3c281c2ae 100644
@@ -956,7 +956,7 @@ static const char * const action_page_types[] = {
 	[MF_MSG_BUDDY]			= "free buddy page",
 	[MF_MSG_DAX]			= "dax page",
 	[MF_MSG_UNSPLIT_THP]		= "unsplit thp",
-	[MF_MSG_ALREADY_POISONED]	= "already poisoned",
+	[MF_MSG_ALREADY_POISONED]	= "already poisoned page",
 	[MF_MSG_UNKNOWN]		= "unknown page",
 };
 

@@ -1349,9 +1349,10 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
 {
 	trace_memory_failure_event(pfn, type, result);
 
-	num_poisoned_pages_inc(pfn);
-
-	update_per_node_mf_stats(pfn, result);
+	if (type != MF_MSG_ALREADY_POISONED) {
+		num_poisoned_pages_inc(pfn);
+		update_per_node_mf_stats(pfn, result);
+	}
 
 	pr_err("%#lx: recovery action for %s: %s\n",
 		pfn, action_page_types[type], action_name[result]);

@@ -2094,12 +2095,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 		*hugetlb = 0;
 		return 0;
 	} else if (res == -EHWPOISON) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
 		if (flags & MF_ACTION_REQUIRED) {
 			folio = page_folio(p);
 			res = kill_accessing_process(current, folio_pfn(folio), flags);
-			action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
 		}
+		action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
 		return res;
 	} else if (res == -EBUSY) {
 		if (!(flags & MF_NO_RETRY)) {

@@ -2285,7 +2285,6 @@ int memory_failure(unsigned long pfn, int flags)
 		goto unlock_mutex;
 
 	if (TestSetPageHWPoison(p)) {
-		pr_err("%#lx: already hardware poisoned\n", pfn);
 		res = -EHWPOISON;
 		if (flags & MF_ACTION_REQUIRED)
 			res = kill_accessing_process(current, pfn, flags);