Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cgroup: support ns lookup 

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

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2025-09-12 13:52:42 +02:00
parent 7d7d164989
commit 7c60593985
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/cgroup/cgroup.c
View File

@ -59,6 +59,7 @@
#include <linux/sched/cputime.h> #include <linux/sched/cputime.h>
#include <linux/sched/deadline.h> #include <linux/sched/deadline.h>
#include <linux/psi.h> #include <linux/psi.h>
#include <linux/nstree.h>
#include <net/sock.h> #include <net/sock.h>
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
@ -6312,6 +6313,7 @@ int __init cgroup_init(void)
WARN_ON(register_filesystem(&cpuset_fs_type)); WARN_ON(register_filesystem(&cpuset_fs_type));
#endif #endif
ns_tree_add(&init_cgroup_ns);
return 0; return 0;
} }

7
kernel/cgroup/namespace.c
View File

@ -5,7 +5,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/proc_ns.h> #include <linux/proc_ns.h>
#include <linux/nstree.h>
/* cgroup namespaces */ /* cgroup namespaces */
@ -30,16 +30,19 @@ static struct cgroup_namespace *alloc_cgroup_ns(void)
ret = ns_common_init(&new_ns->ns, &cgroupns_operations, true); ret = ns_common_init(&new_ns->ns, &cgroupns_operations, true);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
ns_tree_add(new_ns);
return no_free_ptr(new_ns); return no_free_ptr(new_ns);
} }
void free_cgroup_ns(struct cgroup_namespace *ns) void free_cgroup_ns(struct cgroup_namespace *ns)
{ {
ns_tree_remove(ns);
put_css_set(ns->root_cset); put_css_set(ns->root_cset);
dec_cgroup_namespaces(ns->ucounts); dec_cgroup_namespaces(ns->ucounts);
put_user_ns(ns->user_ns); put_user_ns(ns->user_ns);
ns_free_inum(&ns->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); EXPORT_SYMBOL(free_cgroup_ns);