From: jane.chu@oracle.com
To: "Liam R. Howlett" <Liam.Howlett@oracle.com>,
muchun.song@linux.dev, osalvador@suse.de, david@kernel.org,
linmiaohe@huawei.com, jiaqiyan@google.com,
william.roche@oracle.com, rientjes@google.com,
akpm@linux-foundation.org, lorenzo.stoakes@oracle.com,
rppt@kernel.org, surenb@google.com, mhocko@suse.com,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mm/memory-failure: teach kill_accessing_process to accept hugetlb tail page pfn
Date: Fri, 19 Dec 2025 09:29:16 -0800 [thread overview]
Message-ID: <885df351-63c2-41b1-a934-638b914771c9@oracle.com> (raw)
In-Reply-To: <fl5lkxxvlsyeur7e7ls2tnsh4afzyhvotoaluxcv2ge2tm2dp3@7vf7xvbf7mkp>
On 12/19/2025 9:27 AM, Liam R. Howlett wrote:
> * Jane Chu <jane.chu@oracle.com> [251219 01:28]:
>> 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/
>>
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Jane Chu <jane.chu@oracle.com>
>
> I don't see stable in the Cc list, did you miss it?
Good catch, thank you!
>
> Looks good, small nit below.
>
> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Thanks!
-jane
>
>> ---
>> mm/memory-failure.c | 22 ++++++++++++----------
>> 1 file changed, 12 insertions(+), 10 deletions(-)
>>
>> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
>> index 3edebb0cda30..c9d87811b1ea 100644
>> --- a/mm/memory-failure.c
>> +++ b/mm/memory-failure.c
>> @@ -681,9 +681,11 @@ static void set_to_kill(struct to_kill *tk, unsigned long addr, short shift)
>> }
>>
>> static int check_hwpoisoned_entry(pte_t pte, unsigned long addr, short shift,
>> - unsigned long poisoned_pfn, struct to_kill *tk)
>> + unsigned long poisoned_pfn, struct to_kill *tk,
>> + int pte_nr)
>> {
>> unsigned long pfn = 0;
>> + unsigned long hwpoison_vaddr;
>>
>> if (pte_present(pte)) {
>> pfn = pte_pfn(pte);
>> @@ -694,10 +696,11 @@ static int check_hwpoisoned_entry(pte_t pte, unsigned long addr, short shift,
>> pfn = swp_offset_pfn(swp);
>> }
>>
>> - if (!pfn || pfn != poisoned_pfn)
>> + if (!pfn || (pfn > poisoned_pfn || (pfn + pte_nr - 1) < poisoned_pfn))
>> return 0;
>>
>> - set_to_kill(tk, addr, shift);
>> + hwpoison_vaddr = addr + ((poisoned_pfn - pfn) << PAGE_SHIFT);
>> + set_to_kill(tk, hwpoison_vaddr, shift);
>> return 1;
>> }
>>
>> @@ -749,7 +752,7 @@ static int hwpoison_pte_range(pmd_t *pmdp, unsigned long addr,
>>
>> for (; addr != end; ptep++, addr += PAGE_SIZE) {
>> ret = check_hwpoisoned_entry(ptep_get(ptep), addr, PAGE_SHIFT,
>> - hwp->pfn, &hwp->tk);
>> + hwp->pfn, &hwp->tk, 1);
>> if (ret == 1)
>> break;
>> }
>> @@ -772,8 +775,8 @@ static int hwpoison_hugetlb_range(pte_t *ptep, unsigned long hmask,
>>
>> ptl = huge_pte_lock(h, walk->mm, ptep);
>> pte = huge_ptep_get(walk->mm, addr, ptep);
>> - ret = check_hwpoisoned_entry(pte, addr, huge_page_shift(h),
>> - hwp->pfn, &hwp->tk);
>> + ret = check_hwpoisoned_entry(pte, addr, huge_page_shift(h), hwp->pfn,
>> + &hwp->tk, pages_per_huge_page(h));
>> spin_unlock(ptl);
>> return ret;
>> }
>> @@ -2023,10 +2026,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
>> *hugetlb = 0;
>> return 0;
>> } else if (res == -EHWPOISON) {
>> - if (flags & MF_ACTION_REQUIRED) {
>> - folio = page_folio(p);
>> - res = kill_accessing_process(current, folio_pfn(folio), flags);
>> - }
>> + if (flags & MF_ACTION_REQUIRED)
>> + res = kill_accessing_process(current, pfn, flags);
>> action_result(pfn, MF_MSG_ALREADY_POISONED, MF_FAILED);
>> return res;
>> } else if (res == -EBUSY) {
>> @@ -2037,6 +2038,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
>> return action_result(pfn, MF_MSG_GET_HWPOISON, MF_IGNORED);
>> }
>>
>> +
>
> nit: extra witespace added.
>
>> folio = page_folio(p);
>> folio_lock(folio);
>>
>> --
>> 2.43.5
>>
next prev parent reply other threads:[~2025-12-19 17:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-19 6:28 Jane Chu
2025-12-19 8:01 ` Miaohe Lin
2025-12-19 8:06 ` jane.chu
2025-12-22 3:01 ` Miaohe Lin
2025-12-22 20:29 ` jane.chu
2025-12-19 17:27 ` Liam R. Howlett
2025-12-19 17:29 ` jane.chu [this message]
2025-12-20 23:13 ` Andrew Morton
2025-12-22 20:32 ` jane.chu
2025-12-23 0:36 ` jane.chu
2025-12-21 8:49 ` David Hildenbrand (Red Hat)
2025-12-22 18:42 ` jane.chu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=885df351-63c2-41b1-a934-638b914771c9@oracle.com \
--to=jane.chu@oracle.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=jiaqiyan@google.com \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=mhocko@suse.com \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=rientjes@google.com \
--cc=rppt@kernel.org \
--cc=surenb@google.com \
--cc=william.roche@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®