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

mm: memcontrol: replace zone summing with lruvec_page_state() 

Instead of adding up the zone counters, use lruvec_page_state() to get the
node state directly.  This is a bit cheaper and more stream-lined.

Link: http://lkml.kernel.org/r/20190228163020.24100-3-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarRoman Gushchin <guro@fb.com>
Cc: Michal Hocko <mhocko@kernel.org>
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 e0ee0e71

include/linux/memcontrol.h

+0 −18
Original line number Diff line number Diff line
@@ -504,19 +504,6 @@ void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru, 
unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,

					   int nid, unsigned int lru_mask);



static inline

unsigned long mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)

{

	struct mem_cgroup_per_node *mz;

	unsigned long nr_pages = 0;

	int zid;



	mz = container_of(lruvec, struct mem_cgroup_per_node, lruvec);

	for (zid = 0; zid < MAX_NR_ZONES; zid++)

		nr_pages += mz->lru_zone_size[zid][lru];

	return nr_pages;

}



static inline

unsigned long mem_cgroup_get_zone_lru_size(struct lruvec *lruvec,

		enum lru_list lru, int zone_idx)
@@ -960,11 +947,6 @@ static inline bool mem_cgroup_online(struct mem_cgroup *memcg) 
	return true;

}



static inline unsigned long

mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)

{

	return 0;

}

static inline

unsigned long mem_cgroup_get_zone_lru_size(struct lruvec *lruvec,

		enum lru_list lru, int zone_idx)

mm/memcontrol.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, 
	for_each_lru(lru) {

		if (!(BIT(lru) & lru_mask))

			continue;

		nr += mem_cgroup_get_lru_size(lruvec, lru);

		nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru);

	}

	return nr;

}

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone 
	int zid;



	if (!mem_cgroup_disabled())

		lru_size = mem_cgroup_get_lru_size(lruvec, lru);

		lru_size = lruvec_page_state(lruvec, NR_LRU_BASE + lru);

	else

		lru_size = node_page_state(lruvec_pgdat(lruvec), NR_LRU_BASE + lru);

CRA Git | Maintained and supported by SUSTech CRA and CCSE