Commit 5347e5ae authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds

memcg: use css_get() in sock_update_memcg()

Use css_get/css_put instead of mem_cgroup_get/put.

Note, if at the same time someone is moving @current to a different
cgroup and removing the old cgroup, css_tryget() may return false, and
sock->sk_cgrp won't be initialized, which is fine.
Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Glauber Costa <glommer@openvz.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f37a9691
...@@ -551,15 +551,15 @@ void sock_update_memcg(struct sock *sk) ...@@ -551,15 +551,15 @@ void sock_update_memcg(struct sock *sk)
*/ */
if (sk->sk_cgrp) { if (sk->sk_cgrp) {
BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg)); BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg));
mem_cgroup_get(sk->sk_cgrp->memcg); css_get(&sk->sk_cgrp->memcg->css);
return; return;
} }
rcu_read_lock(); rcu_read_lock();
memcg = mem_cgroup_from_task(current); memcg = mem_cgroup_from_task(current);
cg_proto = sk->sk_prot->proto_cgroup(memcg); cg_proto = sk->sk_prot->proto_cgroup(memcg);
if (!mem_cgroup_is_root(memcg) && memcg_proto_active(cg_proto)) { if (!mem_cgroup_is_root(memcg) &&
mem_cgroup_get(memcg); memcg_proto_active(cg_proto) && css_tryget(&memcg->css)) {
sk->sk_cgrp = cg_proto; sk->sk_cgrp = cg_proto;
} }
rcu_read_unlock(); rcu_read_unlock();
...@@ -573,7 +573,7 @@ void sock_release_memcg(struct sock *sk) ...@@ -573,7 +573,7 @@ void sock_release_memcg(struct sock *sk)
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
WARN_ON(!sk->sk_cgrp->memcg); WARN_ON(!sk->sk_cgrp->memcg);
memcg = sk->sk_cgrp->memcg; memcg = sk->sk_cgrp->memcg;
mem_cgroup_put(memcg); css_put(&sk->sk_cgrp->memcg->css);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment