From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A476C2D0DB for ; Fri, 31 Jan 2020 15:01:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C4C920707 for ; Fri, 31 Jan 2020 15:01:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729082AbgAaPBG (ORCPT ); Fri, 31 Jan 2020 10:01:06 -0500 Received: from relay.sw.ru ([185.231.240.75]:52590 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729004AbgAaPBG (ORCPT ); Fri, 31 Jan 2020 10:01:06 -0500 Received: from dhcp-172-16-24-104.sw.ru ([172.16.24.104]) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ixXmu-0002Qt-Vb; Fri, 31 Jan 2020 18:00:53 +0300 Subject: [PATCH v2] mm: Allocate shrinker_map on appropriate NUMA node To: David Hildenbrand , akpm@linux-foundation.org, mhocko@kernel.org, hannes@cmpxchg.org, shakeelb@google.com, vdavydov.dev@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <158047248934.390127.5043060848569612747.stgit@localhost.localdomain> From: Kirill Tkhai Message-ID: <5f3fc9a9-9a22-ccc3-5971-9783b60807bc@virtuozzo.com> Date: Fri, 31 Jan 2020 18:00:51 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org mm: Allocate shrinker_map on appropriate NUMA node From: Kirill Tkhai Despite shrinker_map may be touched from any cpu (e.g., a bit there may be set by a task running everywhere); kswapd is always bound to specific node. So, we will allocate shrinker_map from related NUMA node to respect its NUMA locality. Also, this follows generic way we use for allocation memcg's per-node data. Two hunks node_state() patterns are borrowed from alloc_mem_cgroup_per_node_info(). v2: Use NUMA_NO_NODE instead of -1 Signed-off-by: Kirill Tkhai --- mm/memcontrol.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6f6dc8712e39..20700ad25373 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -323,7 +323,7 @@ static int memcg_expand_one_shrinker_map(struct mem_cgroup *memcg, int size, int old_size) { struct memcg_shrinker_map *new, *old; - int nid; + int nid, tmp; lockdep_assert_held(&memcg_shrinker_map_mutex); @@ -333,8 +333,9 @@ static int memcg_expand_one_shrinker_map(struct mem_cgroup *memcg, /* Not yet online memcg */ if (!old) return 0; - - new = kvmalloc(sizeof(*new) + size, GFP_KERNEL); + /* See comment in alloc_mem_cgroup_per_node_info()*/ + tmp = node_state(nid, N_NORMAL_MEMORY) ? nid : NUMA_NO_NODE; + new = kvmalloc_node(sizeof(*new) + size, GFP_KERNEL, tmp); if (!new) return -ENOMEM; @@ -370,7 +371,7 @@ static void memcg_free_shrinker_maps(struct mem_cgroup *memcg) static int memcg_alloc_shrinker_maps(struct mem_cgroup *memcg) { struct memcg_shrinker_map *map; - int nid, size, ret = 0; + int nid, size, tmp, ret = 0; if (mem_cgroup_is_root(memcg)) return 0; @@ -378,7 +379,9 @@ 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); + /* See comment in alloc_mem_cgroup_per_node_info()*/ + tmp = node_state(nid, N_NORMAL_MEMORY) ? nid : NUMA_NO_NODE; + map = kvzalloc_node(sizeof(*map) + size, GFP_KERNEL, tmp); if (!map) { memcg_free_shrinker_maps(memcg); ret = -ENOMEM;