From: ebiederm@xmission.com (Eric W. Biederman)
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>,
Hugh Dickins <hugh@veritas.com>, Tejun Heo <tj@kernel.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [RFC][PATCH 3/9] sysfs: Use remap_file_mappings.
Date: Sat, 11 Apr 2009 05:06:11 -0700 [thread overview]
Message-ID: <m1eivz75u4.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <m1skkf761y.fsf@fess.ebiederm.org> (Eric W. Biederman's message of "Sat\, 11 Apr 2009 05\:01\:29 -0700")
Instead of wrapping all of the sysfs binary file vm operations
when the backing kobject goes away, we can more easily change
vm_ops on the vma when the backing kobject goes away.
Leading to simpler and more easily maintained code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
fs/sysfs/bin.c | 193 +-------------------------------------------------------
1 files changed, 2 insertions(+), 191 deletions(-)
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 93e0c02..898163c 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -39,8 +39,6 @@ static DEFINE_MUTEX(sysfs_bin_lock);
struct bin_buffer {
struct mutex mutex;
void *buffer;
- int mmapped;
- struct vm_operations_struct *vm_ops;
struct file *file;
struct hlist_node list;
};
@@ -181,175 +179,6 @@ out_free:
return count;
}
-static void bin_vma_open(struct vm_area_struct *vma)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
-
- if (!bb->vm_ops || !bb->vm_ops->open)
- return;
-
- if (!sysfs_get_active_two(attr_sd))
- return;
-
- bb->vm_ops->open(vma);
-
- sysfs_put_active_two(attr_sd);
-}
-
-static void bin_vma_close(struct vm_area_struct *vma)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
-
- if (!bb->vm_ops || !bb->vm_ops->close)
- return;
-
- if (!sysfs_get_active_two(attr_sd))
- return;
-
- bb->vm_ops->close(vma);
-
- sysfs_put_active_two(attr_sd);
-}
-
-static int bin_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- int ret;
-
- if (!bb->vm_ops || !bb->vm_ops->fault)
- return VM_FAULT_SIGBUS;
-
- if (!sysfs_get_active_two(attr_sd))
- return VM_FAULT_SIGBUS;
-
- ret = bb->vm_ops->fault(vma, vmf);
-
- sysfs_put_active_two(attr_sd);
- return ret;
-}
-
-static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- int ret;
-
- if (!bb->vm_ops)
- return VM_FAULT_SIGBUS;
-
- if (!bb->vm_ops->page_mkwrite)
- return 0;
-
- if (!sysfs_get_active_two(attr_sd))
- return VM_FAULT_SIGBUS;
-
- ret = bb->vm_ops->page_mkwrite(vma, vmf);
-
- sysfs_put_active_two(attr_sd);
- return ret;
-}
-
-static int bin_access(struct vm_area_struct *vma, unsigned long addr,
- void *buf, int len, int write)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- int ret;
-
- if (!bb->vm_ops || !bb->vm_ops->access)
- return -EINVAL;
-
- if (!sysfs_get_active_two(attr_sd))
- return -EINVAL;
-
- ret = bb->vm_ops->access(vma, addr, buf, len, write);
-
- sysfs_put_active_two(attr_sd);
- return ret;
-}
-
-#ifdef CONFIG_NUMA
-static int bin_set_policy(struct vm_area_struct *vma, struct mempolicy *new)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- int ret;
-
- if (!bb->vm_ops || !bb->vm_ops->set_policy)
- return 0;
-
- if (!sysfs_get_active_two(attr_sd))
- return -EINVAL;
-
- ret = bb->vm_ops->set_policy(vma, new);
-
- sysfs_put_active_two(attr_sd);
- return ret;
-}
-
-static struct mempolicy *bin_get_policy(struct vm_area_struct *vma,
- unsigned long addr)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- struct mempolicy *pol;
-
- if (!bb->vm_ops || !bb->vm_ops->get_policy)
- return vma->vm_policy;
-
- if (!sysfs_get_active_two(attr_sd))
- return vma->vm_policy;
-
- pol = bb->vm_ops->get_policy(vma, addr);
-
- sysfs_put_active_two(attr_sd);
- return pol;
-}
-
-static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from,
- const nodemask_t *to, unsigned long flags)
-{
- struct file *file = vma->vm_file;
- struct bin_buffer *bb = file->private_data;
- struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
- int ret;
-
- if (!bb->vm_ops || !bb->vm_ops->migrate)
- return 0;
-
- if (!sysfs_get_active_two(attr_sd))
- return 0;
-
- ret = bb->vm_ops->migrate(vma, from, to, flags);
-
- sysfs_put_active_two(attr_sd);
- return ret;
-}
-#endif
-
-static struct vm_operations_struct bin_vm_ops = {
- .open = bin_vma_open,
- .close = bin_vma_close,
- .fault = bin_fault,
- .page_mkwrite = bin_page_mkwrite,
- .access = bin_access,
-#ifdef CONFIG_NUMA
- .set_policy = bin_set_policy,
- .get_policy = bin_get_policy,
- .migrate = bin_migrate,
-#endif
-};
-
static int mmap(struct file *file, struct vm_area_struct *vma)
{
struct bin_buffer *bb = file->private_data;
@@ -370,25 +199,7 @@ static int mmap(struct file *file, struct vm_area_struct *vma)
goto out_put;
rc = attr->mmap(kobj, attr, vma);
- if (rc)
- goto out_put;
-
- /*
- * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup()
- * to satisfy versions of X which crash if the mmap fails: that
- * substitutes a new vm_file, and we don't then want bin_vm_ops.
- */
- if (vma->vm_file != file)
- goto out_put;
-
- rc = -EINVAL;
- if (bb->mmapped && bb->vm_ops != vma->vm_ops)
- goto out_put;
- rc = 0;
- bb->mmapped = 1;
- bb->vm_ops = vma->vm_ops;
- vma->vm_ops = &bin_vm_ops;
out_put:
sysfs_put_active_two(attr_sd);
out_unlock:
@@ -475,9 +286,9 @@ void unmap_bin_file(struct sysfs_dirent *attr_sd)
mutex_lock(&sysfs_bin_lock);
hlist_for_each_entry(bb, tmp, &attr_sd->s_bin_attr.buffers, list) {
- struct inode *inode = bb->file->f_path.dentry->d_inode;
+ struct file *file = bb->file;
- unmap_mapping_range(inode->i_mapping, 0, 0, 1);
+ remap_file_mappings(file, &revoked_vm_ops);
}
mutex_unlock(&sysfs_bin_lock);
--
1.6.1.2.350.g88cc
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2009-04-11 12:06 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-11 12:01 [RFC][PATCH 0/9] File descriptor hot-unplug support Eric W. Biederman
2009-04-11 12:03 ` [RFC][PATCH 1/9] mm: Introduce remap_file_mappings Eric W. Biederman
2009-04-11 12:05 ` [RFC][PATCH 2/9] mm: Implement generic support for revoking a mapping Eric W. Biederman
2009-04-11 12:06 ` Eric W. Biederman [this message]
2009-04-11 12:07 ` [RFC][PATCH 4/9] vfs: Generalize the file_list Eric W. Biederman
2009-04-11 12:08 ` [RFC][PATCH 5/9] vfs: Introduce basic infrastructure for revoking a file Eric W. Biederman
2009-04-14 22:12 ` Jonathan Corbet
2009-04-15 2:55 ` Eric W. Biederman
2009-04-11 12:10 ` [RFC][PATCH 6/9] vfs: Utilize fops_read_lock where appropriate Eric W. Biederman
2009-04-11 12:11 ` [RFC][PATCH 7/9] vfs: Optimize fops_read_lock Eric W. Biederman
2009-04-11 12:13 ` [RFC][PATCH 8/9] vfs: Implement generic revoked file operations Eric W. Biederman
2009-04-12 18:56 ` Jamie Lokier
2009-04-12 20:04 ` Eric W. Biederman
2009-04-12 20:31 ` Jamie Lokier
2009-04-12 21:53 ` Eric W. Biederman
2009-04-12 20:54 ` Eric W. Biederman
2009-04-12 21:02 ` Jamie Lokier
2009-04-12 23:06 ` Eric W. Biederman
2009-04-11 12:14 ` [RFC][PATCH 9/9] proc: Use the generic vfs revoke facility that now exists Eric W. Biederman
2009-04-11 15:58 ` [RFC][PATCH 0/9] File descriptor hot-unplug support Al Viro
2009-04-11 16:49 ` Eric W. Biederman
2009-04-11 16:56 ` Al Viro
2009-04-11 23:57 ` Eric W. Biederman
2009-04-12 20:21 ` Eric W. Biederman
2009-04-14 3:16 ` Tejun Heo
2009-04-14 7:39 ` Eric W. Biederman
2009-04-14 7:45 ` Tejun Heo
2009-04-14 8:27 ` Eric W. Biederman
2009-04-14 8:49 ` Tejun Heo
2009-04-14 15:07 ` Jamie Lokier
2009-04-14 19:09 ` Eric W. Biederman
2009-06-01 21:45 ` [PATCH 0/23] File descriptor hot-unplug support v2 Eric W. Biederman
2009-06-01 21:50 ` [PATCH 01/23] mm: Introduce revoke_file_mappings Eric W. Biederman
2009-06-01 22:25 ` Andrew Morton
2009-06-02 0:12 ` Eric W. Biederman
2009-06-01 21:50 ` [PATCH 02/23] vfs: Implement unpoll_file Eric W. Biederman
2009-06-06 8:08 ` Al Viro
2009-06-01 21:50 ` [PATCH 03/23] vfs: Generalize the file_list Eric W. Biederman
2009-06-02 7:06 ` Nick Piggin
2009-06-05 19:33 ` Eric W. Biederman
2009-06-09 10:38 ` Nick Piggin
2009-06-09 18:38 ` Eric W. Biederman
2009-06-10 6:05 ` Nick Piggin
2009-06-01 21:50 ` [PATCH 04/23] vfs: Introduce infrastructure for revoking a file Eric W. Biederman
2009-06-02 5:16 ` Pekka Enberg
2009-06-02 6:51 ` Eric W. Biederman
2009-06-02 7:08 ` Pekka Enberg
2009-06-02 7:14 ` Nick Piggin
2009-06-02 17:06 ` Linus Torvalds
2009-06-02 20:52 ` Eric W. Biederman
2009-06-03 6:37 ` Nick Piggin
2009-06-02 22:56 ` Eric W. Biederman
2009-06-03 6:38 ` Nick Piggin
2009-06-05 9:03 ` Miklos Szeredi
2009-06-05 19:06 ` Eric W. Biederman
2009-06-01 21:50 ` [PATCH 05/23] vfs: Teach lseek to use file_hotplug_lock Eric W. Biederman
2009-06-01 21:50 ` [PATCH 06/23] vfs: Teach read/write to use file_hotplug_read_lock Eric W. Biederman
2009-06-01 21:50 ` [PATCH 07/23] vfs: Teach sendfile,splice,tee,and vmsplice to use file_hotplug_lock Eric W. Biederman
2009-06-03 23:39 ` Badari Pulavarty
2009-06-05 19:37 ` Eric W. Biederman
2009-06-01 21:50 ` [PATCH 08/23] vfs: Teach readdir " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 09/23] vfs: Teach poll and select " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 10/23] vfs: Teach do_path_lookup " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 11/23] mm: Teach mmap " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 12/23] vfs: Teach fcntl " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 13/23] vfs: Teach ioctl " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 14/23] vfs: Teach flock " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 15/23] vfs: Teach fallocate, and filp_close " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 16/23] vfs: Teach fstatfs, fstatfs64, ftruncate, fchdir, fchmod, fchown " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 17/23] proc: Teach /proc/<pid>/fd " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 18/23] vfs: Teach epoll " Eric W. Biederman
2009-06-02 16:51 ` Davide Libenzi
2009-06-02 21:23 ` Eric W. Biederman
2009-06-02 21:52 ` Davide Libenzi
2009-06-02 22:51 ` Eric W. Biederman
2009-06-03 14:57 ` Davide Libenzi
2009-06-03 20:53 ` Eric W. Biederman
2009-06-04 0:50 ` Davide Libenzi
2009-06-04 1:42 ` Eric W. Biederman
2009-06-01 21:50 ` [PATCH 19/23] eventpoll: Fix comment Eric W. Biederman
2009-06-01 21:50 ` [PATCH 20/23] vfs: Teach aio to use file_hotplug_lock Eric W. Biederman
2009-06-01 21:50 ` [PATCH 21/23] vfs: Teach fsync " Eric W. Biederman
2009-06-01 21:50 ` [PATCH 22/23] vfs: Teach fadvice to file_hotplug_lock Eric W. Biederman
2009-06-01 21:50 ` [PATCH 23/23] vfs: Teach readahead to use the file_hotplug_lock Eric W. Biederman
2009-06-03 23:25 ` Badari Pulavarty
2009-06-06 8:03 ` [PATCH 0/23] File descriptor hot-unplug support v2 Al Viro
2009-06-08 9:41 ` Miklos Szeredi
2009-06-08 10:24 ` Jamie Lokier
2009-06-08 16:29 ` Al Viro
2009-06-08 16:44 ` Miklos Szeredi
2009-06-08 17:50 ` Al Viro
2009-06-08 18:01 ` Linus Torvalds
2009-06-08 18:50 ` Al Viro
2009-06-08 19:18 ` Linus Torvalds
2009-06-09 6:42 ` Eric W. Biederman
2009-06-09 10:52 ` Nick Piggin
2009-06-09 5:50 ` Miklos Szeredi
2009-06-09 6:31 ` Eric W. Biederman
2009-06-09 6:22 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1eivz75u4.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=gregkh@suse.de \
--cc=hugh@veritas.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pci@vger.kernel.org \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).