Memory failure just gets ignored for global huge_zero_page even without a
split attempt. But corresponding memory failure message MF_MSG_UNSPLIT_THP
is misleading as if the THP page could not be split during memory failure
handling. This adds a new message MF_MSG_HUGE_ZERO indicating that memory
got ignored for being a huge zero page.
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Cc: linux-mm@xxxxxxxxx
Cc: linux-edac@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
---
This applies on v5.18-rc4
include/linux/mm.h | 1 +
include/ras/ras_event.h | 1 +
mm/memory-failure.c | 3 ++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9f44254af8ce..a947d87b1ada 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3236,6 +3236,7 @@ enum mf_action_page_type {
MF_MSG_SLAB,
MF_MSG_DIFFERENT_COMPOUND,
MF_MSG_HUGE,
+ MF_MSG_HUGE_ZERO,
MF_MSG_FREE_HUGE,
MF_MSG_NON_PMD_HUGE,
MF_MSG_UNMAP_FAILED,
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 1e694fd239b9..feb9eafee966 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -359,6 +359,7 @@ TRACE_EVENT(aer_event,
EM ( MF_MSG_SLAB, "kernel slab page" ) \
EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \
EM ( MF_MSG_HUGE, "huge page" ) \
+ EM ( MF_MSG_HUGE_ZERO, "huge zero page" ) \
EM ( MF_MSG_FREE_HUGE, "free huge page" ) \
EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" ) \
EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 27760c19bad7..efe99e8afb73 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -718,6 +718,7 @@ static const char * const action_page_types[] = {
[MF_MSG_SLAB] = "kernel slab page",
[MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking",
[MF_MSG_HUGE] = "huge page",
+ [MF_MSG_HUGE_ZERO] = "huge zero page",
[MF_MSG_FREE_HUGE] = "free huge page",
[MF_MSG_NON_PMD_HUGE] = "non-pmd-sized huge page",
[MF_MSG_UNMAP_FAILED] = "unmapping failed page",
@@ -1868,7 +1869,7 @@ int memory_failure(unsigned long pfn, int flags)
* TODO: Handle memory failure of huge_zero_page thoroughly.
*/
if (is_huge_zero_page(hpage)) {
- action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED);
+ action_result(pfn, MF_MSG_HUGE_ZERO, MF_IGNORED);
res = -EBUSY;
goto unlock_mutex;
}
--
2.20.1
