proc-decouple-proc-from-vfs-with-struct-proc_ops.patch removed from -mm tree
The patch titled
Subject: proc: decouple proc from VFS with "struct proc_ops"
has been removed from the -mm tree. Its filename was
proc-decouple-proc-from-vfs-with-struct-proc_ops.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: proc: decouple proc from VFS with "struct proc_ops"
Currently core /proc code uses "struct file_operations" for custom hooks, however, VFS doesn't directly call them. Every time VFS expands file_operations hook set, /proc code bloats for no reason.
Introduce "struct proc_ops" which contains only those hooks which /proc allows to call into (open, release, read, write, ioctl, mmap, poll). It doesn't contain module pointer as well.
Save ~184 bytes per usage:
add/remove: 26/26 grow/shrink: 1/4 up/down: 1922/-6674 (-4752)
Function old new delta
sysvipc_proc_ops - 72 +72
...
config_gz_proc_ops - 72 +72
proc_get_inode 289 339 +50
proc_reg_get_unmapped_area 110 107 -3
close_pdeo 227 224 -3
proc_reg_open 289 284 -5
proc_create_data 60 53 -7
rt_cpu_seq_fops 256 - -256
...
default_affinity_proc_fops 256 - -256
Total: Before=5430095, After=5425343, chg -0.09%
---
fs/proc/generic.c | 38 +++++++++---------- fs/proc/inode.c | 76 +++++++++++++++++++------------------- fs/proc/internal.h | 5 ++ fs/proc/proc_net.c | 32 ++++++++-------- fs/proc/proc_sysctl.c | 2 - fs/proc/root.c | 2 - include/linux/proc_fs.h | 23 +++++++++-- 7 files changed, 98 insertions(+), 80 deletions(-)
fs/proc/generic.c renamed from fs/proc/generic.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +18 -20
@@ -473,7 +473,7 @@ struct proc_dir_entry *proc_mkdir_data(c ent =__proc_create (&parent, name,S_IFDIR | mode,2 );if (ent) { ent->data = data; - ent->proc_fops = &proc_dir_operations; + ent->proc_dir_ops = &proc_dir_operations; ent->proc_iops = &proc_dir_inode_operations; ent =proc_register (parent, ent); }
@@ -503,7 +503,7 @@ struct proc_dir_entry *proc_create_mount ent =__proc_create (&parent, name, mode,2 );if (ent) { ent->data =NULL ; - ent->proc_fops =NULL ; + ent->proc_dir_ops =NULL ; ent->proc_iops =NULL ; ent =proc_register (parent, ent); }
@@ -533,25 +533,23 @@ struct proc_dir_entry *proc_create_reg(cstruct proc_dir_entry *proc_create_data (const char *name,umode_t mode,struct proc_dir_entry *parent, -const struct file_operations *proc_fops,void *data) +const struct proc_ops *proc_ops,void *data) {struct proc_dir_entry *p; -BUG_ON (proc_fops ==NULL ); - p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = proc_fops; + p->proc_ops = proc_ops;return proc_register (parent, p); }EXPORT_SYMBOL (proc_create_data);struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent, -const struct file_operations *proc_fops) +const struct proc_ops *proc_ops) { -return proc_create_data (name, mode, parent, proc_fops,NULL ); +return proc_create_data (name, mode, parent, proc_ops,NULL ); }EXPORT_SYMBOL (proc_create);
@@ -573,11 +571,11 @@ static int proc_seq_release(struct inodereturn seq_release (inode, file); } -static const struct file_operations proc_seq_fops = { - .open = proc_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = proc_seq_release, +static const struct proc_ops proc_seq_ops = { + .proc_open = proc_seq_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = proc_seq_release, }; struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,
@@ -589,7 +587,7 @@ struct proc_dir_entry *proc_create_seq_p p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = &proc_seq_fops; + p->proc_ops = &proc_seq_ops; p->seq_ops = ops; p->state_size = state_size;return proc_register (parent, p);
@@ -603,11 +601,11 @@ static int proc_single_open(struct inodereturn single_open (file, de->single_show, de->data); } -static const struct file_operations proc_single_fops = { - .open = proc_single_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, +static const struct proc_ops proc_single_ops = { + .proc_open = proc_single_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, }; struct proc_dir_entry *proc_create_single_data(const char *name, umode_t mode,
@@ -619,7 +617,7 @@ struct proc_dir_entry *proc_create_singl p =proc_create_reg (name, mode, &parent, data);if (!p)return NULL ; - p->proc_fops = &proc_single_fops; + p->proc_ops = &proc_single_ops; p->single_show = show;return proc_register (parent, p); }
fs/proc/inode.c renamed from fs/proc/inode.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +39 -37
164 lines not on this page · raw message
fs/proc/internal.h renamed from fs/proc/internal.h~proc-decouple-proc-from-vfs-with-struct-proc_ops +4 -1
@@ -39,7 +39,10 @@ struct proc_dir_entry {spinlock_t pde_unload_lock;struct completion *pde_unload_completion;const struct inode_operations *proc_iops; -const struct file_operations *proc_fops; +union { +const struct proc_ops *proc_ops; +const struct file_operations *proc_dir_ops; + };const struct dentry_operations *proc_dops;union {const struct seq_operations *seq_ops;
fs/proc/proc_net.c renamed from fs/proc/proc_net.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +16 -16
@@ -90,12 +90,12 @@ static int seq_release_net(struct inodereturn 0 ; } -static const struct file_operations proc_net_seq_fops = { - .open = seq_open_net, - .read = seq_read, - .write = proc_simple_write, - .llseek = seq_lseek, - .release = seq_release_net, +static const struct proc_ops proc_net_seq_ops = { + .proc_open = seq_open_net, + .proc_read = seq_read, + .proc_write = proc_simple_write, + .proc_lseek = seq_lseek, + .proc_release = seq_release_net, }; struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,
@@ -108,7 +108,7 @@ struct proc_dir_entry *proc_create_net_dif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_seq_fops; + p->proc_ops = &proc_net_seq_ops; p->seq_ops = ops; p->state_size = state_size;return proc_register (parent, p);
@@ -152,7 +152,7 @@ struct proc_dir_entry *proc_create_net_dif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_seq_fops; + p->proc_ops = &proc_net_seq_ops; p->seq_ops = ops; p->state_size = state_size; p->write = write;
@@ -183,12 +183,12 @@ static int single_release_net(struct inoreturn single_release (ino, f); } -static const struct file_operations proc_net_single_fops = { - .open = single_open_net, - .read = seq_read, - .write = proc_simple_write, - .llseek = seq_lseek, - .release = single_release_net, +static const struct proc_ops proc_net_single_ops = { + .proc_open = single_open_net, + .proc_read = seq_read, + .proc_write = proc_simple_write, + .proc_lseek = seq_lseek, + .proc_release = single_release_net, }; struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
@@ -201,7 +201,7 @@ struct proc_dir_entry *proc_create_net_sif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_single_fops; + p->proc_ops = &proc_net_single_ops; p->single_show = show;return proc_register (parent, p); }
@@ -244,7 +244,7 @@ struct proc_dir_entry *proc_create_net_sif (!p)return NULL ;pde_force_lookup (p); - p->proc_fops = &proc_net_single_fops; + p->proc_ops = &proc_net_single_ops; p->single_show = show; p->write = write;return proc_register (parent, p);
fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +1 -1
@@ -1720,7 +1720,7 @@ int __init proc_sys_init(void) proc_sys_root =proc_mkdir ("sys" ,NULL ); proc_sys_root->proc_iops = &proc_sys_dir_operations; - proc_sys_root->proc_fops = &proc_sys_dir_file_operations; + proc_sys_root->proc_dir_ops = &proc_sys_dir_file_operations; proc_sys_root->nlink =0 ;return sysctl_init ();
fs/proc/root.c renamed from fs/proc/root.c~proc-decouple-proc-from-vfs-with-struct-proc_ops +1 -1
@@ -292,7 +292,7 @@ struct proc_dir_entry proc_root = { .nlink = 2, .refcnt = REFCOUNT_INIT(1), .proc_iops = &proc_root_inode_operations, - .proc_fops = &proc_root_operations, + .proc_dir_ops = &proc_root_operations, .parent = &proc_root, .subdir = RB_ROOT, .name = "/proc",
include/linux/proc_fs.h renamed from include/linux/proc_fs.h~proc-decouple-proc-from-vfs-with-struct-proc_ops +19 -4
@@ -12,6 +12,21 @@ struct proc_dir_entry;struct seq_file ;struct seq_operations ; +struct proc_ops { +int (*proc_open)(struct inode *,struct file *); +ssize_t (*proc_read)(struct file *,char __user *,size_t ,loff_t *); +ssize_t (*proc_write)(struct file *,const char __user *,size_t ,loff_t *); +loff_t (*proc_lseek)(struct file *,loff_t ,int ); +int (*proc_release)(struct inode *,struct file *); +__poll_t (*proc_poll)(struct file *,struct poll_table_struct *); +long (*proc_ioctl)(struct file *,unsigned int ,unsigned long ); +#ifdef CONFIG_COMPAT +long (*proc_compat_ioctl)(struct file *,unsigned int ,unsigned long ); +#endif +int (*proc_mmap)(struct file *,struct vm_area_struct *); +unsigned long (*proc_get_unmapped_area)(struct file *,unsigned long ,unsigned long ,unsigned long ,unsigned long ); +}; +#ifdef CONFIG_PROC_FS typedef int (*proc_write_t )(struct file *,char *,size_t );
@@ -43,10 +58,10 @@ struct proc_dir_entry *proc_create_singlextern struct proc_dir_entry *proc_create_data (const char *,umode_t ,struct proc_dir_entry *, -const struct file_operations *, +const struct proc_ops *,void *); -struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent,const struct file_operations *proc_fops); +struct proc_dir_entry *proc_create (const char *name,umode_t mode,struct proc_dir_entry *parent,const struct proc_ops *proc_ops);extern void proc_set_size (struct proc_dir_entry *,loff_t );extern void proc_set_user (struct proc_dir_entry *,kuid_t ,kgid_t );extern void *PDE_DATA (const struct inode *);
@@ -108,8 +123,8 @@ static inline struct proc_dir_entry *pro#define proc_create_seq (name, mode, parent, ops) ({NULL;})#define proc_create_single (name, mode, parent, show) ({NULL;})#define proc_create_single_data (name, mode, parent, show, data) ({NULL;}) -#define proc_create (name, mode, parent, proc_fops) ({NULL;}) -#define proc_create_data (name, mode, parent, proc_fops, data) ({NULL;}) +#define proc_create (name, mode, parent, proc_ops) ({NULL;}) +#define proc_create_data (name, mode, parent, proc_ops, data) ({NULL;})static inline void proc_set_size (struct proc_dir_entry *de,loff_t size) {}static inline void proc_set_user (struct proc_dir_entry *de,kuid_t uid,kgid_t gid) {}
_
Patches currently in -mm which might be from [email protected] are
ramfs-support-o_tmpfile.patch