* [PATCH] memcg: cleanup root memcg checks
@ 2021-02-23 20:56 Shakeel Butt
[not found] ` <20210223205625.2792891-1-shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Shakeel Butt @ 2021-02-23 20:56 UTC (permalink / raw)
To: Johannes Weiner, Roman Gushchin, Michal Hocko
Cc: Andrew Morton, cgroups-u79uwXL29TY76Z2rM5mHXA,
linux-mm-Bw31MaZKKs3YtjvyW6yDsg,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Shakeel Butt
Replace the implicit checking of root memcg with explicit root memcg
checking i.e. !css->parent with mem_cgroup_is_root().
Signed-off-by: Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index dcb5665aeb69..79046ad3eec0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4141,7 +4141,7 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css,
if (val > 100)
return -EINVAL;
- if (css->parent)
+ if (!mem_cgroup_is_root(memcg))
memcg->swappiness = val;
else
vm_swappiness = val;
@@ -4491,7 +4491,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
/* cannot set to root cgroup and only 0 and 1 are allowed */
- if (!css->parent || !((val == 0) || (val == 1)))
+ if (mem_cgroup_is_root(memcg) || !((val == 0) || (val == 1)))
return -EINVAL;
memcg->oom_kill_disable = val;
--
2.30.0.617.g56c4b15f3c-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <20210223205625.2792891-1-shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH] memcg: cleanup root memcg checks [not found] ` <20210223205625.2792891-1-shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> @ 2021-02-24 9:30 ` Michal Hocko 2021-02-24 20:41 ` Johannes Weiner 1 sibling, 0 replies; 3+ messages in thread From: Michal Hocko @ 2021-02-24 9:30 UTC (permalink / raw) To: Shakeel Butt Cc: Johannes Weiner, Roman Gushchin, Andrew Morton, cgroups-u79uwXL29TY76Z2rM5mHXA, linux-mm-Bw31MaZKKs3YtjvyW6yDsg, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Tue 23-02-21 12:56:25, Shakeel Butt wrote: > Replace the implicit checking of root memcg with explicit root memcg > checking i.e. !css->parent with mem_cgroup_is_root(). > > Signed-off-by: Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Acked-by: Michal Hocko <mhocko-IBi9RG/b67k@public.gmane.org> Thanks! > --- > mm/memcontrol.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index dcb5665aeb69..79046ad3eec0 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4141,7 +4141,7 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, > if (val > 100) > return -EINVAL; > > - if (css->parent) > + if (!mem_cgroup_is_root(memcg)) > memcg->swappiness = val; > else > vm_swappiness = val; > @@ -4491,7 +4491,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, > struct mem_cgroup *memcg = mem_cgroup_from_css(css); > > /* cannot set to root cgroup and only 0 and 1 are allowed */ > - if (!css->parent || !((val == 0) || (val == 1))) > + if (mem_cgroup_is_root(memcg) || !((val == 0) || (val == 1))) > return -EINVAL; > > memcg->oom_kill_disable = val; > -- > 2.30.0.617.g56c4b15f3c-goog -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] memcg: cleanup root memcg checks [not found] ` <20210223205625.2792891-1-shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> 2021-02-24 9:30 ` Michal Hocko @ 2021-02-24 20:41 ` Johannes Weiner 1 sibling, 0 replies; 3+ messages in thread From: Johannes Weiner @ 2021-02-24 20:41 UTC (permalink / raw) To: Shakeel Butt Cc: Roman Gushchin, Michal Hocko, Andrew Morton, cgroups-u79uwXL29TY76Z2rM5mHXA, linux-mm-Bw31MaZKKs3YtjvyW6yDsg, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Tue, Feb 23, 2021 at 12:56:25PM -0800, Shakeel Butt wrote: > Replace the implicit checking of root memcg with explicit root memcg > checking i.e. !css->parent with mem_cgroup_is_root(). > > Signed-off-by: Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Acked-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org> ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-24 20:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-23 20:56 [PATCH] memcg: cleanup root memcg checks Shakeel Butt
[not found] ` <20210223205625.2792891-1-shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2021-02-24 9:30 ` Michal Hocko
2021-02-24 20:41 ` Johannes Weiner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).