Skip to content

Commit e37e7b0

Browse files
nhoriguchitorvalds
authored andcommitted
mm, hwpoison: fix condition in free hugetlb page path
When a memory error hits a tail page of a free hugepage, __page_handle_poison() is expected to be called to isolate the error in 4kB unit, but it's not called due to the outdated if-condition in memory_failure_hugetlb(). This loses the chance to isolate the error in the finer unit, so it's not optimal. Drop the condition. This "(p != head && TestSetPageHWPoison(head)" condition is based on the old semantics of PageHWPoison on hugepage (where PG_hwpoison flag was set on the subpage), so it's not necessray any more. By getting to set PG_hwpoison on head page for hugepages, concurrent error events on different subpages in a single hugepage can be prevented by TestSetPageHWPoison(head) at the beginning of memory_failure_hugetlb(). So dropping the condition should not reopen the race window originally mentioned in commit b985194 ("hwpoison, hugetlb: lock_page/unlock_page does not match for handling a free hugepage") [[email protected]: fix "HardwareCorrupted" counter] Link: https://lkml.kernel.org/r/20211220084851.GA1460264@u2004 Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Naoya Horiguchi <[email protected]> Reported-by: Fei Luo <[email protected]> Reviewed-by: Mike Kravetz <[email protected]> Cc: <[email protected]> [5.14+] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 7e5b901 commit e37e7b0

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

mm/memory-failure.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,17 +1470,12 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags)
14701470
if (!(flags & MF_COUNT_INCREASED)) {
14711471
res = get_hwpoison_page(p, flags);
14721472
if (!res) {
1473-
/*
1474-
* Check "filter hit" and "race with other subpage."
1475-
*/
14761473
lock_page(head);
1477-
if (PageHWPoison(head)) {
1478-
if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
1479-
|| (p != head && TestSetPageHWPoison(head))) {
1474+
if (hwpoison_filter(p)) {
1475+
if (TestClearPageHWPoison(head))
14801476
num_poisoned_pages_dec();
1481-
unlock_page(head);
1482-
return 0;
1483-
}
1477+
unlock_page(head);
1478+
return 0;
14841479
}
14851480
unlock_page(head);
14861481
res = MF_FAILED;

0 commit comments

Comments
 (0)