From nobody Mon Feb 9 20:12:09 2026 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (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 CB6E4394490 for ; Thu, 5 Feb 2026 09:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770282324; cv=none; b=XEd0xT0iHGoCyjZM2R2WIP4h/V6WRZkHRzMqjtoCN5MYC83dCLG9y452f20rvoX+7CMKqyOvBRvoahqeWrMoTc2dUS4xzTGBycGlBUySCb7bnDAIm8vfJ9Tpb+3PXWTU1uN/O4mhItoUy1k2NvFCFdqER7GjwqGkYxyGHMLycGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770282324; c=relaxed/simple; bh=DDxcHck/sIoW1LRzxbkSsp+RgSjdg3gt+CVCov3jli8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HiMTeYkuGSGOeVroXsjADYCQ134quNL/YccxqvKwmcfO1j0XZPEnqXQ33lyeqXlzyDEFRcF2NWVcoHLHnFIkFg69Ng+XFSLVw2Pnu8k82M0BCmbF6lI4XS8/xvANF8jDFNMUTaRmPIBW33VAFPnjJ3F35T7Qk/ZTFV9Lz2NabJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=vYOlRAue; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="vYOlRAue" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770282322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a61eWbbzEDz2UJp1doEfV/zCU76HlIc7Sn6ibevaVaQ=; b=vYOlRAueOHnytNbF68ecTXSMe2JBGN42PMMK2NXMNWnU9ULH1WwYVSgQEIjguyt6YXj33T 20N01Om3G23/sdvLlp/Ggtg9jACplaqESglsgpgpEqW14uYq5Pi/Kp41g10EFmcMO2KLud RspUx7COjcAjb9Bd1PDiROhHvqNVghU= From: Qi Zheng To: hannes@cmpxchg.org, hughd@google.com, mhocko@suse.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, david@kernel.org, lorenzo.stoakes@oracle.com, ziy@nvidia.com, harry.yoo@oracle.com, yosry.ahmed@linux.dev, imran.f.khan@oracle.com, kamalesh.babulal@oracle.com, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, chenridong@huaweicloud.com, mkoutny@suse.com, akpm@linux-foundation.org, hamzamahfooz@linux.microsoft.com, apais@linux.microsoft.com, lance.yang@linux.dev, bhe@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Qi Zheng Subject: [PATCH v4 28/31] mm: workingset: use lruvec_lru_size() to get the number of lru pages Date: Thu, 5 Feb 2026 17:01:47 +0800 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Qi Zheng For cgroup v2, count_shadow_nodes() is the only place to read non-hierarchical stats (lruvec_stats->state_local). To avoid the need to consider cgroup v2 during subsequent non-hierarchical stats reparenting, use lruvec_lru_size() instead of lruvec_page_state_local() to get the number of lru pages. For NR_SLAB_RECLAIMABLE_B and NR_SLAB_UNRECLAIMABLE_B cases, it appears that the statistics here have already been problematic for a while since slab pages have been reparented. So just ignore it for now. Signed-off-by: Qi Zheng Acked-by: Muchun Song Acked-by: Shakeel Butt --- include/linux/swap.h | 1 + mm/vmscan.c | 3 +-- mm/workingset.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 62e124ec6b75a..2ee736438b9d6 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -370,6 +370,7 @@ extern void swap_setup(void); extern unsigned long zone_reclaimable_pages(struct zone *zone); extern unsigned long try_to_free_pages(struct zonelist *zonelist, int orde= r, gfp_t gfp_mask, nodemask_t *mask); +unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, in= t zone_idx); =20 #define MEMCG_RECLAIM_MAY_SWAP (1 << 1) #define MEMCG_RECLAIM_PROACTIVE (1 << 2) diff --git a/mm/vmscan.c b/mm/vmscan.c index 8c6f8f0df24b1..4dc52b4b4af50 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -390,8 +390,7 @@ unsigned long zone_reclaimable_pages(struct zone *zone) * @lru: lru to use * @zone_idx: zones to consider (use MAX_NR_ZONES - 1 for the whole LRU li= st) */ -static unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list = lru, - int zone_idx) +unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, in= t zone_idx) { unsigned long size =3D 0; int zid; diff --git a/mm/workingset.c b/mm/workingset.c index 2be53098f6282..ecdc293cd06fb 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -684,9 +684,10 @@ static unsigned long count_shadow_nodes(struct shrinke= r *shrinker, =20 mem_cgroup_flush_stats_ratelimited(sc->memcg); lruvec =3D mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); + for (pages =3D 0, i =3D 0; i < NR_LRU_LISTS; i++) - pages +=3D lruvec_page_state_local(lruvec, - NR_LRU_BASE + i); + pages +=3D lruvec_lru_size(lruvec, i, MAX_NR_ZONES - 1); + pages +=3D lruvec_page_state_local( lruvec, NR_SLAB_RECLAIMABLE_B) >> PAGE_SHIFT; pages +=3D lruvec_page_state_local( --=20 2.20.1