From: Li Zefan <lizefan@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Tejun Heo <tj@kernel.org>, Glauber Costa <glommer@parallels.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Johannes Weiner <hannes@cmpxchg.org>,
LKML <linux-kernel@vger.kernel.org>,
Cgroups <cgroups@vger.kernel.org>,
linux-mm@kvack.org
Subject: [PATCH 05/12] memcg: use css_get() in sock_update_memcg()
Date: Mon, 8 Apr 2013 14:34:12 +0800 [thread overview]
Message-ID: <516264E4.5090405@huawei.com> (raw)
In-Reply-To: <5162648B.9070802@huawei.com>
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: Li Zefan <lizefan@huawei.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
---
mm/memcontrol.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e65eaac..bbf5bf3 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -536,15 +536,15 @@ void sock_update_memcg(struct sock *sk)
*/
if (sk->sk_cgrp) {
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;
}
rcu_read_lock();
memcg = mem_cgroup_from_task(current);
cg_proto = sk->sk_prot->proto_cgroup(memcg);
- if (!mem_cgroup_is_root(memcg) && memcg_proto_active(cg_proto)) {
- mem_cgroup_get(memcg);
+ if (!mem_cgroup_is_root(memcg) &&
+ memcg_proto_active(cg_proto) && css_tryget(&memcg->css)) {
sk->sk_cgrp = cg_proto;
}
rcu_read_unlock();
@@ -558,7 +558,7 @@ void sock_release_memcg(struct sock *sk)
struct mem_cgroup *memcg;
WARN_ON(!sk->sk_cgrp->memcg);
memcg = sk->sk_cgrp->memcg;
- mem_cgroup_put(memcg);
+ css_put(&sk->sk_cgrp->memcg->css);
}
}
--
1.8.0.2
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-04-08 6:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 6:32 [PATCH 0/12][V2] memcg: make memcg's life cycle the same as cgroup Li Zefan
2013-04-08 6:33 ` [PATCH 01/12] memcg: take reference before releasing rcu_read_lock Li Zefan
2013-04-08 6:33 ` [PATCH 02/12] memcg: avoid accessing memcg after releasing reference Li Zefan
2013-04-08 6:33 ` [PATCH 03/12] Revert "memcg: avoid dangling reference count in creation failure." Li Zefan
2013-04-09 2:50 ` Kamezawa Hiroyuki
2013-04-08 6:33 ` [PATCH 04/12] memcg, kmem: fix reference count handling on the error path Li Zefan
2013-04-09 2:51 ` Kamezawa Hiroyuki
2013-04-08 6:34 ` Li Zefan [this message]
2013-04-08 6:34 ` [PATCH 06/12] memcg: don't use mem_cgroup_get() when creating a kmemcg cache Li Zefan
2013-04-09 2:53 ` Kamezawa Hiroyuki
2013-04-08 6:34 ` [PATCH 07/12] memcg: use css_get/put when charging/uncharging kmem Li Zefan
2013-04-08 14:14 ` Michal Hocko
2013-04-09 2:55 ` Kamezawa Hiroyuki
2013-04-08 6:34 ` [PATCH 08/12] memcg: use css_get/put for swap memcg Li Zefan
2013-04-08 6:35 ` [PATCH 09/12] cgroup: make sure parent won't be destroyed before its children Li Zefan
2013-04-08 15:36 ` Tejun Heo
2013-04-08 6:35 ` [PATCH 10/12] memcg: don't need to get a reference to the parent Li Zefan
2013-04-08 6:36 ` [PATCH 11/12] memcg: kill memcg refcnt Li Zefan
2013-04-08 6:36 ` [PATCH 12/12] memcg: don't need to free memcg via RCU or workqueue Li Zefan
2013-04-08 14:15 ` Michal Hocko
2013-04-09 2:57 ` Kamezawa Hiroyuki
2013-04-08 6:36 ` [PATCH 13/12] memcg: don't need memcg->memcg_name Li Zefan
2013-04-08 14:25 ` Michal Hocko
2013-04-09 1:28 ` Li Zefan
2013-04-09 3:10 ` Kamezawa Hiroyuki
2013-04-09 3:18 ` Li Zefan
2013-04-09 3:46 ` Kamezawa Hiroyuki
2013-04-09 7:55 ` Glauber Costa
2013-04-09 3:59 ` Tejun Heo
2013-04-09 7:53 ` Glauber Costa
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=516264E4.5090405@huawei.com \
--to=lizefan@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=glommer@parallels.com \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tj@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).