Skip to content

Commit 2da6de3

Browse files
Hugh Dickinsakpm00
authored andcommitted
mm: folio_may_be_lru_cached() unless folio_test_large()
mm/swap.c and mm/mlock.c agree to drain any per-CPU batch as soon as a large folio is added: so collect_longterm_unpinnable_folios() just wastes effort when calling lru_add_drain[_all]() on a large folio. But although there is good reason not to batch up PMD-sized folios, we might well benefit from batching a small number of low-order mTHPs (though unclear how that "small number" limitation will be implemented). So ask if folio_may_be_lru_cached() rather than !folio_test_large(), to insulate those particular checks from future change. Name preferred to "folio_is_batchable" because large folios can well be put on a batch: it's just the per-CPU LRU caches, drained much later, which need care. Marked for stable, to counter the increase in lru_add_drain_all()s from "mm/gup: check ref_count instead of lru before migration". Link: https://lkml.kernel.org/r/[email protected] Fixes: 9a4e9f3 ("mm: update get_user_pages_longterm to migrate pages allocated from CMA region") Signed-off-by: Hugh Dickins <[email protected]> Suggested-by: David Hildenbrand <[email protected]> Acked-by: David Hildenbrand <[email protected]> Cc: "Aneesh Kumar K.V" <[email protected]> Cc: Axel Rasmussen <[email protected]> Cc: Chris Li <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: John Hubbard <[email protected]> Cc: Keir Fraser <[email protected]> Cc: Konstantin Khlebnikov <[email protected]> Cc: Li Zhe <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Peter Xu <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Shivank Garg <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Wei Xu <[email protected]> Cc: Will Deacon <[email protected]> Cc: yangge <[email protected]> Cc: Yuanchu Xie <[email protected]> Cc: Yu Zhao <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 8d79ed3 commit 2da6de3

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

include/linux/swap.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,16 @@ void folio_add_lru_vma(struct folio *, struct vm_area_struct *);
385385
void mark_page_accessed(struct page *);
386386
void folio_mark_accessed(struct folio *);
387387

388+
static inline bool folio_may_be_lru_cached(struct folio *folio)
389+
{
390+
/*
391+
* Holding PMD-sized folios in per-CPU LRU cache unbalances accounting.
392+
* Holding small numbers of low-order mTHP folios in per-CPU LRU cache
393+
* will be sensible, but nobody has implemented and tested that yet.
394+
*/
395+
return !folio_test_large(folio);
396+
}
397+
388398
extern atomic_t lru_disable_count;
389399

390400
static inline bool lru_cache_disabled(void)

mm/gup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,13 +2307,13 @@ static unsigned long collect_longterm_unpinnable_folios(
23072307
continue;
23082308
}
23092309

2310-
if (drained == 0 &&
2310+
if (drained == 0 && folio_may_be_lru_cached(folio) &&
23112311
folio_ref_count(folio) !=
23122312
folio_expected_ref_count(folio) + 1) {
23132313
lru_add_drain();
23142314
drained = 1;
23152315
}
2316-
if (drained == 1 &&
2316+
if (drained == 1 && folio_may_be_lru_cached(folio) &&
23172317
folio_ref_count(folio) !=
23182318
folio_expected_ref_count(folio) + 1) {
23192319
lru_add_drain_all();

mm/mlock.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void mlock_folio(struct folio *folio)
255255

256256
folio_get(folio);
257257
if (!folio_batch_add(fbatch, mlock_lru(folio)) ||
258-
folio_test_large(folio) || lru_cache_disabled())
258+
!folio_may_be_lru_cached(folio) || lru_cache_disabled())
259259
mlock_folio_batch(fbatch);
260260
local_unlock(&mlock_fbatch.lock);
261261
}
@@ -278,7 +278,7 @@ void mlock_new_folio(struct folio *folio)
278278

279279
folio_get(folio);
280280
if (!folio_batch_add(fbatch, mlock_new(folio)) ||
281-
folio_test_large(folio) || lru_cache_disabled())
281+
!folio_may_be_lru_cached(folio) || lru_cache_disabled())
282282
mlock_folio_batch(fbatch);
283283
local_unlock(&mlock_fbatch.lock);
284284
}
@@ -299,7 +299,7 @@ void munlock_folio(struct folio *folio)
299299
*/
300300
folio_get(folio);
301301
if (!folio_batch_add(fbatch, folio) ||
302-
folio_test_large(folio) || lru_cache_disabled())
302+
!folio_may_be_lru_cached(folio) || lru_cache_disabled())
303303
mlock_folio_batch(fbatch);
304304
local_unlock(&mlock_fbatch.lock);
305305
}

mm/swap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static void __folio_batch_add_and_move(struct folio_batch __percpu *fbatch,
192192
local_lock(&cpu_fbatches.lock);
193193

194194
if (!folio_batch_add(this_cpu_ptr(fbatch), folio) ||
195-
folio_test_large(folio) || lru_cache_disabled())
195+
!folio_may_be_lru_cached(folio) || lru_cache_disabled())
196196
folio_batch_move_lru(this_cpu_ptr(fbatch), move_fn);
197197

198198
if (disable_irq)

0 commit comments

Comments
 (0)