Skip to content

Commit 38f6d29

Browse files
nhoriguchiakpm00
authored andcommitted
mm, hwpoison: set PG_hwpoison for busy hugetlb pages
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: 405ce05 ("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>
1 parent ac5fcde commit 38f6d29

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/linux/mm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,6 +3176,7 @@ enum mf_flags {
31763176
MF_SOFT_OFFLINE = 1 << 3,
31773177
MF_UNPOISON = 1 << 4,
31783178
MF_SW_SIMULATED = 1 << 5,
3179+
MF_NO_RETRY = 1 << 6,
31793180
};
31803181
int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index,
31813182
unsigned long count, int mf_flags);

mm/memory-failure.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,8 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags)
18001800
count_increased = true;
18011801
} else {
18021802
ret = -EBUSY;
1803-
goto out;
1803+
if (!(flags & MF_NO_RETRY))
1804+
goto out;
18041805
}
18051806

18061807
if (hugetlb_set_page_hwpoison(head, page)) {
@@ -1827,7 +1828,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
18271828
struct page *p = pfn_to_page(pfn);
18281829
struct page *head;
18291830
unsigned long page_flags;
1830-
bool retry = true;
18311831

18321832
*hugetlb = 1;
18331833
retry:
@@ -1843,8 +1843,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
18431843
}
18441844
return res;
18451845
} else if (res == -EBUSY) {
1846-
if (retry) {
1847-
retry = false;
1846+
if (!(flags & MF_NO_RETRY)) {
1847+
flags |= MF_NO_RETRY;
18481848
goto retry;
18491849
}
18501850
action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);

0 commit comments

Comments
 (0)