Commit d969328c authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge patch series "ns: minor tweaks" 

Christian Brauner <brauner@kernel.org> says:

* Add a missing include into the cgroup namespace header.
* Simplify ns_common_init{_inum}() and derive the namespace operations
  from the namespace type.
* Add debug asserts into ns_common_init{_inum}() to catch bugs.

* patches from https://lore.kernel.org/20250922-work-namespace-ns_common-fixes-v1-0-3c26aeb30831@kernel.org

:
  ns: add ns_debug()
  ns: simplify ns_common_init() further
  cgroup: add missing ns_common include

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents 7cf73032 5890f504

fs/namespace.c

+2 −2
Original line number Diff line number Diff line
@@ -4104,9 +4104,9 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool a 
	}



	if (anon)

		ret = ns_common_init_inum(new_ns, &mntns_operations, MNT_NS_ANON_INO);

		ret = ns_common_init_inum(new_ns, MNT_NS_ANON_INO);

	else

		ret = ns_common_init(new_ns, &mntns_operations);

		ret = ns_common_init(new_ns);

	if (ret) {

		kfree(new_ns);

		dec_mnt_namespaces(ucounts);

include/linux/cgroup_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _LINUX_CGROUP_NAMESPACE_H

#define _LINUX_CGROUP_NAMESPACE_H



#include <linux/ns_common.h>



struct cgroup_namespace {

	struct ns_common	ns;

	struct user_namespace	*user_ns;

include/linux/ns_common.h

+26 −4
Original line number Diff line number Diff line
@@ -25,6 +25,17 @@ extern struct time_namespace init_time_ns; 
extern struct user_namespace init_user_ns;

extern struct uts_namespace init_uts_ns;



extern const struct proc_ns_operations netns_operations;

extern const struct proc_ns_operations utsns_operations;

extern const struct proc_ns_operations ipcns_operations;

extern const struct proc_ns_operations pidns_operations;

extern const struct proc_ns_operations pidns_for_children_operations;

extern const struct proc_ns_operations userns_operations;

extern const struct proc_ns_operations mntns_operations;

extern const struct proc_ns_operations cgroupns_operations;

extern const struct proc_ns_operations timens_operations;

extern const struct proc_ns_operations timens_for_children_operations;



struct ns_common {

	struct dentry *stashed;

	const struct proc_ns_operations *ops;
@@ -84,10 +95,21 @@ void __ns_common_free(struct ns_common *ns); 
		struct user_namespace *:   &init_user_ns,   \

		struct uts_namespace *:    &init_uts_ns)



#define ns_common_init(__ns, __ops) \

	__ns_common_init(to_ns_common(__ns), __ops, (((__ns) == ns_init_ns(__ns)) ? ns_init_inum(__ns) : 0))



#define ns_common_init_inum(__ns, __ops, __inum) __ns_common_init(to_ns_common(__ns), __ops, __inum)

#define to_ns_operations(__ns)                                                                         \

	_Generic((__ns),                                                                               \

		struct cgroup_namespace *: (IS_ENABLED(CONFIG_CGROUPS) ? &cgroupns_operations : NULL), \

		struct ipc_namespace *:    (IS_ENABLED(CONFIG_IPC_NS)  ? &ipcns_operations    : NULL), \

		struct mnt_namespace *:    &mntns_operations,                                          \

		struct net *:              (IS_ENABLED(CONFIG_NET_NS)  ? &netns_operations    : NULL), \

		struct pid_namespace *:    (IS_ENABLED(CONFIG_PID_NS)  ? &pidns_operations    : NULL), \

		struct time_namespace *:   (IS_ENABLED(CONFIG_TIME_NS) ? &timens_operations   : NULL), \

		struct user_namespace *:   (IS_ENABLED(CONFIG_USER_NS) ? &userns_operations   : NULL), \

		struct uts_namespace *:    (IS_ENABLED(CONFIG_UTS_NS)  ? &utsns_operations    : NULL))



#define ns_common_init(__ns) \

	__ns_common_init(to_ns_common(__ns), to_ns_operations(__ns), (((__ns) == ns_init_ns(__ns)) ? ns_init_inum(__ns) : 0))



#define ns_common_init_inum(__ns, __inum) __ns_common_init(to_ns_common(__ns), to_ns_operations(__ns), __inum)



#define ns_common_free(__ns) __ns_common_free(to_ns_common((__ns)))

ipc/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, 
	if (ns == NULL)

		goto fail_dec;



	err = ns_common_init(ns, &ipcns_operations);

	err = ns_common_init(ns);

	if (err)

		goto fail_free;

kernel/cgroup/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static struct cgroup_namespace *alloc_cgroup_ns(void) 
	new_ns = kzalloc(sizeof(struct cgroup_namespace), GFP_KERNEL_ACCOUNT);

	if (!new_ns)

		return ERR_PTR(-ENOMEM);

	ret = ns_common_init(new_ns, &cgroupns_operations);

	ret = ns_common_init(new_ns);

	if (ret)

		return ERR_PTR(ret);

	ns_tree_add(new_ns);