[RH7,18/32] bury struct proc_ns in fs/proc

Submitted by Pavel Tikhomirov on June 8, 2020, 5:05 p.m.

Details

Message ID 20200608170602.308872-19-ptikhomirov@virtuozzo.com
State New
Series "port nsfs from vz8"
Headers show

Commit Message

Pavel Tikhomirov June 8, 2020, 5:05 p.m.
From: Al Viro <viro@zeniv.linux.org.uk>

a) make get_proc_ns() return a pointer to struct ns_common
b) mirror ns_ops in dentry->d_fsdata of ns dentries, so that
is_mnt_ns_file() could get away with fewer dereferences.

That way struct proc_ns becomes invisible outside of fs/proc/*.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

(cherry picked from VZ9 commit f77c80142e1afe6d5c16975ca5d7d1fc324b16f9)

https://jira.sw.ru/browse/PSBM-102357

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 fs/namespace.c           | 13 ++-----------
 fs/proc/internal.h       |  5 +++++
 fs/proc/namespaces.c     |  7 ++++---
 include/linux/proc_ns.h  |  9 ++-------
 kernel/nsproxy.c         |  4 +---
 net/core/net_namespace.c |  4 +---
 6 files changed, 15 insertions(+), 27 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/namespace.c b/fs/namespace.c
index 7cbc7c13a58e..b88e6083d8d6 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1878,16 +1878,7 @@  static bool is_mnt_ns_file(struct dentry *dentry)
 {
 	/* Is this a proxy for a mount namespace? */
 	struct inode *inode = dentry->d_inode;
-	struct proc_ns *ei;
-
-	if (!proc_ns_inode(inode))
-		return false;
-
-	ei = get_proc_ns(inode);
-	if (ei->ns_ops != &mntns_operations)
-		return false;
-
-	return true;
+	return proc_ns_inode(inode) && dentry->d_fsdata == &mntns_operations;
 }
 
 struct mnt_namespace *to_mnt_ns(struct ns_common *ns)
@@ -1904,7 +1895,7 @@  static bool mnt_ns_loop(struct dentry *dentry)
 	if (!is_mnt_ns_file(dentry))
 		return false;
 
-	mnt_ns = to_mnt_ns(get_proc_ns(dentry->d_inode)->ns);
+	mnt_ns = to_mnt_ns(get_proc_ns(dentry->d_inode));
 	return current->nsproxy->mnt_ns->seq >= mnt_ns->seq;
 }
 
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index c7cb17f4abe6..45a5591fec37 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -43,6 +43,11 @@  union proc_op {
 		struct task_struct *task);
 };
 
+struct proc_ns {
+	struct ns_common *ns;
+	const struct proc_ns_operations *ns_ops;
+};
+
 struct proc_inode {
 	struct pid *pid;
 	int fd;
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 2d53aea1a691..1f152f9f6ec4 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -51,7 +51,7 @@  static int ns_delete_dentry(const struct dentry *dentry)
 static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)
 {
 	struct inode *inode = dentry->d_inode;
-	const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns.ns_ops;
+	const struct proc_ns_operations *ns_ops = dentry->d_fsdata;
 
 	return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]",
 		ns_ops->name, inode->i_ino);
@@ -81,6 +81,7 @@  static struct dentry *proc_ns_get_dentry(struct super_block *sb,
 		ns_ops->put(ns);
 		return ERR_PTR(-ENOMEM);
 	}
+	dentry->d_fsdata = (void *)ns_ops;
 
 	inode = iget_locked(sb, ns->inum);
 	if (!inode) {
@@ -336,9 +337,9 @@  struct file *proc_ns_fget(int fd)
 	return ERR_PTR(-EINVAL);
 }
 
-struct proc_ns *get_proc_ns(struct inode *inode)
+struct ns_common *get_proc_ns(struct inode *inode)
 {
-	return &PROC_I(inode)->ns;
+	return PROC_I(inode)->ns.ns;
 }
 
 bool proc_ns_inode(struct inode *inode)
diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
index f447c5a59aef..0068daaf7c3c 100644
--- a/include/linux/proc_ns.h
+++ b/include/linux/proc_ns.h
@@ -17,11 +17,6 @@  struct proc_ns_operations {
 	int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
 };
 
-struct proc_ns {
-	struct ns_common *ns;
-	const struct proc_ns_operations *ns_ops;
-};
-
 extern const struct proc_ns_operations netns_operations;
 extern const struct proc_ns_operations utsns_operations;
 extern const struct proc_ns_operations ipcns_operations;
@@ -45,7 +40,7 @@  enum {
 extern int pid_ns_prepare_proc(struct pid_namespace *ns);
 extern void pid_ns_release_proc(struct pid_namespace *ns);
 extern struct file *proc_ns_fget(int fd);
-extern struct proc_ns *get_proc_ns(struct inode *);
+extern struct ns_common *get_proc_ns(struct inode *);
 extern int proc_alloc_inum(unsigned int *pino);
 extern void proc_free_inum(unsigned int inum);
 extern bool proc_ns_inode(struct inode *inode);
@@ -62,7 +57,7 @@  static inline struct file *proc_ns_fget(int fd)
 	return ERR_PTR(-EINVAL);
 }
 
-static inline struct proc_ns *get_proc_ns(struct inode *inode) { return NULL; }
+static inline struct ns_common *get_proc_ns(struct inode *inode) { return NULL; }
 
 static inline int proc_alloc_inum(unsigned int *inum)
 {
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 833bba54e784..728eab54f148 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -234,7 +234,6 @@  SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 {
 	struct task_struct *tsk = current;
 	struct nsproxy *new_nsproxy;
-	struct proc_ns *ei;
 	struct file *file;
 	struct ns_common *ns;
 	int err;
@@ -244,8 +243,7 @@  SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 		return PTR_ERR(file);
 
 	err = -EINVAL;
-	ei = get_proc_ns(file_inode(file));
-	ns = ei->ns;
+	ns = get_proc_ns(file_inode(file));
 	if (nstype && (ns->ops->type != nstype))
 		goto out;
 
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 88cff01ed897..3e23dc6c09b0 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -563,7 +563,6 @@  EXPORT_SYMBOL_GPL(__put_net);
 
 struct net *get_net_ns_by_fd(int fd)
 {
-	struct proc_ns *ei;
 	struct file *file;
 	struct ns_common *ns;
 	struct net *net;
@@ -572,8 +571,7 @@  struct net *get_net_ns_by_fd(int fd)
 	if (IS_ERR(file))
 		return ERR_CAST(file);
 
-	ei = get_proc_ns(file_inode(file));
-	ns = ei->ns;
+	ns = get_proc_ns(file_inode(file));
 	if (ns->ops == &netns_operations)
 		net = get_net(container_of(ns, struct net, ns));
 	else