memcg-dynamically-allocate-lruvec_stats.patch removed from -mm tree
The quilt patch titled
Subject: memcg: dynamically allocate lruvec_stats
has been removed from the -mm tree. Its filename was
memcg-dynamically-allocate-lruvec_stats.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: dynamically allocate lruvec_stats
Date: Wed, 1 May 2024 10:26:11 -0700
To decouple the dependency of lruvec_stats on NR_VM_NODE_STAT_ITEMS, we need to dynamically allocate lruvec_stats in the mem_cgroup_per_node structure. Also move the definition of lruvec_stats_percpu and lruvec_stats and related functions to the memcontrol.c to facilitate later patches. No functional changes in the patch.
---
include/linux/memcontrol.h | 62 ++---------------------- mm/memcontrol.c | 87 ++++++++++++++++++++++++++++++----- 2 files changed, 81 insertions(+), 68 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-dynamically-allocate-lruvec_stats +6 -56
@@ -83,6 +83,8 @@ enum mem_cgroup_events_target {struct memcg_vmstats_percpu ;struct memcg_vmstats ; +struct lruvec_stats_percpu ; +struct lruvec_stats ;struct mem_cgroup_reclaim_iter {struct mem_cgroup *position;
@@ -90,25 +92,6 @@ struct mem_cgroup_reclaim_iter {unsigned int generation; }; -struct lruvec_stats_percpu { -/* Local (CPU and cgroup) state */ -long state[NR_VM_NODE_STAT_ITEMS ]; - -/* Delta calculation for lockless upward propagation */ -long state_prev[NR_VM_NODE_STAT_ITEMS ]; -}; - -struct lruvec_stats { -/* Aggregated (CPU and subtree) state */ -long state[NR_VM_NODE_STAT_ITEMS ]; - -/* Non-hierarchical (CPU aggregated) state */ -long state_local[NR_VM_NODE_STAT_ITEMS ]; - -/* Pending child counts during tree propagation */ -long state_pending[NR_VM_NODE_STAT_ITEMS ]; -}; -/* * per-node information in memory controller. */
@@ -116,7 +99,7 @@ struct mem_cgroup_per_node {struct lruvec lruvec;struct lruvec_stats_percpu __percpu *lruvec_stats_percpu; -struct lruvec_stats lruvec_stats; +struct lruvec_stats *lruvec_stats;unsigned long lru_zone_size[MAX_NR_ZONES ][NR_LRU_LISTS ];
@@ -1037,42 +1020,9 @@ static inline void mod_memcg_page_state( }unsigned long memcg_page_state (struct mem_cgroup *memcg,int idx); - -static inline unsigned long lruvec_page_state (struct lruvec *lruvec, -enum node_stat_item idx) -{ -struct mem_cgroup_per_node *pn; -long x; - -if (mem_cgroup_disabled ()) -return node_page_state (lruvec_pgdat (lruvec), idx); - - pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); - x =READ_ONCE (pn->lruvec_stats.state[idx]); -#ifdef CONFIG_SMP -if (x <0 ) - x =0 ; -#endif -return x; -} - -static inline unsigned long lruvec_page_state_local (struct lruvec *lruvec, -enum node_stat_item idx) -{ -struct mem_cgroup_per_node *pn; -long x =0 ; - -if (mem_cgroup_disabled ()) -return node_page_state (lruvec_pgdat (lruvec), idx); - - pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); - x =READ_ONCE (pn->lruvec_stats.state_local[idx]); -#ifdef CONFIG_SMP -if (x <0 ) - x =0 ; -#endif -return x; -} +unsigned long lruvec_page_state (struct lruvec *lruvec,enum node_stat_item idx); +unsigned long lruvec_page_state_local (struct lruvec *lruvec, +enum node_stat_item idx);void mem_cgroup_flush_stats (struct mem_cgroup *memcg);void mem_cgroup_flush_stats_ratelimited (struct mem_cgroup *memcg);
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-dynamically-allocate-lruvec_stats +75 -12
135 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are