Commit 0a6b76dd authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds
Browse files

mm: workingset: make shadow node shrinker memcg aware 



Workingset code was recently made memcg aware, but shadow node shrinker
is still global.  As a result, one small cgroup can consume all memory
available for shadow nodes, possibly hurting other cgroups by reclaiming
their shadow nodes, even though reclaim distances stored in its shadow
nodes have no effect.  To avoid this, we need to make shadow node
shrinker memcg aware.

Signed-off-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cdcbb72e

include/linux/memcontrol.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -403,6 +403,9 @@ int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); 
void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,

void mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,

		int nr_pages);

		int nr_pages);





unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,

					   int nid, unsigned int lru_mask);



static inline

static inline

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

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

{

{
@@ -661,6 +664,13 @@ mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru, 
{

{

}

}





static inline unsigned long

mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,

			     int nid, unsigned int lru_mask)

{

	return 0;

}



static inline void

static inline void

mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)

mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)

{

{

mm/memcontrol.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -638,9 +638,8 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, 
	__this_cpu_add(memcg->stat->nr_page_events, nr_pages);

	__this_cpu_add(memcg->stat->nr_page_events, nr_pages);

}

}





static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,

unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,

						  int nid,

					   int nid, unsigned int lru_mask)

						  unsigned int lru_mask)

{

{

	unsigned long nr = 0;

	unsigned long nr = 0;

	int zid;

	int zid;

mm/workingset.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -349,6 +349,10 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, 
	shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);

	shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);

	local_irq_enable();

	local_irq_enable();





	if (memcg_kmem_enabled())

		pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,

						     LRU_ALL_FILE);

	else

		pages = node_page_state(sc->nid, NR_ACTIVE_FILE) +

		pages = node_page_state(sc->nid, NR_ACTIVE_FILE) +

			node_page_state(sc->nid, NR_INACTIVE_FILE);

			node_page_state(sc->nid, NR_INACTIVE_FILE);
@@ -460,7 +464,7 @@ static struct shrinker workingset_shadow_shrinker = { 
	.count_objects = count_shadow_nodes,

	.count_objects = count_shadow_nodes,

	.scan_objects = scan_shadow_nodes,

	.scan_objects = scan_shadow_nodes,

	.seeks = DEFAULT_SEEKS,

	.seeks = DEFAULT_SEEKS,

	.flags = SHRINKER_NUMA_AWARE,

	.flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE,

};

};





/*

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE