Skip to content

Commit 23580f9

Browse files
tujinjiang11gregkh
authored andcommitted
mm/memory-failure: fix infinite UCE for VM_PFNMAP pfn
commit 2e6053f upstream. When memory_failure() is called for a already hwpoisoned pfn, kill_accessing_process() will be called to kill current task. However, if the vma of the accessing vaddr is VM_PFNMAP, walk_page_range() will skip the vma in walk_page_test() and return 0. Before commit aaf99ac ("mm/hwpoison: do not send SIGBUS to processes with recovered clean pages"), kill_accessing_process() will return EFAULT. For x86, the current task will be killed in kill_me_maybe(). However, after this commit, kill_accessing_process() simplies return 0, that means UCE is handled properly, but it doesn't actually. In such case, the user task will trigger UCE infinitely. To fix it, add .test_walk callback for hwpoison_walk_ops to scan all vmas. Link: https://lkml.kernel.org/r/20250815073209.1984582-1-tujinjiang@huawei.com Fixes: aaf99ac ("mm/hwpoison: do not send SIGBUS to processes with recovered clean pages") Signed-off-by: Jinjiang Tu <tujinjiang@huawei.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Jane Chu <jane.chu@oracle.com> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: Naoya Horiguchi <nao.horiguchi@gmail.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Shuai Xue <xueshuai@linux.alibaba.com> Cc: Zi Yan <ziy@nvidia.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 561171d commit 23580f9

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

mm/memory-failure.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,17 @@ static int hwpoison_hugetlb_range(pte_t *ptep, unsigned long hmask,
847847
#define hwpoison_hugetlb_range NULL
848848
#endif
849849

850+
static int hwpoison_test_walk(unsigned long start, unsigned long end,
851+
struct mm_walk *walk)
852+
{
853+
/* We also want to consider pages mapped into VM_PFNMAP. */
854+
return 0;
855+
}
856+
850857
static const struct mm_walk_ops hwpoison_walk_ops = {
851858
.pmd_entry = hwpoison_pte_range,
852859
.hugetlb_entry = hwpoison_hugetlb_range,
860+
.test_walk = hwpoison_test_walk,
853861
.walk_lock = PGWALK_RDLOCK,
854862
};
855863

0 commit comments

Comments
 (0)