mm/hwpoison: Avoid the impact of hwpoison_filter() return value on mce handler
Subsystems (8)
PATCH v5 1/2 mm/hwpoison: Avoid the impact of hwpoison_filter() return value on mce handler
When the hwpoison page meets the filter conditions, it should not be regarded as successful memory_failure() processing for mce handler, but should return a distinct value, otherwise mce handler regards the error page has been identified and isolated, which may lead to calling set_mce_nospec() to change page attribute, etc.
Here memory_failure() return -EOPNOTSUPP to indicate that the error event is filtered, mce handler should not take any action for this situation and hwpoison injector should treat as correct.
--- arch/x86/kernel/cpu/mce/core.c | 8 +++++--- drivers/base/memory.c | 2 ++ mm/hwpoison-inject.c | 3 ++- mm/madvise.c | 2 ++ mm/memory-failure.c | 9 +++++++-- 5 files changed, 18 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mce/core.c +5 -3
@@ -1332,10 +1332,12 @@ static void kill_me_maybe(struct callback_head *cb)/* * -EHWPOISON from memory_failure() means that it already sent SIGBUS -* to the current process with the proper error info, so no need to -* send SIGBUS here again. +* to the current process with the proper error info, +* -EOPNOTSUPP means hwpoison_filter() filtered the error event, +* +* In both cases, no further processing is required. */ -if (ret == -EHWPOISON ) +if (ret == -EHWPOISON || ret == -EOPNOTSUPP )return ;pr_err ("Memory error not recovered" );
drivers/base/memory.c +2 -0
@@ -555,6 +555,8 @@ static ssize_t hard_offline_page_store(struct device *dev,return -EINVAL ; pfn >>=PAGE_SHIFT ; ret =memory_failure (pfn,0 ); +if (ret == -EOPNOTSUPP ) + ret =0 ;return ret ? ret : count; }
mm/hwpoison-inject.c +2 -1
@@ -48,7 +48,8 @@ static int hwpoison_inject(void *data, u64 val) inject:pr_info ("Injecting memory failure at pfn %#lx\n" , pfn); -return memory_failure (pfn,0 ); + err =memory_failure (pfn,0 ); +return (err == -EOPNOTSUPP ) ?0 : err; }static int hwpoison_unpoison (void *data,u64 val)
mm/madvise.c +2 -0
@@ -1096,6 +1096,8 @@ static int madvise_inject_error(int behavior,pr_info ("Injecting memory failure for pfn %#lx at process virtual address %#lx\n" , pfn, start); ret =memory_failure (pfn,MF_COUNT_INCREASED ); +if (ret == -EOPNOTSUPP ) + ret =0 ; }if (ret)
mm/memory-failure.c +7 -2
@@ -1528,7 +1528,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags)if (TestClearPageHWPoison (head))num_poisoned_pages_dec ();unlock_page (head); -return 0 ; +return -EOPNOTSUPP ; }unlock_page (head); res =MF_FAILED ;
@@ -1615,7 +1615,7 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, goto out;if (hwpoison_filter (page)) { - rc =0 ; + rc = -EOPNOTSUPP ; goto unlock; }
@@ -1688,6 +1688,10 @@ static DEFINE_MUTEX(mf_mutex);* * Must run in process context (e.g. a work queue) with interrupts * enabled and no spinlocks hold. +* +* Return: 0 for successfully handled the memory error, +* -EOPNOTSUPP for memory_filter() filtered the error event, +* < 0(except -EOPNOTSUPP) on failure. */ int memory_failure (unsigned long pfn,int flags) {
@@ -1843,6 +1847,7 @@ int memory_failure(unsigned long pfn, int flags)num_poisoned_pages_dec ();unlock_page (p);put_page (p); + res = -EOPNOTSUPP ; goto unlock_mutex; }
Signature · 1 line
2.27.0
Quoted 11 lines · luofei
When the hwpoison page meets the filter conditions, it should not be regarded as successful
memory_failure()processing for mce handler, but should return a distinct value, otherwise mce handler regards the error page has been identified and isolated, which may lead to callingset_mce_nospec()to change page attribute, etc.Here
memory_failure()return-EOPNOTSUPPto indicate that the error event is filtered, mce handler should not take any action for this situation and hwpoison injector should treat as correct.
Quoted 8 lines
Signed-off-by luofei <[email protected]>--- arch/x86/kernel/cpu/mce/core.c | 8 +++++--- drivers/base/memory.c | 2 ++ mm/hwpoison-inject.c | 3 ++- mm/madvise.c | 2 ++ mm/memory-failure.c | 9 +++++++-- 5 files changed, 18 insertions(+), 6 deletions(-)
Much better, thanks.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette