Commit 86daf94e authored Apr 01, 2020 by Kirill Tkhai Committed by Linus Torvalds Apr 02, 2020

mm/memcontrol.c: allocate shrinker_map on appropriate NUMA node



The shrinker_map may be touched from any cpu (e.g., a bit there may be set
by a task running everywhere) but kswapd is always bound to specific node.
So allocate shrinker_map from the related NUMA node to respect its NUMA
locality.  Also, this follows generic way we use for allocation of memcg's
per-node data.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Roman Gushchin <guro@fb.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Link: http://lkml.kernel.org/r/fff0e636-4c36-ed10-281c-8cdb0687c839@virtuozzo.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a87425a3

mm/memcontrol.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ static int memcg_expand_one_shrinker_map(struct mem_cgroup *memcg,
		if (!old)
		return 0;

		new = kvmalloc(sizeof(*new) + size, GFP_KERNEL);
		new = kvmalloc_node(sizeof(*new) + size, GFP_KERNEL, nid);
		if (!new)
		return -ENOMEM;

		@@ -378,7 +378,7 @@ static int memcg_alloc_shrinker_maps(struct mem_cgroup *memcg)
		mutex_lock(&memcg_shrinker_map_mutex);
		size = memcg_shrinker_map_size;
		for_each_node(nid) {
		map = kvzalloc(sizeof(*map) + size, GFP_KERNEL);
		map = kvzalloc_node(sizeof(*map) + size, GFP_KERNEL, nid);
		if (!map) {
		memcg_free_shrinker_maps(memcg);
		ret = -ENOMEM;

Admin message