nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mm/memory-failure.c: add hwpoison_filter for soft offline

Browse source 
hwpoison_filter is missing in the soft offline path, this leads an issue:
after enabling the corrupt filter, the user process still has a chance to
inject hwpoison fault by madvise(addr, len, MADV_SOFT_OFFLINE) at PFN
which is expected to reject.

Also do a minor change in comment of memory_failure().

Link: https://lkml.kernel.org/r/20220509105641.491313-4-pizhenwei@bytedance.com
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
zhenwei pi 2022-05-12 20:23:10 -07:00 committed by Andrew Morton
parent c8bd84f73f
commit 9113eaf331
1 changed files with 14 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
mm/memory-failure.c
View file

@ -1751,7 +1751,7 @@ static DEFINE_MUTEX(mf_mutex);
* enabled and no spinlocks hold. * enabled and no spinlocks hold.
* *
* Return: 0 for successfully handled the memory error, * Return: 0 for successfully handled the memory error,
* -EOPNOTSUPP for memory_filter() filtered the error event, * -EOPNOTSUPP for hwpoison_filter() filtered the error event,
* < 0(except -EOPNOTSUPP) on failure. * < 0(except -EOPNOTSUPP) on failure.
*/ */
int memory_failure(unsigned long pfn, int flags) int memory_failure(unsigned long pfn, int flags)
@ -2308,7 +2308,9 @@ static void put_ref_page(struct page *page)
* @pfn: pfn to soft-offline * @pfn: pfn to soft-offline
* @flags: flags. Same as memory_failure(). * @flags: flags. Same as memory_failure().
* *
* Returns 0 on success, otherwise negated errno. * Returns 0 on success
* -EOPNOTSUPP for hwpoison_filter() filtered the error event
* < 0 otherwise negated errno.
* *
* Soft offline a page, by migration or invalidation, * Soft offline a page, by migration or invalidation,
* without killing anything. This is for the case when * without killing anything. This is for the case when
@ -2359,6 +2361,16 @@ int soft_offline_page(unsigned long pfn, int flags)
ret = get_hwpoison_page(page, flags | MF_SOFT_OFFLINE); ret = get_hwpoison_page(page, flags | MF_SOFT_OFFLINE);
put_online_mems(); put_online_mems();
if (hwpoison_filter(page)) {
if (ret > 0)
put_page(page);
else
put_ref_page(ref_page);
mutex_unlock(&mf_mutex);
return -EOPNOTSUPP;
}
if (ret > 0) { if (ret > 0) {
ret = soft_offline_in_use_page(page); ret = soft_offline_in_use_page(page);
} else if (ret == 0) { } else if (ret == 0) {