* + hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error.patch added to mm-new branch
@ 2026-11-17 2:07 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2026-11-17 2:07 UTC (permalink / raw)
To: mm-commits, rppt, osalvador, muchun.song, david, jthoughton, akpm
The patch titled
Subject: hugetlb: don't restore vmemmap of non-HVOed folios on bulk restore error
has been added to the -mm mm-new branch. Its filename is
hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error.patch
This patch will later appear in the mm-new branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Note, mm-new is a provisional staging ground for work-in-progress
patches, and acceptance into mm-new is a notification for others take
notice and to finish up reviews. Please do not hesitate to respond to
review feedback and post updated versions to replace or incrementally
fixup patches in mm-new.
The mm-new branch of mm.git is not included in linux-next
If a few days of testing in mm-new is successful, the patch will me moved
into mm.git's mm-unstable branch, which is included in linux-next
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days
------------------------------------------------------
From: James Houghton <jthoughton@google.com>
Subject: hugetlb: don't restore vmemmap of non-HVOed folios on bulk restore error
Date: Mon, 16 Nov 2026 22:15:57 +0000
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.
Link: https://lore.kernel.org/20261116221557.3128331-1-jthoughton@google.com
Fixes: cfb8c75099db ("hugetlb: perform vmemmap restoration on a list of pages")
Signed-off-by: James Houghton <jthoughton@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Muchun Song (ByteDance) <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: David Hildenbrand <david@kernel.org>
Cc: Mike Rapoport <rppt@kernel.org>
mm/hugetlb.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
--- a/mm/hugetlb.c~hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error
+++ a/mm/hugetlb.c
@@ -1655,21 +1655,28 @@ static void bulk_vmemmap_restore_error(s
* If are able to restore vmemmap and free one hugetlb page, we
* quit processing the list to retry the bulk operation.
*/
- list_for_each_entry_safe(folio, t_folio, folio_list, lru)
- if (hugetlb_vmemmap_restore_folio(h, folio)) {
- list_del(&folio->lru);
- spin_lock_irq(&hugetlb_lock);
- add_hugetlb_folio(h, folio, true);
- spin_unlock_irq(&hugetlb_lock);
- } else {
- list_del(&folio->lru);
+ list_for_each_entry_safe(folio, t_folio, folio_list, lru) {
+ list_del(&folio->lru);
+ /*
+ * remove_hugetlb_folio() already cleared the hugetlb flag
+ * for folios whose vmemmap was not optimized, so they can
+ * be freed without restoring vmemmap.
+ */
+ if (folio_test_hugetlb(folio)) {
+ if (hugetlb_vmemmap_restore_folio(h, folio)) {
+ spin_lock_irq(&hugetlb_lock);
+ add_hugetlb_folio(h, folio, true);
+ spin_unlock_irq(&hugetlb_lock);
+ continue;
+ }
spin_lock_irq(&hugetlb_lock);
__folio_clear_hugetlb(folio);
spin_unlock_irq(&hugetlb_lock);
- update_and_free_hugetlb_folio(h, folio, false);
- cond_resched();
- break;
}
+ update_and_free_hugetlb_folio(h, folio, false);
+ cond_resched();
+ break;
+ }
}
}
_
Patches currently in -mm which might be from jthoughton@google.com are
hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-17 2:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 2:07 + hugetlb-dont-restore-vmemmap-of-non-hvoed-folios-on-bulk-restore-error.patch added to mm-new branch Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.