Skip to contentSkip to conversation

mm/mlock: implement folio_mlock_step() using folio_pte_batch()

PATCH Applied Lance Yang 1 participant 1 message Jun 11, 2024

Subsystems (2)
lore
Share & tools
lore

Lance Yang

author
#0 lore raw

PATCH v3 1/1 mm/mlock: implement folio_mlock_step() using folio_pte_batch()

Let's make folio_mlock_step() simply a wrapper around folio_pte_batch(), which will greatly reduce the cost of ptep_get() when scanning a range of contptes.

---
v2 -> v3:
- Rebased to mm/mm-unstable
- https://lore.kernel.org/linux-mm/[email protected]/
v1 -> v2:
- Remove the likely() hint (per Matthew)
- Keep type declarations at the beginning of the function (per Matthew)
- Make a minimum change (per Barry)
- Pick RB from Baolin - thanks!
- Pick AB from David - thanks!
- https://lore.kernel.org/linux-mm/[email protected]/

 mm/mlock.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)
mm/mlock.c +4 -15
index 30b51cdea89d..52d6e401ad67 100644
@@ -307,26 +307,15 @@ void munlock_folio(struct folio *folio)
 static inline unsigned int folio_mlock_step(struct folio *folio,
 		pte_t *pte, unsigned long addr, unsigned long end)
 {
-	unsigned int count, i, nr = folio_nr_pages(folio);
-	unsigned long pfn = folio_pfn(folio);
+	const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY;
+	unsigned int count = (end - addr) >> PAGE_SHIFT;
 	pte_t ptent = ptep_get(pte);
 
 	if (!folio_test_large(folio))
 		return 1;
 
-	count = pfn + nr - pte_pfn(ptent);
-	count = min_t(unsigned int, count, (end - addr) >> PAGE_SHIFT);
-
-	for (i = 0; i < count; i++, pte++) {
-		pte_t entry = ptep_get(pte);
-
-		if (!pte_present(entry))
-			break;
-		if (pte_pfn(entry) - pfn >= nr)
-			break;
-	}
-
-	return i;
+	return folio_pte_batch(folio, addr, pte, ptent, count, fpb_flags, NULL,
+			       NULL, NULL);
 }
 
 static inline bool allow_mlock_munlock(struct folio *folio,
Signature · 1 line
2.33.1