mm: mlock: avoid folio_within_range() on KSM pages
Subsystems (2)
PATCH 1/1 mm: mlock: avoid folio_within_range() on KSM pages
Since mm-hotfixes-stable commit dc68badcede4 ("mm: mlock: update mlock_pte_range to handle large folio") I've just occasionally seen VM_WARN_ON_FOLIO(folio_test_ksm) warnings from folio_within_range(), in a splurge after testing with KSM hyperactive.
folio_referenced_one()'s use of folio_within_vma() is safe because it checks folio_test_large() first; but allow_mlock_munlock() needs to do the same to avoid those warnings (or check !folio_test_ksm() itself? or move either check into folio_within_range()? hard to tell without more examples of its use).
--- mm/mlock.c | 4 ++++ 1 file changed, 4 insertions(+)
mm/mlock.c +4 -0
@@ -346,6 +346,10 @@ static inline bool allow_mlock_munlock(struct folio *folio,if (!(vma->vm_flags &VM_LOCKED ))return true; +/* folio_within_range() cannot take KSM, but any small folio is OK */ +if (!folio_test_large (folio)) +return true; +/* folio not in range [start, end), skip mlock */ if (!folio_within_range (folio, vma, start, end))return false;
Signature · 1 line
2.35.3
Hi Huge,
Quoted 10 lines · Hugh Dickins
Since mm-hotfixes-stable commit
dc68badcede4("mm: mlock: updatemlock_pte_rangeto handle large folio") I've just occasionally seenVM_WARN_ON_FOLIO(folio_test_ksm)warnings fromfolio_within_range(), in a splurge after testing with KSM hyperactive.folio_referenced_one()'s use of
folio_within_vma()is safe because it checksfolio_test_large()first; butallow_mlock_munlock()needs to do the same to avoid those warnings (or check !folio_test_ksm() itself? or move either check intofolio_within_range()? hard to tell without more examples of its use).
Checking folio_test_large() here looks fine to me now. If KSM could support large folio in the future (Not sure whether this will happen in the future), we could revise.
Quoted 3 lines
Fixes dc68badcede4 ("mm: mlock: update mlock_pte_range to handle large folio")Signed-off-by Hugh Dickins <[email protected]>
Thanks a lot for catching this issue and fixing it.