Dave,
On Thu, Jul 18, 2013 at 04:16:32PM -0500, Ben Myers wrote:
> On Thu, Jul 18, 2013 at 01:42:03PM +1000, Dave Chinner wrote:
> > On Wed, Jul 17, 2013 at 05:17:36PM -0700, Linus Torvalds wrote:
> > > On Wed, Jul 17, 2013 at 4:40 PM, Ben Myers <b...@sgi.com> wrote:
> > > >>
> > > >> We're still talking at cross purposes then.
> > > >>
> > > >> How the hell do you handle mmap() and page faulting?
> > > >
> > > > __xfs_get_blocks serializes access to the block map with the i_lock on
> > > > the
> > > > xfs_inode. This appears to be racy with respect to hole punching.
> > >
> > > Would it be possible to just make __xfs_get_blocks get the i_iolock
> > > (non-exclusively)?
> >
> > No. __xfs_get_blocks() operates on metadata (e.g. extent lists), and
> > as such is protected by the i_ilock (note: not the i_iolock). i.e.
> > XFS has a multi-level locking strategy:
> >
> > i_iolock is provided for *data IO serialisation*,
> > i_ilock is for *inode metadata serialisation*.
>
> I think if __xfs_get_blocks has some way of knowing it is the mmap/page fault
> path, taking the iolock shared in addition to the ilock (in just that case)
> would prevent the mmap from being able to read stale data from disk. You
> would
> see either the data before the punch or you would see the hole.
>
> Actually... I think that is wrong: You'd have to take the iolock across the
> read itself (not just the access to the block map) for it to have the desired
> effect:
>
> 1608 int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> ...
> 1704 page_not_uptodate:
> 1705 /*
> 1706 * Umm, take care of errors if the page isn't up-to-date.
> 1707 * Try to re-read it _once_. We do this synchronously,
> 1708 * because there really aren't any performance issues here
> 1709 * and we need to check for errors.
> 1710 */
> 1711 ClearPageError(page);
> 1712 error = mapping->a_ops->readpage(file, page);
> 1713 if (!error) {
> 1714 wait_on_page_locked(page);
> 1715 if (!PageUptodate(page))
> 1716 error = -EIO;
> 1717 }
> 1718 page_cache_release(page);
>
> Wouldn't you have to hold the iolock until after wait_on_page_locked returns?
Maybe like so (crappy/untested/probably wrong/fodder for ridicule/etc):
Index: xfs/fs/xfs/xfs_aops.c
===================================================================
--- xfs.orig/fs/xfs/xfs_aops.c
+++ xfs/fs/xfs/xfs_aops.c
@@ -1663,6 +1663,24 @@ xfs_vm_readpages(
return mpage_readpages(mapping, pages, nr_pages, xfs_get_blocks);
}
+void
+xfs_vm_fault_lock(
+ struct inode *inode)
+{
+ struct xfs_inode *ip = XFS_I(inode);
+
+ xfs_ilock(ip, XFS_IOLOCK_SHARED);
+}
+
+void
+xfs_vm_fault_unlock(
+ struct inode *inode)
+{
+ struct xfs_inode *ip = XFS_I(inode);
+
+ xfs_iunlock(ip, XFS_IOLOCK_SHARED);
+}
+
const struct address_space_operations xfs_address_space_operations = {
.readpage = xfs_vm_readpage,
.readpages = xfs_vm_readpages,
@@ -1677,4 +1695,6 @@ const struct address_space_operations xf
.migratepage = buffer_migrate_page,
.is_partially_uptodate = block_is_partially_uptodate,
.error_remove_page = generic_error_remove_page,
+ .fault_lock = xfs_vm_fault_lock,
+ .fault_unlock = xfs_vm_fault_unlock,
};
Index: xfs/mm/filemap.c
===================================================================
--- xfs.orig/mm/filemap.c
+++ xfs/mm/filemap.c
@@ -1709,12 +1709,16 @@ page_not_uptodate:
* and we need to check for errors.
*/
ClearPageError(page);
+ if (mapping->a_ops->fault_lock)
+ mapping->a_ops->fault_lock(inode);
error = mapping->a_ops->readpage(file, page);
if (!error) {
wait_on_page_locked(page);
if (!PageUptodate(page))
error = -EIO;
}
+ if (mapping->a_ops->fault_unlock)
+ mapping->a_ops->fault_unlock(inode);
page_cache_release(page);
if (!error || error == AOP_TRUNCATED_PAGE)
Index: xfs/include/linux/fs.h
===================================================================
--- xfs.orig/include/linux/fs.h
+++ xfs/include/linux/fs.h
@@ -388,6 +388,9 @@ struct address_space_operations {
int (*swap_activate)(struct swap_info_struct *sis, struct file *file,
sector_t *span);
void (*swap_deactivate)(struct file *file);
+
+ void (*fault_lock) (struct inode *inode);
+ void (*fault_unlock) (struct inode *inode);
};
extern const struct address_space_operations empty_aops;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
