Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3cecc68 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

memcg: free entries in soft_limit_tree if allocation fails 



If we are not able to allocate tree nodes for all NUMA nodes then we
should release those that were allocated.

Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9fb4b7cc

mm/memcontrol.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -4960,7 +4960,7 @@ static int mem_cgroup_soft_limit_tree_init(void) 
			tmp = -1;

			tmp = -1;

		rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, tmp);

		rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, tmp);

		if (!rtpn)

		if (!rtpn)

			return 1;

			goto err_cleanup;





		soft_limit_tree.rb_tree_per_node[node] = rtpn;

		soft_limit_tree.rb_tree_per_node[node] = rtpn;
@@ -4971,6 +4971,16 @@ static int mem_cgroup_soft_limit_tree_init(void) 
		}

		}

	}

	}

	return 0;

	return 0;



err_cleanup:

	for_each_node_state(node, N_POSSIBLE) {

		if (!soft_limit_tree.rb_tree_per_node[node])

			break;

		kfree(soft_limit_tree.rb_tree_per_node[node]);

		soft_limit_tree.rb_tree_per_node[node] = NULL;

	}

	return 1;



}

}





static struct cgroup_subsys_state * __ref

static struct cgroup_subsys_state * __ref