Skip to content

Commit 3a32c7e

Browse files
ryncsn1Naim
authored andcommitted
mm/mglru: remove no longer used reclaim argument for folio protection
Now dirty reclaim folios are handled after isolation, not before, since dirty reactivation must take the folio off LRU first, and that helps to unify the dirty handling logic. So this argument is no longer needed. Just remove it. Signed-off-by: Kairui Song <kasong@tencent.com> Reviewed-by: Axel Rasmussen <axelrasmussen@google.com>
1 parent 81a19b7 commit 3a32c7e

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

mm/vmscan.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,7 +3252,7 @@ static int folio_update_gen(struct folio *folio, int gen)
32523252
}
32533253

32543254
/* protect pages accessed multiple times through file descriptors */
3255-
static int folio_inc_gen(struct lruvec *lruvec, struct folio *folio, bool reclaiming)
3255+
static int folio_inc_gen(struct lruvec *lruvec, struct folio *folio)
32563256
{
32573257
int type = folio_is_file_lru(folio);
32583258
struct lru_gen_folio *lrugen = &lruvec->lrugen;
@@ -3271,9 +3271,6 @@ static int folio_inc_gen(struct lruvec *lruvec, struct folio *folio, bool reclai
32713271

32723272
new_flags = old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS);
32733273
new_flags |= (new_gen + 1UL) << LRU_GEN_PGOFF;
3274-
/* for folio_end_writeback() */
3275-
if (reclaiming)
3276-
new_flags |= BIT(PG_reclaim);
32773274
} while (!try_cmpxchg(&folio->flags.f, &old_flags, new_flags));
32783275

32793276
lru_gen_update_size(lruvec, folio, old_gen, new_gen);
@@ -3873,7 +3870,7 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, int swappiness)
38733870
VM_WARN_ON_ONCE_FOLIO(folio_is_file_lru(folio) != type, folio);
38743871
VM_WARN_ON_ONCE_FOLIO(folio_zonenum(folio) != zone, folio);
38753872

3876-
new_gen = folio_inc_gen(lruvec, folio, false);
3873+
new_gen = folio_inc_gen(lruvec, folio);
38773874
list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]);
38783875

38793876
/* don't count the workingset being lazily promoted */
@@ -4466,7 +4463,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c
44664463

44674464
/* protected */
44684465
if (tier > tier_idx || refs + workingset == BIT(LRU_REFS_WIDTH) + 1) {
4469-
gen = folio_inc_gen(lruvec, folio, false);
4466+
gen = folio_inc_gen(lruvec, folio);
44704467
list_move(&folio->lru, &lrugen->folios[gen][type][zone]);
44714468

44724469
/* don't count the workingset being lazily promoted */
@@ -4481,7 +4478,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c
44814478

44824479
/* ineligible */
44834480
if (zone > sc->reclaim_idx) {
4484-
gen = folio_inc_gen(lruvec, folio, false);
4481+
gen = folio_inc_gen(lruvec, folio);
44854482
list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]);
44864483
return true;
44874484
}

0 commit comments

Comments
 (0)