incorrect direct io error handling
Subsystems (2)
PATCH 1/1 incorrect direct io error handling
This patch is result of discussion started week ago here:
http://lkml.org/lkml/2006/12/11/66
changes from original patch:
- Update wrong comments about i_mutex locking.
- Add BUG_ON(!mutex_is_locked(..)) for non blkdev.
- vmtruncate call only for non blockdev
LOG:
If generic_file_direct_write() has fail (ENOSPC condition) inside __generic_file_aio_write_nolock() it may have instantiated
a few blocks outside i_size. And fsck will complain about wrong i_size (ext2, ext3 and reiserfs interpret i_size and biggest block difference as error), after fsck will fix error i_size will be increased to the biggest block, but this blocks contain gurbage from previous write attempt, this is not information leak, but its silence file data corruption. This issue affect fs regardless the values of blocksize or pagesize.
We need truncate any block beyond i_size after write have failed , do in simular generic_file_buffered_write() error path. If host is !S_ISBLK i_mutex always held inside generic_file_aio_write_nolock() and we may safely call vmtruncate(). Some fs (XFS at least) may directly call generic_file_direct_write()with i_mutex not held. There is no general scenario in this case. This fs have to handle generic_file_direct_write() error by its own specific way (place).
Issue was found during OpenVZ kernel testing.
Exampe:open("mnt2/FILE3", O_WRONLY|O_CREAT|O_DIRECT, 0666) = 3 write(3, "aaaaaa"..., 4096) = -1 ENOSPC (No space left on device)
stat mnt2/FILE3
File: `mnt2/FILE3'
Size: 0 Blocks: 4 IO Block: 4096 regular empty file
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
^^^^^^^^^^ file size is less than biggest block idx
Device: 700h/1792d Inode: 14 Links: 1
Access: (0644/-rw-r--r--) Uid: ( 0/ root) Gid: ( 0/ root)
fsck.ext2 -f -n mnt1/fs_img
Pass 1: Checking inodes, blocks, and sizes
Inode 14, i_size is 0, should be 2048. Fix? no
-------------
mm/filemap.c +23 -4
@@ -2044,8 +2044,9 @@ generic_file_direct_write(struct kiocb */* * Sync the fs metadata but not the minor inode changes and * of course not the data as we did direct DMA for the IO. -* i_mutex is held, which protects generic_osync_inode() from -* livelocking. AIO O_DIRECT ops attempt to sync metadata here. +* i_mutex may not being held (XFS does this), if so some specific locking +* ordering must protect generic_osync_inode() from livelocking. +* AIO O_DIRECT ops attempt to sync metadata here. */ if ((written >=0 || written == -EIOCBQUEUED ) && ((file->f_flags &O_SYNC ) ||IS_SYNC (inode))) {
@@ -2279,6 +2280,17 @@ __generic_file_aio_write_nolock(struct k written =generic_file_direct_write (iocb, iov, &nr_segs, pos, ppos, count, ocount); +/* +* If host is not S_ISBLK generic_file_direct_write() may +* have instantiated a few blocks outside i_size files +* Trim these off again. +*/ +if (unlikely (written <0 ) && !S_ISBLK (inode->i_mode)) { +loff_t isize =i_size_read (inode); +if (pos + count > isize) +vmtruncate (inode, isize); + } +if (written <0 || written == count) goto out;/*
@@ -2341,6 +2353,13 @@ ssize_t generic_file_aio_write_nolock(stssize_t ret;BUG_ON (iocb->ki_pos != pos); +/* +* generic_file_buffered_write() may be called inside +* __generic_file_aio_write_nolock() even in case of +* O_DIRECT for non S_ISBLK files. So i_mutex must be held. +*/ +if (!S_ISBLK (inode->i_mode)) +BUG_ON (!mutex_is_locked (&inode->i_mutex)); ret =__generic_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);
@@ -2383,8 +2402,8 @@ ssize_t generic_file_aio_write(struct kiEXPORT_SYMBOL (generic_file_aio_write);/* -* Called under i_mutex for writes to S_ISREG files. Returns -EIO if something -* went wrong during pagecache shootdown. +* May be called without i_mutex for writes to S_ISREG files. XFS does this. +* Returns -EIO if something went wrong during pagecache shootdown. */ static ssize_t generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
Dmitriy Monakhov wrote on Monday, December 18, 2006 5:23 AM
Quoted 13 lines
This patch is result of discussion started week ago here:
http://lkml.org/lkml/2006/12/11/66
changes from original patch:
- Update wrong comments abouti_mutexlocking.
- Add BUG_ON(!mutex_is_locked(..)) for non blkdev.
- vmtruncate call only for non blockdev
LOG:
Ifgeneric_file_direct_write()has fail (ENOSPC condition) inside__generic_file_aio_write_nolock()it may have instantiated
a few blocks outsidei_size. And fsck will complain about wrongi_size(ext2, ext3 and reiserfs interpreti_sizeand biggest block difference as error), after fsck will fix errori_sizewill be increased to the biggest block, but this blocks contain gurbage from previous write attempt, this is not
Quoted 8 lines
information leak, but its silence file data corruption. This issue affect fs regardless the values of blocksize or pagesize.
We need truncate any block beyondi_sizeafter write have failed , do in simulargeneric_file_buffered_write()error path. If host is !S_ISBLKi_mutexalways held insidegeneric_file_aio_write_nolock()and we may safely callvmtruncate(). Some fs (XFS at least) may directly call generic_file_direct_write()withi_mutexnot held. There is no general scenario in this case. This fs have to handlegeneric_file_direct_write()error by its own specific way (place).
I'm puzzled that if ext2 is able to instantiate some blocks, then why does it return no space error? Where is the error coming from?
Quoted 24 lines · Kenneth W
Dmitriy Monakhov wrote on Monday, December 18, 2006 5:23 AM
Quoted 13 lines
This patch is result of discussion started week ago here:
http://lkml.org/lkml/2006/12/11/66
changes from original patch:
- Update wrong comments abouti_mutexlocking.
- Add BUG_ON(!mutex_is_locked(..)) for non blkdev.
- vmtruncate call only for non blockdev
LOG:
Ifgeneric_file_direct_write()has fail (ENOSPC condition) inside__generic_file_aio_write_nolock()it may have instantiated
a few blocks outsidei_size. And fsck will complain about wrongi_size(ext2, ext3 and reiserfs interpreti_sizeand biggest block difference as error), after fsck will fix errori_sizewill be increased to the biggest block, but this blocks contain gurbage from previous write attempt, this is notQuoted 8 lines
information leak, but its silence file data corruption. This issue affect fs regardless the values of blocksize or pagesize.
We need truncate any block beyondi_sizeafter write have failed , do in simulargeneric_file_buffered_write()error path. If host is !S_ISBLKi_mutexalways held insidegeneric_file_aio_write_nolock()and we may safely callvmtruncate(). Some fs (XFS at least) may directly call generic_file_direct_write()withi_mutexnot held. There is no general scenario in this case. This fs have to handlegeneric_file_direct_write()error by its own specific way (place).
Quoted 2 lines
I'm puzzled that if ext2 is able to instantiate some blocks, then why does it return no space error? Where is the error coming from?
generic_file_aio_write_nolock()
->generic_file_direct_write()
->generic_file_direct_IO()
->ext2_direct_IO(WRITE,...)
->blockdev_direct_IO( ....,ext2_get_block,...)Quoted 23 lines · Dmitriy Monakhov
mm/filemap.c +6
-2@@ -2044,8 +2044,9 @@ generic_file_direct_write(struct kiocb */* * Sync the fs metadata but not the minor inode changes and * of course not the data as we did direct DMA for the IO. -* i_mutex is held, which protects generic_osync_inode() from -* livelocking. AIO O_DIRECT ops attempt to sync metadata here. +* i_mutex may not being held (XFS does this), if so some specific locking +* ordering must protect generic_osync_inode() from livelocking. +* AIO O_DIRECT ops attempt to sync metadata here. */ if ((written >=0 || written == -EIOCBQUEUED ) && ((file->f_flags &O_SYNC ) ||IS_SYNC (inode))) {@@ -2279,6 +2280,17 @@ __generic_file_aio_write_nolock(struct k written =generic_file_direct_write (iocb, iov, &nr_segs, pos, ppos, count, ocount); +/* +* If host is not S_ISBLK generic_file_direct_write() may +* have instantiated a few blocks outside i_size files
mm/filemap.c __generic_file_aio_write_nolock(struct k · line 2295
Quoted 10 lines
mm/filemap.c +8
-0+* Trim these off again. +*/ +if (unlikely (written <0 ) && !S_ISBLK (inode->i_mode)) { +loff_t isize =i_size_read (inode); +if (pos + count > isize) +vmtruncate (inode, isize); + } +if (written <0 || written == count) goto out;
You comment in the first hunk that i_mutex may not be held here, but there's no comment in __generic_file_aio_write_nolock() that the i_mutex must be held for !S_ISBLK devices.
Quoted 4 lines
mm/filemap.c +0
-0@@ -2341,6 +2353,13 @@ ssize_t generic_file_aio_write_nolock(stssize_t ret;BUG_ON (iocb->ki_pos != pos);
mm/filemap.c ssize_t generic_file_aio_write_nolock(st · line 2365
Quoted 10 lines
mm/filemap.c +7
-0+/* +* generic_file_buffered_write() may be called inside +* __generic_file_aio_write_nolock() even in case of +* O_DIRECT for non S_ISBLK files. So i_mutex must be held. +*/ +if (!S_ISBLK (inode->i_mode)) +BUG_ON (!mutex_is_locked (&inode->i_mutex)); ret =__generic_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);
I note that you comment here in generic_file_aio_write_nolock(), but it's not immediately obvious that this is refering to the vmtruncate() call in __generic_file_aio_write_nolock().
IOWs, wouldn't it be better to put this comment and check in __generic_file_aio_write_nolock() directly above the vmtruncate() call that cares about this?
mm/filemap.c ssize_t generic_file_aio_write(struct ki · line 2407
Quoted 9 lines
mm/filemap.c +2
-2@@ -2383,8 +2402,8 @@ ssize_t generic_file_aio_write(struct kiEXPORT_SYMBOL (generic_file_aio_write);/* -* Called under i_mutex for writes to S_ISREG files. Returns -EIO if something -* went wrong during pagecache shootdown. +* May be called without i_mutex for writes to S_ISREG files. XFS does this. +* Returns -EIO if something went wrong during pagecache shootdown. */
Not sure you need to say "XFS does this" - other filesystems may do this in the future.....
Cheers,
Dave.
Signature · 3 lines
Dave Chinner Principal Engineer SGI Australian Software Group
Quoted 30 lines · David Chinner
Quoted 29 lines · Dmitriy Monakhov
mm/filemap.c +12
-2@@ -2044,8 +2044,9 @@ generic_file_direct_write(struct kiocb */* * Sync the fs metadata but not the minor inode changes and * of course not the data as we did direct DMA for the IO. -* i_mutex is held, which protects generic_osync_inode() from -* livelocking. AIO O_DIRECT ops attempt to sync metadata here. +* i_mutex may not being held (XFS does this), if so some specific locking +* ordering must protect generic_osync_inode() from livelocking. +* AIO O_DIRECT ops attempt to sync metadata here. */ if ((written >=0 || written == -EIOCBQUEUED ) && ((file->f_flags &O_SYNC ) ||IS_SYNC (inode))) {@@ -2279,6 +2280,17 @@ __generic_file_aio_write_nolock(struct k written =generic_file_direct_write (iocb, iov, &nr_segs, pos, ppos, count, ocount); +/* +* If host is not S_ISBLK generic_file_direct_write() may +* have instantiated a few blocks outside i_size files +* Trim these off again. +*/ +if (unlikely (written <0 ) && !S_ISBLK (inode->i_mode)) { +loff_t isize =i_size_read (inode); +if (pos + count > isize) +vmtruncate (inode, isize);
Quoted 8 lines
mm/filemap.c __generic_file_aio_write_nolock(struct k · line 2295
Quoted 4 lines
mm/filemap.c +2
-0+ } +if (written <0 || written == count) goto out;You comment in the first hunk that
i_mutexmay not be held here, but there's no comment in__generic_file_aio_write_nolock()that thei_mutexmust be held for !S_ISBLK devices.
Any one may call directly call generic_file_direct_write() with i_mutex not held.
Quoted 13 lines
Quoted 13 lines
mm/filemap.c +7
-0@@ -2341,6 +2353,13 @@ ssize_t generic_file_aio_write_nolock(stssize_t ret;BUG_ON (iocb->ki_pos != pos); +/* +* generic_file_buffered_write() may be called inside +* __generic_file_aio_write_nolock() even in case of +* O_DIRECT for non S_ISBLK files. So i_mutex must be held. +*/ +if (!S_ISBLK (inode->i_mode)) +BUG_ON (!mutex_is_locked (&inode->i_mutex));
Quoted 6 lines
mm/filemap.c ssize_t generic_file_aio_write_nolock(st · line 2365
Quoted 2 lines
mm/filemap.c +0
-0ret =__generic_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);I note that you comment here in
generic_file_aio_write_nolock(), but it's not immediately obvious that this is refering to thevmtruncate()call in__generic_file_aio_write_nolock().
This is not about vmtruncate(). __generic_file_aio_write_nolock() may call generic_file_buffered_write() even in case of O_DIRECT for !S_ISBLK, and generic_file_buffered_write() has documented locking rules (i_mutex held). IMHO it is important to explicitly document this . And after we realize that i_mutex always held, vmtruncate() may be safely called.
Quoted 8 lines
IOWs, wouldn't it be better to put this comment and check in
__generic_file_aio_write_nolock()directly above thevmtruncate()call that cares about this?Quoted 3 lines
mm/filemap.c +0
-0@@ -2383,8 +2402,8 @@ ssize_t generic_file_aio_write(struct kiEXPORT_SYMBOL (generic_file_aio_write);
Quoted 9 lines
mm/filemap.c ssize_t generic_file_aio_write(struct ki · line 2407
Quoted 6 lines
mm/filemap.c +2
-2/* -* Called under i_mutex for writes to S_ISREG files. Returns -EIO if something -* went wrong during pagecache shootdown. +* May be called without i_mutex for writes to S_ISREG files. XFS does this. +* Returns -EIO if something went wrong during pagecache shootdown. */ Not sure you need to say "XFS does this" - other filesystems may do this in the future.....
Yes, but where are multiple comments about "reiserfs does this" in fs/buffer.c
Quoted 13 lines
Cheers,
Dave.
Signature · 8 lines
Dave Chinner Principal Engineer SGI Australian Software Group - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 6 lines · Dmitriy Monakhov
Quoted 5 lines · David Chinner
mm/filemap.c
Quoted 4 lines · Dmitriy Monakhov
mm/filemap.c +0
-0
<snip stuff>
Quoted 4 lines
Quoted 3 lines
You comment in the first hunk that
i_mutexmay not be held here, but there's no comment in__generic_file_aio_write_nolock()that thei_mutexmust be held for !S_ISBLK devices.Any one may call directly call
generic_file_direct_write()withi_mutexnot held.
Only block devices based on the implementation (i.e. buffered I/O is done here). but one can't call vmtruncate without the i_mutex held, so if a filesystem is calling generic_file_direct_write() it won't be able to use __generic_file_aio_write_nolock() without the i_mutex held (because it can right now if it doesn't need the buffered I/O fallback path), then
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
mm/filemap.c +7
-0@@ -2341,6 +2353,13 @@ ssize_t generic_file_aio_write_nolock(stssize_t ret;BUG_ON (iocb->ki_pos != pos); +/* +* generic_file_buffered_write() may be called inside +* __generic_file_aio_write_nolock() even in case of +* O_DIRECT for non S_ISBLK files. So i_mutex must be held. +*/ +if (!S_ISBLK (inode->i_mode)) +BUG_ON (!mutex_is_locked (&inode->i_mutex));
Quoted 8 lines
Quoted 6 lines
mm/filemap.c ssize_t generic_file_aio_write_nolock(st · line 2365
Quoted 2 lines
mm/filemap.c +0
-0ret =__generic_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);I note that you comment here in
generic_file_aio_write_nolock(), but it's not immediately obvious that this is refering to thevmtruncate()call in__generic_file_aio_write_nolock().This is not about
vmtruncate().__generic_file_aio_write_nolock()may callgeneric_file_buffered_write()even in case ofO_DIRECTfor !S_ISBLK, and
No, the need for i_mutex is currently dependent on doing direct I/O and the return value from generic_file_buffered_write().
A filesystem that doesn't fall back to buffered I/O (e.g. XFS) can currently use generic_file_aio_write_nolock() without needing to hold i_mutex.
Your change prevents that by introducing a vmtruncate() before the generic_file_buffered_write() return value check, which means that a filesystem now _must_ hold the i_mutex when calling generic_file_aio_write_nolock() even when it doesn't do buffered I/O through this path.
Quoted 3 lines
generic_file_buffered_write()has documented locking rules (i_mutexheld). IMHO it is important to explicitly document this . And after we realize thati_mutexalways held,vmtruncate()may be safely called.
I don't think changing the locking semantics of generic_file_aio_write_nolock() to require a lock for all filesystem-based users is a good way to fix a filesystem specific direct I/O problem which can be easily fixed in filesystem specific code - i.e. call vmtruncate() in ext3_file_write() on failure....
Cheers,
Dave.
Signature · 3 lines
Dave Chinner Principal Engineer SGI Australian Software Group
Sorry for long delay (russian holidays are very hard time :) )
Quoted 41 lines · David Chinner
Quoted 6 lines · Dmitriy Monakhov
Quoted 5 lines · David Chinner
mm/filemap.c
Quoted 4 lines · Dmitriy Monakhov
mm/filemap.c +0
-0<snip stuff>
Quoted 4 lines
Quoted 3 lines
You comment in the first hunk that
i_mutexmay not be held here, but there's no comment in__generic_file_aio_write_nolock()that thei_mutexmust be held for !S_ISBLK devices.Any one may call directly call
generic_file_direct_write()withi_mutexnot held.Only block devices based on the implementation (i.e. buffered I/O is done here). but one can't call vmtruncate without the
i_mutexheld, so if a filesystem is callinggeneric_file_direct_write()it won't be able to use__generic_file_aio_write_nolock()without thei_mutexheld (because it can right now if it doesn't need the buffered I/O fallback path), thenQuoted 19 lines
Quoted 19 lines
Quoted 5 lines
mm/filemap.c +0
-0@@ -2341,6 +2353,13 @@ ssize_t generic_file_aio_write_nolock(stssize_t ret;BUG_ON (iocb->ki_pos != pos);mm/filemap.c ssize_t generic_file_aio_write_nolock(st · line 2365
Quoted 10 lines
mm/filemap.c +7
-0+/* +* generic_file_buffered_write() may be called inside +* __generic_file_aio_write_nolock() even in case of +* O_DIRECT for non S_ISBLK files. So i_mutex must be held. +*/ +if (!S_ISBLK (inode->i_mode)) +BUG_ON (!mutex_is_locked (&inode->i_mutex)); ret =__generic_file_aio_write_nolock (iocb, iov, nr_segs, &iocb->ki_pos);I note that you comment here in
generic_file_aio_write_nolock(), but it's not immediately obvious that this is refering to thevmtruncate()call in__generic_file_aio_write_nolock().
Quoted 8 lines
Quoted 2 lines
This is not about
vmtruncate().__generic_file_aio_write_nolock()may callgeneric_file_buffered_write()even in case ofO_DIRECTfor !S_ISBLK, andNo, the need for
i_mutexis currently dependent on doing direct I/O and the return value fromgeneric_file_buffered_write().
A filesystem that doesn't fall back to buffered I/O (e.g. XFS) can currently usegeneric_file_aio_write_nolock()without needing to holdi_mutex. usegeneric_file_aio_write_nolock()without needing to holdi_mutex.
But it doesn't use it. XFS implement it's own write method with it's own locking rules and explicitly call generic_file_direct_write() in case of O_DIRECT. BTW XFS correctly handling ENOSPC in case of O_DIRECT (fs corruption not happend after error occur).
Quoted 6 lines
Your change prevents that by introducing a
vmtruncate()before thegeneric_file_buffered_write()return value check, which means that a filesystem now _must_ hold thei_mutexwhen callinggeneric_file_aio_write_nolock()even when it doesn't do buffered I/O through this path.
Yes it's so. But it is just explicitly document the fact that every fs call generic_file_aio_write_nolock() with i_mutex held (where is no any fs that invoke it without i_mutex). As i understand Andrew Morton think so too:
http://lkml.org/lkml/2006/12/12/67
<snip>
I guess we can make that a rule (document it, add BUG_ON(!mutex_is_locked(..)) if it isn't a blockdev) if needs be. After really checking that this matches reality for all callers.
<snip>
Quoted 10 lines
Quoted 4 lines
generic_file_buffered_write()has documented locking rules (i_mutexheld). IMHO it is important to explicitly document this . And after we realize thati_mutexalways held,vmtruncate()may be safely called.I don't think changing the locking semantics of
generic_file_aio_write_nolock()to require a lock for all filesystem-based users is a good way to fix a filesystem specific direct I/O problem which can be easily fixed in filesystem specific code - i.e. callvmtruncate()inext3_file_write()on failure....
Where are more than 10 filesystems where we have to fix it then. And fix is almost the same for all fs, so we have to do many copy/paste work IMHO fix it inside generic_file_aio_write_nolock is realy straightforward way. What do you think?
Quoted 8 lines
Cheers,
Dave.
Signature · 3 lines
Dave Chinner Principal Engineer SGI Australian Software Group