Re: [PATCH] hugetlb: Don't restore vmemmap of non-HVOed folios on bulk restore error

From: Muchun Song

Date: Mon Nov 16 2026 - 20:58:24 EST




> On Nov 17, 2026, at 06:15, James Houghton <jthoughton@xxxxxxxxxx> wrote:
>
> When hugetlb_vmemmap_restore_folios() fails, it stops processing the
> list, so folio_list may still contain folios that were never vmemmap
> optimized, e.g. because HVO failed when they were allocated. Their
> hugetlb flag has already been cleared by remove_hugetlb_folio().
>
> If no folios could be restored, bulk_vmemmap_restore_error() then calls
> hugetlb_vmemmap_restore_folio() on every folio left on folio_list,
> including those, which trips the !folio_test_hugetlb() check in
> __hugetlb_vmemmap_restore_folio():
>
> page dumped because: VM_WARN_ON_ONCE_FOLIO(!folio_test_hugetlb(folio))
> WARNING: mm/hugetlb_vmemmap.c:503 at __hugetlb_vmemmap_restore_folio+0x270/0x300
> ...
> __hugetlb_vmemmap_restore_folio+0x270/0x300 (P)
> hugetlb_vmemmap_restore_folio+0x1c/0x30
> update_and_free_pages_bulk+0x2c0/0x368
> __nr_hugepages_store_common+0x2e8/0x3f0
>
> Otherwise this is benign: the restore is a no-op returning success for
> non-optimized folios, which are then freed as intended.
>
> Skip the restore for folios that are not vmemmap optimized; they can be
> freed right away.
>
> This is very unlikely to happen without fault injection, as it requires
> both HVO and a subsequent vmemmap restore to fail.
>
> Fixes: cfb8c75099db ("hugetlb: perform vmemmap restoration on a list of pages")
> Signed-off-by: James Houghton <jthoughton@xxxxxxxxxx>

Reviewed-by: Muchun Song (ByteDance) <muchun.song@xxxxxxxxx>

Thanks.