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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41310C433F5 for ; Sat, 23 Apr 2022 15:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235399AbiDWPmD (ORCPT ); Sat, 23 Apr 2022 11:42:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231204AbiDWPmA (ORCPT ); Sat, 23 Apr 2022 11:42:00 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18E153D1FA for ; Sat, 23 Apr 2022 08:39:03 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id c15so12915927ljr.9 for ; Sat, 23 Apr 2022 08:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz-org.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:cc :references:content-language:in-reply-to:content-transfer-encoding; bh=a+z70vimB+5HjACd5bJnkNciNJmYhICT7m82HtTW0ak=; b=DGOxBYWGDBUZ85wK2PSmDgFBf3glfu6gBp9RcuZpjhtgF6HOjUY5Q2ABqF6SbbucDY ALM7X7aHf99HafMPHM99WC7enJTKMJTEBI283/ereOCVLfHFuQ8XI1lmfyBXO4h9RU39 n7ABaPpwvD4EdliIxzOrw9UewqCBHWH67THLRGJkCkFdWcimUmA0Utg7st7+XwHgRZEN Tu0dkwEzwiUufuFq4DrEvruNVCpmplVfy26ZaeqNDdT2ToVxmbZ4I9RCx2oG79NVen3C Wb/krsbyfcOO9f8SOZQBZytlQePpf4MEK1030tBTm6Gbcd4qrT0i/toFpmtC8xaMzfOw 2oNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:cc:references:content-language:in-reply-to :content-transfer-encoding; bh=a+z70vimB+5HjACd5bJnkNciNJmYhICT7m82HtTW0ak=; b=KoRiZueqwm5Tk0mWWJau6adEyU1Z7L7sCBt08HAFNEO2ZFH/6/D4cUDNNl0B6fYLT8 et6S/6+Akeg0FPRGlhhxydSfk0Wapx5kLKOOSUnawFIwqTW5/AU5nrIqYVCf3w1eBIVS M2yBhBiZRqK5iqpAUmBSOTWpyzIb+/JwRPH5egeD2rhRGduereTzatCxHxIhj9S2HTdk Ho+JLw67+ylRhykY4GGG01RI2f7ZEnkUS/jM3aaVNM8hby6Qxt6PtZvruY/9J4xoZsKO DNC+DH3OaAvmW70W+1mnY1W6BfKzMRZlZ/HgeTOGdcnudYoPOOqcC2gBsaq2QnINubuJ u9SQ== X-Gm-Message-State: AOAM532CA1L//ACRObslUEDR3Cs8FDbm48aWaBdxSeuwoYkKBEScSBc1 jQheKytT77mGeuiOIbImajMySg== X-Google-Smtp-Source: ABdhPJyYd1HfSKlhZZ2xbgUsaXPbfPteYDgF4mpaisyCzRwuDfskdLVMadU5g6ZMLIwnSMH0GOHZmg== X-Received: by 2002:a05:651c:1617:b0:247:fd84:2195 with SMTP id f23-20020a05651c161700b00247fd842195mr5903693ljq.356.1650728341337; Sat, 23 Apr 2022 08:39:01 -0700 (PDT) Received: from [192.168.1.65] ([46.188.121.177]) by smtp.gmail.com with ESMTPSA id q3-20020a196e43000000b00470e15b24casm658735lfk.89.2022.04.23.08.39.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Apr 2022 08:39:00 -0700 (PDT) Message-ID: <3e457e4e-a908-0de7-ba3e-6d5ab434107e@openvz.org> Date: Sat, 23 Apr 2022 18:38:59 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: Vasily Averin Subject: [PATCH memcg v2] net: set proper memcg for net_init hooks allocations To: Vlastimil Babka , Shakeel Butt Cc: kernel@openvz.org, Florian Westphal , linux-kernel@vger.kernel.org, Roman Gushchin , Michal Hocko , cgroups@vger.kernel.org, netdev@vger.kernel.org, "David S. Miller" , Jakub Kicinski , Paolo Abeni References: <202204231806.8O86U791-lkp@intel.com> Content-Language: en-US In-Reply-To: <202204231806.8O86U791-lkp@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __register_pernet_operations() executes init hook of registered pernet_operation structure in all existing net namespaces. Typically, these hooks are called by a process associated with the specified net namespace, and all __GFP_ACCOUNTING marked allocation are accounted for corresponding container/memcg. However __register_pernet_operations() calls the hooks in the same context, and as a result all marked allocations are accounted to one memcg for all processed net namespaces. This patch adjusts active memcg for each net namespace and helps to account memory allocated inside ops_init() into the proper memcg. Signed-off-by: Vasily Averin --- v2: introduced get/put_net_memcg(), new functions are moved under CONFIG_MEMCG_KMEM to fix compilation issues reported by Intel's kernel test robot v1: introduced get_mem_cgroup_from_kmem(), which takes the refcount for the found memcg, suggested by Shakeel --- include/linux/memcontrol.h | 35 +++++++++++++++++++++++++++++++++++ net/core/net_namespace.c | 7 +++++++ 2 files changed, 42 insertions(+) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 0abbd685703b..5230d3c5585a 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1714,6 +1714,33 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg) struct mem_cgroup *mem_cgroup_from_obj(void *p); +static inline struct mem_cgroup *get_mem_cgroup_from_kmem(void *p) +{ + struct mem_cgroup *memcg; + + rcu_read_lock(); + do { + memcg = mem_cgroup_from_obj(p); + } while (memcg && !css_tryget(&memcg->css)); + rcu_read_unlock(); + return memcg; +} + +static inline struct mem_cgroup *get_net_memcg(void *p) +{ + struct mem_cgroup *memcg; + + memcg = get_mem_cgroup_from_kmem(p); + + if (!memcg) + memcg = root_mem_cgroup; + + return memcg; +} +static inline void put_net_memcg(struct mem_cgroup *memcg) +{ + css_put(&memcg->css); +} #else static inline bool mem_cgroup_kmem_disabled(void) { @@ -1766,6 +1793,14 @@ static inline struct mem_cgroup *mem_cgroup_from_obj(void *p) return NULL; } +static inline struct mem_cgroup *get_net_memcg(void *p) +{ + return NULL; +} + +static inline void put_net_memcg(struct mem_cgroup *memcg) +{ +} #endif /* CONFIG_MEMCG_KMEM */ #endif /* _LINUX_MEMCONTROL_H */ diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index a5b5bb99c644..bf88360b8377 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -26,6 +26,7 @@ #include #include +#include /* * Our network namespace constructor/destructor lists */ @@ -1147,7 +1148,13 @@ static int __register_pernet_operations(struct list_head *list, * setup_net() and cleanup_net() are not possible. */ for_each_net(net) { + struct mem_cgroup *old, *memcg; + + memcg = get_net_memcg(net); + old = set_active_memcg(memcg); error = ops_init(ops, net); + set_active_memcg(old); + put_net_memcg(memcg); if (error) goto out_undo; list_add_tail(&net->exit_list, &net_exit_list); -- 2.31.1