From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 437A441A921; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=uwC7VATxiALjhffPjPHVQAdukWjcpJNZKfL+PvcxcMfvg4LZlLa2eDiTPXbipTfgEdox4Rgvgd423UY59ql+ZgdVLDYLhGf05gBYbfHmBUGL5CJyvmTAURN8xeRqMoS5XQO/auZh5qjjTIBWZC2laAQ7pxssnQHXq2nBf91DUeM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=bN2F8gmSHKc1/jt75s0wLe0MmFp59ane/uTTthFFmOQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=on70bx4XPS8TsFfs3UsxjC7ua4gYlOHdiv18zX3c8C/xbF70pIVlbU1CkC5OJm2FbjvqRiI9MWPPi6Na/lpiTjYbkmAr7czTZ9WmYoi2b+oYJPNPfQ0VpQCByqErLg8WFRD8QBLHLH2SZasi2xlfwFt8ZpRuQ1J7ey8lyDpqD8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZNHeNCf9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZNHeNCf9" Received: by smtp.kernel.org (Postfix) with ESMTPS id D36A4C19425; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585191; bh=bN2F8gmSHKc1/jt75s0wLe0MmFp59ane/uTTthFFmOQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZNHeNCf9t7zLgIVI7HBfTfunv7f59iFTKQczIwTWr0zUM5Uij6nDVv8g8FZbHI52I X56PQNRAEgFeTT1t5csi3wRpmkxhvxRT0rziugCWbeZX2bvpy8zury5iAQF11cK37O sCWbnVVdXvhxrCtESr9CT99nSjxyrkf/PR3kKg4T0A6ZlTb0J6BqK9PKF16evvBGp6 p6Hrfr94J0Vo+z8PlnQ29wC7T7fKGlc9Jad0/PUJSNBzkAobmkfsAPfmNW0Bu9NTd4 iYPBOcYZmj7O9fxu0k/X1BkAujPKgGC/NOXJtsMfTNET5xUNwxowOIAtdA/ldIgnnT 3meD7YAwdZrYA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0CBBC5DF9C; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:28 +0800 Subject: [PATCH v2 1/6] mm/memcontrol: make lru_zone_size atomic and simplify sanity check Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-1-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=3616; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=RexeF1U3Yfl0k0lRFmBeywxr/pHJWWKLBeFtqNt3agc=; b=BZLmo0P2XGHFX1zI7sUUmKSe4H3Wpg70rneiSn6rerCZeGSMyCua0Uo+7VKEzGhYmGwVtnAdv 7TwR1hIlpuTAf9aQp09WtZ/jGtYwqgpmaPHmB5ZMWy4z5yZucbnyrIx X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song commit ca707239e8a7 ("mm: update_lru_size warn and reset bad lru_size") introduced a sanity check to catch memcg counter underflow, which was more of a workaround for another bug: lru_zone_size is unsigned, so underflow wraps it around and returns an enormously large number, then the memcg shrinker loops almost forever as the calculated number of folios to shrink is huge. That commit also checked if a zero value matches the empty LRU list, so we have to hold the LRU lock, and handle the positive and negative deltas separately. But later commit b4536f0c829c ("mm, memcg: fix the active list aging for lowmem requests when memcg is enabled") already removed the LRU emptiness check, so handling the deltas separately is no longer needed. And if we just turn it into an atomic long, underflow isn't a big issue either, and can be checked at the reader side, which is called much less frequently than the updater. So let's turn the counter into an atomic long and check at the reader side instead, which has a smaller overhead. The underflow correction is removed: a massive leak of the LRU size counter would indicate that something else has gone very wrong, and one should fix that leaking site instead. Besides, the updater-side sanity check is unlikely to catch the leaking site anyway: if a folio was removed without updating the counter while other folios remain on the LRU, the WARN only triggers much later, from a likely innocent callsite. Reviewed-by: Ridong Chen Signed-off-by: Kairui Song --- include/linux/memcontrol.h | 9 +++++++-- mm/memcontrol.c | 18 +----------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 215e2e87f42b..7b89d0cb5f6c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -113,7 +113,7 @@ struct mem_cgroup_per_node { /* Fields which get updated often at the end. */ struct lruvec lruvec; CACHELINE_PADDING(_pad2_); - unsigned long lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS]; + atomic_long_t lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS]; struct mem_cgroup_reclaim_iter iter; =20 /* @@ -902,10 +902,15 @@ static inline unsigned long mem_cgroup_get_zone_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone_idx) { + long val; struct mem_cgroup_per_node *mz; =20 mz =3D container_of(lruvec, struct mem_cgroup_per_node, lruvec); - return READ_ONCE(mz->lru_zone_size[zone_idx][lru]); + val =3D atomic_long_read(&mz->lru_zone_size[zone_idx][lru]); + if (WARN_ON_ONCE(val < 0)) + return 0; + + return val; } =20 void __mem_cgroup_handle_over_high(gfp_t gfp_mask); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 11b85f4b6828..a7572ded56c9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1529,28 +1529,12 @@ void mem_cgroup_update_lru_size(struct lruvec *lruv= ec, enum lru_list lru, int zid, long nr_pages) { struct mem_cgroup_per_node *mz; - unsigned long *lru_size; - long size; =20 if (mem_cgroup_disabled()) return; =20 mz =3D container_of(lruvec, struct mem_cgroup_per_node, lruvec); - lru_size =3D &mz->lru_zone_size[zid][lru]; - - if (nr_pages < 0) - *lru_size +=3D nr_pages; - - size =3D *lru_size; - if (WARN_ONCE(size < 0, - "%s(%p, %d, %ld): lru_size %ld\n", - __func__, lruvec, lru, nr_pages, size)) { - VM_BUG_ON(1); - *lru_size =3D 0; - } - - if (nr_pages > 0) - *lru_size +=3D nr_pages; + atomic_long_add(nr_pages, &mz->lru_zone_size[zid][lru]); } =20 /** --=20 2.55.0 From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84AC443B3EF; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=kEH9dO1A8cYf5Ey7SCnK15NMQGKpiyJZ8QpaiplxqtQXc4XAsaQB2gNnQ9C00bOqGc1Z37EObk6zh8YPLAHB2e7A75tMs7N1Ts9oy8722TAIiTg51ff9vFYVkBF54UomxUf0BB+spYfdnctGM+8c25d1+Rbv+OLRD+Ga28Gh584= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=vQxrUTjaXGFh/l5Qjt2PhmZ1+t11Or8RRZ6t+7dyC1A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lvoaM75iROHofkVwYY+5kwtA5OBqjQwNIyXLOQET5HXV3fbCgrlgKlT+YTWyJoOfN/Cfx5bsWSM3ahM0GLq7F6dP8XX9Z10MczvgTDzqE1f9hVMjnSjpmiXZXXKqK8KZsUEZ32PKIWaX/3DVR+x832334a/Hhe8LojiAyxVyWXg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EGiNPp3P; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EGiNPp3P" Received: by smtp.kernel.org (Postfix) with ESMTPS id E8333C2BCFF; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585192; bh=vQxrUTjaXGFh/l5Qjt2PhmZ1+t11Or8RRZ6t+7dyC1A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=EGiNPp3PH4LeJ3vpaypGVs/AHOG0bFN6rshrwNaUzdRXLCETLkg07lN7lUBjIbI/1 VfDxdHA6BtAyd2d4fkZUcuyjstHiaFkgwCvgQUTbOlcibHFm7BluIo65wZvGvCjt60 xH/Vrt9p9Wc96xYTCdzxiu1Znmzrai4LBjAhGLTxIbe4VugUVQbGQvsZmhWvKQQTlc hfgQRSZUMnBL8yuI6swEcTLB6pTjW1Hl0Ki2Cf2+jhHRfC7MxigwpqRfHvGks6Ysf+ LShAbSpz/Rqt+nJlvQUL37AIA5iMWI3Y1aQtZEaWJxSFXCvS06fsu2JUPPFDvqW+gI 7ameRyKEHLrgQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7FFCC5DF94; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:29 +0800 Subject: [PATCH v2 2/6] mm/mglru: introduce helpers for manipulating gen and refs flags Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-2-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=12106; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=EHAfalkckCLnooY0He00lMtQVHsE4Di8s0DBo5GhRpE=; b=bMarFhOz/dxPGTwR4bWWhdwEN0dWlGrDw5hStFTlQTKitG/1j6PSLpqFaQHusx3Xh3MlB3tz0 oY1D9HEHzolAbpZhEiRa2TmB83eNY6jRnJ0uSMalVanX9SbRQnak//U X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song Instead of doing bit ops on folio->flags.f, introduce helpers for adjusting a folio's refs and generation info, making the code easier to debug and understand. No functional change is intended: some combined atomic operations are split into two, which only creates harmless transient states. There is no measurable performance impact, and some paths even look slightly better in the generated assembly. Signed-off-by: Kairui Song --- include/linux/mm_inline.h | 76 ++++++++++++++++++++++++++++++++++++++++++-= ---- include/linux/mmzone.h | 1 + mm/folio.c | 19 +++++++----- mm/vmscan.c | 61 ++++++++++++++++++++----------------- 4 files changed, 114 insertions(+), 43 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 621c8653d8f7..edfaf2661812 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -142,10 +142,42 @@ static inline int lru_tier_from_refs(int refs, bool w= orkingset) return workingset ? MAX_NR_TIERS - 1 : order_base_2(refs); } =20 -static inline int folio_lru_refs(const struct folio *folio) +/** + * lru_gen_from_flags - Return the LRU generation number from folio flags. + * @flags: folio flags + * + * Returns: A number between 0 and (MAX_NR_GENS - 1), inclusive. Returns + * -1 if the flags indicate the folio is off the list (e.g., isolated). + */ +static inline int lru_gen_from_flags(unsigned long flags) +{ + int gen =3D ((flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF); + + BUILD_BUG_ON(LRU_GEN_MASK & LRU_REFS_MASK); + gen -=3D 1; + VM_WARN_ON_ONCE(gen !=3D -1 && gen >=3D MAX_NR_GENS); + return gen; +} + +/** + * lru_gen_set_flags - Set the LRU generation number to specified folio fl= ags. + * @flags: pointer to the folio flags + * @gen: generation number, between 0 and (MAX_NR_GENS - 1), inclusive. + */ +static inline void lru_gen_set_flags(unsigned long *flags, int gen) { - unsigned long flags =3D READ_ONCE(folio->flags.f); + VM_WARN_ON_ONCE(gen >=3D MAX_NR_GENS || gen < 0); + + *flags &=3D ~LRU_GEN_MASK; + *flags |=3D (gen + 1UL) << LRU_GEN_PGOFF; +} =20 +/** + * lru_refs_from_flags - Return LRU referenced / access count from folio f= lags. + * @flags: folio flags + */ +static inline int lru_refs_from_flags(unsigned long flags) +{ if (!(flags & BIT(PG_referenced))) return 0; /* @@ -155,11 +187,40 @@ static inline int folio_lru_refs(const struct folio *= folio) return ((flags & LRU_REFS_MASK) >> LRU_REFS_PGOFF) + 1; } =20 -static inline int folio_lru_gen(const struct folio *folio) +/** + * lru_refs_set_flags - Set the LRU referenced / access count to specified= folio flags. + * @flags: pointer to the folio flags + * @refs: referenced / access count number, between 0 and LRU_REFS_MAX, in= clusive. + */ +static inline void lru_refs_set_flags(unsigned long *flags, unsigned int r= efs) +{ + VM_WARN_ON_ONCE(refs > LRU_REFS_MAX); + BUILD_BUG_ON(LRU_REFS_MAX !=3D (LRU_REFS_MASK >> LRU_REFS_PGOFF) + 1); + + *flags &=3D ~LRU_REFS_FLAGS; + if (!refs) + return; + *flags |=3D (BIT(PG_referenced) | ((refs - 1UL) << LRU_REFS_PGOFF)); +} + +static inline int folio_lru_refs(const struct folio *folio) { - unsigned long flags =3D READ_ONCE(folio->flags.f); + return lru_refs_from_flags(READ_ONCE(*const_folio_flags(folio, 0))); +} + +static inline void folio_set_lru_refs(struct folio *folio, unsigned int re= fs) +{ + unsigned long new_flags, old_flags =3D READ_ONCE(*folio_flags(folio, 0)); + + do { + new_flags =3D old_flags; + lru_refs_set_flags(&new_flags, refs); + } while (!try_cmpxchg(folio_flags(folio, 0), &old_flags, new_flags)); +} =20 - return ((flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; +static inline int folio_lru_gen(const struct folio *folio) +{ + return lru_gen_from_flags(READ_ONCE(*const_folio_flags(folio, 0))); } =20 static inline bool lru_gen_is_active(const struct lruvec *lruvec, int gen) @@ -270,7 +331,7 @@ static inline bool lru_gen_add_folio(struct lruvec *lru= vec, struct folio *folio, gen =3D lru_gen_from_seq(seq); flags =3D (gen + 1UL) << LRU_GEN_PGOFF; /* see the comment on MIN_NR_GENS about PG_active */ - set_mask_bits(&folio->flags.f, LRU_GEN_MASK | BIT(PG_active), flags); + set_mask_bits(folio_flags(folio, 0), LRU_GEN_MASK | BIT(PG_active), flags= ); =20 lru_gen_update_size(lruvec, folio, -1, gen); /* for folio_rotate_reclaimable() */ @@ -295,7 +356,7 @@ static inline bool lru_gen_del_folio(struct lruvec *lru= vec, struct folio *folio, =20 /* for folio_migrate_flags() */ flags =3D !reclaiming && lru_gen_is_active(lruvec, gen) ? BIT(PG_active) = : 0; - flags =3D set_mask_bits(&folio->flags.f, LRU_GEN_MASK, flags); + flags =3D set_mask_bits(folio_flags(folio, 0), LRU_GEN_MASK, flags); gen =3D ((flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; =20 lru_gen_update_size(lruvec, folio, gen, -1); @@ -339,7 +400,6 @@ static inline bool lru_gen_del_folio(struct lruvec *lru= vec, struct folio *folio, =20 static inline void folio_migrate_refs(struct folio *new, const struct foli= o *old) { - } #endif /* CONFIG_LRU_GEN */ =20 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 94f9c3ff5416..c9ecf370cd9f 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -497,6 +497,7 @@ enum lruvec_flags { =20 #define LRU_GEN_MASK ((BIT(LRU_GEN_WIDTH) - 1) << LRU_GEN_PGOFF) #define LRU_REFS_MASK ((BIT(LRU_REFS_WIDTH) - 1) << LRU_REFS_PGOFF) +#define LRU_REFS_MAX BIT(LRU_REFS_WIDTH) =20 /* * For folios accessed multiple times through file descriptors, diff --git a/mm/folio.c b/mm/folio.c index 59c477120b9a..0adfe4f5ef72 100644 --- a/mm/folio.c +++ b/mm/folio.c @@ -353,26 +353,28 @@ static void __lru_cache_activate_folio(struct folio *= folio) =20 static void lru_gen_inc_refs(struct folio *folio) { - unsigned long new_flags, old_flags =3D READ_ONCE(folio->flags.f); + unsigned long new_flags, old_flags =3D READ_ONCE(*folio_flags(folio, 0)); + int refs; =20 if (folio_test_unevictable(folio)) return; =20 /* see the comment on LRU_REFS_FLAGS */ - if (!folio_test_referenced(folio)) { - set_mask_bits(&folio->flags.f, LRU_REFS_MASK, BIT(PG_referenced)); + if (!folio_lru_refs(folio)) { + folio_set_lru_refs(folio, 1); return; } =20 do { - if ((old_flags & LRU_REFS_MASK) =3D=3D LRU_REFS_MASK) { + new_flags =3D old_flags; + refs =3D lru_refs_from_flags(old_flags); + if (refs =3D=3D LRU_REFS_MAX) { if (!folio_test_workingset(folio)) folio_set_workingset(folio); return; } - - new_flags =3D old_flags + BIT(LRU_REFS_PGOFF); - } while (!try_cmpxchg(&folio->flags.f, &old_flags, new_flags)); + lru_refs_set_flags(&new_flags, refs + 1); + } while (!try_cmpxchg(folio_flags(folio, 0), &old_flags, new_flags)); } =20 static bool lru_gen_clear_refs(struct folio *folio) @@ -384,7 +386,8 @@ static bool lru_gen_clear_refs(struct folio *folio) if (gen < 0) return true; =20 - set_mask_bits(&folio->flags.f, LRU_REFS_FLAGS | BIT(PG_workingset), 0); + folio_set_lru_refs(folio, 0); + folio_clear_workingset(folio); =20 rcu_read_lock(); seq =3D READ_ONCE(folio_lruvec(folio)->lrugen.min_seq[type]); diff --git a/mm/vmscan.c b/mm/vmscan.c index c1404a59523d..080132997d87 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -843,19 +843,22 @@ static bool lru_gen_set_refs(struct folio *folio, con= st vma_flags_t *vma_flags) if (!folio_test_referenced(folio) && !folio_test_workingset(folio)) { /* Activate file-backed executable folios after first usage. */ if (is_exec_file_folio(folio, vma_flags)) { - set_mask_bits(&folio->flags.f, LRU_REFS_FLAGS, BIT(PG_workingset)); + folio_set_lru_refs(folio, 0); + folio_set_workingset(folio); return true; } =20 - set_mask_bits(&folio->flags.f, LRU_REFS_MASK, BIT(PG_referenced)); + folio_set_lru_refs(folio, 1); return false; } =20 /* Promote on second access */ - if (folio_lru_refs(folio) > 1) - set_mask_bits(&folio->flags.f, LRU_REFS_FLAGS, BIT(PG_workingset)); - else + if (folio_lru_refs(folio) > 1) { + folio_set_lru_refs(folio, 0); + folio_set_workingset(folio); + } else { folio_mark_accessed(folio); + } return true; } #else @@ -3266,11 +3269,10 @@ static bool positive_ctrl_err(struct ctrl_pos *sp, = struct ctrl_pos *pv) *************************************************************************= *****/ =20 /* promote pages accessed through page tables */ -static int folio_update_gen(struct folio *folio, int gen, const vma_flags_= t *vma_flags) +static int folio_update_gen(struct folio *folio, int new_gen, const vma_fl= ags_t *vma_flags) { - unsigned long new_flags, old_flags =3D READ_ONCE(folio->flags.f); - - VM_WARN_ON_ONCE(gen >=3D MAX_NR_GENS); + unsigned long new_flags, old_flags =3D READ_ONCE(*folio_flags(folio, 0)); + int old_gen; =20 /* * See the comment on LRU_REFS_FLAGS, and activate file-backed @@ -3279,20 +3281,24 @@ static int folio_update_gen(struct folio *folio, in= t gen, const vma_flags_t *vma */ if (!folio_test_referenced(folio) && !folio_test_workingset(folio) && !is_exec_file_folio(folio, vma_flags)) { - set_mask_bits(&folio->flags.f, LRU_REFS_MASK, BIT(PG_referenced)); + folio_set_lru_refs(folio, 1); return -1; } =20 do { + old_gen =3D lru_gen_from_flags(old_flags); + new_flags =3D old_flags; + /* lru_gen_del_folio() has isolated this page? */ - if (!(old_flags & LRU_GEN_MASK)) - return -1; + if (old_gen < 0) + break; =20 - new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); - new_flags |=3D ((gen + 1UL) << LRU_GEN_PGOFF) | BIT(PG_workingset); - } while (!try_cmpxchg(&folio->flags.f, &old_flags, new_flags)); + lru_gen_set_flags(&new_flags, new_gen); + lru_refs_set_flags(&new_flags, 0); + new_flags |=3D BIT(PG_workingset); + } while (!try_cmpxchg(folio_flags(folio, 0), &old_flags, new_flags)); =20 - return ((old_flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; + return old_gen; } =20 /* protect pages accessed multiple times through file descriptors */ @@ -3301,21 +3307,20 @@ static int folio_inc_gen(struct lruvec *lruvec, str= uct folio *folio) int type =3D folio_is_file_lru(folio); struct lru_gen_folio *lrugen =3D &lruvec->lrugen; int new_gen, old_gen =3D lru_gen_from_seq(lrugen->min_seq[type]); - unsigned long new_flags, old_flags =3D READ_ONCE(folio->flags.f); - - VM_WARN_ON_ONCE_FOLIO(!(old_flags & LRU_GEN_MASK), folio); + unsigned long new_flags, old_flags =3D READ_ONCE(*folio_flags(folio, 0)); =20 do { - new_gen =3D ((old_flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; + new_gen =3D lru_gen_from_flags(old_flags); + /* folio_update_gen() has promoted this page? */ if (new_gen >=3D 0 && new_gen !=3D old_gen) return new_gen; =20 + new_flags =3D old_flags; new_gen =3D (old_gen + 1) % MAX_NR_GENS; - - new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); - new_flags |=3D (new_gen + 1UL) << LRU_GEN_PGOFF; - } while (!try_cmpxchg(&folio->flags.f, &old_flags, new_flags)); + lru_gen_set_flags(&new_flags, new_gen); + lru_refs_set_flags(&new_flags, 0); + } while (!try_cmpxchg(folio_flags(folio, 0), &old_flags, new_flags)); =20 lru_gen_update_size(lruvec, folio, old_gen, new_gen); =20 @@ -4711,7 +4716,7 @@ static bool isolate_folio(struct lruvec *lruvec, stru= ct folio *folio, struct sca =20 /* see the comment on LRU_REFS_FLAGS */ if (!folio_test_referenced(folio)) - set_mask_bits(&folio->flags.f, LRU_REFS_MASK, 0); + folio_set_lru_refs(folio, 0); =20 success =3D lru_gen_del_folio(lruvec, folio, true); VM_WARN_ON_ONCE_FOLIO(!success, folio); @@ -4927,8 +4932,10 @@ static int evict_folios(unsigned long nr_to_scan, st= ruct lruvec *lruvec, } =20 /* don't add rejected folios to the oldest generation */ - if (lru_gen_folio_seq(lruvec, folio, false) =3D=3D min_seq[type]) - set_mask_bits(&folio->flags.f, LRU_REFS_FLAGS, BIT(PG_active)); + if (lru_gen_folio_seq(lruvec, folio, false) =3D=3D min_seq[type]) { + folio_set_lru_refs(folio, 0); + folio_set_active(folio); + } } =20 move_folios_to_lru(&list); --=20 2.55.0 From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83ADF43B3EA; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=dY9m2zweEFk9MGrJ+V6t+pRC7Bp/zzSq1VEVMNI7S+Dfr9N1eNe9DJ50M1e1DIaASjU7bAwAFCU/NsgXOg7+eSgqPSoOPT/KGfzx/0rbW0T2lgAtMM/oewKVQx9rqZAc7CtFx8ztDm+IssXJtLAopJ99uHpyizvTaXQZiDFBvT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=P+17iUIaKozZUszrRwBPon4mP56KzLJ6WpxOwu3K73M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bg0eHc8nDhwd16Vkw1JcD/iiaB+rNjP8nXpobLD+RWvg/hM4ER8OeYI8SQxoF+KE3rj4YRQCdAXWRC7qrgXbW1Yx9zO1k0EvqkWpOny//UgSBF7s48WechAn9JqSHIVhVvuRxuZaZhiQpz7IBX7BlYpz25Zjink4VwRCx97dE6U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=evkVSOi/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="evkVSOi/" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0181CC2BD00; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585192; bh=P+17iUIaKozZUszrRwBPon4mP56KzLJ6WpxOwu3K73M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=evkVSOi/AASgqhx0m0pslJmESHDQjSwT2XZ5pV4+3mjA4X+KiInpvYmecFJhALIbS ghsOjUBgDXcgO130CF/TYN21VMOCSLCcHoohwcE8K/NZQcorYMpnF4hErX3gfwuejo YCuNPm9Aq/8c4qqwNhZGY5FfvG6LYI1n0lpMd9KObZ4IWvEE1kHg2ofh8IHU/CBzoQ KumQ4PKXKFDiKP7b7QR4VUN3G+7X6wtDGyjLTsag1D2l8xTTfqrhIkqkKuIUtcMlkT yjG7KbW9n8iAzYgFdLhioROxcv8fCBtrFez5xXn8GwebSK6/X4zB9HDO1dR2KnVjCB vO6iAX2jHYTUw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB982C61DB4; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:30 +0800 Subject: [PATCH v2 3/6] mm/migrate: copy all referenced state via folio_migrate_lru_refs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-3-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=3250; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=cPJ+z22jDdcCM3atcpqaDtz2zW4ZvNzKe4hDfgAQsCE=; b=yVbj2v8HH/FoZaiXjkE0G1SM5F9E68EtrLhFxk6egxlIGeT+4fZ0IJPVD9g/sfre3W6ZuzyaO qhoBG9o1nzMBvRIH/Nl/0QiyoXI6itIZ8RvOPdhjdo3dIHFQ9qA9Un2 X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song folio_migrate_flags() copies PG_referenced separately from the MGLRU refs counter, which folio_migrate_refs() transfers. Yet under MGLRU, PG_referenced and the refs counter bits together describe the referenced status of a folio. Consolidate the two: rename folio_migrate_refs() to folio_migrate_lru_refs() and let it copy the complete referenced status, i.e., the MGLRU refs count including PG_referenced, or just PG_referenced for the active/inactive LRU. Drop the open-coded PG_referenced copy so the referenced status is transferred in one place. No behavior change is intended: under the active/inactive LRU the extra bits are unused, so operating on them is a noop. Reviewed-by: Baoquan He Signed-off-by: Kairui Song --- include/linux/mm_inline.h | 20 +++++++++++++++----- mm/migrate.c | 6 +++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index edfaf2661812..7f91a89b5ba3 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -365,11 +365,19 @@ static inline bool lru_gen_del_folio(struct lruvec *l= ruvec, struct folio *folio, return true; } =20 -static inline void folio_migrate_refs(struct folio *new, const struct foli= o *old) +/** + * folio_migrate_lru_refs - copy the reference state to a new folio + * @new: the destination folio + * @old: the source folio + * + * Transfer the reference state to @new during migration: the MGLRU + * refs count, including PG_referenced, or just PG_referenced for the + * active/inactive LRU. + */ +static inline void folio_migrate_lru_refs(struct folio *new, const struct = folio *old) { - unsigned long refs =3D READ_ONCE(old->flags.f) & LRU_REFS_MASK; - - set_mask_bits(&new->flags.f, LRU_REFS_MASK, refs); + BUILD_BUG_ON(LRU_REFS_MASK & BIT(PG_referenced)); + folio_set_lru_refs(new, folio_lru_refs(old)); } #else /* !CONFIG_LRU_GEN */ =20 @@ -398,8 +406,10 @@ static inline bool lru_gen_del_folio(struct lruvec *lr= uvec, struct folio *folio, return false; } =20 -static inline void folio_migrate_refs(struct folio *new, const struct foli= o *old) +static inline void folio_migrate_lru_refs(struct folio *new, const struct = folio *old) { + if (folio_test_referenced(old)) + folio_set_referenced(new); } #endif /* CONFIG_LRU_GEN */ =20 diff --git a/mm/migrate.c b/mm/migrate.c index 15b45832bcfa..96eda490ba43 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -776,8 +776,6 @@ void folio_migrate_flags(struct folio *newfolio, struct= folio *folio) { int cpupid; =20 - if (folio_test_referenced(folio)) - folio_set_referenced(newfolio); if (folio_test_uptodate(folio)) folio_mark_uptodate(newfolio); if (folio_test_clear_active(folio)) { @@ -807,7 +805,9 @@ void folio_migrate_flags(struct folio *newfolio, struct= folio *folio) if (folio_test_idle(folio)) folio_set_idle(newfolio); =20 - folio_migrate_refs(newfolio, folio); + /* Copy the reference state, including PG_referenced */ + folio_migrate_lru_refs(newfolio, folio); + /* * Copy NUMA information to the new page, to prevent over-eager * future migrations of this same page. --=20 2.55.0 From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7997D43B3C6; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=Bsvj/JIh3YlEbLNKuU87kwPwauGONchBevJXOm2T8YNO1MuiSR2323b7w0upKVtTNAhjrdNJtWILcEPbNRwEI+53EorUiJtoq60jZ1Tsm3RXfj7Oa0YlBUg62YZXI/JZMY3TErSnmDIuH4ez3mC9WFzoKTakOLFa5V4Frt3nBSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=dpmYkQOyU/63g41Wz5LkJjXAI/RubSJlPh6+4gkd8v8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=byW+XD7NzOnjtiikvnkvpjwql8QECr/G8hfWRfXR09dmUlcS9XsZMHeRtaX1fU8l9J+QPRa3W5eWu6iMiENSLErh2E3LstIhzRuIK6oXPmWrmyY6GyKTK3ncHOtcbajuPY5ZZaWatZ3MgYXF6yHriBTeIhJ8bs/h59mfrrbL3x8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fFwWL5qy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fFwWL5qy" Received: by smtp.kernel.org (Postfix) with ESMTPS id 10ED8C32782; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585192; bh=dpmYkQOyU/63g41Wz5LkJjXAI/RubSJlPh6+4gkd8v8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=fFwWL5qyjQ2sDGsOcuVqWIWL9cnJGxjGq2x4vlVELteMSRpd64+DYvDELQFUluY7P kfyY1wT8crg8KgYYtRNb5n8wa/th532Ddbn0aH9a8XyVQHa2e45LCVZd393H+MaLJl jKRyn9tl+qjRNdQQitULSxbdsUxg1fimdWx20Yv9ggW97xO8+vTJ/+vG4e5xKuSGC1 /a1KpUCxexeWjJ/i+7g2fJfrxp/zRs7ijyGy58A79CBhsxX1emJVmbfUiLkPh46is5 YcujKuMTxFLFz3TKjOWndbvhN10rXrSDfuEKZqRhFIaUPjpSXIbBxr3GfZQA/aEQWY rgoE5l4oXUDEA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F139BC61CE3; Mon, 24 Aug 2026 15:26:31 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:31 +0800 Subject: [PATCH v2 4/6] mm/mglru: move max_seq read into walk_update_folio Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-4-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=5157; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=dIFhd9ek4+se0CLteaNFAXeBhV2iEYvheQuV+FpkZJ8=; b=ILIf9yWr8WDVruprF6y5ipPLOwRchwpqZ0QcFLxl3FxIhy/GFqzlb7HRxzazOhfW1R6GrnPy5 aGusfe3+SarC4HDHoaw+F9Co30AhK0q/JfeqyPFE/6Qza533ssU1M3w X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song walk_pte_range(), walk_pmd_range_locked(), and lru_gen_look_around() each read lrugen->max_seq to compute the target generation used by walk_update_folio(), then pass it as a parameter. Move the read into walk_update_folio() itself so the callers no longer need to compute or pass the value. The max_seq read now happens once per folio update rather than once per walk range, so folios always get promoted to the current youngest generation. Reviewed-by: Baoquan He Reviewed-by: Baolin Wang Reviewed-by: Ridong Chen Signed-off-by: Kairui Song --- mm/vmscan.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 080132997d87..557927b498fa 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3517,13 +3517,15 @@ static bool suitable_to_scan(int total, int young) } =20 static void walk_update_folio(struct lru_gen_mm_walk *walk, struct vm_area= _struct *vma, - struct folio *folio, int new_gen, bool dirty) + struct lruvec *lruvec, struct folio *folio, bool dirty) { - int old_gen; + int new_gen, old_gen; =20 if (!folio) return; =20 + new_gen =3D lru_gen_from_seq(READ_ONCE(lruvec->lrugen.max_seq)); + if (dirty && !folio_test_dirty(folio) && !(folio_test_anon(folio) && folio_test_swapbacked(folio) && !folio_test_swapcache(folio))) @@ -3554,8 +3556,6 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long = start, unsigned long end, struct lru_gen_mm_walk *walk =3D args->private; struct mem_cgroup *memcg =3D lruvec_memcg(walk->lruvec); struct pglist_data *pgdat =3D lruvec_pgdat(walk->lruvec); - DEFINE_MAX_SEQ(walk->lruvec); - int gen =3D lru_gen_from_seq(max_seq); unsigned int nr; pmd_t pmdval; =20 @@ -3606,7 +3606,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long = start, unsigned long end, continue; =20 if (last !=3D folio) { - walk_update_folio(walk, args->vma, last, gen, dirty); + walk_update_folio(walk, args->vma, walk->lruvec, last, dirty); =20 last =3D folio; dirty =3D false; @@ -3619,7 +3619,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long = start, unsigned long end, walk->mm_stats[MM_LEAF_YOUNG] +=3D nr; } =20 - walk_update_folio(walk, args->vma, last, gen, dirty); + walk_update_folio(walk, args->vma, walk->lruvec, last, dirty); last =3D NULL; =20 if (i < PTRS_PER_PTE && get_next_vma(PMD_MASK, PAGE_SIZE, args, &start, &= end)) @@ -3642,8 +3642,6 @@ static void walk_pmd_range_locked(pud_t *pud, unsigne= d long addr, struct vm_area struct lru_gen_mm_walk *walk =3D args->private; struct mem_cgroup *memcg =3D lruvec_memcg(walk->lruvec); struct pglist_data *pgdat =3D lruvec_pgdat(walk->lruvec); - DEFINE_MAX_SEQ(walk->lruvec); - int gen =3D lru_gen_from_seq(max_seq); =20 VM_WARN_ON_ONCE(pud_leaf(*pud)); =20 @@ -3697,7 +3695,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigne= d long addr, struct vm_area goto next; =20 if (last !=3D folio) { - walk_update_folio(walk, vma, last, gen, dirty); + walk_update_folio(walk, vma, walk->lruvec, last, dirty); =20 last =3D folio; dirty =3D false; @@ -3711,7 +3709,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigne= d long addr, struct vm_area i =3D i > MIN_LRU_BATCH ? 0 : find_next_bit(bitmap, MIN_LRU_BATCH, i) + = 1; } while (i <=3D MIN_LRU_BATCH); =20 - walk_update_folio(walk, vma, last, gen, dirty); + walk_update_folio(walk, vma, walk->lruvec, last, dirty); =20 lazy_mmu_mode_disable(); spin_unlock(ptl); @@ -4275,8 +4273,6 @@ bool lru_gen_look_around(struct page_vma_mapped_walk = *pvmw, unsigned int nr) struct pglist_data *pgdat =3D folio_pgdat(folio); struct lruvec *lruvec; struct lru_gen_mm_state *mm_state; - unsigned long max_seq; - int gen; =20 lockdep_assert_held(pvmw->ptl); VM_WARN_ON_ONCE_FOLIO(folio_test_lru(folio), folio); @@ -4313,8 +4309,6 @@ bool lru_gen_look_around(struct page_vma_mapped_walk = *pvmw, unsigned int nr) =20 memcg =3D get_mem_cgroup_from_folio(folio); lruvec =3D mem_cgroup_lruvec(memcg, pgdat); - max_seq =3D READ_ONCE((lruvec)->lrugen.max_seq); - gen =3D lru_gen_from_seq(max_seq); mm_state =3D get_mm_state(lruvec); =20 lazy_mmu_mode_enable(); @@ -4346,7 +4340,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk = *pvmw, unsigned int nr) continue; =20 if (last !=3D folio) { - walk_update_folio(walk, vma, last, gen, dirty); + walk_update_folio(walk, vma, lruvec, last, dirty); =20 last =3D folio; dirty =3D false; @@ -4358,13 +4352,14 @@ bool lru_gen_look_around(struct page_vma_mapped_wal= k *pvmw, unsigned int nr) young +=3D nr; } =20 - walk_update_folio(walk, vma, last, gen, dirty); + walk_update_folio(walk, vma, lruvec, last, dirty); =20 lazy_mmu_mode_disable(); =20 /* feedback from rmap walkers to page table walkers */ if (mm_state && suitable_to_scan(i, young)) - update_bloom_filter(mm_state, max_seq, pvmw->pmd); + update_bloom_filter(mm_state, READ_ONCE(lruvec->lrugen.max_seq), + pvmw->pmd); =20 mem_cgroup_put(memcg); =20 --=20 2.55.0 From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 839F143B3D5; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=pPCS8Y31Htk7WaJ4zTMuCKhdb2l6rQi5HezOZb3NfIb7t3MDvX6zGKbYBU17XNEfE/6d/ATfXmtHndm7xuQtPA9NySvTnkZDGW7tbDyqvRxfbu/4Wd506HQTg+ORtAw/DX284JVi+UdXwtCNJFH7KMYvhbHq3wvphxeaD8fh81w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=mQEI7l7Cq0I+IgVoWLBWri2Jyk4zZGhg0P6mQGe2AKU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sU5dq4+ZidmRbNT0cHplUsCgbKciAAyQnjwf1xfxRRSRZuRx1eTAVXzpMAJhEnDWIgPdezUd49TI+cEJXHksTz7CjggctJ2jcv+fuYefuU4V2Re+bha1PhcraA1lUdM1v2QJIJpMTCvJ5YYXXiTGSMmI8kzmWw3twETFYnaJM0s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ht9i7wUn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ht9i7wUn" Received: by smtp.kernel.org (Postfix) with ESMTPS id 25F9EC4AF0C; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585192; bh=mQEI7l7Cq0I+IgVoWLBWri2Jyk4zZGhg0P6mQGe2AKU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ht9i7wUnH8etcN27Ts3xRBEhfGWk8yxmhu1zyHJW9LGSYqurglmDx8RwXHYg4KJFf z2KHduPXoaB8FF58xtffkDV1Q0a7vqzxq36ZEfYc+QXsNtqN7lQ7ABSX6wFPZO1tAJ o5eup5wnjtD8lV8KR1D6BVFAvtr1M1Bh2Jgze/iFvslNi89UlZ7BC6e7/edm6lHcug 2CzMV0jWn8YASfIYNXOdprkU1mO8kpnbymPbvpm6KbCVfgJ86Eir1I0kNEjCYMJY49 MOJc2d3uo0hA3tKN9VukXYgV2Vjy0OFzE6PP4BVk04XsGJMoUvu3lIOLzjkEubcHJr c/Syri+mFVWfw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11DF4C61DB6; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:32 +0800 Subject: [PATCH v2 5/6] mm/mglru: use explicit tier range in read_ctrl_pos() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-5-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=3599; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=F4Gku0HzSaxpr5vUbexfrLyrBNocoQzHGkkgGGw70CY=; b=PZykz2Q/M9MgVmYuwCevSKyf2Ua8qd0n2vPVt4NypGyLX1ZWWF0KtD6b/i6LAUaArsVkCRhAz EatgnbIiJXODaIuKBhJOtS8ErTHwNbFu75Ut9Mb27O9WIgPfUI4WDQJ X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song read_ctrl_pos() encodes the tier range in a single "tier" parameter via "tier % MAX_NR_TIERS" as the start and "min(tier, MAX_NR_TIERS-1)" as the end. This is hard to follow, maintain, or extend. Tier values 0..3 select a single tier, while tier =3D=3D MAX_NR_TIERS selects the full range. Replace it with explicit (tier_min, tier_max) parameters using a closed [tier_min, tier_max] interval, and add LRU_TIER_MIN and LRU_TIER_MAX for the tier bounds. The call sites now become self-documenting: - get_tier_idx: (LRU_TIER_MIN, LRU_TIER_MIN) for the first tier, (tier, tier) for each subsequent tier - get_type_to_scan: (LRU_TIER_MIN, LRU_TIER_MAX) for the full range No functional change. Reviewed-by: Baolin Wang Reviewed-by: Baoquan He Reviewed-by: Barry Song Signed-off-by: Kairui Song --- include/linux/mmzone.h | 2 ++ mm/vmscan.c | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index c9ecf370cd9f..9b27cf53bdbc 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -492,6 +492,8 @@ enum lruvec_flags { * folio->flags, masked by LRU_REFS_MASK. */ #define MAX_NR_TIERS 4U +#define LRU_TIER_MIN 0U +#define LRU_TIER_MAX (MAX_NR_TIERS - 1) =20 #ifndef __GENERATING_BOUNDS_H =20 diff --git a/mm/vmscan.c b/mm/vmscan.c index 557927b498fa..f8e291968342 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3198,8 +3198,8 @@ struct ctrl_pos { int gain; }; =20 -static void read_ctrl_pos(struct lruvec *lruvec, int type, int tier, int g= ain, - struct ctrl_pos *pos) +static void read_ctrl_pos(struct lruvec *lruvec, int type, int tier_min, + int tier_max, int gain, struct ctrl_pos *pos) { int i; struct lru_gen_folio *lrugen =3D &lruvec->lrugen; @@ -3208,7 +3208,7 @@ static void read_ctrl_pos(struct lruvec *lruvec, int = type, int tier, int gain, pos->gain =3D gain; pos->refaulted =3D pos->total =3D 0; =20 - for (i =3D tier % MAX_NR_TIERS; i <=3D min(tier, MAX_NR_TIERS - 1); i++) { + for (i =3D tier_min; i <=3D tier_max; i++) { pos->refaulted +=3D lrugen->avg_refaulted[type][i] + atomic_long_read(&lrugen->refaulted[hist][type][i]); pos->total +=3D lrugen->avg_total[type][i] + @@ -4804,9 +4804,9 @@ static int get_tier_idx(struct lruvec *lruvec, int ty= pe) * This value is chosen because any other tier would have at least twice * as many refaults as the first tier. */ - read_ctrl_pos(lruvec, type, 0, 2, &sp); - for (tier =3D 1; tier < MAX_NR_TIERS; tier++) { - read_ctrl_pos(lruvec, type, tier, 3, &pv); + read_ctrl_pos(lruvec, type, LRU_TIER_MIN, LRU_TIER_MIN, 2, &sp); + for (tier =3D LRU_TIER_MIN + 1; tier <=3D LRU_TIER_MAX; tier++) { + read_ctrl_pos(lruvec, type, tier, tier, 3, &pv); if (!positive_ctrl_err(&sp, &pv)) break; } @@ -4827,8 +4827,10 @@ static int get_type_to_scan(struct lruvec *lruvec, i= nt swappiness) * Compare the sum of all tiers of anon with that of file to determine * which type to scan. */ - read_ctrl_pos(lruvec, LRU_GEN_ANON, MAX_NR_TIERS, swappiness, &sp); - read_ctrl_pos(lruvec, LRU_GEN_FILE, MAX_NR_TIERS, MAX_SWAPPINESS - swappi= ness, &pv); + read_ctrl_pos(lruvec, LRU_GEN_ANON, LRU_TIER_MIN, LRU_TIER_MAX, + swappiness, &sp); + read_ctrl_pos(lruvec, LRU_GEN_FILE, LRU_TIER_MIN, LRU_TIER_MAX, + MAX_SWAPPINESS - swappiness, &pv); =20 return positive_ctrl_err(&sp, &pv); } --=20 2.55.0 From nobody Mon Sep 28 08:12:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8277643B3CE; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; cv=none; b=r68XBZwokRSK2+VPh12FIwdoAfRiCDWhNHOZbr2PI8L9hHxKkx69wofSEQC1MMF1o5HqqVHaoxmyugY3Rj6Ox0ZOxzM3Px61Ua2dNw/fAmM1ob3M6jmWXNBtypdCcCXVmQJOxhGlXva/Z961K97Hg8NTo0o6EeJvzS8CEGquOX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787585192; c=relaxed/simple; bh=LSpVtO/hFU1Y8AvNZfXAsZKiYVFMAqKDVGjSAMR2uhs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VQyyqjmzfyu7ZVEXgGDEX9QRyxW+h4zEfltalm9UMkh7kfuFXL+ANTeTaarGNRadN78O9WeBhk2HjqXBDFPUe2ynZ75DFonJlSrDHmna0qaS1DlsFJ/VVSr7Kjoz6Mjbt0+B4YNc/XXVF/dx072s6SxuGoX68qNNDCS2O0YSSDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rlvEUG6n; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rlvEUG6n" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3DA26C2BCF7; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787585192; bh=LSpVtO/hFU1Y8AvNZfXAsZKiYVFMAqKDVGjSAMR2uhs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=rlvEUG6n2HLPgiYttJSI/+dUdKAgxBeCajSAeASepWPCeBrBFb1Y9jS0CVOI5IhKk ig/sxzNQtpoGjmYfs0OIn177KdCUqmmfSd9a8onlzsNiQJpHHOQWNIjaxW+f0iSTLl b/yTp+P4ZHPZDiC09W44ZLEX4yXD7kW0Xvs1+GtbX/KR+wkq5YGhrtX9+3k+lJHhhO P7xh3RBgBiDYOArM8RyBy9adfysVWoPC4G2TwVH25hzf4pS/kUVi6f7Xc5rCGZNenc TYLMzul863RpYWQwtzje4zXqtcVcFYelWKUnEmMRmYCKVopvm6Tat7fKfYm4ROgThz zJCZdUZ0RTBdQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25D67C5DF81; Mon, 24 Aug 2026 15:26:32 +0000 (UTC) From: Kairui Song via B4 Relay Date: Mon, 24 Aug 2026 23:26:33 +0800 Subject: [PATCH v2 6/6] mm/mglru: fix potential generation folio number leak Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260824-mglru-flags-cleanup-v2-6-0104132114ae@tencent.com> References: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> In-Reply-To: <20260824-mglru-flags-cleanup-v2-0-0104132114ae@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Chris Li , Baolin Wang , Ridong Chen , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Yu Zhao , Zi Yan , Qi Zheng , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , Kairui Song X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787585189; l=5305; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=tj/12DD/VSfeSYVO143tuBTxpcfyZNrpYVNaXEBtCkk=; b=NRrbduhTkXP/HPCS8wsMxUmN6w34FdFo5lTlwiaKmyEXifN5Dfy7gXCfbo7nXlcrTNCXaHypS nEP9/yGzheFDNojvLfL0GGdDREFejku+i3WMu1uWQ9y/W65UzFGOI2P X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= X-Endpoint-Received: by B4 Relay for kasong@tencent.com/kasong-sign-tencent with auth_id=562 X-Original-From: Kairui Song Reply-To: kasong@tencent.com From: Kairui Song Each generation of MGLRU accounts anon and file folio numbers separately, and the page table walker updates each generation's counters in batch once the walk is done. The walker promotes a folio's generation with a cmpxchg on folio->flags, and update_batch_size() then reads the live flags again to pick the anon/file column to charge. The walk holds neither the lruvec lock nor the folio lock, so the type can flip between the cmpxchg and that read: the lazyfree path clears PG_swapbacked, and reclaim sets it back on a dirty lazyfree folio. The batched delta pair is then recorded in the wrong type column. Nothing reconciles it afterwards, permanently skewing lrugen->nr_pages and the reclaim budgets derived from it. Fix it by capturing the type from the flags snapshot the cmpxchg linearized against: folio_update_gen() returns the type of the state it transitioned from, and update_batch_size() accounts with that. A folio's type only changes while it is off the LRU list, inside a del/add pair under the lruvec lock, with the gen bits cleared in between. The generation and PG_swapbacked sit in the same folio->flags word, so the cmpxchg snapshot captures them together. Let G be the generation that snapshot captured (old_gen) and G' the one it wrote (new_gen); the CAS can land in only three places: - before the del: the folio is anon at G; the batch records anon G -> G', and the del later removes the folio from the anon counters; - between del and add: gen =3D=3D -1, so folio_update_gen() returns -1 without touching the flags and no batch is recorded; the del/add pair accounts for the move alone; - after the add: the folio is file at the fresh generation the add charged; the batch records file, that gen -> G', matching that charge. Unlike the drift of lazy promotions, which sort_folio() repairs under the lruvec lock, the phantom deltas from before this fix land in a column the folio never occupies again, so nothing ever repairs them. Fixes: 018ee47f1489 ("mm: multi-gen LRU: exploit locality in rmap") Signed-off-by: Kairui Song --- include/linux/mm_inline.h | 7 ++++++- mm/vmscan.c | 13 +++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 7f91a89b5ba3..8cf82989ec26 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -10,6 +10,11 @@ #include #include =20 +static inline int folio_flags_is_file_lru(const unsigned long *flags) +{ + return !test_bit(PG_swapbacked, flags); +} + /** * folio_is_file_lru - Should the folio be on a file LRU or anon LRU? * @folio: The folio to test. @@ -27,7 +32,7 @@ */ static inline int folio_is_file_lru(const struct folio *folio) { - return !folio_test_swapbacked(folio); + return folio_flags_is_file_lru(const_folio_flags(folio, 0)); } =20 static __always_inline void __update_lru_size(struct lruvec *lruvec, diff --git a/mm/vmscan.c b/mm/vmscan.c index f8e291968342..a1497ad61ad7 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3269,7 +3269,8 @@ static bool positive_ctrl_err(struct ctrl_pos *sp, st= ruct ctrl_pos *pv) *************************************************************************= *****/ =20 /* promote pages accessed through page tables */ -static int folio_update_gen(struct folio *folio, int new_gen, const vma_fl= ags_t *vma_flags) +static int folio_update_gen(struct folio *folio, int new_gen, int *is_file, + const vma_flags_t *vma_flags) { unsigned long new_flags, old_flags =3D READ_ONCE(*folio_flags(folio, 0)); int old_gen; @@ -3298,6 +3299,7 @@ static int folio_update_gen(struct folio *folio, int = new_gen, const vma_flags_t new_flags |=3D BIT(PG_workingset); } while (!try_cmpxchg(folio_flags(folio, 0), &old_flags, new_flags)); =20 + *is_file =3D folio_flags_is_file_lru(&old_flags); return old_gen; } =20 @@ -3328,9 +3330,8 @@ static int folio_inc_gen(struct lruvec *lruvec, struc= t folio *folio) } =20 static void update_batch_size(struct lru_gen_mm_walk *walk, struct folio *= folio, - int old_gen, int new_gen) + int old_gen, int new_gen, int type) { - int type =3D folio_is_file_lru(folio); int zone =3D folio_zonenum(folio); int delta =3D folio_nr_pages(folio); =20 @@ -3519,7 +3520,7 @@ static bool suitable_to_scan(int total, int young) static void walk_update_folio(struct lru_gen_mm_walk *walk, struct vm_area= _struct *vma, struct lruvec *lruvec, struct folio *folio, bool dirty) { - int new_gen, old_gen; + int new_gen, old_gen, file; =20 if (!folio) return; @@ -3532,9 +3533,9 @@ static void walk_update_folio(struct lru_gen_mm_walk = *walk, struct vm_area_struc folio_mark_dirty(folio); =20 if (walk) { - old_gen =3D folio_update_gen(folio, new_gen, &vma->flags); + old_gen =3D folio_update_gen(folio, new_gen, &file, &vma->flags); if (old_gen >=3D 0 && old_gen !=3D new_gen) - update_batch_size(walk, folio, old_gen, new_gen); + update_batch_size(walk, folio, old_gen, new_gen, file); } else if (lru_gen_set_refs(folio, &vma->flags)) { old_gen =3D folio_lru_gen(folio); if (old_gen >=3D 0 && old_gen !=3D new_gen) --=20 2.55.0