Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-01 07:26:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

ns: simplify ns_common_init() further

Browse Source 
Simply derive the ns operations from the namespace type.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner
2025-09-22 14:42:36 +02:00
parent 8535bd38b4
commit d7610cb745
9 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/namespace.c
View File

@@ -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);

28
include/linux/ns_common.h
View File

@@ -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 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_inum(__ns, __ops, __inum) __ns_common_init(to_ns_common(__ns), __ops, __inum)
#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)))

2
ipc/namespace.c
View File

@@ -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;

2
kernel/cgroup/namespace.c
View File

@@ -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);

2
kernel/pid_namespace.c
View File

@@ -103,7 +103,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
if (ns->pid_cachep == NULL)
goto out_free_idr;
err = ns_common_init(ns, &pidns_operations);
err = ns_common_init(ns);
if (err)
goto out_free_idr;

2
kernel/time/namespace.c
View File

@@ -97,7 +97,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns,
if (!ns->vvar_page)
goto fail_free;
err = ns_common_init(ns, &timens_operations);
err = ns_common_init(ns);
if (err)
goto fail_free_page;

2
kernel/user_namespace.c
View File

@@ -126,7 +126,7 @@ int create_user_ns(struct cred *new)
ns->parent_could_setfcap = cap_raised(new->cap_effective, CAP_SETFCAP);
ret = ns_common_init(ns, &userns_operations);
ret = ns_common_init(ns);
if (ret)
goto fail_free;

2
kernel/utsname.c
View File

@@ -50,7 +50,7 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
if (!ns)
goto fail_dec;
err = ns_common_init(ns, &utsns_operations);
err = ns_common_init(ns);
if (err)
goto fail_free;

9
net/core/net_namespace.c
View File

@@ -400,16 +400,9 @@ static __net_init void preinit_net_sysctl(struct net *net)
/* init code that must occur even if setup_net() is not called. */
static __net_init int preinit_net(struct net *net, struct user_namespace *user_ns)
{
const struct proc_ns_operations *ns_ops;
int ret;
#ifdef CONFIG_NET_NS
ns_ops = &netns_operations;
#else
ns_ops = NULL;
#endif
ret = ns_common_init(net, ns_ops);
ret = ns_common_init(net);
if (ret)
return ret;