From: Wandun Chen Extract the consecutive-offset scan from swap_pte_batch() into __softleaf_pte_batch() to prepare for migration PTE batching in a subsequent patch. No functional change. Signed-off-by: Wandun Chen --- mm/internal.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 3a1643afedc0..9f78c12882cb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -512,29 +512,26 @@ static inline pte_t pte_next_swp_offset(pte_t pte) } /** - * swap_pte_batch - detect a PTE batch for a set of contiguous swap entries + * __softleaf_pte_batch - detect a PTE batch for contiguous softleaf entries * @start_ptep: Page table pointer for the first entry. * @max_nr: The maximum number of table entries to consider. * @pte: Page table entry for the first entry. * - * Detect a batch of contiguous swap entries: consecutive (non-present) PTEs - * containing swap entries all with consecutive offsets and targeting the same - * swap type, all with matching swp pte bits. + * Detect a batch of contiguous swap or migration entries: consecutive + * (non-present) PTEs with consecutive offsets/PFNs and the same entry type, + * all with matching swp pte bits. * * max_nr must be at least one and must be limited by the caller so scanning * cannot exceed a single page table. * * Return: the number of table entries in the batch. */ -static inline int swap_pte_batch(pte_t *start_ptep, int max_nr, pte_t pte) +static inline int __softleaf_pte_batch(pte_t *start_ptep, int max_nr, pte_t pte) { pte_t expected_pte = pte_next_swp_offset(pte); const pte_t *end_ptep = start_ptep + max_nr; pte_t *ptep = start_ptep + 1; - VM_WARN_ON(max_nr < 1); - VM_WARN_ON(!softleaf_is_swap(softleaf_from_pte(pte))); - while (ptep < end_ptep) { pte = ptep_get(ptep); @@ -546,6 +543,15 @@ static inline int swap_pte_batch(pte_t *start_ptep, int max_nr, pte_t pte) return ptep - start_ptep; } + +static inline int swap_pte_batch(pte_t *start_ptep, int max_nr, pte_t pte) +{ + VM_WARN_ON(max_nr < 1); + VM_WARN_ON(!softleaf_is_swap(softleaf_from_pte(pte))); + + return __softleaf_pte_batch(start_ptep, max_nr, pte); +} + #endif /* CONFIG_MMU */ void __acct_reclaim_writeback(pg_data_t *pgdat, struct folio *folio, -- 2.43.0