mm/mglru: use the common routine for dirty/writeback reactivation

Currently MGLRU will move the dirty writeback folios to the second oldest
gen instead of reactivate them like the classical LRU.  This might help to
reduce the LRU contention as it skipped the isolation.  But as a result we
will see these folios at the LRU tail more frequently leading to
inefficient reclaim.

Besides, the dirty / writeback check after isolation in shrink_folio_list
is more accurate and covers more cases.  So instead, just drop the special
handling for dirty writeback, use the common routine and re-activate it
like the classical LRU.

This should in theory improve the scan efficiency.  These folios will be
rotated back to LRU tail once writeback is done so there is no risk of
hotness inversion.  And now each reclaim loop will have a higher success
rate.  This also prepares for unifying the writeback and throttling
mechanism with classical LRU, we keep these folios far from tail so
detecting the tail batch will have a similar pattern with classical LRU.

The micro optimization that avoids LRU contention by skipping the
isolation is gone, which should be fine.  Compared to IO and writeback
cost, the isolation overhead is trivial.

And using the common routine also keeps the folio's referenced bits (tier
bits), which could improve metrics in the long term.  Also no more need to
clean reclaim bit as the common routine will make use of it.

Note the common routine updates a few throttling and writeback counters,
which are not used, and never have been for the MGLRU case.  We will start
making use of these in later commits.

Link: https://lore.kernel.org/20260428-mglru-reclaim-v7-10-02fabb92dc43@tencent.com
Signed-off-by: Kairui Song <kasong@tencent.com>
Reviewed-by: Axel Rasmussen <axelrasmussen@google.com>
Reviewed-by: Barry Song <baohua@kernel.org>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Chen Ridong <chenridong@huaweicloud.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: David Stevens <stevensd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Leno Hou <lenohou@gmail.com>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vernon Yang <vernon2gm@gmail.com>
Cc: Wei Xu <weixugc@google.com>
Cc: Yafang <laoar.shao@gmail.com>
Cc: Yuanchu Xie <yuanchu@google.com>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/vmscan.c b/mm/vmscan.c
index c5de863aeceb114e2b7a29e962f1f424f9642361..e699425c5b0640b471d10d581443bc7d0334a9a1 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -4582,7 +4582,6 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c
                       int tier_idx)
 {
        bool success;
-       bool dirty, writeback;
        int gen = folio_lru_gen(folio);
        int type = folio_is_file_lru(folio);
        int zone = folio_zonenum(folio);
@@ -4632,21 +4631,6 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c
                return true;
        }
 
-       dirty = folio_test_dirty(folio);
-       writeback = folio_test_writeback(folio);
-       if (type == LRU_GEN_FILE && dirty) {
-               sc->nr.file_taken += delta;
-               if (!writeback)
-                       sc->nr.unqueued_dirty += delta;
-       }
-
-       /* waiting for writeback */
-       if (writeback || (type == LRU_GEN_FILE && dirty)) {
-               gen = folio_inc_gen(lruvec, folio, true);
-               list_move(&folio->lru, &lrugen->folios[gen][type][zone]);
-               return true;
-       }
-
        return false;
 }
 
@@ -4668,9 +4652,6 @@ static bool isolate_folio(struct lruvec *lruvec, struct folio *folio, struct sca
        if (!folio_test_referenced(folio))
                set_mask_bits(&folio->flags.f, LRU_REFS_MASK, 0);
 
-       /* for shrink_folio_list() */
-       folio_clear_reclaim(folio);
-
        success = lru_gen_del_folio(lruvec, folio, true);
        VM_WARN_ON_ONCE_FOLIO(!success, folio);