mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
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. Link: https://lkml.kernel.org/r/20220223082135.2769649-1-luofei@unicloud.com Signed-off-by: luofei <luofei@unicloud.com> Acked-by: Borislav Petkov <bp@suse.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Naoya Horiguchi <naoya.horiguchi@nec.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -1515,7 +1515,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;
|
||||
@@ -1602,7 +1602,7 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
|
||||
goto out;
|
||||
|
||||
if (hwpoison_filter(page)) {
|
||||
rc = 0;
|
||||
rc = -EOPNOTSUPP;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
@@ -1671,6 +1671,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)
|
||||
{
|
||||
@@ -1836,6 +1840,7 @@ try_again:
|
||||
num_poisoned_pages_dec();
|
||||
unlock_page(p);
|
||||
put_page(p);
|
||||
res = -EOPNOTSUPP;
|
||||
goto unlock_mutex;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user