Commit a18e6e6e authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: privatize memcg_page_state query functions 

There are no users outside of the memory controller itself. The rest
of the kernel cares either about node or lruvec stats.

Link: https://lkml.kernel.org/r/20210209163304.77088-4-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Reviewed-by: default avatarRoman Gushchin <guro@fb.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarMichal Koutný <mkoutny@suse.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3747b53

include/linux/memcontrol.h

+0 −44
Original line number Original line Diff line number Diff line
@@ -864,39 +864,6 @@ extern bool cgroup_memory_noswap; 
void lock_page_memcg(struct page *page);

void lock_page_memcg(struct page *page);

void unlock_page_memcg(struct page *page);

void unlock_page_memcg(struct page *page);





/*

 * idx can be of type enum memcg_stat_item or node_stat_item.

 * Keep in sync with memcg_exact_page_state().

 */

static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx)

{

	long x = atomic_long_read(&memcg->vmstats[idx]);

#ifdef CONFIG_SMP

	if (x < 0)

		x = 0;

#endif

	return x;

}



/*

 * idx can be of type enum memcg_stat_item or node_stat_item.

 * Keep in sync with memcg_exact_page_state().

 */

static inline unsigned long memcg_page_state_local(struct mem_cgroup *memcg,

						   int idx)

{

	long x = 0;

	int cpu;



	for_each_possible_cpu(cpu)

		x += per_cpu(memcg->vmstats_local->stat[idx], cpu);

#ifdef CONFIG_SMP

	if (x < 0)

		x = 0;

#endif

	return x;

}



void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);

void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);





/* idx can be of type enum memcg_stat_item or node_stat_item */

/* idx can be of type enum memcg_stat_item or node_stat_item */
@@ -1322,17 +1289,6 @@ static inline void mem_cgroup_print_oom_group(struct mem_cgroup *memcg) 
{

{

}

}





static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx)

{

	return 0;

}



static inline unsigned long memcg_page_state_local(struct mem_cgroup *memcg,

						   int idx)

{

	return 0;

}



static inline void __mod_memcg_state(struct mem_cgroup *memcg,

static inline void __mod_memcg_state(struct mem_cgroup *memcg,

				     int idx,

				     int idx,

				     int nr)

				     int nr)

mm/memcontrol.c

+32 −0
Original line number Original line Diff line number Diff line
@@ -789,6 +789,38 @@ void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val) 
	__this_cpu_write(memcg->vmstats_percpu->stat[idx], x);

	__this_cpu_write(memcg->vmstats_percpu->stat[idx], x);

}

}





/*

 * idx can be of type enum memcg_stat_item or node_stat_item.

 * Keep in sync with memcg_exact_page_state().

 */

static unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx)

{

	long x = atomic_long_read(&memcg->vmstats[idx]);

#ifdef CONFIG_SMP

	if (x < 0)

		x = 0;

#endif

	return x;

}



/*

 * idx can be of type enum memcg_stat_item or node_stat_item.

 * Keep in sync with memcg_exact_page_state().

 */

static unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx)

{

	long x = 0;

	int cpu;



	for_each_possible_cpu(cpu)

		x += per_cpu(memcg->vmstats_local->stat[idx], cpu);

#ifdef CONFIG_SMP

	if (x < 0)

		x = 0;

#endif

	return x;

}



static struct mem_cgroup_per_node *

static struct mem_cgroup_per_node *

parent_nodeinfo(struct mem_cgroup_per_node *pn, int nid)

parent_nodeinfo(struct mem_cgroup_per_node *pn, int nid)

{

{