partial revoke implementation for procfs
Subsystems (5)
cover partial revoke implementation for procfs
Hi Al Viro,
I tried to implement what you proposed in:
https://lkml.org/lkml/2013/4/5/15
When you have time, would you please help to take a look at it, and give your comments?
I sent the draft early, just want to make sure I didn't misunderstand anything in your proposal, and what I did and next step plan are not heading the wrong direction.
This is only an initial draft to do only what procfs is needed
1. didn't do anything about kick, mmap, fasync, ... and something you mentioned in following mails
2. I only wrapped f_ops in vfs which are used by procfs ( but maybe I still missed something).
3. It seems all f_ops are const, so I couldn't easliy clear the pointer of ->owner, maybe that needs every calling site of proc_create(_data) to make sure the proc_fops doesn't have ->owner set?
Currently, I added an ugly check in __fput, so if if ->f_revoke is set in file, we don't call fput_ops; and in proc_reg_open(), restore the old ->f_op if make_revokable() fails.
patch 1: adding the implementation proposed in your mail patch 2: convert procfs to use this implementation
If there aren't any big issues, I plan to look for another file system (with backing device) to try other things that's not implemented this time.
Thanks, Zhong
Li Zhong (2):
vfs: partial revoke implementation suggested by Al Viro
proc: covert procfs to use the general revoke implementation
fs/Makefile | 2 +- fs/compat_ioctl.c | 8 +- fs/eventpoll.c | 10 ++- fs/file_table.c | 13 ++- fs/ioctl.c | 7 +- fs/proc/generic.c | 12 +-- fs/proc/inode.c | 229 ++++-------------------------------------------- fs/proc/internal.h | 9 +- fs/read_write.c | 30 +++++-- fs/revoke.c | 133 ++++++++++++++++++++++++++++ fs/select.c | 11 ++- include/linux/fs.h | 2 + include/linux/revoke.h | 50 +++++++++++ mm/mmap.c | 8 +- mm/nommu.c | 16 +++- 15 files changed, 297 insertions(+), 243 deletions(-) create mode 100644 fs/revoke.c create mode 100644 include/linux/revoke.h
Signature · 1 line
1.7.9.5
PATCH 1/2 vfs: partial revoke implementation suggested by Al Viro
This patch tries to partially implement what Al Viro suggested in
https://lkml.org/lkml/2013/4/5/15
Code also mostly copied from the above link
--- fs/Makefile | 2 +- fs/revoke.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 2 + include/linux/revoke.h | 50 ++++++++++++++++++ 4 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 fs/revoke.c create mode 100644 include/linux/revoke.h
fs/Makefile +1 -1
@@ -11,7 +11,7 @@ obj-y := open.o read_write.o file_table.o super.o \ attr.o bad_inode.o file.o filesystems.o namespace.o \ seq_file.o xattr.o libfs.o fs-writeback.o \ pnode.o splice.o sync.o utimes.o \ - stack.o fs_struct.o statfs.o + stack.o fs_struct.o statfs.o revoke.o ifeq ($(CONFIG_BLOCK),y) obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
fs/revoke.c new file +133 -0
133 lines not on this page · raw message
include/linux/fs.h +2 -0
@@ -45,6 +45,7 @@ struct vfsmount;struct cred ;struct swap_info_struct ;struct seq_file ; +struct revoke ;extern void __init inode_init (void );extern void __init inode_init_early (void );
@@ -807,6 +808,7 @@ struct file {#ifdef CONFIG_DEBUG_WRITECOUNT unsigned long f_mnt_write_state;#endif +struct revoke *f_revoke; };struct file_handle {
include/linux/revoke.h new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/2 proc: covert procfs to use the general revoke implementation
In reply to Li ZhongThis patch tries to replace the current revoke logic in procfs with the implementation suggested by Al Viro in
https://lkml.org/lkml/2013/4/5/15
Below is the replacement guideline copied from that mail:
procfs would have struct revokable embedded into proc_dir_entry, with freeing of those guys RCUd. It would set ->f_op to ->proc_fops and call make_revokable(file, &pde->revokable) in proc_reg_open(); no wrappers for other methods needed anymore. All file_operations instances fed to proc_create() et.al. would lose ->owner - it's already not needed for those, actually. remove_proc_entry()/remove_proc_subtree() would call revoke_it() on everything we are removing.
--- fs/compat_ioctl.c | 8 +- fs/eventpoll.c | 10 ++- fs/file_table.c | 13 ++- fs/ioctl.c | 7 +- fs/proc/generic.c | 12 +-- fs/proc/inode.c | 229 +++++----------------------------------------------- fs/proc/internal.h | 9 +-- fs/read_write.c | 30 +++++-- fs/select.c | 11 ++- mm/mmap.c | 8 +- mm/nommu.c | 16 +++- 11 files changed, 111 insertions(+), 242 deletions(-)
fs/compat_ioctl.c +7 -1
@@ -110,6 +110,7 @@#include <linux/dvb/video.h> #include <linux/sort.h> +#include <linux/revoke.h> #ifdef CONFIG_SPARC #include <asm/fbio.h>
@@ -1584,7 +1585,12 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,default :if (f.file->f_op && f.file->f_op->compat_ioctl) { - error = f.file->f_op->compat_ioctl (f.file, cmd, arg); +if (likely (start_using (f.file))) { + error = f.file->f_op->compat_ioctl (f.file, + cmd, arg); +stop_using (f.file); + }else + error = -ENOTTY ;if (error != -ENOIOCTLCMD ) goto out_fput; }
fs/eventpoll.c +9 -1
@@ -42,6 +42,7 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/compat.h> +#include <linux/revoke.h> /* * LOCKING:
@@ -776,9 +777,16 @@ static int ep_eventpoll_release(struct inode *inode, struct file *file)static inline unsigned int ep_item_poll (struct epitem *epi,poll_table *pt) { +unsigned int rv =DEFAULT_POLLMASK ; pt->_key = epi->event.events; -return epi->ffd.file->f_op->poll (epi->ffd.file, pt) & epi->event.events; +if (likely (start_using (epi->ffd.file))) { + rv = epi->ffd.file->f_op->poll (epi->ffd.file, pt) + & epi->event.events; +stop_using (epi->ffd.file); + } + +return rv; } static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
fs/file_table.c +10 -3
@@ -26,6 +26,7 @@#include <linux/hardirq.h> #include <linux/task_work.h> #include <linux/ima.h> +#include <linux/revoke.h> #include <linux/atomic.h>
@@ -244,14 +245,20 @@ static void __fput(struct file *file) file->f_op->fasync (-1 , file,0 ); }ima_file_free (file); -if (file->f_op && file->f_op->release) - file->f_op->release (inode, file); +if (file->f_op && file->f_op->release) { +if (likely (!(file->f_revoke))) + file->f_op->release (inode, file); +else +release_revoke (file->f_revoke); + }security_file_free (file);if (unlikely (S_ISCHR (inode->i_mode) && inode->i_cdev !=NULL && !(file->f_mode &FMODE_PATH ))) {cdev_put (inode->i_cdev); } -fops_put (file->f_op); +if (likely (!(file->f_revoke))) +fops_put (file->f_op); +put_pid (file->f_owner.pid);if ((file->f_mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ )i_readcount_dec (inode);
fs/ioctl.c +6 -1
@@ -15,6 +15,7 @@#include <linux/writeback.h> #include <linux/buffer_head.h> #include <linux/falloc.h> +#include <linux/revoke.h> #include <asm/ioctls.h>
@@ -40,7 +41,11 @@ static long vfs_ioctl(struct file *filp, unsigned int cmd,if (!filp->f_op || !filp->f_op->unlocked_ioctl) goto out; - error = filp->f_op->unlocked_ioctl (filp, cmd, arg); +if (likely (start_using (filp))) { + error = filp->f_op->unlocked_ioctl (filp, cmd, arg); +stop_using (filp); + } +if (error == -ENOIOCTLCMD ) error = -ENOTTY ; out:
fs/proc/generic.c +7 -5
@@ -23,6 +23,7 @@#include <linux/bitops.h> #include <linux/spinlock.h> #include <linux/completion.h> +#include <linux/revoke.h> #include <asm/uaccess.h> #include "internal.h"
@@ -367,13 +368,14 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,if (!ent) goto out; +spin_lock_init (&ent->revokable.lock); +INIT_HLIST_HEAD (&ent->revokable.list); +memcpy (ent->name, fn, len +1 ); ent->namelen = len; ent->mode = mode; ent->nlink = nlink;atomic_set (&ent->count,1 ); -spin_lock_init (&ent->pde_unload_lock); -INIT_LIST_HEAD (&ent->pde_openers); out:return ent; }
@@ -488,7 +490,7 @@ static void free_proc_entry(struct proc_dir_entry *de)if (S_ISLNK (de->mode))kfree (de->data); -kfree (de); +kfree_rcu (de, rcu); }void pde_put (struct proc_dir_entry *pde)
@@ -528,7 +530,7 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)return ; } -proc_entry_rundown (de); +revoke_it (&de->revokable);if (S_ISDIR (de->mode)) parent->nlink--;
@@ -577,7 +579,7 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) }spin_unlock (&proc_subdir_lock); -proc_entry_rundown (de); +revoke_it (&de->revokable); next = de->parent;if (S_ISDIR (de->mode)) next->nlink--;
fs/proc/inode.c +18 -211
272 lines not on this page · raw message
fs/proc/internal.h +3 -6
@@ -14,6 +14,7 @@#include <linux/spinlock.h> #include <linux/atomic.h> #include <linux/binfmts.h> +#include <linux/revoke.h> struct ctl_table_header ;struct mempolicy ;
@@ -41,11 +42,8 @@ struct proc_dir_entry {struct proc_dir_entry *next, *parent, *subdir;void *data;atomic_t count;/* use count */ -atomic_t in_use;/* number of callers into module in progress; */ -/* negative -> it's going away RSN */ -struct completion *pde_unload_completion; -struct list_head pde_openers;/* who did ->open, but not ->release */ -spinlock_t pde_unload_lock;/* proc_fops checks and pde_users bumps */ +struct revokable revokable; +struct rcu_head rcu;u8 namelen;char name[]; };
@@ -208,7 +206,6 @@ extern const struct inode_operations proc_pid_link_inode_operations;extern void proc_init_inodecache (void );extern struct inode *proc_get_inode (struct super_block *,struct proc_dir_entry *);extern int proc_fill_super (struct super_block *); -extern void proc_entry_rundown (struct proc_dir_entry *);/* * proc_devtree.c
fs/read_write.c +23 -7
@@ -17,6 +17,7 @@#include <linux/pagemap.h> #include <linux/splice.h> #include <linux/compat.h> +#include <linux/revoke.h> #include "internal.h" #include <asm/uaccess.h>
@@ -254,13 +255,20 @@ EXPORT_SYMBOL(default_llseek);loff_t vfs_llseek (struct file *file,loff_t offset,int whence) {loff_t (*fn)(struct file *,loff_t ,int ); +loff_t rv = -EINVAL ; fn = no_llseek;if (file->f_mode &FMODE_LSEEK ) {if (file->f_op && file->f_op->llseek) fn = file->f_op->llseek; } -return fn (file, offset, whence); + +if (likely (start_using (file))) { + rv =fn (file, offset, whence); +stop_using (file); + } + +return rv; }EXPORT_SYMBOL (vfs_llseek);
@@ -393,9 +401,13 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) ret =rw_verify_area (READ , file, pos, count);if (ret >=0 ) { count = ret; -if (file->f_op->read) - ret = file->f_op->read (file, buf, count, pos); -else +if (file->f_op->read) { +if (likely (start_using (file))) { + ret = file->f_op->read (file, buf, count, pos); +stop_using (file); + }else + ret = -EIO ; + }else ret =do_sync_read (file, buf, count, pos);if (ret >0 ) {fsnotify_access (file);
@@ -471,9 +483,13 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_if (ret >=0 ) { count = ret;file_start_write (file); -if (file->f_op->write) - ret = file->f_op->write (file, buf, count, pos); -else +if (file->f_op->write) { +if (likely (start_using (file))) { + ret = file->f_op->write (file, buf, count, pos); +stop_using (file); + }else + ret = -EIO ; + }else ret =do_sync_write (file, buf, count, pos);if (ret >0 ) {fsnotify_modify (file);
fs/select.c +9 -2
@@ -28,6 +28,7 @@#include <linux/hrtimer.h> #include <linux/sched/rt.h> #include <linux/freezer.h> +#include <linux/revoke.h> #include <asm/uaccess.h>
@@ -452,7 +453,10 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time) mask =DEFAULT_POLLMASK ;if (f_op && f_op->poll) {wait_key_set (wait, in, out, bit); - mask = (*f_op->poll)(f.file, wait); +if (likely (start_using (f.file))) { + mask = (*f_op->poll)(f.file, wait); +stop_using (f.file); + } }fdput (f);if ((mask &POLLIN_SET ) && (in & bit)) {
@@ -733,7 +737,10 @@ static inline unsigned int do_pollfd(struct pollfd *pollfd, poll_table *pwait) mask =DEFAULT_POLLMASK ;if (f.file->f_op && f.file->f_op->poll) { pwait->_key = pollfd->events|POLLERR |POLLHUP ; - mask = f.file->f_op->poll (f.file, pwait); +if (likely (start_using (f.file))) { + mask = f.file->f_op->poll (f.file, pwait); +stop_using (f.file); + } }/* Mask out unneeded events. */ mask &= pollfd->events |POLLERR |POLLHUP ;
mm/mmap.c +7 -1
@@ -36,6 +36,7 @@#include <linux/sched/sysctl.h> #include <linux/notifier.h> #include <linux/memory.h> +#include <linux/revoke.h> #include <asm/uaccess.h> #include <asm/cacheflush.h>
@@ -1554,7 +1555,12 @@ munmap_back: correct_wcount =1 ; } vma->vm_file =get_file (file); - error = file->f_op->mmap (file, vma); +if (likely (start_using (file))) { + error = file->f_op->mmap (file, vma); +stop_using (file); + }else + error = -EIO ; +if (error) goto unmap_and_free_vma;
mm/nommu.c +12 -4
@@ -30,6 +30,7 @@#include <linux/syscalls.h> #include <linux/audit.h> #include <linux/sched/sysctl.h> +#include <linux/revoke.h> #include <asm/uaccess.h> #include <asm/tlb.h>
@@ -1116,9 +1117,13 @@ static unsigned long determine_vm_flags(struct file *file,*/ static int do_mmap_shared_file (struct vm_area_struct *vma) { -int ret; +int ret = -EIO ; + +if (likely (start_using (vma->vm_file))) { + ret = vma->vm_file->f_op->mmap (vma->vm_file, vma); +stop_using (vma->vm_file); + } - ret = vma->vm_file->f_op->mmap (vma->vm_file, vma);if (ret ==0 ) { vma->vm_region->vm_top = vma->vm_region->vm_end;return 0 ;
@@ -1143,14 +1148,17 @@ static int do_mmap_private(struct vm_area_struct *vma,struct page *pages;unsigned long total, point, n;void *base; -int ret, order; +int ret = -EIO , order;/* invoke the file's mapping function so that it can keep track of * shared mappings on devices or memory * - VM_MAYSHARE will be set if it may attempt to share */ if (capabilities &BDI_CAP_MAP_DIRECT ) { - ret = vma->vm_file->f_op->mmap (vma->vm_file, vma); +if (likely (start_using (vma->vm_file))) { + ret = vma->vm_file->f_op->mmap (vma->vm_file, vma); +stop_using (vma->vm_file); + }if (ret ==0 ) {/* shouldn't return success if we're not sharing */ BUG_ON (!(vma->vm_flags &VM_MAYSHARE ));
Signature · 1 line
1.7.9.5