Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm, hwpoison: set PG_hwpoison for busy hugetlb pages

Browse Source 
If memory_failure() fails to grab page refcount on a hugetlb page because
it's busy, it returns without setting PG_hwpoison on it.  This not only
loses a chance of error containment, but breaks the rule that
action_result() should be called only when memory_failure() do any of
handling work (even if that's just setting PG_hwpoison).  This
inconsistency could harm code maintainability.

So set PG_hwpoison and call hugetlb_set_page_hwpoison() for such a case.

Link: https://lkml.kernel.org/r/20220714042420.1847125-6-naoya.horiguchi@linux.dev
Fixes: 405ce05123 ("mm/hwpoison: fix race between hugetlb free/demotion and memory_failure_hugetlb()")
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Liu Shixin <liushixin2@huawei.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Naoya Horiguchi 2022-07-14 13:24:17 +09:00 committed by Andrew Morton
parent ac5fcde0a9
commit 38f6d29397
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/mm.h
View File

@ -3176,6 +3176,7 @@ enum mf_flags {
MF_SOFT_OFFLINE = 1 << 3, MF_SOFT_OFFLINE = 1 << 3,
MF_UNPOISON = 1 << 4, MF_UNPOISON = 1 << 4,
MF_SW_SIMULATED = 1 << 5, MF_SW_SIMULATED = 1 << 5,
MF_NO_RETRY = 1 << 6,
}; };
int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index,
unsigned long count, int mf_flags); unsigned long count, int mf_flags);

8
mm/memory-failure.c
View File

@ -1800,7 +1800,8 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags)
count_increased = true; count_increased = true;
} else { } else {
ret = -EBUSY; ret = -EBUSY;
goto out; if (!(flags & MF_NO_RETRY))
goto out;
} }
if (hugetlb_set_page_hwpoison(head, page)) { if (hugetlb_set_page_hwpoison(head, page)) {
@ -1827,7 +1828,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
struct page *p = pfn_to_page(pfn); struct page *p = pfn_to_page(pfn);
struct page *head; struct page *head;
unsigned long page_flags; unsigned long page_flags;
bool retry = true;
*hugetlb = 1; *hugetlb = 1;
retry: retry:
@ -1843,8 +1843,8 @@ retry:
} }
return res; return res;
} else if (res == -EBUSY) { } else if (res == -EBUSY) {
if (retry) { if (!(flags & MF_NO_RETRY)) {
retry = false; flags |= MF_NO_RETRY;
goto retry; goto retry;
} }
action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED); action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);