From: jlayton@kernel.org To: Andrew Morton <akpm@linux-foundation.org>, Al Viro <viro@ZenIV.linux.org.uk>, Jan Kara <jack@suse.cz>, tytso@mit.edu, axboe@kernel.dk, mawilcox@microsoft.com, ross.zwisler@linux.intel.com, corbet@lwn.net, Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>, David Sterba <dsterba@suse.com>, "Darrick J . Wong" <darrick.wong@oracle.com> Cc: Carlos Maiolino <cmaiolino@redhat.com>, Eryu Guan <eguan@redhat.com>, David Howells <dhowells@redhat.com>, Christoph Hellwig <hch@infradead.org>, Liu Bo <bo.li.liu@oracle.com>, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v8 05/18] jbd2: don't clear and reset errors after waiting on writeback Date: Thu, 29 Jun 2017 09:19:41 -0400 [thread overview] Message-ID: <20170629131954.28733-6-jlayton@kernel.org> (raw) In-Reply-To: <20170629131954.28733-1-jlayton@kernel.org> From: Jeff Layton <jlayton@redhat.com> Resetting this flag is almost certainly racy, and will be problematic with some coming changes. Make filemap_fdatawait_keep_errors return int, but not clear the flag(s). Have jbd2 call it instead of filemap_fdatawait and don't attempt to re-set the error flag if it fails. Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/jbd2/commit.c | 16 ++++------------ include/linux/fs.h | 2 +- mm/filemap.c | 16 ++++++++++++++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index b6b194ec1b4f..3c1c31321d9b 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -263,18 +263,10 @@ static int journal_finish_inode_data_buffers(journal_t *journal, continue; 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; - } + err = filemap_fdatawait_keep_errors( + jinode->i_vfs_inode->i_mapping); + if (!ret) + ret = err; spin_lock(&journal->j_list_lock); jinode->i_flags &= ~JI_COMMIT_RUNNING; smp_mb(); diff --git a/include/linux/fs.h b/include/linux/fs.h index 4ff4498297fa..74872c0f1c07 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2508,7 +2508,7 @@ extern int write_inode_now(struct inode *, int); extern int filemap_fdatawrite(struct address_space *); extern int filemap_flush(struct address_space *); extern int filemap_fdatawait(struct address_space *); -extern void filemap_fdatawait_keep_errors(struct address_space *); +extern int filemap_fdatawait_keep_errors(struct address_space *mapping); extern int filemap_fdatawait_range(struct address_space *, loff_t lstart, loff_t lend); extern int filemap_write_and_wait(struct address_space *mapping); diff --git a/mm/filemap.c b/mm/filemap.c index 6f1be573a5e6..e5711b2728f4 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -309,6 +309,16 @@ int filemap_check_errors(struct address_space *mapping) } EXPORT_SYMBOL(filemap_check_errors); +static int filemap_check_and_keep_errors(struct address_space *mapping) +{ + /* Check for outstanding write errors */ + if (test_bit(AS_EIO, &mapping->flags)) + return -EIO; + if (test_bit(AS_ENOSPC, &mapping->flags)) + return -ENOSPC; + return 0; +} + /** * __filemap_fdatawrite_range - start writeback on mapping dirty pages in range * @mapping: address space structure to write @@ -453,15 +463,17 @@ EXPORT_SYMBOL(filemap_fdatawait_range); * call sites are system-wide / filesystem-wide data flushers: e.g. sync(2), * fsfreeze(8) */ -void filemap_fdatawait_keep_errors(struct address_space *mapping) +int filemap_fdatawait_keep_errors(struct address_space *mapping) { loff_t i_size = i_size_read(mapping->host); if (i_size == 0) - return; + return 0; __filemap_fdatawait_range(mapping, 0, i_size - 1); + return filemap_check_and_keep_errors(mapping); } +EXPORT_SYMBOL(filemap_fdatawait_keep_errors); /** * filemap_fdatawait - wait for all under-writeback pages to complete -- 2.13.0
WARNING: multiple messages have this Message-ID (diff)
From: jlayton@kernel.org To: Andrew Morton <akpm@linux-foundation.org>, Al Viro <viro@ZenIV.linux.org.uk>, Jan Kara <jack@suse.cz>, tytso@mit.edu, axboe@kernel.dk, mawilcox@microsoft.com, ross.zwisler@linux.intel.com, corbet@lwn.net, Chris Mason <clm@fb.com>, Josef Bacik <jbacik@fb.com>, David Sterba <dsterba@suse.com>, "Darrick J . Wong" <darrick.wong@oracle.com> Cc: Carlos Maiolino <cmaiolino@redhat.com>, Eryu Guan <eguan@redhat.com>, David Howells <dhowells@redhat.com>, Christoph Hellwig <hch@infradead.org>, Liu Bo <bo.li.liu@oracle.com>, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH v8 05/18] jbd2: don't clear and reset errors after waiting on writeback Date: Thu, 29 Jun 2017 09:19:41 -0400 [thread overview] Message-ID: <20170629131954.28733-6-jlayton@kernel.org> (raw) In-Reply-To: <20170629131954.28733-1-jlayton@kernel.org> From: Jeff Layton <jlayton@redhat.com> Resetting this flag is almost certainly racy, and will be problematic with some coming changes. Make filemap_fdatawait_keep_errors return int, but not clear the flag(s). Have jbd2 call it instead of filemap_fdatawait and don't attempt to re-set the error flag if it fails. Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/jbd2/commit.c | 16 ++++------------ include/linux/fs.h | 2 +- mm/filemap.c | 16 ++++++++++++++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index b6b194ec1b4f..3c1c31321d9b 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -263,18 +263,10 @@ static int journal_finish_inode_data_buffers(journal_t *journal, continue; 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; - } + err = filemap_fdatawait_keep_errors( + jinode->i_vfs_inode->i_mapping); + if (!ret) + ret = err; spin_lock(&journal->j_list_lock); jinode->i_flags &= ~JI_COMMIT_RUNNING; smp_mb(); diff --git a/include/linux/fs.h b/include/linux/fs.h index 4ff4498297fa..74872c0f1c07 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2508,7 +2508,7 @@ extern int write_inode_now(struct inode *, int); extern int filemap_fdatawrite(struct address_space *); extern int filemap_flush(struct address_space *); extern int filemap_fdatawait(struct address_space *); -extern void filemap_fdatawait_keep_errors(struct address_space *); +extern int filemap_fdatawait_keep_errors(struct address_space *mapping); extern int filemap_fdatawait_range(struct address_space *, loff_t lstart, loff_t lend); extern int filemap_write_and_wait(struct address_space *mapping); diff --git a/mm/filemap.c b/mm/filemap.c index 6f1be573a5e6..e5711b2728f4 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -309,6 +309,16 @@ int filemap_check_errors(struct address_space *mapping) } EXPORT_SYMBOL(filemap_check_errors); +static int filemap_check_and_keep_errors(struct address_space *mapping) +{ + /* Check for outstanding write errors */ + if (test_bit(AS_EIO, &mapping->flags)) + return -EIO; + if (test_bit(AS_ENOSPC, &mapping->flags)) + return -ENOSPC; + return 0; +} + /** * __filemap_fdatawrite_range - start writeback on mapping dirty pages in range * @mapping: address space structure to write @@ -453,15 +463,17 @@ EXPORT_SYMBOL(filemap_fdatawait_range); * call sites are system-wide / filesystem-wide data flushers: e.g. sync(2), * fsfreeze(8) */ -void filemap_fdatawait_keep_errors(struct address_space *mapping) +int filemap_fdatawait_keep_errors(struct address_space *mapping) { loff_t i_size = i_size_read(mapping->host); if (i_size == 0) - return; + return 0; __filemap_fdatawait_range(mapping, 0, i_size - 1); + return filemap_check_and_keep_errors(mapping); } +EXPORT_SYMBOL(filemap_fdatawait_keep_errors); /** * filemap_fdatawait - wait for all under-writeback pages to complete -- 2.13.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-06-29 13:19 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-29 13:19 [PATCH v8 00/18] fs: enhanced writeback error reporting with errseq_t (pile #1) jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 01/18] fs: remove call_fsync helper function jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 02/18] buffer: use mapping_set_error instead of setting the flag jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 03/18] fs: check for writeback errors after syncing out buffers in generic_file_fsync jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 14:19 ` Christoph Hellwig 2017-06-29 14:19 ` Christoph Hellwig 2017-06-29 20:17 ` Jeff Layton 2017-06-29 20:17 ` Jeff Layton 2017-06-29 20:17 ` Jeff Layton 2017-06-29 20:17 ` Jeff Layton 2017-06-29 13:19 ` [PATCH v8 04/18] buffer: set errors in mapping at the time that the error occurs jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` jlayton [this message] 2017-06-29 13:19 ` [PATCH v8 05/18] jbd2: don't clear and reset errors after waiting on writeback jlayton 2017-06-29 13:19 ` [PATCH v8 06/18] mm: clear AS_EIO/AS_ENOSPC when writeback initiation fails jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 07/18] mm: don't TestClearPageError in __filemap_fdatawait_range jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 08/18] mm: clean up error handling in write_one_page jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 09/18] lib: add errseq_t type and infrastructure for handling it jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 10/18] fs: new infrastructure for writeback error handling and reporting jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:45 ` Jeff Layton 2017-06-29 13:45 ` Jeff Layton 2017-06-29 13:45 ` Jeff Layton 2017-06-29 13:45 ` Jeff Layton 2017-06-29 17:52 ` Jeff Layton 2017-06-29 17:52 ` Jeff Layton 2017-06-29 17:52 ` Jeff Layton 2017-06-29 17:52 ` Jeff Layton 2017-06-29 13:19 ` [PATCH v8 11/18] mm: set both AS_EIO/AS_ENOSPC and errseq_t in mapping_set_error jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 12/18] Documentation: flesh out the section in vfs.txt on storing and reporting writeback errors jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 17:11 ` Darrick J. Wong 2017-06-29 17:11 ` Darrick J. Wong 2017-06-29 18:13 ` Jeff Layton 2017-06-29 18:13 ` Jeff Layton 2017-06-29 18:13 ` Jeff Layton 2017-06-29 18:13 ` Jeff Layton 2017-06-29 18:21 ` Matthew Wilcox 2017-06-29 18:21 ` Matthew Wilcox 2017-06-29 18:21 ` Matthew Wilcox 2017-06-29 20:42 ` Jeff Layton 2017-06-29 20:42 ` Jeff Layton 2017-06-29 20:42 ` Jeff Layton 2017-06-29 20:42 ` Jeff Layton 2017-06-29 20:42 ` Jeff Layton 2017-06-29 13:19 ` [PATCH v8 13/18] dax: set errors in mapping when writeback fails jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 14/18] block: convert to errseq_t based writeback error tracking jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 14:18 ` Christoph Hellwig 2017-06-29 14:18 ` Christoph Hellwig 2017-06-29 13:19 ` [PATCH v8 15/18] fs: convert __generic_file_fsync to use errseq_t based reporting jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 13:19 ` [PATCH v8 16/18] ext4: use errseq_t based error handling for reporting data writeback errors jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 14:12 ` Christoph Hellwig 2017-06-29 14:12 ` Christoph Hellwig 2017-06-29 20:26 ` Jeff Layton 2017-06-29 20:26 ` Jeff Layton 2017-06-29 20:26 ` Jeff Layton 2017-06-29 20:26 ` Jeff Layton 2017-06-29 13:19 ` [PATCH v8 17/18] xfs: minimal conversion to errseq_t writeback error reporting jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 14:12 ` Christoph Hellwig 2017-06-29 14:12 ` Christoph Hellwig 2017-06-30 16:45 ` Jeff Layton 2017-06-30 16:45 ` Jeff Layton 2017-06-30 16:45 ` Jeff Layton 2017-06-30 16:45 ` Jeff Layton 2017-06-30 16:49 ` Christoph Hellwig 2017-06-30 16:49 ` Christoph Hellwig 2017-06-29 17:13 ` Darrick J. Wong 2017-06-29 17:13 ` Darrick J. Wong 2017-06-29 13:19 ` [PATCH v8 18/18] btrfs: minimal conversion to errseq_t writeback error reporting on fsync jlayton 2017-06-29 13:19 ` jlayton 2017-06-29 14:17 ` Christoph Hellwig 2017-06-29 14:17 ` Christoph Hellwig 2017-06-29 20:32 ` Jeff Layton 2017-06-29 20:32 ` Jeff Layton 2017-06-29 20:32 ` Jeff Layton 2017-06-29 20:32 ` Jeff Layton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170629131954.28733-6-jlayton@kernel.org \ --to=jlayton@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=axboe@kernel.dk \ --cc=bo.li.liu@oracle.com \ --cc=clm@fb.com \ --cc=cmaiolino@redhat.com \ --cc=corbet@lwn.net \ --cc=darrick.wong@oracle.com \ --cc=dhowells@redhat.com \ --cc=dsterba@suse.com \ --cc=eguan@redhat.com \ --cc=hch@infradead.org \ --cc=jack@suse.cz \ --cc=jbacik@fb.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-xfs@vger.kernel.org \ --cc=mawilcox@microsoft.com \ --cc=ross.zwisler@linux.intel.com \ --cc=tytso@mit.edu \ --cc=viro@ZenIV.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.