linux-kernel - RE: [PATCH 1/1] mm: prevent poison consumption when splitting THP

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <SA1PR11MB71303A772356C994DB932077891BA@SA1PR11MB7130.namprd11.prod.outlook.com>
Date: Mon, 29 Sep 2025 13:52:24 +0000
From: "Zhuo, Qiuxu" <qiuxu.zhuo@...el.com>
To: David Hildenbrand <david@...hat.com>, "akpm@...ux-foundation.org"
	<akpm@...ux-foundation.org>, "lorenzo.stoakes@...cle.com"
	<lorenzo.stoakes@...cle.com>, "linmiaohe@...wei.com" <linmiaohe@...wei.com>,
	"Luck, Tony" <tony.luck@...el.com>
CC: "ziy@...dia.com" <ziy@...dia.com>, "baolin.wang@...ux.alibaba.com"
	<baolin.wang@...ux.alibaba.com>, "Liam.Howlett@...cle.com"
	<Liam.Howlett@...cle.com>, "npache@...hat.com" <npache@...hat.com>,
	"ryan.roberts@....com" <ryan.roberts@....com>, "dev.jain@....com"
	<dev.jain@....com>, "baohua@...nel.org" <baohua@...nel.org>,
	"nao.horiguchi@...il.com" <nao.horiguchi@...il.com>, "Chen, Farrah"
	<farrah.chen@...el.com>, "linux-mm@...ck.org" <linux-mm@...ck.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "Andrew
 Zaborowski" <andrew.zaborowski@...el.com>
Subject: RE: [PATCH 1/1] mm: prevent poison consumption when splitting THP

Hi David,

> From: David Hildenbrand <david@...hat.com>
> [...]
> > --- a/mm/memory-failure.c
> > +++ b/mm/memory-failure.c
> > @@ -2351,8 +2351,10 @@ int memory_failure(unsigned long pfn, int flags)
> >   		 * otherwise it may race with THP split.
> >   		 * And the flag can't be set in get_hwpoison_page() since
> >   		 * it is called by soft offline too and it is just called
> > -		 * for !MF_COUNT_INCREASED.  So here seems to be the best
> > -		 * place.
> > +		 * for !MF_COUNT_INCREASED.
> > +		 * It also tells split_huge_page() to not bother using
> > +		 * the shared zeropage -- the all-zeros check would
> > +		 * consume the poison.  So here seems to be the best place.
> >   		 *
> >   		 * Don't need care about the above error handling paths for
> >   		 * get_hwpoison_page() since they handle either free page
> 
> Hm, I wonder if we should actually check in
> try_to_map_unused_to_zeropage() whether the page has the hwpoison flag
> set. Nothing wrong with scanning non-affected pages.
> 

Good point about continuing to scan non-affected pages for possible zeropage mapping.

> In thp_underused() we should just skip the folio entirely I guess, so keep it
> simple.
> 
> So what about something like this:
> 
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c index
> 9c38a95e9f091..d4109fd7fa1f2 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -4121,6 +4121,9 @@ static bool thp_underused(struct folio *folio)
>          if (khugepaged_max_ptes_none == HPAGE_PMD_NR - 1)
>                  return false;
> 
> +       folio_contain_hwpoisoned_page(folio)

Typo here 😊?

if (folio_contain_hwpoisoned_page(folio))

> +               return false;
> +
>          for (i = 0; i < folio_nr_pages(folio); i++) {
>                  kaddr = kmap_local_folio(folio, i * PAGE_SIZE);
>                  if (!memchr_inv(kaddr, 0, PAGE_SIZE)) { diff --git a/mm/migrate.c
> b/mm/migrate.c index 9e5ef39ce73af..393fc2ffc96e5 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@ -305,8 +305,9 @@ static bool try_to_map_unused_to_zeropage(struct
> page_vma_mapped_walk *pvmw,
>          pte_t newpte;
>          void *addr;
> 
> -       if (PageCompound(page))
> +       if (PageCompound(page) || PageHWPoison(page))
>                  return false;
> +
>          VM_BUG_ON_PAGE(!PageAnon(page), page);
>          VM_BUG_ON_PAGE(!PageLocked(page), page);
>          VM_BUG_ON_PAGE(pte_present(ptep_get(pvmw->pte)), page);
>

I tested this diff and it works well.
If there are no objections, I'll use this diff for v2.

Thanks David.

-Qiuxu