mm/rmap: cleanup partially-mapped handling in __folio_remove_rmap()
Subsystems (2)
PATCH v2 1/1 mm/rmap: cleanup partially-mapped handling in __folio_remove_rmap()
Let's simplify and reduce code indentation. In the RMAP_LEVEL_PTE case, we already check for nr when computing partially_mapped.
For RMAP_LEVEL_PMD, it's a bit more confusing. Likely, we don't need the "nr" check, but we could have "nr < nr_pmdmapped" also if we stumbled into the "/* Raced ahead of another remove and an add? */" case. So let's simply move the nr check in there.
Note that partially_mapped is always false for small folios.
No functional change intended.
Reviewed-by Zi Yan <[email protected]>
Reviewed-by Yosry Ahmed <[email protected]>
Cc Andrew Morton <[email protected]>
Signed-off-by David Hildenbrand <[email protected]>
---
v1 -> v2:
* Move comment as well; add RB's.
* CC Andrew ;)
--- mm/rmap.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
mm/rmap.c +10 -13
@@ -1549,22 +1549,19 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, } } - partially_mapped = nr < nr_pmdmapped; + partially_mapped = nr && nr < nr_pmdmapped;break ; } -if (nr) { -/* -* Queue anon large folio for deferred split if at least one -* page of the folio is unmapped and at least one page -* is still mapped. -* -* Check partially_mapped first to ensure it is a large folio. -*/ -if (folio_test_anon (folio) && partially_mapped && -list_empty (&folio->_deferred_list)) -deferred_split_folio (folio); - } +/* +* Queue anon large folio for deferred split if at least one page of +* the folio is unmapped and at least one page is still mapped. +* +* Check partially_mapped first to ensure it is a large folio. +*/ +if (partially_mapped &&folio_test_anon (folio) && +list_empty (&folio->_deferred_list)) +deferred_split_folio (folio);__folio_mod_stat (folio, -nr, -nr_pmdmapped);/*
Signature · 1 line
2.45.2