[061/155] mm/memcontrol.c: allocate shrinker_map on appropriate NUMA node

Commit Message

Andrew Morton April 2, 2020, 4:06 a.m. UTC

From: Kirill Tkhai <[e-mail]>
Subject: 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.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Kirill Tkhai <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Reviewed-by: Shakeel Butt <[e-mail]>
Reviewed-by: Roman Gushchin <[e-mail]>
Acked-by: Michal Hocko <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Cc: Vladimir Davydov <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/memcontrol.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

--- a/mm/memcontrol.c~mm-allocate-shrinker_map-on-appropriate-numa-node
+++ a/mm/memcontrol.c
@@ -334,7 +334,7 @@  static int memcg_expand_one_shrinker_map
 		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(str
 	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;