Re: [PATCH v5 17/17] mm/mglru: make folio_test_workingset() work based on folio LRU refs

From: KunWu Chan

Date: Fri Nov 20 2026 - 04:55:59 EST


On Thu, Nov 19, 2026 at 5:04 AM Kairui Song via B4 Relay
<devnull+kasong.tencent.com@xxxxxxxxxx> wrote:
>
> From: Kairui Song <kasong@xxxxxxxxxxx>
>
> folio_test_workingset() currently tests the PG_workingset bit, which
> is only the second lowest access bit of the folio LRU refs count now.
> Folios with refs 4 or 5 carry it in the LRU_REFS_MASK field
> and no longer have PG_workingset set, so the bit test misses them.
>
> folio_set_workingset() currently sets the PG_workingset bit with a
> plain set_bit(), which also over-promotes folios at a higher refs
> count: e.g. a folio at refs 4 is bumped to refs 6, advancing it
> toward LRU_REFS_MAX and an earlier generation promotion.
>
> Move the test into mm_inline.h as an inline helper based on
> folio_lru_refs(), checking refs >= LRU_REFS_WORKINGSET. The set
> stays a plain PG_workingset bit operation reserved for the
> classical LRU: under MGLRU the refs count is maintained by
> folio_inc_lru_refs(), and now triggers a debug WARN when called
> while MGLRU is fully on (the switching window is exempt, as the
> classical paths legitimately run alongside MGLRU then). The one
> PageWorkingset() user in erofs is converted to the folio helper.
>
> Under the classical LRU the refs count is not maintained, so the
> test is equivalent to the PG_workingset bit test, which is the old
> behavior.
>
> Tested-by: Zhao Zhenzhuo <zhaozhengzhuo@xxxxxxxxxxxxx>
> Signed-off-by: Kairui Song <kasong@xxxxxxxxxxx>
> ---
> fs/btrfs/compression.c | 1 +
> fs/erofs/zdata.c | 3 ++-
> include/linux/mm_inline.h | 29 +++++++++++++++++++++++++++++
> include/linux/page-flags.h | 2 --
> mm/filemap.c | 1 +
> mm/page_io.c | 1 +
> 6 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index ad90e14032db..127c5ee38979 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -8,6 +8,7 @@
> #include <linux/file.h>
> #include <linux/fs.h>
> #include <linux/pagemap.h>
> +#include <linux/mm_inline.h>
> #include <linux/folio_batch.h>
> #include <linux/highmem.h>
> #include <linux/kthread.h>
> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
> index e981e371d6c2..34ee41e1ccdc 100644
> --- a/fs/erofs/zdata.c
> +++ b/fs/erofs/zdata.c
> @@ -6,6 +6,7 @@
> */
> #include "compress.h"
> #include <linux/psi.h>
> +#include <linux/mm_inline.h>
> #include <linux/cpuhotplug.h>
> #include <trace/events/erofs.h>
>
> @@ -1713,7 +1714,7 @@ static void z_erofs_submit_queue(struct z_erofs_frontend *f,
> DBG_BUGON(bvec.bv_len < sb->s_blocksize);
> }
>
> - if (unlikely(PageWorkingset(bvec.bv_page)) &&
> + if (unlikely(folio_test_workingset(page_folio(bvec.bv_page))) &&
> !memstall) {
> psi_memstall_enter(&pflags);
> memstall = 1;
> diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
> index 2c6cbd0df686..a2442e49aca2 100644
> --- a/include/linux/mm_inline.h
> +++ b/include/linux/mm_inline.h
> @@ -300,6 +300,23 @@ static inline void folio_migrate_lru_refs(struct folio *new, const struct folio
> __folio_set_lru_refs(new, folio_lru_refs(old));
> }
>
> +/**
> + * folio_test_workingset - Test if a folio is in the workingset.
> + * @folio: the folio
> + *
> + * A folio is workingset when its LRU refs count reaches
> + * LRU_REFS_WORKINGSET. Under the classical LRU flag encoding,
> + * this is just testing the PG_workingset bit.
> + * NOTE: folio_set_workingset() must not be used under MGLRU, as the
> + * folio refs are tracked by folio_inc_lru_refs() with rules.
> + *
> + * Return: true if the folio is workingset.
> + */
> +static __always_inline bool folio_test_workingset(const struct folio *folio)
> +{
> + return lru_refs_is_workingset(folio_lru_refs(folio));
> +}
> +
> #ifdef CONFIG_LRU_GEN
> static inline bool lru_refs_is_active(unsigned int refs)
> {
> @@ -551,6 +568,18 @@ static inline void folio_clear_lru_refs(struct folio *folio)
> folio_clear_referenced(folio);
> }
>
> +/*
> + * For the classical LRU only: with MGLRU the PG_workingset bit is
> + * part of the folio refs count maintained by folio_inc_lru_refs(),
> + * and a raw set would corrupt it. The switching window is exempt
> + * because the classical paths legitimately run alongside MGLRU then.
> + */
> +static __always_inline void folio_set_workingset(struct folio *folio)
> +{
> + VM_WARN_ON_ONCE(lru_gen_enabled() && !lru_gen_switching());

Could shrink_active_list() still hit this WARN after the switch
to MGLRU completes? It can reschedule after isolating folios and
reach this setter after lru_switch is cleared.

Thanks,
Kunwu

> + set_bit(PG_workingset, folio_flags(folio, FOLIO_HEAD_PAGE));
> +}
> +
> static __always_inline
> void lruvec_add_folio(struct lruvec *lruvec, struct folio *folio)
> {
> diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
> index b0ddc652e76c..f6625dc042da 100644
> --- a/include/linux/page-flags.h
> +++ b/include/linux/page-flags.h
> @@ -549,8 +549,6 @@ PAGEFLAG(LRU, lru, PF_HEAD) __CLEARPAGEFLAG(LRU, lru, PF_HEAD)
> FOLIO_FLAG(active, FOLIO_HEAD_PAGE)
> __FOLIO_CLEAR_FLAG(active, FOLIO_HEAD_PAGE)
> FOLIO_TEST_CLEAR_FLAG(active, FOLIO_HEAD_PAGE)
> -PAGEFLAG(Workingset, workingset, PF_HEAD)
> - TESTCLEARFLAG(Workingset, workingset, PF_HEAD)
> PAGEFLAG(Checked, checked, PF_NO_COMPOUND) /* Used by some filesystems */
>
> /* Xen */
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 648f783454c3..2939647940c1 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -21,6 +21,7 @@
> #include <linux/gfp.h>
> #include <linux/mm.h>
> #include <linux/swap.h>
> +#include <linux/mm_inline.h>
> #include <linux/leafops.h>
> #include <linux/syscalls.h>
> #include <linux/mman.h>
> diff --git a/mm/page_io.c b/mm/page_io.c
> index a57cdcf2892d..12deab296718 100644
> --- a/mm/page_io.c
> +++ b/mm/page_io.c
> @@ -16,6 +16,7 @@
> #include <linux/gfp.h>
> #include <linux/pagemap.h>
> #include <linux/swap.h>
> +#include <linux/mm_inline.h>
> #include <linux/bio.h>
> #include <linux/swapops.h>
> #include <linux/writeback.h>
>
> --
> 2.56.1
>
>