From: Vasily Averin <vvs@openvz.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: kernel@openvz.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Shakeel Butt" <shakeelb@google.com>, "Roman Gushchin" <roman.gushchin@linux.dev>, "Michal Koutný" <mkoutny@suse.com>, "Vlastimil Babka" <vbabka@suse.cz>, "Michal Hocko" <mhocko@suse.com>, "Florian Westphal" <fw@strlen.de>, "David S. Miller" <davem@davemloft.net>, "Jakub Kicinski" <kuba@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Eric Dumazet" <edumazet@google.com>, cgroups@vger.kernel.org Subject: [PATCH memcg v6] net: set proper memcg for net_init hooks allocations Date: Fri, 3 Jun 2022 07:19:43 +0300 [thread overview] Message-ID: <f9394752-e272-9bf9-645f-a18c56d1c4ec@openvz.org> (raw) In-Reply-To: <6b362c6e-9c80-4344-9430-b831f9871a3c@openvz.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_ACCOUNT 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 <vvs@openvz.org> Acked-by: Roman Gushchin <roman.gushchin@linux.dev> Acked-by: Shakeel Butt <shakeelb@google.com> --- v6: re-based to current upstream (v5.18-11267-gb00ed48bb0a7) v5: documented get_mem_cgroup_from_obj() and for mem_cgroup_or_root() functions, asked by Shakeel. v4: get_mem_cgroup_from_kmem() renamed to get_mem_cgroup_from_obj(), get_net_memcg() renamed to mem_cgroup_or_root(), suggested by Roman. v3: put_net_memcg() replaced by an alreay existing mem_cgroup_put() It checks memcg before accessing it, this is required for __register_pernet_operations() called before memcg initialization. Additionally fixed leading whitespaces in non-memcg_kmem version of mem_cgroup_from_obj(). 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 | 47 +++++++++++++++++++++++++++++++++++++- net/core/net_namespace.c | 7 ++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9ecead1042b9..dad16b484cd5 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1755,6 +1755,42 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, rcu_read_unlock(); } +/** + * get_mem_cgroup_from_obj - get a memcg associated with passed kernel object. + * @p: pointer to object from which memcg should be extracted. It can be NULL. + * + * Retrieves the memory group into which the memory of the pointed kernel + * object is accounted. If memcg is found, its reference is taken. + * If a passed kernel object is uncharged, or if proper memcg cannot be found, + * as well as if mem_cgroup is disabled, NULL is returned. + * + * Return: valid memcg pointer with taken reference or NULL. + */ +static inline struct mem_cgroup *get_mem_cgroup_from_obj(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; +} + +/** + * mem_cgroup_or_root - always returns a pointer to a valid memory cgroup. + * @memcg: pointer to a valid memory cgroup or NULL. + * + * If passed argument is not NULL, returns it without any additional checks + * and changes. Otherwise, root_mem_cgroup is returned. + * + * NOTE: root_mem_cgroup can be NULL during early boot. + */ +static inline struct mem_cgroup *mem_cgroup_or_root(struct mem_cgroup *memcg) +{ + return memcg ? memcg : root_mem_cgroup; +} #else static inline bool mem_cgroup_kmem_disabled(void) { @@ -1798,7 +1834,7 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg) static inline struct mem_cgroup *mem_cgroup_from_obj(void *p) { - return NULL; + return NULL; } static inline void count_objcg_event(struct obj_cgroup *objcg, @@ -1806,6 +1842,15 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, { } +static inline struct mem_cgroup *get_mem_cgroup_from_obj(void *p) +{ + return NULL; +} + +static inline struct mem_cgroup *mem_cgroup_or_root(struct mem_cgroup *memcg) +{ + return NULL; +} #endif /* CONFIG_MEMCG_KMEM */ #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 0ec2f5906a27..6b9f19122ec1 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -18,6 +18,7 @@ #include <linux/user_namespace.h> #include <linux/net_namespace.h> #include <linux/sched/task.h> +#include <linux/sched/mm.h> #include <linux/uidgid.h> #include <linux/cookie.h> @@ -1143,7 +1144,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 = mem_cgroup_or_root(get_mem_cgroup_from_obj(net)); + old = set_active_memcg(memcg); error = ops_init(ops, net); + set_active_memcg(old); + mem_cgroup_put(memcg); if (error) goto out_undo; list_add_tail(&net->exit_list, &net_exit_list); -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Vasily Averin <vvs-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org> To: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: kernel-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, "Shakeel Butt" <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, "Roman Gushchin" <roman.gushchin-fxUVXftIFDnyG1zEObXtfA@public.gmane.org>, "Michal Koutný" <mkoutny-IBi9RG/b67k@public.gmane.org>, "Vlastimil Babka" <vbabka-AlSwsSmVLrQ@public.gmane.org>, "Michal Hocko" <mhocko-IBi9RG/b67k@public.gmane.org>, "Florian Westphal" <fw-HFFVJYpyMKqzQB+pC5nmwQ@public.gmane.org>, "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>, "Jakub Kicinski" <kuba-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, "Paolo Abeni" <pabeni-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, "Eric Dumazet" <edumazet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH memcg v6] net: set proper memcg for net_init hooks allocations Date: Fri, 3 Jun 2022 07:19:43 +0300 [thread overview] Message-ID: <f9394752-e272-9bf9-645f-a18c56d1c4ec@openvz.org> (raw) In-Reply-To: <6b362c6e-9c80-4344-9430-b831f9871a3c-GEFAQzZX7r8dnm+yROfE0A@public.gmane.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_ACCOUNT 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 <vvs-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org> Acked-by: Roman Gushchin <roman.gushchin-fxUVXftIFDnyG1zEObXtfA@public.gmane.org> Acked-by: Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> --- v6: re-based to current upstream (v5.18-11267-gb00ed48bb0a7) v5: documented get_mem_cgroup_from_obj() and for mem_cgroup_or_root() functions, asked by Shakeel. v4: get_mem_cgroup_from_kmem() renamed to get_mem_cgroup_from_obj(), get_net_memcg() renamed to mem_cgroup_or_root(), suggested by Roman. v3: put_net_memcg() replaced by an alreay existing mem_cgroup_put() It checks memcg before accessing it, this is required for __register_pernet_operations() called before memcg initialization. Additionally fixed leading whitespaces in non-memcg_kmem version of mem_cgroup_from_obj(). 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 | 47 +++++++++++++++++++++++++++++++++++++- net/core/net_namespace.c | 7 ++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9ecead1042b9..dad16b484cd5 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1755,6 +1755,42 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, rcu_read_unlock(); } +/** + * get_mem_cgroup_from_obj - get a memcg associated with passed kernel object. + * @p: pointer to object from which memcg should be extracted. It can be NULL. + * + * Retrieves the memory group into which the memory of the pointed kernel + * object is accounted. If memcg is found, its reference is taken. + * If a passed kernel object is uncharged, or if proper memcg cannot be found, + * as well as if mem_cgroup is disabled, NULL is returned. + * + * Return: valid memcg pointer with taken reference or NULL. + */ +static inline struct mem_cgroup *get_mem_cgroup_from_obj(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; +} + +/** + * mem_cgroup_or_root - always returns a pointer to a valid memory cgroup. + * @memcg: pointer to a valid memory cgroup or NULL. + * + * If passed argument is not NULL, returns it without any additional checks + * and changes. Otherwise, root_mem_cgroup is returned. + * + * NOTE: root_mem_cgroup can be NULL during early boot. + */ +static inline struct mem_cgroup *mem_cgroup_or_root(struct mem_cgroup *memcg) +{ + return memcg ? memcg : root_mem_cgroup; +} #else static inline bool mem_cgroup_kmem_disabled(void) { @@ -1798,7 +1834,7 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg) static inline struct mem_cgroup *mem_cgroup_from_obj(void *p) { - return NULL; + return NULL; } static inline void count_objcg_event(struct obj_cgroup *objcg, @@ -1806,6 +1842,15 @@ static inline void count_objcg_event(struct obj_cgroup *objcg, { } +static inline struct mem_cgroup *get_mem_cgroup_from_obj(void *p) +{ + return NULL; +} + +static inline struct mem_cgroup *mem_cgroup_or_root(struct mem_cgroup *memcg) +{ + return NULL; +} #endif /* CONFIG_MEMCG_KMEM */ #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 0ec2f5906a27..6b9f19122ec1 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -18,6 +18,7 @@ #include <linux/user_namespace.h> #include <linux/net_namespace.h> #include <linux/sched/task.h> +#include <linux/sched/mm.h> #include <linux/uidgid.h> #include <linux/cookie.h> @@ -1143,7 +1144,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 = mem_cgroup_or_root(get_mem_cgroup_from_obj(net)); + old = set_active_memcg(memcg); error = ops_init(ops, net); + set_active_memcg(old); + mem_cgroup_put(memcg); if (error) goto out_undo; list_add_tail(&net->exit_list, &net_exit_list); -- 2.36.1
next prev parent reply other threads:[~2022-06-03 4:19 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-28 7:17 [PATCH RFC] net: memcg accounting for veth devices Vasily Averin 2022-02-28 14:36 ` Luis Chamberlain 2022-03-01 18:09 ` Shakeel Butt 2022-03-01 18:28 ` Luis Chamberlain 2022-03-01 20:50 ` Eric W. Biederman 2022-03-01 21:25 ` Luis Chamberlain 2022-03-01 21:31 ` Luis Chamberlain 2022-03-02 14:43 ` Eric W. Biederman 2022-03-02 21:52 ` Luis Chamberlain 2022-03-02 13:30 ` King, Colin 2022-04-11 9:40 ` problem with accounting of allocations called from __net_init hooks Vasily Averin 2022-04-17 6:39 ` [PATCH memcg RFC] net: set proper memcg for net_init hooks allocations Vasily Averin 2022-04-21 15:56 ` Shakeel Butt 2022-04-22 20:01 ` Vasily Averin 2022-04-22 20:09 ` Vasily Averin 2022-04-22 20:22 ` Shakeel Butt 2022-04-23 7:56 ` [PATCH] " Vasily Averin 2022-04-23 7:56 ` Vasily Averin 2022-04-23 9:39 ` kernel test robot 2022-04-23 9:39 ` kernel test robot 2022-04-23 9:39 ` kernel test robot 2022-04-23 9:39 ` kernel test robot 2022-04-23 10:31 ` kernel test robot 2022-04-23 15:38 ` [PATCH memcg v2] " Vasily Averin 2022-04-24 14:46 ` [net] 3b379e5391: BUG:kernel_NULL_pointer_dereference,address kernel test robot 2022-04-24 14:46 ` kernel test robot 2022-04-25 10:56 ` [PATCH memcg v3] net: set proper memcg for net_init hooks allocations Vasily Averin 2022-04-25 10:56 ` Vasily Averin 2022-04-26 2:50 ` Roman Gushchin 2022-04-26 5:58 ` Vasily Averin 2022-04-26 5:58 ` Vasily Averin 2022-04-26 6:43 ` [PATCH memcg v4] " Vasily Averin 2022-04-26 22:13 ` Roman Gushchin 2022-04-26 22:13 ` Roman Gushchin 2022-04-27 5:23 ` Shakeel Butt 2022-04-27 12:22 ` Michal Koutný 2022-04-27 12:22 ` Michal Koutný 2022-04-27 15:06 ` Shakeel Butt 2022-04-27 15:06 ` Shakeel Butt 2022-04-27 22:16 ` Vasily Averin 2022-04-27 22:16 ` Vasily Averin 2022-04-27 22:36 ` Roman Gushchin 2022-04-28 4:37 ` Vasily Averin 2022-04-28 4:37 ` Vasily Averin 2022-04-27 22:47 ` Shakeel Butt 2022-04-27 22:47 ` Shakeel Butt 2022-05-01 13:44 ` Vasily Averin 2022-05-01 13:44 ` Vasily Averin 2022-05-01 21:09 ` Roman Gushchin 2022-05-01 21:09 ` Roman Gushchin 2022-05-02 0:10 ` [PATCH memcg v5] " Vasily Averin 2022-05-30 8:57 ` Vasily Averin 2022-05-30 8:57 ` Vasily Averin 2022-06-03 4:19 ` Vasily Averin [this message] 2022-06-03 4:19 ` [PATCH memcg v6] " Vasily Averin 2022-06-06 13:49 ` Qian Cai 2022-06-06 13:49 ` Qian Cai 2022-06-06 17:37 ` Vasily Averin 2022-06-06 18:43 ` Qian Cai 2022-06-06 18:43 ` Qian Cai 2022-06-06 18:45 ` Vasily Averin 2022-06-06 18:45 ` Vasily Averin 2022-06-07 5:58 ` Shakeel Butt 2022-06-07 5:58 ` Shakeel Butt 2022-06-07 12:37 ` Vasily Averin 2022-06-07 12:37 ` Vasily Averin 2022-06-07 14:10 ` Shakeel Butt 2022-06-07 14:10 ` Shakeel Butt 2022-09-18 9:28 ` [sparc64] fails to boot, (was: Re: [PATCH memcg v6] net: set proper memcg for net_init hooks allocations) Anatoly Pugachev 2022-09-21 14:41 ` Anatoly Pugachev 2022-09-21 14:44 ` Anatoly Pugachev 2022-09-21 14:44 ` Anatoly Pugachev 2022-09-21 17:02 ` Michal Koutný 2022-09-21 17:02 ` Michal Koutný 2022-09-26 13:06 ` Anatoly Pugachev 2022-09-26 13:06 ` Anatoly Pugachev 2022-09-26 17:28 ` Jakub Kicinski 2022-09-26 17:28 ` Jakub Kicinski 2022-09-26 17:32 ` Shakeel Butt 2022-09-26 17:32 ` Shakeel Butt 2022-09-26 17:36 ` Andrew Morton 2022-09-26 17:36 ` Andrew Morton 2022-09-26 19:00 ` Shakeel Butt 2022-09-27 9:54 ` Vlastimil Babka 2022-09-27 9:54 ` Vlastimil Babka 2022-09-28 7:54 ` Thorsten Leemhuis 2022-09-28 7:21 ` [sparc64] fails to boot, (was: Re: [PATCH memcg v6] net: set proper memcg for net_init hooks allocations) #forregzbot Thorsten Leemhuis
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=f9394752-e272-9bf9-645f-a18c56d1c4ec@openvz.org \ --to=vvs@openvz.org \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=davem@davemloft.net \ --cc=edumazet@google.com \ --cc=fw@strlen.de \ --cc=kernel@openvz.org \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.com \ --cc=mkoutny@suse.com \ --cc=pabeni@redhat.com \ --cc=roman.gushchin@linux.dev \ --cc=shakeelb@google.com \ --cc=vbabka@suse.cz \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.