fs: introduce new writeback error reporting and convert existing API as a wrapper around it
Subsystems (23)
v3 cover fs: introduce new writeback error reporting and convert existing API as a wrapper around it
v3: wb_err_t -> errseq_t
clean up places that re-set errors after calling filemap_* functions
v2: introduce wb_err_t, use atomics
Apologies for the wide posting here, but this touches a lot of areas. This is v3 of the patchset to improve how we're tracking and reporting errors that occur during pagecache writeback.
There are several situations where the kernel can "lose" errors that occur during writeback, such that fsync will return success even though it failed to write back some data previously. The basic idea here is to have the kernel be more deliberate about the point from which errors are checked to ensure that that doesn't happen.
Additionally, this set changes the behavior of fsync in Linux to report writeback errors on all fds instead of just the first one. This allows writers to reliably tell whether their data made it to the backing device without having to coordinate fsync calls with other writers.
This set sprawls over a large swath of kernel code. I think the first 12 patches in the series are pretty straightforward and are more or less ready for merge.
The real changes start with patch 13. That adds support for errseq_t, builds a new writeback error tracking API on top of that, and converts the existing code to use it. After that, there are a few cleanup patches to eliminate some unneeded error re-setting, etc.
Unfortunately, testing this across so many filesystems is rather difficult. I have a xfstest for block-based filesystems that uses dm_error that I'll post soon. That works well with ext4, but btrfs and xfs seem to go r/o soon after the first error. I also don't have a good general method for testing this on network filesystems (yet!).
I'd like to see better testing here and am open to suggestions. I will note that the POSIX fsync spec says this:
"It is reasonable to assert that the key aspects of fsync() are unreasonable to test in a test suite. That does not make the function any less valuable, just more difficult to test. [...] It would also not be unreasonable to omit testing for fsync(), allowing it to be treated as a quality-of-implementation issue."
Of course, they're talking about a POSIX conformance test, but I think the same point applies here.
At this point, I'd like to start getting some of the preliminary patches merged (the first 12 or so). Most of those aren't terribly controversial and seem like reasonable bugfixes and cleanups. If any subsystem maintainers want to pick those up, then please do.
After that, I'd like to get the larger changes into linux-next with an aim for merge in v4.13 or v4.14 (depending on how testing goes).
Feedback is of course welcome!
Jeff Layton (20):
mm: drop "wait" parameter from write_one_page
mm: fix mapping_set_error call in me_pagecache_dirty
buffer: use mapping_set_error instead of setting the flag
fs: check for writeback errors after syncing out buffers in
generic_file_fsync
orangefs: don't call filemap_write_and_wait from fsync
dax: set errors in mapping when writeback fails
nilfs2: set the mapping error when calling SetPageError on writeback
mm: ensure that we set mapping error if writeout() fails 9p: set mapping error when writeback fails in launder_page
fuse: set mapping error in writepage_locked when it fails
cifs: set mapping error when page writeback fails in writepage or
launder_pages
lib: add errseq_t type and infrastructure for handling it
fs: new infrastructure for writeback error handling and reporting
fs: retrofit old error reporting API onto new infrastructure
mm: remove AS_EIO and AS_ENOSPC flags
mm: don't TestClearPageError in __filemap_fdatawait_range
cifs: cleanup writeback handling errors and comments
mm: clean up error handling in write_one_page
jbd2: don't reset error in journal_finish_inode_data_buffers
gfs2: clean up some filemap_* calls
Documentation/filesystems/vfs.txt | 9 +- fs/9p/vfs_addr.c | 5 +- fs/btrfs/file.c | 10 +- fs/btrfs/tree-log.c | 9 +- fs/buffer.c | 2 +- fs/cifs/cifsfs.c | 4 +- fs/cifs/file.c | 17 ++-- fs/cifs/inode.c | 22 ++--- fs/dax.c | 4 +- fs/exofs/dir.c | 2 +- fs/ext2/dir.c | 2 +- fs/ext2/file.c | 2 +- fs/f2fs/file.c | 3 + fs/f2fs/node.c | 6 +- fs/fuse/file.c | 8 +- fs/gfs2/glops.c | 12 +-- fs/gfs2/lops.c | 4 +- fs/gfs2/super.c | 6 +- fs/jbd2/commit.c | 13 +-- fs/jfs/jfs_metapage.c | 4 +- fs/libfs.c | 3 + fs/minix/dir.c | 2 +- fs/nilfs2/segment.c | 1 + fs/open.c | 3 + fs/orangefs/file.c | 5 +- fs/sysv/dir.c | 2 +- fs/ufs/dir.c | 2 +- include/linux/errseq.h | 16 +++ include/linux/fs.h | 41 ++++++-- include/linux/mm.h | 2 +- include/linux/pagemap.h | 18 ++-- lib/Makefile | 2 +- lib/errseq.c | 199 ++++++++++++++++++++++++++++++++++++++ mm/filemap.c | 88 ++++++++++------- mm/memory-failure.c | 2 +- mm/migrate.c | 6 +- mm/page-writeback.c | 23 +++-- 37 files changed, 398 insertions(+), 161 deletions(-) create mode 100644 include/linux/errseq.h create mode 100644 lib/errseq.c
Signature · 1 line
2.9.3
PATCH v3 1/20 mm: drop "wait" parameter from write_one_page
The callers all set it to 1.
Also, make it clear that this function will not set any sort of AS_* error, and that the caller must do so if necessary. No existing caller uses this on normal files, so none of them need it.
Also, add __must_check here since, in general, the callers need to handle an error here in some fashion.
--- fs/exofs/dir.c | 2 +- fs/ext2/dir.c | 2 +- fs/jfs/jfs_metapage.c | 4 ++-- fs/minix/dir.c | 2 +- fs/sysv/dir.c | 2 +- fs/ufs/dir.c | 2 +- include/linux/mm.h | 2 +- mm/page-writeback.c | 14 +++++++------- 8 files changed, 15 insertions(+), 15 deletions(-)
fs/exofs/dir.c +1 -1
@@ -72,7 +72,7 @@ static int exofs_commit_chunk(struct page *page, loff_t pos, unsigned len)set_page_dirty (page);if (IS_DIRSYNC (dir)) - err =write_one_page (page,1 ); + err =write_one_page (page);else unlock_page (page);
fs/ext2/dir.c +1 -1
@@ -100,7 +100,7 @@ static int ext2_commit_chunk(struct page *page, loff_t pos, unsigned len) }if (IS_DIRSYNC (dir)) { - err =write_one_page (page,1 ); + err =write_one_page (page);if (!err) err =sync_inode_metadata (dir,1 ); }else {
fs/jfs/jfs_metapage.c +2 -2
@@ -711,7 +711,7 @@ void force_metapage(struct metapage *mp)get_page (page);lock_page (page);set_page_dirty (page); -write_one_page (page,1 ); +write_one_page (page);clear_bit (META_forcewrite, &mp->flag);put_page (page); }
@@ -756,7 +756,7 @@ void release_metapage(struct metapage * mp)set_page_dirty (page);if (test_bit (META_sync, &mp->flag)) {clear_bit (META_sync, &mp->flag); -write_one_page (page,1 ); +write_one_page (page);lock_page (page);/* write_one_page unlocks the page */ } }else if (mp->lsn)/* discard_metapage doesn't remove it */
fs/minix/dir.c +1 -1
@@ -57,7 +57,7 @@ static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)mark_inode_dirty (dir); }if (IS_DIRSYNC (dir)) - err =write_one_page (page,1 ); + err =write_one_page (page);else unlock_page (page);return err;
fs/sysv/dir.c +1 -1
@@ -45,7 +45,7 @@ static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)mark_inode_dirty (dir); }if (IS_DIRSYNC (dir)) - err =write_one_page (page,1 ); + err =write_one_page (page);else unlock_page (page);return err;
fs/ufs/dir.c +1 -1
@@ -53,7 +53,7 @@ static int ufs_commit_chunk(struct page *page, loff_t pos, unsigned len)mark_inode_dirty (dir); }if (IS_DIRSYNC (dir)) - err =write_one_page (page,1 ); + err =write_one_page (page);else unlock_page (page);return err;
include/linux/mm.h +1 -1
@@ -2187,7 +2187,7 @@ extern void filemap_map_pages(struct vm_fault *vmf,extern int filemap_page_mkwrite (struct vm_fault *vmf);/* mm/page-writeback.c */ -int write_one_page (struct page *page,int wait); +int __must_check write_one_page (struct page *page);void task_dirty_inc (struct task_struct *tsk);/* readahead.c */
mm/page-writeback.c +7 -7
@@ -2361,15 +2361,16 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) }/** -* write_one_page - write out a single page and optionally wait on I/O +* write_one_page - write out a single page and wait on I/O * @page: the page to write -* @wait: if true, wait on writeout * * The page must be locked by the caller and will be unlocked upon return. * -* write_one_page() returns a negative error code if I/O failed. +* write_one_page() returns a negative error code if I/O failed. Note that +* the address_space is not marked for error. The caller must do this if +* needed. */ -int write_one_page (struct page *page,int wait) +int write_one_page (struct page *page) {struct address_space *mapping = page->mapping;int ret =0 ;
@@ -2380,13 +2381,12 @@ int write_one_page(struct page *page, int wait)BUG_ON (!PageLocked (page)); -if (wait) -wait_on_page_writeback (page); +wait_on_page_writeback (page);if (clear_page_dirty_for_io (page)) {get_page (page); ret = mapping->a_ops->writepage (page, &wbc); -if (ret ==0 && wait) { +if (ret ==0 ) {wait_on_page_writeback (page);if (PageError (page)) ret = -EIO ;
Signature · 1 line
2.9.3
Re: [PATCH v3 01/20] mm: drop "wait" parameter from write_one_page
Looks fine,
PATCH v3 2/20 mm: fix mapping_set_error call in me_pagecache_dirty
In reply to Jeff LaytonThe error code should be negative. Since this ends up in the default case anyway, this is harmless, but it's less confusing to negate it. Also, later patches will require a negative error code here.
--- mm/memory-failure.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memory-failure.c +1 -1
@@ -674,7 +674,7 @@ static int me_pagecache_dirty(struct page *p, unsigned long pfn)* the first EIO, but we're not worse than other parts * of the kernel. */ -mapping_set_error (mapping,EIO ); +mapping_set_error (mapping, -EIO ); }return me_pagecache_clean (p, pfn);
Signature · 1 line
2.9.3
Re: [PATCH v3 02/20] mm: fix mapping_set_error call in me_pagecache_dirty
Looks fine,
PATCH v3 3/20 buffer: use mapping_set_error instead of setting the flag
In reply to Jeff Layton--- fs/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/buffer.c +1 -1
@@ -483,7 +483,7 @@ static void __remove_assoc_queue(struct buffer_head *bh)list_del_init (&bh->b_assoc_buffers);WARN_ON (!bh->b_assoc_map);if (buffer_write_io_error (bh)) -set_bit (AS_EIO , &bh->b_assoc_map->flags); +mapping_set_error (bh->b_assoc_map, -EIO ); bh->b_assoc_map =NULL ; }
Signature · 1 line
2.9.3
Re: [PATCH v3 03/20] buffer: use mapping_set_error instead of setting the flag
Looks fine,
PATCH v3 4/20 fs: check for writeback errors after syncing out buffers in generic_file_fsync
In reply to Jeff Laytonext2 currently does a test+clear of the AS_EIO flag, which is is problematic for some coming changes.
What we really need to do instead is call filemap_check_errors in __generic_file_fsync after syncing out the buffers. That will be sufficient for this case, and help other callers detect these errors properly as well.
With that, we don't need to twiddle it in ext2.
--- fs/ext2/file.c | 2 +- fs/libfs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
fs/ext2/file.c +1 -1
@@ -177,7 +177,7 @@ int ext2_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping; ret =generic_file_fsync (file, start, end, datasync); -if (ret == -EIO ||test_and_clear_bit (AS_EIO , &mapping->flags)) { +if (ret == -EIO ) {/* We don't really know where the IO error happened... */ ext2_error (sb, __func__,"detected IO error when writing metadata buffers" );
fs/libfs.c +2 -1
@@ -991,7 +991,8 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end, out:inode_unlock (inode); -return ret; + err =filemap_check_errors (inode->i_mapping); +return ret ? : err; }EXPORT_SYMBOL (__generic_file_fsync);
Signature · 1 line
2.9.3
Re: [PATCH v3 04/20] fs: check for writeback errors after syncing out buffers in generic_file_fsync
fs/libfs.c int __generic_file_fsync(struct file *file, loff_t start, loff_t end, · line 995
Quoted 5 lines
out:
fs/libfs.c +2
-1inode_unlock (inode); -return ret; + err =filemap_check_errors (inode->i_mapping); +return ret ? : err;
Can you spell out the whole unary operation instead of this weird GCC extension?
Otherwise looks fine:
Re: [PATCH v3 04/20] fs: check for writeback errors after syncing out buffers in generic_file_fsync
In reply to Jeff LaytonQuoted 8 lines · Jeff Layton
ext2 currently does a test+clear of the
AS_EIOflag, which is is problematic for some coming changes.What we really need to do instead is call
filemap_check_errorsin__generic_file_fsyncafter syncing out the buffers. That will be sufficient for this case, and help other callers detect these errors properly as well.
Quoted 4 lines
With that, we don't need to twiddle it in ext2.
Suggested-by Jan Kara <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Looks good to me. You can add:
Honza
Quoted 36 lines
--- fs/ext2/file.c | 2 +- fs/libfs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)fs/ext2/file.c +1
-1@@ -177,7 +177,7 @@ int ext2_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping; ret =generic_file_fsync (file, start, end, datasync); -if (ret == -EIO ||test_and_clear_bit (AS_EIO , &mapping->flags)) { +if (ret == -EIO ) {/* We don't really know where the IO error happened... */ ext2_error (sb, __func__,"detected IO error when writing metadata buffers" );fs/libfs.c +2
-1@@ -991,7 +991,8 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end, out:inode_unlock (inode); -return ret; + err =filemap_check_errors (inode->i_mapping); +return ret ? : err; }EXPORT_SYMBOL (__generic_file_fsync);Signature · 1 line
2.9.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v3 5/20 orangefs: don't call filemap_write_and_wait from fsync
In reply to Jeff LaytonOrangefs doesn't do buffered writes yet, so there's no point in initiating and waiting for writeback.
--- fs/orangefs/file.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
fs/orangefs/file.c +1 -4
@@ -646,14 +646,11 @@ static int orangefs_fsync(struct file *file,loff_t end, int datasync) { - int ret = -EINVAL; + int ret;struct orangefs_inode_s *orangefs_inode =ORANGEFS_I (file_inode (file));struct orangefs_kernel_op_s *new_op =NULL ; -/* required call */ -filemap_write_and_wait_range (file->f_mapping, start, end); - new_op =op_alloc (ORANGEFS_VFS_OP_FSYNC );if (!new_op)return -ENOMEM ;
Signature · 1 line
2.9.3
Re: [PATCH v3 05/20] orangefs: don't call filemap_write_and_wait from fsync
Looks fine,
Re: [PATCH v3 05/20] orangefs: don't call filemap_write_and_wait from fsync
I've been running it here...
Quoted 3 lines · Christoph Hellwig
Looks fine,
Reviewed-by Christoph Hellwig <[email protected]>
PATCH v3 6/20 dax: set errors in mapping when writeback fails
In reply to Jeff LaytonIn order to get proper error codes from fsync, we must set an error in the mapping range when writeback fails.
--- fs/dax.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/dax.c +3 -1
@@ -901,8 +901,10 @@ int dax_writeback_mapping_range(struct address_space *mapping, ret =dax_writeback_one (bdev, mapping, indices[i], pvec.pages[i]); -if (ret <0 ) +if (ret <0 ) { +mapping_set_error (mapping, ret);return ret; + } } }return 0 ;
Signature · 1 line
2.9.3
Re: [PATCH v3 06/20] dax: set errors in mapping when writeback fails
Looks fine,
Re: [PATCH v3 06/20] dax: set errors in mapping when writeback fails
In reply to Jeff LaytonQuoted 4 lines · Jeff Layton
In order to get proper error codes from fsync, we must set an error in the mapping range when writeback fails.
Signed-off-by Jeff Layton <[email protected]>
So I'm fine with the change but please expand the changelog to something like:
DAX currently doesn't set errors in the mapping when cache flushing fails in dax_writeback_mapping_range(). Since this function can get called only from fsync(2) or sync(2), this is actually as good as it can currently get since we correctly propagate the error up from dax_writeback_mapping_range() to filemap_fdatawrite(). However in the future better writeback error handling will enable us to properly report these errors on fsync(2) even if there are multiple file descriptors open against the file or if sync(2) gets called before fsync(2). So convert DAX to using standard error reporting through the mapping.
After improving the changelog you can add:
Honza
Quoted 24 lines
--- fs/dax.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/dax.c +3
-1@@ -901,8 +901,10 @@ int dax_writeback_mapping_range(struct address_space *mapping, ret =dax_writeback_one (bdev, mapping, indices[i], pvec.pages[i]); -if (ret <0 ) +if (ret <0 ) { +mapping_set_error (mapping, ret);return ret; + } } }return 0 ;Signature · 1 line
2.9.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v3 06/20] dax: set errors in mapping when writeback fails
In reply to Jeff LaytonQuoted 4 lines · Jeff Layton
In order to get proper error codes from fsync, we must set an error in the mapping range when writeback fails.
Signed-off-by Jeff Layton <[email protected]>
Works fine in some error injection testing.
Quoted 23 lines
--- fs/dax.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/dax.c +3
-1@@ -901,8 +901,10 @@ int dax_writeback_mapping_range(struct address_space *mapping, ret =dax_writeback_one (bdev, mapping, indices[i], pvec.pages[i]); -if (ret <0 ) +if (ret <0 ) { +mapping_set_error (mapping, ret);return ret; + } } }return 0 ;Signature · 1 line
2.9.3
PATCH v3 7/20 nilfs2: set the mapping error when calling SetPageError on writeback
In reply to Jeff LaytonIn a later patch, we're going to want to make the fsync codepath not do a TestClearPageError call as that can override the error set in the address space. To do that though, we need to ensure that filesystems that are relying on the PG_error bit for reporting writeback errors also set an error in the address space.
Ensure that this is set in nilfs2.
--- fs/nilfs2/segment.c | 1 + 1 file changed, 1 insertion(+)
fs/nilfs2/segment.c +1 -0
@@ -1745,6 +1745,7 @@ static void nilfs_end_page_io(struct page *page, int err) }else {__set_page_dirty_nobuffers (page);SetPageError (page); +mapping_set_error (page_mapping (page), err); }end_page_writeback (page);
Signature · 1 line
2.9.3
Re: [PATCH v3 07/20] nilfs2: set the mapping error when calling SetPageError on writeback
Looks fine,
PATCH v3 8/20 mm: ensure that we set mapping error if writeout() fails
In reply to Jeff LaytonIf writepage fails during a page migration, then we need to ensure that fsync will see it by flagging the mapping.
--- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
mm/migrate.c +5 -1
@@ -792,7 +792,11 @@ static int writeout(struct address_space *mapping, struct page *page)/* unlocked. Relock */ lock_page (page); -return (rc <0 ) ? -EIO : -EAGAIN ; +if (rc <0 ) { +mapping_set_error (mapping, rc); +return -EIO ; + } +return -EAGAIN ; }/*
Signature · 1 line
2.9.3
Re: [PATCH v3 08/20] mm: ensure that we set mapping error if writeout() fails
Looks fine,
Re: [PATCH v3 08/20] mm: ensure that we set mapping error if writeout() fails
In reply to Jeff LaytonQuoted 4 lines · Jeff Layton
If writepage fails during a page migration, then we need to ensure that fsync will see it by flagging the mapping.
Signed-off-by Jeff Layton <[email protected]>
Looks good to me. You can add:
Honza
Quoted 25 lines
--- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)mm/migrate.c +5
-1@@ -792,7 +792,11 @@ static int writeout(struct address_space *mapping, struct page *page)/* unlocked. Relock */ lock_page (page); -return (rc <0 ) ? -EIO : -EAGAIN ; +if (rc <0 ) { +mapping_set_error (mapping, rc); +return -EIO ; + } +return -EAGAIN ; }/* Signature · 1 line
2.9.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v3 9/20 9p: set mapping error when writeback fails in launder_page
In reply to Jeff Laytonlaunder_page is just writeback under the page lock. We still need to mark the mapping for errors there when they occur.
--- fs/9p/vfs_addr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/9p/vfs_addr.c +4 -1
@@ -223,8 +223,11 @@ static int v9fs_launder_page(struct page *page)v9fs_fscache_wait_on_page_write (inode, page);if (clear_page_dirty_for_io (page)) { retval =v9fs_vfs_writepage_locked (page); -if (retval) +if (retval) { +if (retval != -EAGAIN ) +mapping_set_error (page->mapping, retval);return retval; + } }return 0 ; }
Signature · 1 line
2.9.3
Re: [PATCH v3 09/20] 9p: set mapping error when writeback fails in launder_page
Quoted 4 lines · Jeff Layton
launder_pageis just writeback under the page lock. We still need to mark the mapping for errors there when they occur.Signed-off-by Jeff Layton <[email protected]>
Looks fine,
Re: [PATCH v3 09/20] 9p: set mapping error when writeback fails in launder_page
In reply to Jeff LaytonQuoted 4 lines · Jeff Layton
launder_pageis just writeback under the page lock. We still need to mark the mapping for errors there when they occur.Signed-off-by Jeff Layton <[email protected]>
Looks good. You can add:
Honza
Quoted 25 lines
--- fs/9p/vfs_addr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/9p/vfs_addr.c +4
-1@@ -223,8 +223,11 @@ static int v9fs_launder_page(struct page *page)v9fs_fscache_wait_on_page_write (inode, page);if (clear_page_dirty_for_io (page)) { retval =v9fs_vfs_writepage_locked (page); -if (retval) +if (retval) { +if (retval != -EAGAIN ) +mapping_set_error (page->mapping, retval);return retval; + } }return 0 ; }Signature · 1 line
2.9.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v3 10/20 fuse: set mapping error in writepage_locked when it fails
In reply to Jeff LaytonThis ensures that we see errors on fsync when writeback fails.
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)
fs/fuse/file.c +1 -0
@@ -1669,6 +1669,7 @@ static int fuse_writepage_locked(struct page *page) err_free:fuse_request_free (req); err: +mapping_set_error (page->mapping, error);end_page_writeback (page);return error; }
Signature · 1 line
2.9.3
Re: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Looks fine,
Jan Kara
maintainerRe: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
In reply to Jeff LaytonQuoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>
Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in mapping_set_error?
Honza
Quoted 20 lines
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)fs/fuse/file.c +1
-0@@ -1669,6 +1669,7 @@ static int fuse_writepage_locked(struct page *page) err_free:fuse_request_free (req); err: +mapping_set_error (page->mapping, error);end_page_writeback (page);return error; }Signature · 1 line
2.9.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Quoted 8 lines · Jan Kara
Quoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in
mapping_set_error?
Right now we don't really have such a thing as temporary errors in the writeback codepath. If you return an error here, the data doesn't stay dirty or anything, and I think we want to ensure that that gets reported via fsync.
I'd like to see us add better handling for retryable errors for stuff like ENOMEM or EAGAIN. I think this is the first step toward that though. Once we have more consistent handling of writeback errors in general, then we can start doing more interesting things with retryable errors.
So yeah, I this is the right thing to do for now.
Quoted 21 lines
Quoted 21 lines
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)fs/fuse/file.c +1
-0@@ -1669,6 +1669,7 @@ static int fuse_writepage_locked(struct page *page) err_free:fuse_request_free (req); err: +mapping_set_error (page->mapping, error);end_page_writeback (page);return error; }Signature · 1 line
2.9.3
Signature · 1 line
Jeff Layton <[email protected]>
Jan Kara
maintainerRe: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Quoted 15 lines · Jeff Layton
Quoted 8 lines · Jan Kara
Quoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in
mapping_set_error?Right now we don't really have such a thing as temporary errors in the writeback codepath. If you return an error here, the data doesn't stay dirty or anything, and I think we want to ensure that that gets reported via fsync.
Quoted 7 lines
I'd like to see us add better handling for retryable errors for stuff like ENOMEM or EAGAIN. I think this is the first step toward that though. Once we have more consistent handling of writeback errors in general, then we can start doing more interesting things with retryable errors.
So yeah, I this is the right thing to do for now.
OK, fair enough. And question number 2):
Who is actually responsible for setting the error in the mapping when error happens inside ->writepage()? Is it the ->writepage() callback or the caller of ->writepage()? Or something else? Currently it seems to be a strange mix (e.g. mm/page-writeback.c: __writepage() calls mapping_set_error() when ->writepage() returns error) so I'd like to understand what's the plan and have that recorded in the changelogs.
Honza
Quoted 25 lines
Quoted 22 lines
Quoted 22 lines
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)fs/fuse/file.c +1
-0@@ -1669,6 +1669,7 @@ static int fuse_writepage_locked(struct page *page) err_free:fuse_request_free (req); err: +mapping_set_error (page->mapping, error);end_page_writeback (page);return error; }Signature · 1 line
2.9.3Signature · 1 line
Jeff Layton <[email protected]>
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Quoted 24 lines · Jan Kara
Quoted 15 lines · Jeff Layton
Quoted 8 lines · Jan Kara
Quoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in
mapping_set_error?Right now we don't really have such a thing as temporary errors in the writeback codepath. If you return an error here, the data doesn't stay dirty or anything, and I think we want to ensure that that gets reported via fsync.
Quoted 7 lines
I'd like to see us add better handling for retryable errors for stuff like ENOMEM or EAGAIN. I think this is the first step toward that though. Once we have more consistent handling of writeback errors in general, then we can start doing more interesting things with retryable errors.
So yeah, I this is the right thing to do for now.
Quoted 9 lines
OK, fair enough. And question number 2):
Who is actually responsible for setting the error in the mapping when error happens inside ->writepage()? Is it the ->writepage() callback or the caller of ->writepage()? Or something else? Currently it seems to be a strange mix (e.g.
mm/page-writeback.c:__writepage()callsmapping_set_error()when ->writepage() returns error) so I'd like to understand what's the plan and have that recorded in the changelogs.
That's an excellent question.
I think we probably want the writepage/launder_page operations to call mapping_set_error. That makes it possible for filesystems (e.g. NFS) to handle their own error tracking and reporting without using the new infrastructure. If they never call mapping_set_error then we'll always just return whatever their ->fsync operation returns on an fsync.
I'll make another pass through the tree and see whether we have some mapping_set_error calls that should be removed, and will flesh out vfs.txt to state this. Maybe that file needs a whole section on writeback error reporting? Hmmm...
That probably also means that I should drop patch 8 from this series (mm: ensure that we set mapping error if writeout fails), since that should be happening in writepage already.
Quoted 25 lines
Quoted 25 lines
Quoted 22 lines
Quoted 22 lines
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)fs/fuse/file.c +1
-0@@ -1669,6 +1669,7 @@ static int fuse_writepage_locked(struct page *page) err_free:fuse_request_free (req); err: +mapping_set_error (page->mapping, error);end_page_writeback (page);return error; }Signature · 1 line
2.9.3Signature · 1 line
Jeff Layton <[email protected]>
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Quoted 35 lines · Jeff Layton
Quoted 24 lines · Jan Kara
Quoted 15 lines · Jeff Layton
Quoted 8 lines · Jan Kara
Quoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in
mapping_set_error?Right now we don't really have such a thing as temporary errors in the writeback codepath. If you return an error here, the data doesn't stay dirty or anything, and I think we want to ensure that that gets reported via fsync.
Quoted 7 lines
I'd like to see us add better handling for retryable errors for stuff like ENOMEM or EAGAIN. I think this is the first step toward that though. Once we have more consistent handling of writeback errors in general, then we can start doing more interesting things with retryable errors.
So yeah, I this is the right thing to do for now.
Quoted 9 lines
OK, fair enough. And question number 2):
Who is actually responsible for setting the error in the mapping when error happens inside ->writepage()? Is it the ->writepage() callback or the caller of ->writepage()? Or something else? Currently it seems to be a strange mix (e.g.
mm/page-writeback.c:__writepage()callsmapping_set_error()when ->writepage() returns error) so I'd like to understand what's the plan and have that recorded in the changelogs.
Quoted 7 lines
That's an excellent question.
I think we probably want the writepage/launder_page operations to call
mapping_set_error. That makes it possible for filesystems (e.g. NFS) to handle their own error tracking and reporting without using the new infrastructure. If they never callmapping_set_errorthen we'll always just return whatever their ->fsync operation returns on an fsync.
OK, makes sense. It is also in line with what you did for DAX, 9p, or here for FUSE. So feel free to add:
for this patch but please also add a sentense that ->writepage() is responsible for calling mapping_set_error() if it fails and page is not redirtied to the changelogs of patches changing writepage handlers.
Quoted 4 lines
I'll make another pass through the tree and see whether we have some
mapping_set_errorcalls that should be removed, and will flesh out vfs.txt to state this. Maybe that file needs a whole section on writeback error reporting? Hmmm...
I think it would be nice to have all the logic described in one place. So +1 from me.
Quoted 3 lines
That probably also means that I should drop patch 8 from this series (mm: ensure that we set mapping error if writeout fails), since that should be happening in writepage already.
Yes.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH v3 10/20] fuse: set mapping error in writepage_locked when it fails
Quoted 61 lines · Jan Kara
Quoted 35 lines · Jeff Layton
Quoted 24 lines · Jan Kara
Quoted 15 lines · Jeff Layton
Quoted 8 lines · Jan Kara
Quoted 3 lines · Jeff Layton
This ensures that we see errors on fsync when writeback fails.
Signed-off-by Jeff Layton <[email protected]>Hum, but do we really want to clobber mapping errors with temporary stuff like ENOMEM? Or do you want to handle that in
mapping_set_error?Right now we don't really have such a thing as temporary errors in the writeback codepath. If you return an error here, the data doesn't stay dirty or anything, and I think we want to ensure that that gets reported via fsync.
Quoted 7 lines
I'd like to see us add better handling for retryable errors for stuff like ENOMEM or EAGAIN. I think this is the first step toward that though. Once we have more consistent handling of writeback errors in general, then we can start doing more interesting things with retryable errors.
So yeah, I this is the right thing to do for now.
Quoted 9 lines
OK, fair enough. And question number 2):
Who is actually responsible for setting the error in the mapping when error happens inside ->writepage()? Is it the ->writepage() callback or the caller of ->writepage()? Or something else? Currently it seems to be a strange mix (e.g.
mm/page-writeback.c:__writepage()callsmapping_set_error()when ->writepage() returns error) so I'd like to understand what's the plan and have that recorded in the changelogs.Quoted 7 lines
That's an excellent question.
I think we probably want the writepage/launder_page operations to call
mapping_set_error. That makes it possible for filesystems (e.g. NFS) to handle their own error tracking and reporting without using the new infrastructure. If they never callmapping_set_errorthen we'll always just return whatever their ->fsync operation returns on an fsync.OK, makes sense. It is also in line with what you did for DAX, 9p, or here for FUSE. So feel free to add:
Reviewed-by Jan Kara <[email protected]>for this patch but please also add a sentense that ->writepage() is responsible for calling
mapping_set_error()if it fails and page is not redirtied to the changelogs of patches changing writepage handlers.Quoted 4 lines
I'll make another pass through the tree and see whether we have some
mapping_set_errorcalls that should be removed, and will flesh out vfs.txt to state this. Maybe that file needs a whole section on writeback error reporting? Hmmm...I think it would be nice to have all the logic described in one place. So +1 from me.
Quoted 7 lines
Quoted 3 lines
That probably also means that I should drop patch 8 from this series (mm: ensure that we set mapping error if writeout fails), since that should be happening in writepage already.
Yes.
Honza
(cc'ing Jon since I'm proposing a doc update)
Here's what I'm thinking for a vfs.txt update after this series. The section on writeback_control could probably be more specific.
----------------------8<-------------------------
Documentation/filesystems/vfs.txt +20 -2
@@ -576,7 +576,23 @@ should clear PG_Dirty and set PG_Writeback. It can be actually written at any point after PG_Dirty is clear. Once it is known to be safe, PG_Writeback is cleared. -Writeback makes use of a writeback_control structure... +Writeback makes use of a writeback_control structure to direct the +operations. This tells the writepage and writepages operations something +about the nature of and reason for the writeback request, and the +constraints under which it is being done. It is also used to track state +between successive writeback requests. + +When there is an error during writeback, then an error should be +reported to fsync on all file descriptors that were open@the time of +the error. This is typically done by setting the wb_err value in the +address_space via mapping_set_error when writeback errors occur. The +vfs-layer fsync code will then report the errors on a per-fd basis. + +Filesystems are free to track errors internally if they choose, but they +should aim to provide the same semantics for error reporting when there +are multiple writers. Filesystems that track their own errors should +avoid calling mapping_set_error in order to ensure that errors stored in +the mapping aren't improperly reported by the generic filesystem code. struct address_space_operations -------------------------------
@@ -888,7 +904,9 @@ otherwise noted. release: called when the last reference to an open file is closed - fsync: called by the fsync(2) system call + fsync: called by the fsync(2) system call. Errors that were previously + recorded using mapping_set_error will automatically be returned to + the application and the file's error sequence advanced. fasync: called by the fcntl(2) system call when asynchronous (non-blocking) mode is enabled for a file
PATCH v3 11/20 cifs: set mapping error when page writeback fails in writepage or launder_pages
In reply to Jeff Layton--- fs/cifs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/cifs/file.c +6 -4
@@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)set_page_writeback (page); retry_write: rc =cifs_partialpagewrite (page,0 ,PAGE_SIZE ); -if (rc == -EAGAIN && wbc->sync_mode ==WB_SYNC_ALL ) +if (rc == -EAGAIN && wbc->sync_mode ==WB_SYNC_ALL ) { goto retry_write; -else if (rc == -EAGAIN ) + }else if (rc == -EAGAIN ) {redirty_page_for_writepage (wbc, page); -else if (rc !=0 ) + }else if (rc !=0 ) {SetPageError (page); -else +mapping_set_error (page->mapping, rc); + }else {SetPageUptodate (page); + }end_page_writeback (page);put_page (page);free_xid (xid);
Signature · 1 line
2.9.3
Re: [PATCH v3 11/20] cifs: set mapping error when page writeback fails in writepage or launder_pages
Quoted 13 lines · Jeff Layton
Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)fs/cifs/file.c +0
-0@@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)set_page_writeback (page); retry_write: rc =cifs_partialpagewrite (page,0 ,PAGE_SIZE );
fs/cifs/file.c cifs_writepage_locked(struct page *page, struct writeback_control *wbc) · line 2246
Quoted 10 lines
fs/cifs/file.c +6
-0+if (rc == -EAGAIN && wbc->sync_mode ==WB_SYNC_ALL ) { goto retry_write; + }else if (rc == -EAGAIN ) {redirty_page_for_writepage (wbc, page); + }else if (rc !=0 ) {SetPageError (page); +mapping_set_error (page->mapping, rc); + }else {SetPageUptodate (page); + }
Hmmm. I might be a little too nitpicky, but I hate having the same partial condition duplicated if possible. Why not:
if (rc == -EAGAIN) {
if (wbc->sync_mode == WB_SYNC_ALL)
goto retry_write;
redirty_page_for_writepage(wbc, page);
} else if (rc) {
SetPageError(page);
mapping_set_error(page->mapping, rc);
} else {
SetPageUptodate(page);
}Otherwise this looks fine to me:
Re: [PATCH v3 11/20] cifs: set mapping error when page writeback fails in writepage or launder_pages
Quoted 39 lines · Christoph Hellwig
Quoted 13 lines · Jeff Layton
Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)fs/cifs/file.c +0
-0@@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc)set_page_writeback (page); retry_write: rc =cifs_partialpagewrite (page,0 ,PAGE_SIZE );fs/cifs/file.c cifs_writepage_locked(struct page *page, struct writeback_control *wbc) · line 2246
Quoted 10 lines
fs/cifs/file.c +6
-0+if (rc == -EAGAIN && wbc->sync_mode ==WB_SYNC_ALL ) { goto retry_write; + }else if (rc == -EAGAIN ) {redirty_page_for_writepage (wbc, page); + }else if (rc !=0 ) {SetPageError (page); +mapping_set_error (page->mapping, rc); + }else {SetPageUptodate (page); + }Hmmm. I might be a little too nitpicky, but I hate having the same partial condition duplicated if possible. Why not:
if (rc == -EAGAIN) { if (wbc->sync_mode == WB_SYNC_ALL) goto retry_write; redirty_page_for_writepage(wbc, page); } else if (rc) { SetPageError(page); mapping_set_error(page->mapping, rc); } else { SetPageUptodate(page); }
Quoted 3 lines
Otherwise this looks fine to me:
Reviewed-by Christoph Hellwig <[email protected]>
No, you're absolutely right. I merged that change into the patch.
Thanks for the review so far!
Signature · 1 line
Jeff Layton <[email protected]>
PATCH v3 12/20 lib: add errseq_t type and infrastructure for handling it
In reply to Jeff LaytonAn errseq_t is a way of recording errors in one place, and allowing any number of "subscribers" to tell whether an error has been set again since a previous time.
It's implemented as an unsigned 32-bit value that is managed with atomic operations. The low order bits are designated to hold an error code (max size of MAX_ERRNO). The upper bits are used as a counter.
The API works with consumers sampling an errseq_t value at a particular point in time. Later, that value can be used to tell whether new errors have been set since that time.
Note that there is a 1 in 512k risk of collisions here if new errors are being recorded frequently, since we have so few bits to use as a counter. To mitigate this, one bit is used as a flag to tell whether the value has been sampled since a new value was recorded. That allows us to avoid bumping the counter if no one has sampled it since it was last bumped.
Later patches will build on this infrastructure to change how writeback errors are tracked in the kernel.
--- include/linux/errseq.h | 16 ++++ lib/Makefile | 2 +- lib/errseq.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 include/linux/errseq.h create mode 100644 lib/errseq.c
include/linux/errseq.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef _LINUX_ERRSEQ_H +#define _LINUX_ERRSEQ_H +typedef u32 errseq_t ; + +void __errseq_set (errseq_t *eseq,int err); +static inline void errseq_set (errseq_t *eseq,int err) +{ +/* Optimize for the common case of no error */ +if (unlikely (err)) +__errseq_set (eseq, err); +} + +errseq_t errseq_sample (errseq_t *eseq); +int errseq_check (errseq_t *eseq,errseq_t since); +int errseq_check_and_advance (errseq_t *eseq,errseq_t *since); +#endif
lib/Makefile +1 -1
@@ -41,7 +41,7 @@ obj-y += bcd.o div64.o sort.o parser.o debug_locks.o random32.o \ gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \ bsearch.o find_bit.o llist.o memweight.o kfifo.o \ percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o \ - once.o refcount.o + once.o refcount.o errseq.o obj-y += string_helpers.o obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o obj-y += hexdump.o
lib/errseq.c new file +199 -0
199 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v3 13/20 fs: new infrastructure for writeback error handling and reporting
In reply to Jeff LaytonMost filesystems currently use mapping_set_error and filemap_check_errors for setting and reporting/clearing writeback errors at the mapping level. filemap_check_errors is indirectly called from most of the filemap_fdatawait_* functions and from filemap_write_and_wait*. These functions are called from all sorts of contexts to wait on writeback to finish -- e.g. mostly in fsync, but also in truncate calls, getattr, etc.
The non-fsync callers are problematic. We should be reporting writeback errors during fsync, but many places spread over the tree clear out errors before they can be properly reported, or report errors at nonsensical times.
If I get -EIO on a stat() call, there is no reason for me to assume that it is because some previous writeback failed. The fact that it also clears out the error such that a subsequent fsync returns 0 is a bug, and a nasty one since that's potentially silent data corruption.
This patch adds a small bit of new infrastructure for setting and reporting errors during address_space writeback. While the above was my original impetus for adding this, I think it's also the case that current fsync semantics are just problematic for userland. Most applications that call fsync do so to ensure that the data they wrote has hit the backing store.
In the case where there are multiple writers to the file at the same time, this is really hard to determine. The first one to call fsync will see any stored error, and the rest get back 0. The processes with open fds may not be associated with one another in any way. They could even be in different containers, so ensuring coordination between all fsync callers is not really an option.
One way to remedy this would be to track what file descriptor was used to dirty the file, but that's rather cumbersome and would likely be slow. However, there is a simpler way to improve the semantics here without incurring too much overhead.
This set adds an errseq_t to struct address_space, and a corresponding one is added to struct file. Writeback errors are recorded in the mapping's errseq_t, and the one in struct file is used as the "since" value.
This changes the semantics of the Linux fsync implementation such that applications can now use it to determine whether there were any writeback errors since fsync(fd) was last called (or since the file was opened in the case of fsync having never been called).
Note that those writeback errors may have occurred when writing data that was dirtied via an entirely different fd, but that's the case now with the current mapping_set_error/filemap_check_error infrastructure. This will at least prevent you from getting a false report of success.
The new behavior is still consistent with the POSIX spec, and is more reliable for application developers. This patch just adds some basic infrastructure for doing this. Later patches will change the existing code to use this new infrastructure.
--- Documentation/filesystems/vfs.txt | 10 +++++++++- fs/open.c | 3 +++ include/linux/fs.h | 24 ++++++++++++++++++++++++ mm/filemap.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-)
Documentation/filesystems/vfs.txt +9 -1
@@ -576,6 +576,11 @@ should clear PG_Dirty and set PG_Writeback. It can be actually written at any point after PG_Dirty is clear. Once it is known to be safe, PG_Writeback is cleared. +If there is an error during writeback, then the address_space should be +marked with an error (typically using filemap_set_wb_error), in order to +ensure that the error can later be reported to the application when an +fsync is issued. + Writeback makes use of a writeback_control structure... struct address_space_operations
@@ -888,7 +893,10 @@ otherwise noted. release: called when the last reference to an open file is closed - fsync: called by the fsync(2) system call + fsync: called by the fsync(2) system call. Filesystems that use the + pagecache should call filemap_report_wb_error before returning + to ensure that any errors that occurred during writeback are + reported and the file's error sequence advanced. fasync: called by the fcntl(2) system call when asynchronous (non-blocking) mode is enabled for a file
fs/open.c +3 -0
@@ -709,6 +709,9 @@ static int do_dentry_open(struct file *f, f->f_inode = inode; f->f_mapping = inode->i_mapping; +/* Ensure that we skip any errors that predate opening of the file */ + f->f_wb_err =filemap_sample_wb_error (f->f_mapping); +if (unlikely (f->f_flags &O_PATH )) { f->f_mode =FMODE_PATH ; f->f_op = &empty_fops;
include/linux/fs.h +24 -0
@@ -31,6 +31,7 @@#include <linux/workqueue.h> #include <linux/percpu-rwsem.h> #include <linux/delayed_call.h> +#include <linux/errseq.h> #include <asm/byteorder.h> #include <uapi/linux/fs.h>
@@ -394,6 +395,7 @@ struct address_space {gfp_t gfp_mask;/* implicit gfp mask for allocations */ struct list_head private_list;/* ditto */ void *private_data;/* ditto */ +errseq_t wb_err; } __attribute__((aligned(sizeof(long))));/* * On most architectures that alignment is already the case; but
@@ -846,6 +848,7 @@ struct file {* Must not be taken from IRQ context. */ spinlock_t f_lock; +errseq_t f_wb_err;atomic_long_t f_count;unsigned int f_flags;fmode_t f_mode;
@@ -2521,6 +2524,27 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping,extern int filemap_fdatawrite_range (struct address_space *mapping,loff_t start,loff_t end);extern int filemap_check_errors (struct address_space *mapping); +extern int __must_check filemap_report_wb_error (struct file *file); + +/** +* filemap_check_wb_error - has an error occurred since the mark was sampled? +* @mapping: mapping to check for writeback errors +* @since: previously-sampled errseq_t +* +* Grab the errseq_t value from the mapping, and see if it has changed "since" +* the given value was sampled. +* +* If it has then report the latest error set, otherwise return 0. +*/ +static inline int filemap_check_wb_error (struct address_space *mapping,errseq_t since) +{ +return errseq_check (&mapping->wb_err, since); +} + +static inline errseq_t filemap_sample_wb_error (struct address_space *mapping) +{ +return errseq_sample (&mapping->wb_err); +}extern int vfs_fsync_range (struct file *file,loff_t start,loff_t end,int datasync);
mm/filemap.c +38 -0
@@ -546,6 +546,44 @@ int filemap_write_and_wait_range(struct address_space *mapping,EXPORT_SYMBOL (filemap_write_and_wait_range);/** +* filemap_report_wb_error - report wb error (if any) that was previously set +* @file: struct file on which the error is being reported +* +* When userland calls fsync (or something like nfsd does the equivalent), we +* want to report any writeback errors that occurred since the last fsync (or +* since the file was opened if there haven't been any). +* +* Grab the wb_err from the mapping. If it matches what we have in the file, +* then just quickly return 0. The file is all caught up. +* +* If it doesn't match, then take the mapping value, set the "seen" flag in +* it and try to swap it into place. If it works, or another task beat us +* to it with the new value, then update the f_wb_err and return the error +* portion. The error at this point must be reported via proper channels +* (a'la fsync, or NFS COMMIT operation, etc.). +* +* While we handle mapping->wb_err with atomic operations, the f_wb_err +* value is protected by the f_lock since we must ensure that it reflects +* the latest value swapped in for this file descriptor. +*/ +int filemap_report_wb_error (struct file *file) +{ +int err =0 ; +struct address_space *mapping = file->f_mapping; + +/* Locklessly handle the common case where nothing has changed */ +if (errseq_check (&mapping->wb_err,READ_ONCE (file->f_wb_err))) { +/* Something changed, must use slow path */ +spin_lock (&file->f_lock); + err =errseq_check_and_advance (&mapping->wb_err, + &file->f_wb_err); +spin_unlock (&file->f_lock); + } +return err; +} +EXPORT_SYMBOL (filemap_report_wb_error); + +/** * replace_page_cache_page - replace a pagecache page with a new one * @old: page to be replaced * @new: page to replace with
Signature · 1 line
2.9.3
PATCH v3 14/20 fs: retrofit old error reporting API onto new infrastructure
In reply to Jeff LaytonNow that we have a better way to store and report errors that occur during writeback, we need to convert the existing codebase to use it. We could just adapt all of the filesystem code and related infrastructure to the new API, but that's a lot of churn.
When it comes to setting errors in the mapping, filemap_set_wb_error is a drop-in replacement for mapping_set_error. Turn that function into a simple wrapper around the new one.
Because we want to ensure that writeback errors are always reported at fsync time, inject filemap_report_wb_error calls much closer to the syscall boundary, in call_fsync.
For fsync calls (and things like the nfsd equivalent), we either return the error that the fsync operation returns, or the one returned by filemap_report_wb_error. In both cases, we advance the file->f_wb_err to the latest value. This allows us to provide new fsync semantics that will return errors that may have occurred previously and been viewed via other file descriptors.
The final piece of the puzzle is what to do about filemap_check_errors calls that are being called directly or via filemap_* functions. Here, we must take a little "creative license".
Since we now handle advancing the file->f_wb_err value at the generic filesystem layer, we no longer need those callers to clear errors out of the mapping or advance an errseq_t.
A lot of the existing codebase relies on being getting an error back from those functions when there is a writeback problem, so we do still want to have them report writeback errors somehow.
When reporting writeback errors, we will always report errors that have occurred since a particular point in time. With the old writeback error reporting, the time we used was "since it was last tested/cleared" which is entirely arbitrary and potentially racy. Now, we can at least report the latest error that has occurred since an arbitrary point in time (represented as a sampled errseq_t value).
In the case where we don't have a struct file to work with, this patch just has the wrappers sample the current mapping->wb_err value, and use that as an arbitrary point from which to check for errors.
That's probably not "correct" in all cases, particularly in the case of something like filemap_fdatawait, but I'm not sure it's any worse than what we already have, and this gives us a basis from which to work.
A lot of those callers will likely want to change to a model where they sample the errseq_t much earlier (perhaps when starting a transaction), store it in an appropriate place and then use that value later when checking to see if an error occurred.
That will almost certainly take some involvement from other subsystem maintainers. I'm quite open to adding new API functions to help enable this if that would be helpful, but I don't really want to do that until I better understand what's needed.
--- Documentation/filesystems/vfs.txt | 9 ++++----- fs/btrfs/file.c | 10 ++-------- fs/btrfs/tree-log.c | 9 ++------- fs/f2fs/file.c | 3 +++ fs/f2fs/node.c | 6 +----- fs/fuse/file.c | 7 +++++-- fs/libfs.c | 6 ++++-- include/linux/fs.h | 17 ++++++++++------- include/linux/pagemap.h | 8 ++------ mm/filemap.c | 33 +++++++++++---------------------- 10 files changed, 44 insertions(+), 64 deletions(-)
Documentation/filesystems/vfs.txt +4 -5
@@ -577,7 +577,7 @@ written at any point after PG_Dirty is clear. Once it is known to be safe, PG_Writeback is cleared. If there is an error during writeback, then the address_space should be -marked with an error (typically using filemap_set_wb_error), in order to +marked with an error (typically using mapping_set_error), in order to ensure that the error can later be reported to the application when an fsync is issued.
@@ -893,10 +893,9 @@ otherwise noted. release: called when the last reference to an open file is closed - fsync: called by the fsync(2) system call. Filesystems that use the - pagecache should call filemap_report_wb_error before returning - to ensure that any errors that occurred during writeback are - reported and the file's error sequence advanced. + fsync: called by the fsync(2) system call. Errors that were previously + recorded using mapping_set_error will automatically be returned to + the application and the file's error sequence advanced. fasync: called by the fcntl(2) system call when asynchronous (non-blocking) mode is enabled for a file
fs/btrfs/file.c +2 -8
@@ -1962,6 +1962,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)int ret =0 ;bool full_sync =0 ;u64 len; +errseq_t wb_since =READ_ONCE (file->f_wb_err);/* * The range length can be represented by u64, we have to do the typecasts
@@ -2079,14 +2080,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)*/ clear_bit (BTRFS_INODE_NEEDS_FULL_SYNC , &BTRFS_I (inode)->runtime_flags); -/* -* An ordered extent might have started before and completed -* already with io errors, in which case the inode was not -* updated and we end up here. So check the inode's mapping -* flags for any errors that might have happened while doing -* writeback of file data. -*/ - ret =filemap_check_errors (inode->i_mapping); + ret =filemap_check_wb_error (inode->i_mapping, wb_since);inode_unlock (inode); goto out; }
fs/btrfs/tree-log.c +2 -7
@@ -3972,12 +3972,6 @@ static int wait_ordered_extents(struct btrfs_trans_handle *trans, test_bit(BTRFS_ORDERED_IOERR, &ordered->flags)));if (test_bit (BTRFS_ORDERED_IOERR , &ordered->flags)) { -/* -* Clear the AS_EIO/AS_ENOSPC flags from the inode's -* i_mapping flags, so that the next fsync won't get -* an outdated io error too. -*/ -filemap_check_errors (inode->i_mapping); *ordered_io_error = true;break ; }
@@ -4171,6 +4165,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,u64 test_gen;int ret =0 ;int num =0 ; +errseq_t since =filemap_sample_wb_error (inode->vfs_inode.i_mapping);INIT_LIST_HEAD (&extents);
@@ -4214,7 +4209,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans,* without writing to the log tree and the fsync must report the * file data write error and not commit the current transaction. */ - ret =filemap_check_errors (inode->vfs_inode.i_mapping); + ret =filemap_check_wb_error (inode->vfs_inode.i_mapping, since);if (ret) ctx->io_err = ret; process:
fs/f2fs/file.c +3 -0
@@ -187,6 +187,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, .nr_to_write = LONG_MAX, .for_reclaim = 0, }; +errseq_t since =READ_ONCE (file->f_wb_err);if (unlikely (f2fs_readonly (inode->i_sb)))return 0 ;
@@ -265,6 +266,8 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, } ret =wait_on_node_pages_writeback (sbi, ino); +if (ret ==0 ) + ret =filemap_check_wb_error (NODE_MAPPING (sbi), since);if (ret) goto out;
fs/f2fs/node.c +1 -5
@@ -1630,7 +1630,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) {pgoff_t index =0 , end =ULONG_MAX ;struct pagevec pvec; -int ret2, ret =0 ; +int ret =0 ;pagevec_init (&pvec,0 );
@@ -1658,10 +1658,6 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino)pagevec_release (&pvec);cond_resched (); } - - ret2 =filemap_check_errors (NODE_MAPPING (sbi)); -if (!ret) - ret = ret2;return ret; }
fs/fuse/file.c +5 -2
@@ -398,6 +398,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)struct fuse_req *req;struct fuse_flush_in inarg;int err; +errseq_t since =READ_ONCE (file->f_wb_err);if (is_bad_inode (inode))return -EIO ;
@@ -413,7 +414,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)fuse_sync_writes (inode);inode_unlock (inode); - err =filemap_check_errors (file->f_mapping); + err =filemap_check_wb_error (file->f_mapping, since);if (err)return err;
@@ -446,6 +447,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,FUSE_ARGS (args);struct fuse_fsync_in inarg;int err; +errseq_t since;if (is_bad_inode (inode))return -EIO ;
@@ -461,6 +463,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,if (err) goto out; + since =READ_ONCE (file->f_wb_err);fuse_sync_writes (inode);/*
@@ -468,7 +471,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,* filemap_write_and_wait_range() does not catch errors. * We have to do this directly after fuse_sync_writes() */ - err =filemap_check_errors (file->f_mapping); + err =filemap_check_wb_error (file->f_mapping, since);if (err) goto out;
fs/libfs.c +4 -2
@@ -991,8 +991,10 @@ int __generic_file_fsync(struct file *file, loff_t start, loff_t end, out:inode_unlock (inode); - err =filemap_check_errors (inode->i_mapping); -return ret ? : err; +if (!ret) + ret =filemap_check_wb_error (inode->i_mapping, +READ_ONCE (file->f_wb_err)); +return ret; }EXPORT_SYMBOL (__generic_file_fsync);
include/linux/fs.h +10 -7
@@ -1741,12 +1741,6 @@ static inline int call_mmap(struct file *file, struct vm_area_struct *vma)return file->f_op->mmap (file, vma); } -static inline int call_fsync (struct file *file,loff_t start,loff_t end, -int datasync) -{ -return file->f_op->fsync (file, start, end, datasync); -} - ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer,
@@ -2523,7 +2517,6 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start, loff_t end, int sync_mode);extern int filemap_fdatawrite_range (struct address_space *mapping,loff_t start,loff_t end); -extern int filemap_check_errors (struct address_space *mapping);extern int __must_check filemap_report_wb_error (struct file *file);/**
@@ -2546,6 +2539,16 @@ static inline errseq_t filemap_sample_wb_error(struct address_space *mapping)return errseq_sample (&mapping->wb_err); } +static inline int call_fsync (struct file *file,loff_t start,loff_t end, +int datasync) +{ +int ret, ret2; + + ret = file->f_op->fsync (file, start, end, datasync); + ret2 =filemap_report_wb_error (file); +return ret ? : ret2; +} +extern int vfs_fsync_range (struct file *file,loff_t start,loff_t end,int datasync);extern int vfs_fsync (struct file *file,int datasync);
include/linux/pagemap.h +2 -6
@@ -14,6 +14,7 @@#include <linux/bitops.h> #include <linux/hardirq.h> /* for in_interrupt() */ #include <linux/hugetlb_inline.h> +#include <linux/errseq.h> /* * Bits in mapping->flags.
@@ -30,12 +31,7 @@ enum mapping_flags {static inline void mapping_set_error (struct address_space *mapping,int error) { -if (unlikely (error)) { -if (error == -ENOSPC ) -set_bit (AS_ENOSPC , &mapping->flags); -else -set_bit (AS_EIO , &mapping->flags); - } +return errseq_set (&mapping->wb_err, error); }static inline void mapping_set_unevictable (struct address_space *mapping)
mm/filemap.c +11 -22
@@ -36,6 +36,7 @@#include <linux/memcontrol.h> #include <linux/cleancache.h> #include <linux/rmap.h> +#include <linux/errseq.h> #include "internal.h" #define CREATE_TRACE_POINTS
@@ -295,20 +296,6 @@ void delete_from_page_cache(struct page *page) }EXPORT_SYMBOL (delete_from_page_cache); -int filemap_check_errors (struct address_space *mapping) -{ -int ret =0 ; -/* Check for outstanding write errors */ -if (test_bit (AS_ENOSPC , &mapping->flags) && -test_and_clear_bit (AS_ENOSPC , &mapping->flags)) - ret = -ENOSPC ; -if (test_bit (AS_EIO , &mapping->flags) && -test_and_clear_bit (AS_EIO , &mapping->flags)) - ret = -EIO ; -return ret; -} -EXPORT_SYMBOL (filemap_check_errors); -/** * __filemap_fdatawrite_range - start writeback on mapping dirty pages in range * @mapping: address space structure to write
@@ -431,9 +418,10 @@ int filemap_fdatawait_range(struct address_space *mapping, loff_t start_byte, loff_t end_byte) {int ret, ret2; +errseq_t since =filemap_sample_wb_error (mapping); ret =__filemap_fdatawait_range (mapping, start_byte, end_byte); - ret2 =filemap_check_errors (mapping); + ret2 =filemap_check_wb_error (mapping, since);if (!ret) ret = ret2;
@@ -489,6 +477,7 @@ EXPORT_SYMBOL(filemap_fdatawait);int filemap_write_and_wait (struct address_space *mapping) {int err =0 ; +errseq_t since =filemap_sample_wb_error (mapping);if ((!dax_mapping (mapping) && mapping->nrpages) || (dax_mapping (mapping) && mapping->nrexceptional)) {
@@ -500,12 +489,12 @@ int filemap_write_and_wait(struct address_space *mapping)* thing (e.g. bug) happened, so we avoid waiting for it. */ if (err != -EIO ) { -int err2 =filemap_fdatawait (mapping); +filemap_fdatawait_keep_errors (mapping);if (!err) - err = err2; + err =filemap_check_wb_error (mapping, since); } }else { - err =filemap_check_errors (mapping); + err =filemap_check_wb_error (mapping, since); }return err; }
@@ -526,6 +515,7 @@ int filemap_write_and_wait_range(struct address_space *mapping, loff_t lstart, loff_t lend) { int err = 0; +errseq_t since =filemap_sample_wb_error (mapping);if ((!dax_mapping (mapping) && mapping->nrpages) || (dax_mapping (mapping) && mapping->nrexceptional)) {
@@ -533,13 +523,12 @@ int filemap_write_and_wait_range(struct address_space *mapping, WB_SYNC_ALL);/* See comment of filemap_write_and_wait() */ if (err != -EIO ) { -int err2 =filemap_fdatawait_range (mapping, - lstart, lend); +__filemap_fdatawait_range (mapping, lstart, lend);if (!err) - err = err2; + err =filemap_check_wb_error (mapping, since); } }else { - err =filemap_check_errors (mapping); + err =filemap_check_wb_error (mapping, since); }return err; }
Signature · 1 line
2.9.3
PATCH v3 15/20 mm: remove AS_EIO and AS_ENOSPC flags
In reply to Jeff LaytonThey're no longer used.
--- include/linux/pagemap.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
include/linux/pagemap.h +4 -6
@@ -20,13 +20,11 @@* Bits in mapping->flags. */ enum mapping_flags { -AS_EIO =0 ,/* IO error on async write */ -AS_ENOSPC =1 ,/* ENOSPC on async write */ -AS_MM_ALL_LOCKS =2 ,/* under mm_take_all_locks() */ -AS_UNEVICTABLE =3 ,/* e.g., ramdisk, SHM_LOCK */ -AS_EXITING =4 ,/* final truncate in progress */ +AS_MM_ALL_LOCKS =0 ,/* under mm_take_all_locks() */ +AS_UNEVICTABLE =1 ,/* e.g., ramdisk, SHM_LOCK */ +AS_EXITING =2 ,/* final truncate in progress */ /* writeback related tags are not used */ -AS_NO_WRITEBACK_TAGS =5 , +AS_NO_WRITEBACK_TAGS =3 , };static inline void mapping_set_error (struct address_space *mapping,int error)
Signature · 1 line
2.9.3
PATCH v3 16/20 mm: don't TestClearPageError in __filemap_fdatawait_range
In reply to Jeff LaytonThe -EIO returned here can end up overriding whatever error is marked in the address space, and be returned at fsync time, even when there is a more appropriate error stored in the mapping.
Read errors are also sometimes tracked on a per-page level using PG_error. Suppose we have a read error on a page, and then that page is subsequently dirtied by overwriting the whole page. Writeback doesn't clear PG_error, so we can then end up successfully writing back that page and still return -EIO on fsync.
Worse yet, PG_error is cleared during a sync() syscall, but the -EIO return from that is silently discarded. Any subsystem that is relying on PG_error to report errors during fsync can easily lose writeback errors due to this. All you need is a stray sync() call on the box at the wrong time and you've lost the error.
Since the handling of the PG_error flag is somewhat inconsistent across subsystems, let's just rely on marking the address space when there are writeback errors. Change the TestClearPageError call to ClearPageError, and make __filemap_fdatawait_range a void return function.
--- mm/filemap.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
mm/filemap.c +5 -14
@@ -363,17 +363,16 @@ int filemap_flush(struct address_space *mapping) }EXPORT_SYMBOL (filemap_flush); -static int __filemap_fdatawait_range (struct address_space *mapping, +static void __filemap_fdatawait_range (struct address_space *mapping,loff_t start_byte,loff_t end_byte) {pgoff_t index = start_byte >>PAGE_SHIFT ;pgoff_t end = end_byte >>PAGE_SHIFT ;struct pagevec pvec;int nr_pages; -int ret =0 ;if (end_byte < start_byte) - goto out; +return ;pagevec_init (&pvec,0 ); while ((index <= end) &&
@@ -390,14 +389,11 @@ static int __filemap_fdatawait_range(struct address_space *mapping,continue ;wait_on_page_writeback (page); -if (TestClearPageError (page)) - ret = -EIO ; +ClearPageError (page); }pagevec_release (&pvec);cond_resched (); } -out: -return ret; }/**
@@ -417,15 +413,10 @@ static int __filemap_fdatawait_range(struct address_space *mapping,int filemap_fdatawait_range (struct address_space *mapping,loff_t start_byte,loff_t end_byte) { -int ret, ret2;errseq_t since =filemap_sample_wb_error (mapping); - ret =__filemap_fdatawait_range (mapping, start_byte, end_byte); - ret2 =filemap_check_wb_error (mapping, since); -if (!ret) - ret = ret2; - -return ret; +__filemap_fdatawait_range (mapping, start_byte, end_byte); +return filemap_check_wb_error (mapping, since); }EXPORT_SYMBOL (filemap_fdatawait_range);
Signature · 1 line
2.9.3
PATCH v3 17/20 cifs: cleanup writeback handling errors and comments
In reply to Jeff LaytonNow that writeback errors are handled on a per-file basis using the new sequence counter method at the vfs layer, we no longer need to re-set errors in the mapping after doing writeback in non-fsync codepaths.
Also, fix up some bogus comments.
--- fs/cifs/cifsfs.c | 4 +--- fs/cifs/file.c | 7 ++----- fs/cifs/inode.c | 22 +++++++--------------- 3 files changed, 10 insertions(+), 23 deletions(-)
fs/cifs/cifsfs.c +1 -3
@@ -829,10 +829,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)if (!CIFS_CACHE_READ (CIFS_I (inode)) && inode->i_mapping && inode->i_mapping->nrpages !=0 ) { rc =filemap_fdatawait (inode->i_mapping); -if (rc) { -mapping_set_error (inode->i_mapping, rc); +if (rc)return rc; - } }/* * Some applications poll for the file length in this strange
fs/cifs/file.c +2 -5
@@ -722,9 +722,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) cinode =CIFS_I (inode);if (can_flush) { - rc =filemap_write_and_wait (inode->i_mapping); -mapping_set_error (inode->i_mapping, rc); - +filemap_write_and_wait (inode->i_mapping);if (tcon->unix_ext) rc =cifs_get_inode_info_unix (&inode, full_path, inode->i_sb, xid);
@@ -3906,8 +3904,7 @@ void cifs_oplock_break(struct work_struct *work)break_lease (inode,O_WRONLY ); rc =filemap_fdatawrite (inode->i_mapping);if (!CIFS_CACHE_READ (cinode)) { - rc =filemap_fdatawait (inode->i_mapping); -mapping_set_error (inode->i_mapping, rc); +filemap_fdatawait (inode->i_mapping);cifs_zap_mapping (inode); }cifs_dbg (FYI ,"Oplock flush inode %p rc %d\n" , inode, rc);
fs/cifs/inode.c +7 -15
@@ -2008,10 +2008,8 @@ int cifs_getattr(const struct path *path, struct kstat *stat,if (!CIFS_CACHE_READ (CIFS_I (inode)) && inode->i_mapping && inode->i_mapping->nrpages !=0 ) { rc =filemap_fdatawait (inode->i_mapping); -if (rc) { -mapping_set_error (inode->i_mapping, rc); +if (rc)return rc; - } } rc =cifs_revalidate_dentry_attr (dentry);
@@ -2171,15 +2169,12 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)* Attempt to flush data before changing attributes. We need to do * this for ATTR_SIZE and ATTR_MTIME for sure, and if we change the * ownership or mode then we may also need to do this. Here, we take -* the safe way out and just do the flush on all setattr requests. If -* the flush returns error, store it to report later and continue. +* the safe way out and just do the flush on all setattr requests. * * BB: This should be smarter. Why bother flushing pages that -* will be truncated anyway? Also, should we error out here if -* the flush returns error? +* will be truncated anyway? */ - rc =filemap_write_and_wait (inode->i_mapping); -mapping_set_error (inode->i_mapping, rc); +filemap_write_and_wait (inode->i_mapping); rc =0 ;if (attrs->ia_valid &ATTR_SIZE ) {
@@ -2314,15 +2309,12 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)* Attempt to flush data before changing attributes. We need to do * this for ATTR_SIZE and ATTR_MTIME for sure, and if we change the * ownership or mode then we may also need to do this. Here, we take -* the safe way out and just do the flush on all setattr requests. If -* the flush returns error, store it to report later and continue. +* the safe way out and just do the flush on all setattr requests. * * BB: This should be smarter. Why bother flushing pages that -* will be truncated anyway? Also, should we error out here if -* the flush returns error? +* will be truncated anyway? */ - rc =filemap_write_and_wait (inode->i_mapping); -mapping_set_error (inode->i_mapping, rc); +filemap_write_and_wait (inode->i_mapping); rc =0 ;if (attrs->ia_valid &ATTR_SIZE ) {
Signature · 1 line
2.9.3
PATCH v3 18/20 mm: clean up error handling in write_one_page
In reply to Jeff LaytonDon't try to check PageError since that's potentially racy and not necessarily going to be set after writepage errors out.
Instead, sample the mapping error early on, and use that value to tell us whether we got a writeback error since then.
--- mm/page-writeback.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
mm/page-writeback.c +5 -6
@@ -2373,11 +2373,12 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc)int write_one_page (struct page *page) {struct address_space *mapping = page->mapping; -int ret =0 ; +int ret =0 , ret2;struct writeback_control wbc = { .sync_mode =WB_SYNC_ALL , .nr_to_write =1 , }; +errseq_t since =filemap_sample_wb_error (mapping);BUG_ON (!PageLocked (page));
@@ -2386,16 +2387,14 @@ int write_one_page(struct page *page)if (clear_page_dirty_for_io (page)) {get_page (page); ret = mapping->a_ops->writepage (page, &wbc); -if (ret ==0 ) { +if (ret ==0 )wait_on_page_writeback (page); -if (PageError (page)) - ret = -EIO ; - }put_page (page); }else {unlock_page (page); } -return ret; + ret2 =filemap_check_wb_error (mapping, since); +return ret ? : ret2; }EXPORT_SYMBOL (write_one_page);
Signature · 1 line
2.9.3
PATCH v3 19/20 jbd2: don't reset error in journal_finish_inode_data_buffers
In reply to Jeff LaytonNow that we don't clear writeback errors after fetching them, there is no need to reset them. This is also potentially racy.
--- fs/jbd2/commit.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
fs/jbd2/commit.c +2 -11
@@ -264,17 +264,8 @@ static int journal_finish_inode_data_buffers(journal_t *journal, jinode->i_flags |=JI_COMMIT_RUNNING ;spin_unlock (&journal->j_list_lock); err =filemap_fdatawait (jinode->i_vfs_inode->i_mapping); -if (err) { -/* -* Because AS_EIO is cleared by -* filemap_fdatawait_range(), set it again so -* that user process can get -EIO from fsync(). -*/ -mapping_set_error (jinode->i_vfs_inode->i_mapping, -EIO ); - -if (!ret) - ret = err; - } +if (err && !ret) + ret = err;spin_lock (&journal->j_list_lock); jinode->i_flags &= ~JI_COMMIT_RUNNING ;smp_mb ();
Signature · 1 line
2.9.3
PATCH v3 20/20 gfs2: clean up some filemap_* calls
In reply to Jeff LaytonIn some places, it's trying to reset the mapping error after calling filemap_fdatawait. That's no longer required. Also, turn several filemap_fdatawrite+filemap_fdatawait calls into filemap_write_and_wait. That will at least return writeback errors that occur during the write phase.
--- fs/gfs2/glops.c | 12 ++++-------- fs/gfs2/lops.c | 4 +--- fs/gfs2/super.c | 6 ++---- 3 files changed, 7 insertions(+), 15 deletions(-)
fs/gfs2/glops.c +4 -8
@@ -158,9 +158,7 @@ static void rgrp_go_sync(struct gfs2_glock *gl)GLOCK_BUG_ON (gl, gl->gl_state !=LM_ST_EXCLUSIVE );gfs2_log_flush (sdp, gl,NORMAL_FLUSH ); -filemap_fdatawrite_range (mapping, gl->gl_vm.start, gl->gl_vm.end); - error =filemap_fdatawait_range (mapping, gl->gl_vm.start, gl->gl_vm.end); -mapping_set_error (mapping, error); +filemap_write_and_wait_range (mapping, gl->gl_vm.start, gl->gl_vm.end);gfs2_ail_empty_gl (gl);spin_lock (&gl->gl_lockref.lock);
@@ -225,12 +223,10 @@ static void inode_go_sync(struct gfs2_glock *gl)filemap_fdatawrite (metamapping);if (ip) {struct address_space *mapping = ip->i_inode.i_mapping; -filemap_fdatawrite (mapping); - error =filemap_fdatawait (mapping); -mapping_set_error (mapping, error); +filemap_write_and_wait (mapping); + }else { +filemap_fdatawait (metamapping); } - error =filemap_fdatawait (metamapping); -mapping_set_error (metamapping, error);gfs2_ail_empty_gl (gl);/* * Writeback of the data mapping may cause the dirty flag to be set
fs/gfs2/lops.c +1 -3
@@ -586,9 +586,7 @@ static void gfs2_meta_sync(struct gfs2_glock *gl)if (mapping ==NULL ) mapping = &sdp->sd_aspace; -filemap_fdatawrite (mapping); - error =filemap_fdatawait (mapping); - + error =filemap_write_and_wait (mapping);if (error)gfs2_io_error (gl->gl_name.ln_sbd); }
fs/gfs2/super.c +2 -4
@@ -1593,10 +1593,8 @@ static void gfs2_evict_inode(struct inode *inode) out_truncate:gfs2_log_flush (sdp, ip->i_gl,NORMAL_FLUSH ); metamapping =gfs2_glock2aspace (ip->i_gl); -if (test_bit (GLF_DIRTY , &ip->i_gl->gl_flags)) { -filemap_fdatawrite (metamapping); -filemap_fdatawait (metamapping); - } +if (test_bit (GLF_DIRTY , &ip->i_gl->gl_flags)) +filemap_write_and_wait (metamapping);write_inode_now (inode,1 );gfs2_ail_flush (ip->i_gl,0 );
Signature · 1 line
2.9.3
Re: [PATCH v3 20/20] gfs2: clean up some filemap_* calls
----- Original Message -----
| In some places, it's trying to reset the mapping error after calling | filemap_fdatawait. That's no longer required. Also, turn several | filemap_fdatawrite+filemap_fdatawait calls into filemap_write_and_wait. | That will at least return writeback errors that occur during the write | phase. | | Signed-off-by: Jeff Layton <[email protected]> | --- | fs/gfs2/glops.c | 12 ++++-------- | fs/gfs2/lops.c | 4 +--- | fs/gfs2/super.c | 6 ++---- | 3 files changed, 7 insertions(+), 15 deletions(-) | | diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c | index 5db59d444838..7362d19fdc4c 100644 | --- a/fs/gfs2/glops.c | +++ b/fs/gfs2/glops.c | @@ -158,9 +158,7 @@ static void rgrp_go_sync(struct gfs2_glock *gl) | GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE); | | gfs2_log_flush(sdp, gl, NORMAL_FLUSH); | - filemap_fdatawrite_range(mapping, gl->gl_vm.start, gl->gl_vm.end); | - error = filemap_fdatawait_range(mapping, gl->gl_vm.start, gl->gl_vm.end); | - mapping_set_error(mapping, error); | + filemap_write_and_wait_range(mapping, gl->gl_vm.start, gl->gl_vm.end);
This should probably have "error = ", no?
| gfs2_ail_empty_gl(gl);
|
| spin_lock(&gl->gl_lockref.lock);
| @@ -225,12 +223,10 @@ static void inode_go_sync(struct gfs2_glock *gl)
| filemap_fdatawrite(metamapping);
| if (ip) {
| struct address_space *mapping = ip->i_inode.i_mapping;
| - filemap_fdatawrite(mapping);
| - error = filemap_fdatawait(mapping);
| - mapping_set_error(mapping, error);
| + filemap_write_and_wait(mapping);
| + } else {
| + filemap_fdatawait(metamapping);
| }
| - error = filemap_fdatawait(metamapping);
| - mapping_set_error(metamapping, error);This part doesn't look right at all. There's a big difference in gfs2 between mapping and metamapping. We need to wait for metamapping regardless.
(snip)
Regards,
Bob Peterson
Red Hat File Systems
Re: [PATCH v3 20/20] gfs2: clean up some filemap_* calls
Quoted 21 lines · Bob Peterson
----- Original Message -----
Quoted 20 lines
In some places, it's trying to reset the mapping error after calling
filemap_fdatawait. That's no longer required. Also, turn several filemap_fdatawrite+filemap_fdatawait calls intofilemap_write_and_wait. That will at least return writeback errors that occur during the write phase.Signed-off-by Jeff Layton <[email protected]>--- fs/gfs2/glops.c | 12 ++++-------- fs/gfs2/lops.c | 4 +--- fs/gfs2/super.c | 6 ++---- 3 files changed, 7 insertions(+), 15 deletions(-)fs/gfs2/glops.c +0
-0@@ -158,9 +158,7 @@ static void rgrp_go_sync(struct gfs2_glock *gl)GLOCK_BUG_ON (gl, gl->gl_state !=LM_ST_EXCLUSIVE );
Quoted 8 lines
fs/gfs2/glops.c static void rgrp_go_sync(struct gfs2_glock *gl) · line 161
Quoted 5 lines
fs/gfs2/glops.c +1
-3gfs2_log_flush (sdp, gl,NORMAL_FLUSH ); -filemap_fdatawrite_range (mapping, gl->gl_vm.start, gl->gl_vm.end); - error =filemap_fdatawait_range (mapping, gl->gl_vm.start, gl->gl_vm.end); -mapping_set_error (mapping, error); +filemap_write_and_wait_range (mapping, gl->gl_vm.start, gl->gl_vm.end);This should probably have "error = ", no?
This error is discarded in the current code after resetting the error in the mapping. With the earlier patches in this set we don't need to reset the error like this anymore.
Now, if this code should doing something else with those errors, then that's a separate problem.
Quoted 11 lines
Quoted 11 lines
fs/gfs2/glops.c +1
-3gfs2_ail_empty_gl (gl);spin_lock (&gl->gl_lockref.lock);@@ -225,12 +223,10 @@ static void inode_go_sync(struct gfs2_glock *gl)filemap_fdatawrite (metamapping);if (ip) {struct address_space *mapping = ip->i_inode.i_mapping; -filemap_fdatawrite (mapping); - error =filemap_fdatawait (mapping); -mapping_set_error (mapping, error); +filemap_write_and_wait (mapping);
Quoted 9 lines
fs/gfs2/glops.c static void inode_go_sync(struct gfs2_glock *gl) · line 233
Quoted 5 lines
fs/gfs2/glops.c +2
-2+ }else { +filemap_fdatawait (metamapping); } - error =filemap_fdatawait (metamapping); -mapping_set_error (metamapping, error);This part doesn't look right at all. There's a big difference in gfs2 between mapping and metamapping. We need to wait for metamapping regardless.
...and this should wait. Basically, filemap_write_and_wait does filemap_fdatawrite and then filemap_fdatawait. This is mostly just replacing the existing code with a more concise helper.
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH v3 20/20] gfs2: clean up some filemap_* calls
Hi,
----- Original Message -----
| On Mon, 2017-04-24 at 10:12 -0400, Bob Peterson wrote: | > > + filemap_write_and_wait_range(mapping, gl->gl_vm.start, gl->gl_vm.end); | > | > This should probably have "error = ", no? | > | | This error is discarded in the current code after resetting the error in | the mapping. With the earlier patches in this set we don't need to reset | the error like this anymore. | | Now, if this code should doing something else with those errors, then | that's a separate problem.
Okay, I see. My bad.
| > > gfs2_ail_empty_gl(gl);
| > >
| > > spin_lock(&gl->gl_lockref.lock);
| > > @@ -225,12 +223,10 @@ static void inode_go_sync(struct gfs2_glock *gl)
| > > filemap_fdatawrite(metamapping);
| > > if (ip) {
| > > struct address_space *mapping = ip->i_inode.i_mapping;
| > > - filemap_fdatawrite(mapping);
| > > - error = filemap_fdatawait(mapping);
| > > - mapping_set_error(mapping, error);
| > > + filemap_write_and_wait(mapping);
| > > + } else {
| > > + filemap_fdatawait(metamapping);
| > > }
| > > - error = filemap_fdatawait(metamapping);
| > > - mapping_set_error(metamapping, error);
| >
| > This part doesn't look right at all. There's a big difference in gfs2
| > between
| > mapping and metamapping. We need to wait for metamapping regardless.
| >
|
| ...and this should wait. Basically, filemap_write_and_wait does
| filemap_fdatawrite and then filemap_fdatawait. This is mostly just
| replacing the existing code with a more concise helper.But this isn't a simple replacement with a helper. This is two different address spaces (mapping and metamapping) and you added an else in there.
So with this patch metamapping gets written, and if there's an ip, mapping gets written but it doesn't wait for metamapping. Unless I'm missing something.
You could replace both filemap_fdatawrites with the helper instead. Today's code is structured as:
(a) write metamapping
if (ip)
(b) write mapping
(c) wait for mapping
(d) wait for metamapping
If you use the helper for both, it becomes, (a & d)(b & c) which is probably acceptable. (I think we just tried to optimize what the elevator was doing).
But the way you've got it coded here still looks wrong. It looks like:
(a)
if (ip)
(b & c)
ELSE -
(d)
So (d) (metamapping) isn't guaranteed to be synced at the end of the function. Of course, you know the modified helper functions better than I do. What am I missing?
Regards,
Bob Peterson
Red Hat File Systems
Re: [PATCH v3 20/20] gfs2: clean up some filemap_* calls
Quoted 70 lines · Bob Peterson
Hi,
----- Original Message -----
Quoted 6 lines · Bob Peterson
Quoted 4 lines
fs/gfs2/glops.c static void rgrp_go_sync(struct gfs2_glock *gl) · line 161
Quoted 1 line
fs/gfs2/glops.c +1
-0+filemap_write_and_wait_range (mapping, gl->gl_vm.start, gl->gl_vm.end);This should probably have "error = ", no?
Quoted 6 lines
This error is discarded in the current code after resetting the error in the mapping. With the earlier patches in this set we don't need to reset the error like this anymore.
Now, if this code should doing something else with those errors, then that's a separate problem.
Okay, I see. My bad.
Quoted 22 lines
Quoted 12 lines
Quoted 12 lines
fs/gfs2/glops.c +2
-3gfs2_ail_empty_gl (gl);spin_lock (&gl->gl_lockref.lock);@@ -225,12 +223,10 @@ static void inode_go_sync(struct gfs2_glock *gl)filemap_fdatawrite (metamapping);if (ip) {struct address_space *mapping = ip->i_inode.i_mapping; -filemap_fdatawrite (mapping); - error =filemap_fdatawait (mapping); -mapping_set_error (mapping, error); +filemap_write_and_wait (mapping); + }else {Quoted 9 lines
fs/gfs2/glops.c static void inode_go_sync(struct gfs2_glock *gl) · line 233
Quoted 4 lines
fs/gfs2/glops.c +1
-2+filemap_fdatawait (metamapping); } - error =filemap_fdatawait (metamapping); -mapping_set_error (metamapping, error);This part doesn't look right at all. There's a big difference in gfs2 between
mapping and metamapping. We need to wait for metamapping regardless.Quoted 3 lines
...and this should wait. Basically,
filemap_write_and_waitdoesfilemap_fdatawriteand thenfilemap_fdatawait. This is mostly just replacing the existing code with a more concise helper.But this isn't a simple replacement with a helper. This is two different address spaces (mapping and metamapping) and you added an else in there.
So with this patch metamapping gets written, and if there's an ip, mapping gets written but it doesn't wait for metamapping. Unless I'm missing something.
You could replace both
filemap_fdatawriteswith the helper instead. Today's code is structured as:(a) write metamapping
if (ip)
(b) write mapping
(c) wait for mapping
(d) wait for metamappingIf you use the helper for both, it becomes, (a & d)(b & c) which is probably acceptable. (I think we just tried to optimize what the elevator was doing).
But the way you've got it coded here still looks wrong. It looks like:
(a)
if (ip)
(b & c)
ELSE -
(d)
Quoted 5 lines
So (d) (metamapping) isn't guaranteed to be synced at the end of the function. Of course, you know the modified helper functions better than I do. What am I missing?
<facepalm>
You're right of course. I'll fix that up in my tree.
Thanks!
Signature · 1 line
Jeff Layton <[email protected]>