From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BCE117BB21 for ; Mon, 23 Feb 2026 08:49:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771836567; cv=none; b=Rdu7l6y2ama9Wigjj9lT+vPo8w+M/tfKdHp1QXNDpAt/Q1aFqCPBip0Fa08wzmEK5X4OKX53CXPKOf2gXtScBz/gxRQI+yFYUKLWh8gUKIvzNgpdZhimfGFqc43NHQFhUo0RD0HoBvHT7MR26eMklKs66H/JmzdjR/3RBmvq86Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771836567; c=relaxed/simple; bh=CPcTqIwKdGrgjQkZKiyMYwMRFUUoGRejaC+F57KM46g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=p+VGmgInvoh4jzlEPfnIyhy99f53F8BEKjrjGqqDLDlozDsSxUoNNuckWR9uMzoMX3qfn6M2k8nnDTBXK8CEtUvyn7cA1QlUN7ZSyCr3a6yRVQBk//81IckzDSrxUFXJElWE9kZH3IZxnopExid8esNQhR1QaSD7bSmcivju00M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=c5hhGdqP; arc=none smtp.client-ip=209.85.128.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="c5hhGdqP" Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-480706554beso49181575e9.1 for ; Mon, 23 Feb 2026 00:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1771836563; x=1772441363; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Ez7ZL/ZZTKjaKro/no8ifIkmvDs+hXx0YgHRHReG5g8=; b=c5hhGdqP6jn94MnuI4fDrbhc5ZeolOvfggGIE0Ny1x/g5WMEkzqfhYSHi1RGm5oXxF R2xhQdtyxIc6UBilYLzV3nd2/q8gVzOgNVkdYav7BYBYc2mYbUykZJpHChlscpqvVnrP 4+dKFeW/VkJ/6/S1hnEUbIy10ErhTmIWQGSpU40qlIGczFeFP+68RILFCJkbq+vtORwy JVSCmg9C4TomLU16p86iUrdwJOKiwhENnTfb+iWLZXITb5vKQpkLXMmtXh603uLBK5aA AEMYVtZlcAOUt25S/+KDsZCIMyDFnuzv9IORCx6jomyl0GPlHwH1jya8SSuCQzWZ38kU dKNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771836563; x=1772441363; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ez7ZL/ZZTKjaKro/no8ifIkmvDs+hXx0YgHRHReG5g8=; b=nbeWOpMxY9m1a4K3k/5CX+gDOkiCq4Y9kP09v34njiE5TV317wPueWEI22bcILyi49 5EHHuNEsOlQaKcasfr1oW/+x7oqNIg9opm2D7PaGaWNtqJjYo4OEVt9jCtLIF11IkmQV WIn0k9o3chfV0uJhQWUg/wmq3UsEhKBhW860lJ3ThDk8h5QulY2JAelysI3NF8UH7adu OTr0jf45EPviZZ0JMOHEAjFVgaNKi4TPigVWqBPo+sB/gyfOFiUAuH+TxvVnCronOdbw JhtPK1G8BMFK6Bh/AYi0YpsC178vGcnIYWb4+170Z5MSrX0y+HxH2eoMZXcrn3IJ8nPg iG4Q== X-Forwarded-Encrypted: i=1; AJvYcCW1dQIipiE5XhTDs3Dtfy6yGOCaT4Pq0wTpsrBwFKNDnxkVzWsRuc/1d1AG5i6o2KchBQA2GUpo1FMgNWDVGQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yzrh1RL+IoAVr5aRJI5szYYl7BZVN9pLjwugTD+3S8Mq9pZlVD4 8QnAdHUQr5WyTBQIrr9u1q2Hg0J7sUSm3jDJZ53cLeSVBfXzGWN62cYkOk2u7O1+eak= X-Gm-Gg: AZuq6aIQMyKJYc2InJBZh4ZEvYNOToKI0/60vNxpMJOSbKr3WfCn5cBh1UoUmVidcP0 kzGMDadHLh9mJn9Q+sW3z/gxrIxxg0NRIzafGVOqagznLSv2DXtIezkMoFhNYlh4/3Qb1mJgKhC F3F7jwmBMi7XMaEpdl620C/ZaKiRn1vSWR4WT/Q43NvV56VpolOA56pVD69gMidYF7jCW50gBn/ ibAN8XllE5wJaMekFUawuxXWduy3Dog2h/o0WyPlST86wKuJzo4yVpAySbTx3Q56L8b7o/ReWOw 9w//RuGNbSQycp1EnQZ+q6R7y+8lTKfnAkotPlFc6J+uOojEI9LViuyov819zNL26zzxo/HYbBi 8OGRaISyz7MkVsxMC2+I++H2cIB1Tv2HczYclECLP26gVRRlL2l/ZmfZIeuijvrk3YQaL1YozsC LQtJ/mzSfbNDKubpwAYRcuY5FFftVmNEs= X-Received: by 2002:a05:600c:3b10:b0:483:43da:6c87 with SMTP id 5b1f17b1804b1-483a963d603mr110784615e9.33.1771836562560; Mon, 23 Feb 2026 00:49:22 -0800 (PST) Received: from localhost (109-81-84-7.rct.o2.cz. [109.81.84.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483a31b3e0dsm392926575e9.1.2026.02.23.00.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 00:49:22 -0800 (PST) Date: Mon, 23 Feb 2026 09:49:21 +0100 From: Michal Hocko To: "JP Kobryn (Meta)" Cc: linux-mm@kvack.org, mst@redhat.com, vbabka@suse.cz, apopple@nvidia.com, akpm@linux-foundation.org, axelrasmussen@google.com, byungchul@sk.com, cgroups@vger.kernel.org, david@kernel.org, eperezma@redhat.com, gourry@gourry.net, jasowang@redhat.com, hannes@cmpxchg.org, joshua.hahnjy@gmail.com, Liam.Howlett@oracle.com, linux-kernel@vger.kernel.org, lorenzo.stoakes@oracle.com, matthew.brost@intel.com, rppt@kernel.org, muchun.song@linux.dev, zhengqi.arch@bytedance.com, rakie.kim@sk.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, surenb@google.com, virtualization@lists.linux.dev, weixugc@google.com, xuanzhuo@linux.alibaba.com, ying.huang@linux.alibaba.com, yuanchu@google.com, ziy@nvidia.com, kernel-team@meta.com Subject: Re: [PATCH v5] mm: move pgscan, pgsteal, pgrefill to node stats Message-ID: References: <20260219235846.161910-1-jp.kobryn@linux.dev> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260219235846.161910-1-jp.kobryn@linux.dev> On Thu 19-02-26 15:58:46, JP Kobryn (Meta) wrote: > There are situations where reclaim kicks in on a system with free memory. > One possible cause is a NUMA imbalance scenario where one or more nodes are > under pressure. It would help if we could easily identify such nodes. > > Move the pgscan, pgsteal, and pgrefill counters from vm_event_item to > node_stat_item to provide per-node reclaim visibility. With these counters > as node stats, the values are now displayed in the per-node section of > /proc/zoneinfo, which allows for quick identification of the affected > nodes. > > /proc/vmstat continues to report the same counters, aggregated across all > nodes. But the ordering of these items within the readout changes as they > move from the vm events section to the node stats section. > > Memcg accounting of these counters is preserved. The relocated counters > remain visible in memory.stat alongside the existing aggregate pgscan and > pgsteal counters. > > However, this change affects how the global counters are accumulated. > Previously, the global event count update was gated on !cgroup_reclaim(), > excluding memcg-based reclaim from /proc/vmstat. Now that > mod_lruvec_state() is being used to update the counters, the global > counters will include all reclaim. This is consistent with how pgdemote > counters are already tracked. > > Finally, the virtio_balloon driver is updated to use > global_node_page_state() to fetch the counters, as they are no longer > accessible through the vm_events array. > > Signed-off-by: JP Kobryn > Suggested-by: Johannes Weiner > Acked-by: Michael S. Tsirkin > Reviewed-by: Vlastimil Babka (SUSE) Acked-by: Michal Hocko Thanks > --- > v5: > - rebase onto mm/mm-new > > v4: https://lore.kernel.org/linux-mm/20260219171124.19053-1-jp.kobryn@linux.dev/ > - remove unused memcg var from scan_folios() > > v3: https://lore.kernel.org/linux-mm/20260218222652.108411-1-jp.kobryn@linux.dev/ > - additionally move PGREFILL to node stats > > v2: https://lore.kernel.org/linux-mm/20260218032941.225439-1-jp.kobryn@linux.dev/ > - update commit message > - add entries to memory_stats array > - add switch cases in memcg_page_state_output_unit() > > v1: https://lore.kernel.org/linux-mm/20260212045109.255391-3-inwardvessel@gmail.com/ > > drivers/virtio/virtio_balloon.c | 8 ++--- > include/linux/mmzone.h | 13 ++++++++ > include/linux/vm_event_item.h | 13 -------- > mm/memcontrol.c | 56 +++++++++++++++++++++++---------- > mm/vmscan.c | 39 ++++++++--------------- > mm/vmstat.c | 26 +++++++-------- > 6 files changed, 82 insertions(+), 73 deletions(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index 4e549abe59ff..ab945532ceef 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -369,13 +369,13 @@ static inline unsigned int update_balloon_vm_stats(struct virtio_balloon *vb) > update_stat(vb, idx++, VIRTIO_BALLOON_S_ALLOC_STALL, stall); > > update_stat(vb, idx++, VIRTIO_BALLOON_S_ASYNC_SCAN, > - pages_to_bytes(events[PGSCAN_KSWAPD])); > + pages_to_bytes(global_node_page_state(PGSCAN_KSWAPD))); > update_stat(vb, idx++, VIRTIO_BALLOON_S_DIRECT_SCAN, > - pages_to_bytes(events[PGSCAN_DIRECT])); > + pages_to_bytes(global_node_page_state(PGSCAN_DIRECT))); > update_stat(vb, idx++, VIRTIO_BALLOON_S_ASYNC_RECLAIM, > - pages_to_bytes(events[PGSTEAL_KSWAPD])); > + pages_to_bytes(global_node_page_state(PGSTEAL_KSWAPD))); > update_stat(vb, idx++, VIRTIO_BALLOON_S_DIRECT_RECLAIM, > - pages_to_bytes(events[PGSTEAL_DIRECT])); > + pages_to_bytes(global_node_page_state(PGSTEAL_DIRECT))); > > #ifdef CONFIG_HUGETLB_PAGE > update_stat(vb, idx++, VIRTIO_BALLOON_S_HTLB_PGALLOC, > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index 3e51190a55e4..546bca95ca40 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -255,6 +255,19 @@ enum node_stat_item { > PGDEMOTE_DIRECT, > PGDEMOTE_KHUGEPAGED, > PGDEMOTE_PROACTIVE, > + PGSTEAL_KSWAPD, > + PGSTEAL_DIRECT, > + PGSTEAL_KHUGEPAGED, > + PGSTEAL_PROACTIVE, > + PGSTEAL_ANON, > + PGSTEAL_FILE, > + PGSCAN_KSWAPD, > + PGSCAN_DIRECT, > + PGSCAN_KHUGEPAGED, > + PGSCAN_PROACTIVE, > + PGSCAN_ANON, > + PGSCAN_FILE, > + PGREFILL, > #ifdef CONFIG_HUGETLB_PAGE > NR_HUGETLB, > #endif > diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h > index 22a139f82d75..03fe95f5a020 100644 > --- a/include/linux/vm_event_item.h > +++ b/include/linux/vm_event_item.h > @@ -38,21 +38,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, > PGFREE, PGACTIVATE, PGDEACTIVATE, PGLAZYFREE, > PGFAULT, PGMAJFAULT, > PGLAZYFREED, > - PGREFILL, > PGREUSE, > - PGSTEAL_KSWAPD, > - PGSTEAL_DIRECT, > - PGSTEAL_KHUGEPAGED, > - PGSTEAL_PROACTIVE, > - PGSCAN_KSWAPD, > - PGSCAN_DIRECT, > - PGSCAN_KHUGEPAGED, > - PGSCAN_PROACTIVE, > PGSCAN_DIRECT_THROTTLE, > - PGSCAN_ANON, > - PGSCAN_FILE, > - PGSTEAL_ANON, > - PGSTEAL_FILE, > #ifdef CONFIG_NUMA > PGSCAN_ZONE_RECLAIM_SUCCESS, > PGSCAN_ZONE_RECLAIM_FAILED, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 6fb9c999347b..0d834c47706f 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -331,6 +331,19 @@ static const unsigned int memcg_node_stat_items[] = { > PGDEMOTE_DIRECT, > PGDEMOTE_KHUGEPAGED, > PGDEMOTE_PROACTIVE, > + PGSTEAL_KSWAPD, > + PGSTEAL_DIRECT, > + PGSTEAL_KHUGEPAGED, > + PGSTEAL_PROACTIVE, > + PGSTEAL_ANON, > + PGSTEAL_FILE, > + PGSCAN_KSWAPD, > + PGSCAN_DIRECT, > + PGSCAN_KHUGEPAGED, > + PGSCAN_PROACTIVE, > + PGSCAN_ANON, > + PGSCAN_FILE, > + PGREFILL, > #ifdef CONFIG_HUGETLB_PAGE > NR_HUGETLB, > #endif > @@ -444,17 +457,8 @@ static const unsigned int memcg_vm_event_stat[] = { > #endif > PSWPIN, > PSWPOUT, > - PGSCAN_KSWAPD, > - PGSCAN_DIRECT, > - PGSCAN_KHUGEPAGED, > - PGSCAN_PROACTIVE, > - PGSTEAL_KSWAPD, > - PGSTEAL_DIRECT, > - PGSTEAL_KHUGEPAGED, > - PGSTEAL_PROACTIVE, > PGFAULT, > PGMAJFAULT, > - PGREFILL, > PGACTIVATE, > PGDEACTIVATE, > PGLAZYFREE, > @@ -1401,6 +1405,15 @@ static const struct memory_stat memory_stats[] = { > { "pgdemote_direct", PGDEMOTE_DIRECT }, > { "pgdemote_khugepaged", PGDEMOTE_KHUGEPAGED }, > { "pgdemote_proactive", PGDEMOTE_PROACTIVE }, > + { "pgsteal_kswapd", PGSTEAL_KSWAPD }, > + { "pgsteal_direct", PGSTEAL_DIRECT }, > + { "pgsteal_khugepaged", PGSTEAL_KHUGEPAGED }, > + { "pgsteal_proactive", PGSTEAL_PROACTIVE }, > + { "pgscan_kswapd", PGSCAN_KSWAPD }, > + { "pgscan_direct", PGSCAN_DIRECT }, > + { "pgscan_khugepaged", PGSCAN_KHUGEPAGED }, > + { "pgscan_proactive", PGSCAN_PROACTIVE }, > + { "pgrefill", PGREFILL }, > #ifdef CONFIG_NUMA_BALANCING > { "pgpromote_success", PGPROMOTE_SUCCESS }, > #endif > @@ -1444,6 +1457,15 @@ static int memcg_page_state_output_unit(int item) > case PGDEMOTE_DIRECT: > case PGDEMOTE_KHUGEPAGED: > case PGDEMOTE_PROACTIVE: > + case PGSTEAL_KSWAPD: > + case PGSTEAL_DIRECT: > + case PGSTEAL_KHUGEPAGED: > + case PGSTEAL_PROACTIVE: > + case PGSCAN_KSWAPD: > + case PGSCAN_DIRECT: > + case PGSCAN_KHUGEPAGED: > + case PGSCAN_PROACTIVE: > + case PGREFILL: > #ifdef CONFIG_NUMA_BALANCING > case PGPROMOTE_SUCCESS: > #endif > @@ -1562,15 +1584,15 @@ static void memcg_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) > > /* Accumulated memory events */ > memcg_seq_buf_print_stat(s, NULL, "pgscan", ' ', > - memcg_events(memcg, PGSCAN_KSWAPD) + > - memcg_events(memcg, PGSCAN_DIRECT) + > - memcg_events(memcg, PGSCAN_PROACTIVE) + > - memcg_events(memcg, PGSCAN_KHUGEPAGED)); > + memcg_page_state(memcg, PGSCAN_KSWAPD) + > + memcg_page_state(memcg, PGSCAN_DIRECT) + > + memcg_page_state(memcg, PGSCAN_PROACTIVE) + > + memcg_page_state(memcg, PGSCAN_KHUGEPAGED)); > memcg_seq_buf_print_stat(s, NULL, "pgsteal", ' ', > - memcg_events(memcg, PGSTEAL_KSWAPD) + > - memcg_events(memcg, PGSTEAL_DIRECT) + > - memcg_events(memcg, PGSTEAL_PROACTIVE) + > - memcg_events(memcg, PGSTEAL_KHUGEPAGED)); > + memcg_page_state(memcg, PGSTEAL_KSWAPD) + > + memcg_page_state(memcg, PGSTEAL_DIRECT) + > + memcg_page_state(memcg, PGSTEAL_PROACTIVE) + > + memcg_page_state(memcg, PGSTEAL_KHUGEPAGED)); > > for (i = 0; i < ARRAY_SIZE(memcg_vm_event_stat); i++) { > #ifdef CONFIG_MEMCG_V1 > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 5fa6e6bd6540..c3dc7c7befac 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1984,7 +1984,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, > unsigned long nr_taken; > struct reclaim_stat stat; > bool file = is_file_lru(lru); > - enum vm_event_item item; > + enum node_stat_item item; > struct pglist_data *pgdat = lruvec_pgdat(lruvec); > bool stalled = false; > > @@ -2010,10 +2010,8 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, > > __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, nr_taken); > item = PGSCAN_KSWAPD + reclaimer_offset(sc); > - if (!cgroup_reclaim(sc)) > - __count_vm_events(item, nr_scanned); > - count_memcg_events(lruvec_memcg(lruvec), item, nr_scanned); > - __count_vm_events(PGSCAN_ANON + file, nr_scanned); > + mod_lruvec_state(lruvec, item, nr_scanned); > + mod_lruvec_state(lruvec, PGSCAN_ANON + file, nr_scanned); > > spin_unlock_irq(&lruvec->lru_lock); > > @@ -2030,10 +2028,8 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, > stat.nr_demoted); > __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); > item = PGSTEAL_KSWAPD + reclaimer_offset(sc); > - if (!cgroup_reclaim(sc)) > - __count_vm_events(item, nr_reclaimed); > - count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); > - __count_vm_events(PGSTEAL_ANON + file, nr_reclaimed); > + mod_lruvec_state(lruvec, item, nr_reclaimed); > + mod_lruvec_state(lruvec, PGSTEAL_ANON + file, nr_reclaimed); > > lru_note_cost_unlock_irq(lruvec, file, stat.nr_pageout, > nr_scanned - nr_reclaimed); > @@ -2120,9 +2116,7 @@ static void shrink_active_list(unsigned long nr_to_scan, > > __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, nr_taken); > > - if (!cgroup_reclaim(sc)) > - __count_vm_events(PGREFILL, nr_scanned); > - count_memcg_events(lruvec_memcg(lruvec), PGREFILL, nr_scanned); > + mod_lruvec_state(lruvec, PGREFILL, nr_scanned); > > spin_unlock_irq(&lruvec->lru_lock); > > @@ -4537,7 +4531,7 @@ static int scan_folios(unsigned long nr_to_scan, struct lruvec *lruvec, > { > int i; > int gen; > - enum vm_event_item item; > + enum node_stat_item item; > int sorted = 0; > int scanned = 0; > int isolated = 0; > @@ -4545,7 +4539,6 @@ static int scan_folios(unsigned long nr_to_scan, struct lruvec *lruvec, > int scan_batch = min(nr_to_scan, MAX_LRU_BATCH); > int remaining = scan_batch; > struct lru_gen_folio *lrugen = &lruvec->lrugen; > - struct mem_cgroup *memcg = lruvec_memcg(lruvec); > > VM_WARN_ON_ONCE(!list_empty(list)); > > @@ -4596,13 +4589,9 @@ static int scan_folios(unsigned long nr_to_scan, struct lruvec *lruvec, > } > > item = PGSCAN_KSWAPD + reclaimer_offset(sc); > - if (!cgroup_reclaim(sc)) { > - __count_vm_events(item, isolated); > - __count_vm_events(PGREFILL, sorted); > - } > - count_memcg_events(memcg, item, isolated); > - count_memcg_events(memcg, PGREFILL, sorted); > - __count_vm_events(PGSCAN_ANON + type, isolated); > + mod_lruvec_state(lruvec, item, isolated); > + mod_lruvec_state(lruvec, PGREFILL, sorted); > + mod_lruvec_state(lruvec, PGSCAN_ANON + type, isolated); > trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, scan_batch, > scanned, skipped, isolated, > type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON); > @@ -4705,7 +4694,7 @@ static int evict_folios(unsigned long nr_to_scan, struct lruvec *lruvec, > LIST_HEAD(clean); > struct folio *folio; > struct folio *next; > - enum vm_event_item item; > + enum node_stat_item item; > struct reclaim_stat stat; > struct lru_gen_mm_walk *walk; > bool skip_retry = false; > @@ -4769,10 +4758,8 @@ static int evict_folios(unsigned long nr_to_scan, struct lruvec *lruvec, > stat.nr_demoted); > > item = PGSTEAL_KSWAPD + reclaimer_offset(sc); > - if (!cgroup_reclaim(sc)) > - __count_vm_events(item, reclaimed); > - count_memcg_events(memcg, item, reclaimed); > - __count_vm_events(PGSTEAL_ANON + type, reclaimed); > + mod_lruvec_state(lruvec, item, reclaimed); > + mod_lruvec_state(lruvec, PGSTEAL_ANON + type, reclaimed); > > spin_unlock_irq(&lruvec->lru_lock); > > diff --git a/mm/vmstat.c b/mm/vmstat.c > index 86b14b0f77b5..44bbb7752f11 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1276,6 +1276,19 @@ const char * const vmstat_text[] = { > [I(PGDEMOTE_DIRECT)] = "pgdemote_direct", > [I(PGDEMOTE_KHUGEPAGED)] = "pgdemote_khugepaged", > [I(PGDEMOTE_PROACTIVE)] = "pgdemote_proactive", > + [I(PGSTEAL_KSWAPD)] = "pgsteal_kswapd", > + [I(PGSTEAL_DIRECT)] = "pgsteal_direct", > + [I(PGSTEAL_KHUGEPAGED)] = "pgsteal_khugepaged", > + [I(PGSTEAL_PROACTIVE)] = "pgsteal_proactive", > + [I(PGSTEAL_ANON)] = "pgsteal_anon", > + [I(PGSTEAL_FILE)] = "pgsteal_file", > + [I(PGSCAN_KSWAPD)] = "pgscan_kswapd", > + [I(PGSCAN_DIRECT)] = "pgscan_direct", > + [I(PGSCAN_KHUGEPAGED)] = "pgscan_khugepaged", > + [I(PGSCAN_PROACTIVE)] = "pgscan_proactive", > + [I(PGSCAN_ANON)] = "pgscan_anon", > + [I(PGSCAN_FILE)] = "pgscan_file", > + [I(PGREFILL)] = "pgrefill", > #ifdef CONFIG_HUGETLB_PAGE > [I(NR_HUGETLB)] = "nr_hugetlb", > #endif > @@ -1318,21 +1331,8 @@ const char * const vmstat_text[] = { > [I(PGMAJFAULT)] = "pgmajfault", > [I(PGLAZYFREED)] = "pglazyfreed", > > - [I(PGREFILL)] = "pgrefill", > [I(PGREUSE)] = "pgreuse", > - [I(PGSTEAL_KSWAPD)] = "pgsteal_kswapd", > - [I(PGSTEAL_DIRECT)] = "pgsteal_direct", > - [I(PGSTEAL_KHUGEPAGED)] = "pgsteal_khugepaged", > - [I(PGSTEAL_PROACTIVE)] = "pgsteal_proactive", > - [I(PGSCAN_KSWAPD)] = "pgscan_kswapd", > - [I(PGSCAN_DIRECT)] = "pgscan_direct", > - [I(PGSCAN_KHUGEPAGED)] = "pgscan_khugepaged", > - [I(PGSCAN_PROACTIVE)] = "pgscan_proactive", > [I(PGSCAN_DIRECT_THROTTLE)] = "pgscan_direct_throttle", > - [I(PGSCAN_ANON)] = "pgscan_anon", > - [I(PGSCAN_FILE)] = "pgscan_file", > - [I(PGSTEAL_ANON)] = "pgsteal_anon", > - [I(PGSTEAL_FILE)] = "pgsteal_file", > > #ifdef CONFIG_NUMA > [I(PGSCAN_ZONE_RECLAIM_SUCCESS)] = "zone_reclaim_success", > -- > 2.47.3 -- Michal Hocko SUSE Labs