mm/memcg: Fix incorrect flushing of lruvec data in obj_stock
Subsystems (3)
PATCH v2 1/1 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.
--- mm/memcontrol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/memcontrol.c +4 -2
@@ -3106,13 +3106,15 @@ void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, stock->cached_pgdat = pgdat; }else if (stock->cached_pgdat != pgdat) {/* Flush the existing cached vmstat data */ +struct pglist_data *oldpg = stock->cached_pgdat; +if (stock->nr_slab_reclaimable_b) { -mod_objcg_mlstate (objcg, pgdat,NR_SLAB_RECLAIMABLE_B , +mod_objcg_mlstate (objcg, oldpg,NR_SLAB_RECLAIMABLE_B , stock->nr_slab_reclaimable_b); stock->nr_slab_reclaimable_b =0 ; }if (stock->nr_slab_unreclaimable_b) { -mod_objcg_mlstate (objcg, pgdat,NR_SLAB_UNRECLAIMABLE_B , +mod_objcg_mlstate (objcg, oldpg,NR_SLAB_UNRECLAIMABLE_B , stock->nr_slab_unreclaimable_b); stock->nr_slab_unreclaimable_b =0 ; }
Signature · 1 line
2.18.1
Quoted 7 lines · Waiman Long
When
mod_objcg_state()is called with a pgdat that is different from that in theobj_stock, the old lruvec data cached inobj_stockare 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.
Quoted 5 lines
Fix that by flushing the data to the cached pgdat instead.
Fixes 68ac5b3c8db2 ("mm/memcg: cache vmstat data in percpu memcg_stock_pcp")Signed-off-by Waiman Long <[email protected]>Acked-by Michal Hocko <[email protected]>
Quoted 11 lines · Waiman Long
When
mod_objcg_state()is called with a pgdat that is different from that in theobj_stock, the old lruvec data cached inobj_stockare 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.
Fixes 68ac5b3c8db2 ("mm/memcg: cache vmstat data in percpu memcg_stock_pcp")Signed-off-by Waiman Long <[email protected]>
Thanks!