Skip to content

Commit 58fa2a5

Browse files
Vladimir Davydovtorvalds
Vladimir Davydov
authored andcommitted
mm: memcontrol: add sanity checks for memcg->id.ref on get/put
Link: http://lkml.kernel.org/r/1c5ddb1c171dbdfc3262252769d6138a29b35b70.1470219853.git.vdavydov@virtuozzo.com Signed-off-by: Vladimir Davydov <[email protected]> Acked-by: Johannes Weiner <[email protected]> Acked-by: Michal Hocko <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 252e5c6 commit 58fa2a5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

mm/memcontrol.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -4062,11 +4062,13 @@ static DEFINE_IDR(mem_cgroup_idr);
40624062

40634063
static void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n)
40644064
{
4065+
VM_BUG_ON(atomic_read(&memcg->id.ref) <= 0);
40654066
atomic_add(n, &memcg->id.ref);
40664067
}
40674068

40684069
static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n)
40694070
{
4071+
VM_BUG_ON(atomic_read(&memcg->id.ref) < n);
40704072
if (atomic_sub_and_test(n, &memcg->id.ref)) {
40714073
idr_remove(&mem_cgroup_idr, memcg->id.id);
40724074
memcg->id.id = 0;
@@ -4255,8 +4257,10 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
42554257

42564258
static int mem_cgroup_css_online(struct cgroup_subsys_state *css)
42574259
{
4260+
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
4261+
42584262
/* Online state pins memcg ID, memcg ID pins CSS */
4259-
mem_cgroup_id_get(mem_cgroup_from_css(css));
4263+
atomic_set(&memcg->id.ref, 1);
42604264
css_get(css);
42614265
return 0;
42624266
}

0 commit comments

Comments
 (0)