Unverified Commit 7c605939 authored by Christian Brauner's avatar Christian Brauner
Browse files

cgroup: support ns lookup 



Support the generic ns lookup infrastructure to support file handles for
namespaces.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 7d7d1649

kernel/cgroup/cgroup.c

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <linux/sched/cputime.h>

#include <linux/sched/deadline.h>

#include <linux/psi.h>

#include <linux/nstree.h>

#include <net/sock.h>



#define CREATE_TRACE_POINTS
@@ -6312,6 +6313,7 @@ int __init cgroup_init(void) 
	WARN_ON(register_filesystem(&cpuset_fs_type));

#endif



	ns_tree_add(&init_cgroup_ns);

	return 0;

}

kernel/cgroup/namespace.c

+5 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/slab.h>

#include <linux/nsproxy.h>

#include <linux/proc_ns.h>



#include <linux/nstree.h>



/* cgroup namespaces */
@@ -30,16 +30,19 @@ static struct cgroup_namespace *alloc_cgroup_ns(void) 
	ret = ns_common_init(&new_ns->ns, &cgroupns_operations, true);

	if (ret)

		return ERR_PTR(ret);

	ns_tree_add(new_ns);

	return no_free_ptr(new_ns);

}



void free_cgroup_ns(struct cgroup_namespace *ns)

{

	ns_tree_remove(ns);

	put_css_set(ns->root_cset);

	dec_cgroup_namespaces(ns->ucounts);

	put_user_ns(ns->user_ns);

	ns_free_inum(&ns->ns);

	kfree(ns);

	/* Concurrent nstree traversal depends on a grace period. */

	kfree_rcu(ns, ns.ns_rcu);

}

EXPORT_SYMBOL(free_cgroup_ns);