Re: [PATCH v2 1/3] mm/hugetlb_vmemmap: fix lost HWPoison state during optimization
From: Jiaqi Yan
Date: Wed Nov 11 2026 - 13:39:23 EST
On Wed, Nov 11, 2026 at 1:38 AM Muchun Song <songmuchun@xxxxxxxxxxxxx> wrote:
>
> HVO copies the vmemmap head page before remapping it to a newly allocated
> backing page. Memory failure can update the old head page after the copy
> but before the remap's TLB invalidation completes:
>
> CPU 0 CPU 1
> init_new_hugetlb_folio()
> __hugetlb_vmemmap_optimize_folio()
> vmemmap_optimize_pte()
> copy_page(old_head, new_head)
> try_memory_failure_hugetlb()
> get_huge_page_for_hwpoison()
> hugetlb_update_hwpoison(old_head)
> set_pte_at(..., new_head)
> flush_tlb_all()
> free_vmemmap_page_list(old_head)
>
> The raw_hwp_page linked to the old head is then leaked and the folio's
> HWPoison state is lost when the obsolete backing page is freed, allowing
> the poisoned huge page to be allocated later.
>
> Serialize HVO remapping against HWPoison updates. This ensures that an
> update is either copied to the new vmemmap head page or applied after HVO
> installs the new mapping and completes the TLB flush.
>
> Fixes: 11aad2631bf7 ("mm/hugetlb_vmemmap: remap head page to newly allocated page")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
> Reported-by: Sashiko <sashiko-bot@xxxxxxxxxx>
> Closes: https://sashiko.dev/#/bug/linux-18e93f17-529b-4d84-ba44-a41829f4be64
> ---
> mm/hugetlb_vmemmap.c | 10 ++++++++++
> mm/hugetlb_vmemmap.h | 24 ++++++++++++++++++++++++
> mm/memory-failure.c | 2 ++
> 3 files changed, 36 insertions(+)
>
> diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c
> index ba8e11e399b2..79ca68dff635 100644
> --- a/mm/hugetlb_vmemmap.c
> +++ b/mm/hugetlb_vmemmap.c
> @@ -15,6 +15,7 @@
> #include <linux/mmdebug.h>
> #include <linux/pagewalk.h>
> #include <linux/pgalloc.h>
> +#include <linux/rwsem.h>
> #include <linux/vmemmap-optimization.h>
>
> #include <asm/tlbflush.h>
> @@ -41,6 +42,8 @@ struct vmemmap_remap_walk {
> unsigned long flags;
> };
>
> +DECLARE_RWSEM(vmemmap_remap_rwsem);
> +
> static int vmemmap_split_pmd(pmd_t *pmd, struct page *head, unsigned long start,
> struct vmemmap_remap_walk *walk)
> {
> @@ -333,6 +336,9 @@ static int vmemmap_pteify_folio(const struct folio *folio, unsigned long flags)
> * responsible for freeing the pages left on the @vmemmap_pages list, even on
> * failure.
> *
> + * Note: The caller must hold vmemmap_remap_rwsem. If TLB flushing is deferred,
> + * the lock must remain held until the final TLB flush.
> + *
> * Return: %0 on success, negative error code otherwise.
> */
> static int vmemmap_optimize_folio(const struct folio *folio,
> @@ -348,6 +354,8 @@ static int vmemmap_optimize_folio(const struct folio *folio,
> .flags = flags,
> };
>
> + rwsem_assert_held(&vmemmap_remap_rwsem);
> +
> VM_WARN_ON_ONCE_FOLIO(folio_ref_count(folio), folio);
>
> if (!vmemmap_optimizable_order(folio_order(folio)))
> @@ -536,6 +544,7 @@ void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio)
> {
> LIST_HEAD(vmemmap_pages);
>
> + guard(rwsem_read)(&vmemmap_remap_rwsem);
> __hugetlb_vmemmap_optimize_folio(h, folio, &vmemmap_pages, 0);
> free_vmemmap_page_list(&vmemmap_pages);
> }
> @@ -588,6 +597,7 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_l
>
> flush_tlb_all();
>
> + guard(rwsem_read)(&vmemmap_remap_rwsem);
> list_for_each_entry(folio, folio_list, lru) {
> int ret;
>
> diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h
> index d057e8b12bf1..8b28063d78cc 100644
> --- a/mm/hugetlb_vmemmap.h
> +++ b/mm/hugetlb_vmemmap.h
> @@ -9,9 +9,12 @@
> #ifndef _LINUX_HUGETLB_VMEMMAP_H
> #define _LINUX_HUGETLB_VMEMMAP_H
> #include <linux/hugetlb.h>
> +#include <linux/rwsem.h>
> #include <linux/vmemmap-optimization.h>
>
> #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
> +extern struct rw_semaphore vmemmap_remap_rwsem;
> +
> int hugetlb_vmemmap_restore_folio(const struct hstate *h, struct folio *folio);
> long hugetlb_vmemmap_restore_folios(const struct hstate *h,
> struct list_head *folio_list,
> @@ -20,6 +23,16 @@ void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio)
> void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list);
> void hugetlb_vmemmap_optimize_bootmem_page(unsigned long pfn, unsigned int order);
>
> +static inline void hugetlb_vmemmap_write_lock(void)
> +{
> + down_write(&vmemmap_remap_rwsem);
> +}
> +
> +static inline void hugetlb_vmemmap_write_unlock(void)
> +{
> + up_write(&vmemmap_remap_rwsem);
> +}
> +
> static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h)
> {
> return pages_per_huge_page(h) * sizeof(struct page);
> @@ -59,6 +72,14 @@ static inline void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list
> {
> }
>
> +static inline void hugetlb_vmemmap_write_lock(void)
> +{
> +}
> +
> +static inline void hugetlb_vmemmap_write_unlock(void)
> +{
> +}
> +
> static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct hstate *h)
> {
> return 0;
> @@ -69,6 +90,9 @@ static inline void hugetlb_vmemmap_optimize_bootmem_page(unsigned long pfn, unsi
> }
> #endif /* CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP */
>
> +DEFINE_LOCK_GUARD_0(vmemmap_remap,
> + hugetlb_vmemmap_write_lock(), hugetlb_vmemmap_write_unlock())
> +
> static inline bool hugetlb_vmemmap_optimizable(const struct hstate *h)
> {
> return hugetlb_vmemmap_optimizable_size(h) != 0;
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 78f0a13349cb..164a02866fd5 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -69,6 +69,7 @@
> #include "page_alloc.h"
> #include "internal.h"
> #include "memory-failure.h"
> +#include "hugetlb_vmemmap.h"
>
> static int sysctl_memory_failure_early_kill __read_mostly;
>
> @@ -2038,6 +2039,7 @@ static int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
> bool count_increased = false;
> int ret, rc;
>
> + guard(vmemmap_remap)();
> spin_lock_irq(&hugetlb_lock);
> folio = page_folio(page);
> if (!folio_test_hugetlb(folio)) {
> --
> 2.54.0
>
>
LGTM :)
Reviewed-by: Jiaqi Yan <jiaqiyan@xxxxxxxxxx>