Skip to content

Commit 057a6f2

Browse files
jchu314atgithubakpm00
authored andcommitted
mm/memory-failure: teach kill_accessing_process to accept hugetlb tail page pfn
When a hugetlb folio is being poisoned again, try_memory_failure_hugetlb() passed head pfn to kill_accessing_process(), that is not right. The precise pfn of the poisoned page should be used in order to determine the precise vaddr as the SIGBUS payload. This issue has already been taken care of in the normal path, that is, hwpoison_user_mappings(), see [1][2]. Further more, for [3] to work correctly in the hugetlb repoisoning case, it's essential to inform VM the precise poisoned page, not the head page. [1] https://lkml.kernel.org/r/20231218135837.3310403-1-willy@infradead.org [2] https://lkml.kernel.org/r/20250224211445.2663312-1-jane.chu@oracle.com [3] https://lore.kernel.org/lkml/20251116013223.1557158-1-jiaqiyan@google.com/ Link: https://lkml.kernel.org/r/20260120232234.3462258-2-jane.chu@oracle.com Signed-off-by: Jane Chu <jane.chu@oracle.com> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> Acked-by: Miaohe Lin <linmiaohe@huawei.com> Cc: Chris Mason <clm@meta.com> Cc: David Hildenbrand <david@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Jiaqi Yan <jiaqiyan@google.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Rapoport <rppt@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Naoya Horiguchi <nao.horiguchi@gmail.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Suren Baghdasaryan <surenb@google.com> Cc: William Roche <william.roche@oracle.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent a148a20 commit 057a6f2

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

mm/memory-failure.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,8 @@ static int check_hwpoisoned_entry(pte_t pte, unsigned long addr, short shift,
692692
unsigned long poisoned_pfn, struct to_kill *tk)
693693
{
694694
unsigned long pfn = 0;
695+
unsigned long hwpoison_vaddr;
696+
unsigned long mask;
695697

696698
if (pte_present(pte)) {
697699
pfn = pte_pfn(pte);
@@ -702,10 +704,12 @@ static int check_hwpoisoned_entry(pte_t pte, unsigned long addr, short shift,
702704
pfn = softleaf_to_pfn(entry);
703705
}
704706

705-
if (!pfn || pfn != poisoned_pfn)
707+
mask = ~((1UL << (shift - PAGE_SHIFT)) - 1);
708+
if (!pfn || pfn != (poisoned_pfn & mask))
706709
return 0;
707710

708-
set_to_kill(tk, addr, shift);
711+
hwpoison_vaddr = addr + ((poisoned_pfn - pfn) << PAGE_SHIFT);
712+
set_to_kill(tk, hwpoison_vaddr, shift);
709713
return 1;
710714
}
711715

@@ -2052,10 +2056,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
20522056
case MF_HUGETLB_FOLIO_PRE_POISONED:
20532057
case MF_HUGETLB_PAGE_PRE_POISONED:
20542058
rv = -EHWPOISON;
2055-
if (flags & MF_ACTION_REQUIRED) {
2056-
folio = page_folio(p);
2057-
rv = kill_accessing_process(current, folio_pfn(folio), flags);
2058-
}
2059+
if (flags & MF_ACTION_REQUIRED)
2060+
rv = kill_accessing_process(current, pfn, flags);
20592061
if (res == MF_HUGETLB_PAGE_PRE_POISONED)
20602062
action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
20612063
else

0 commit comments

Comments
 (0)