[PATCH 2/5] mm,hugetlb: Document the reason to lock the folio in the faulting path
From: Oscar Salvador
Date: Thu Jun 12 2025 - 09:55:33 EST
Recent conversations showed that there was a misunderstanding about why we
were locking the folio prior to calling hugetlb_wp().
Document explicitly why we need to take the lock, explaining on the way that
although the timespan for the locking of anonymous and file folios is different,
it would require a major surgery to represent that difference with the current
code.
Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
---
mm/hugetlb.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 175edafeec67..dfa09fc3b2c6 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6537,6 +6537,10 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping,
}
new_pagecache_folio = true;
} else {
+ /*
+ * hugetlb_wp() expects the folio to be locked in order to
+ * check whether we can re-use this page exclusively for us.
+ */
folio_lock(folio);
anon_rmap = 1;
}
@@ -6801,7 +6805,19 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
/* Fallthrough to CoW */
}
- /* hugetlb_wp() requires page locks of pte_page(vmf.orig_pte) */
+ /*
+ * We need to lock the folio before calling hugetlb_wp().
+ * Either the folio is in the pagecache and we need to copy it over
+ * to another file, so it must remain stable throughout the operation,
+ * or the folio is anonymous and we need to lock it in order to check
+ * whether we can re-use it and mark it exclusive for this process.
+ * The timespan for the lock differs depending on the type, since
+ * anonymous folios only need to hold the lock while checking whether we
+ * can re-use it, while we need to hold it throughout the copy in case
+ * we are dealing with a folio from a pagecache.
+ * Representing this difference would be tricky with the current code,
+ * so just hold the lock for the duration of hugetlb_wp().
+ */
folio = page_folio(pte_page(vmf.orig_pte));
folio_lock(folio);
folio_get(folio);
--
2.49.0