Skip to content

Commit 7fa0dac

Browse files
Waiman-Longtorvalds
authored andcommitted
mm/memcg: fix incorrect flushing of lruvec data in obj_stock
When mod_objcg_state() is called with a pgdat that is different from that in the obj_stock, the old lruvec data cached in obj_stock are flushed out. Unfortunately, they were flushed to the new pgdat and so the data go to the wrong node. This will screw up the slab data reported in /sys/devices/system/node/node*/meminfo. Fix that by flushing the data to the cached pgdat instead. Link: https://lkml.kernel.org/r/20210802143834.30578-1-longman@redhat.com Fixes: 68ac5b3 ("mm/memcg: cache vmstat data in percpu memcg_stock_pcp") Signed-off-by: Waiman Long <longman@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Shakeel Butt <shakeelb@google.com> Acked-by: Roman Gushchin <guro@fb.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Tejun Heo <tj@kernel.org> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Muchun Song <songmuchun@bytedance.com> Cc: Alex Shi <alex.shi@linux.alibaba.com> Cc: Chris Down <chris@chrisdown.name> Cc: Yafang Shao <laoar.shao@gmail.com> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Masayoshi Mizuma <msys.mizuma@gmail.com> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Waiman Long <longman@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent eb2faa5 commit 7fa0dac

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

mm/memcontrol.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3106,13 +3106,15 @@ void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat,
31063106
stock->cached_pgdat = pgdat;
31073107
} else if (stock->cached_pgdat != pgdat) {
31083108
/* Flush the existing cached vmstat data */
3109+
struct pglist_data *oldpg = stock->cached_pgdat;
3110+
31093111
if (stock->nr_slab_reclaimable_b) {
3110-
mod_objcg_mlstate(objcg, pgdat, NR_SLAB_RECLAIMABLE_B,
3112+
mod_objcg_mlstate(objcg, oldpg, NR_SLAB_RECLAIMABLE_B,
31113113
stock->nr_slab_reclaimable_b);
31123114
stock->nr_slab_reclaimable_b = 0;
31133115
}
31143116
if (stock->nr_slab_unreclaimable_b) {
3115-
mod_objcg_mlstate(objcg, pgdat, NR_SLAB_UNRECLAIMABLE_B,
3117+
mod_objcg_mlstate(objcg, oldpg, NR_SLAB_UNRECLAIMABLE_B,
31163118
stock->nr_slab_unreclaimable_b);
31173119
stock->nr_slab_unreclaimable_b = 0;
31183120
}

0 commit comments

Comments
 (0)