Btrfs: add missing end_page_writeback on submit_extent_page failure
PATCH 1/2 Btrfs: add missing end_page_writeback on submit_extent_page failure
If submit_extent_page() fails in write_one_eb(), we end up with the current page not marked dirty anymore, unlocked and marked for writeback. But we never end up calling end_page_writeback() against the page, which will make calls to filemap_fdatawait_range (e.g. at transaction commit time) hang forever waiting for the writeback bit to be cleared from the page.
--- fs/btrfs/extent_io.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/extent_io.c +1 -0
@@ -3668,6 +3668,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,if (ret) {set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);SetPageError (p); +end_page_writeback (p);if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb); ret = -EIO ;
Signature · 1 line
1.9.1
PATCH 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
While we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the BTRFS_INODE_BTREE_IO_ERR and BTRFS_INODE_BTREE_LOG_IO_ERR inode flags also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
--- fs/btrfs/btrfs_inode.h | 2 ++ fs/btrfs/extent_io.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- fs/btrfs/transaction.c | 20 ++++++++++++--- fs/btrfs/transaction.h | 3 +-- fs/btrfs/tree-log.c | 13 ++++++---- 5 files changed, 93 insertions(+), 14 deletions(-)
fs/btrfs/btrfs_inode.h +2 -0
@@ -44,6 +44,8 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +#define BTRFS_INODE_BTREE_IO_ERR 12 +#define BTRFS_INODE_BTREE_LOG_IO_ERR 13/* in memory btrfs inode */ struct btrfs_inode {
fs/btrfs/extent_io.c +65 -4
94 lines not on this page · raw message
fs/btrfs/transaction.c +17 -3
@@ -844,6 +844,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;
@@ -852,6 +853,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct inode *btree_inode = root->fs_info->btree_inode;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +867,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (dirty_pages == &trans->transaction->dirty_pages) { +if (test_and_clear_bit (BTRFS_INODE_BTREE_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_LOG_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + } +return werr; }
@@ -874,6 +887,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;
@@ -883,7 +897,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;
@@ -892,7 +906,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {
@@ -900,7 +914,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }
fs/btrfs/transaction.h +1 -2
@@ -146,8 +146,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);
@@ -167,6 +165,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);
fs/btrfs/tree-log.c +8 -5
@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);
@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Signature · 1 line
1.9.1
Re: [PATCH 2/2] Btrfs: be aware of btree inode write errors to avoid fs corruption
Quoted 10 lines · Filipe Manana
While we have a transaction ongoing, the VM might decide at any time to call
btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even
Quoted 8 lines
if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Good catch!
Quoted 14 lines
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's
i_mappingwould not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call tofilemap_fdatawait_range()will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flagEXTENT_BUFFER_IOERRat transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Quoted 8 lines
Using the
BTRFS_INODE_BTREE_IO_ERRandBTRFS_INODE_BTREE_LOG_IO_ERRinode flags also makes us achieve the goal of AS_EIO/AS_ENOSPC whenwritepages()returns success, started writeback for all dirty pages and beforefilemap_fdatawait_range()is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC,filemap_fdatawait_range()would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
But there is a problem when the extent buffer with IO error is COWed and deleted, but the BTRFS_INODE_BTREE_IO_ERR flag still remains in btree_inode's runtime_flags, we'd still run into cleanup_transaction() as this patch expects. So I think we need to remove that BTREE_IO_ERR flag in this case.
Well, I notice that you don't clear rest pages' DIRTY in the error case, so it can lead to hitting the BUG_ON in btrfs_release_extent_buffer_page() when the eb with IO error is COWed by a new good eb and gets itself freed then. I'm making a patch to add missing clear_page_dirty_for_io().
thanks,
-liubo
Quoted 271 lines
Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/btrfs_inode.h | 2 ++ fs/btrfs/extent_io.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- fs/btrfs/transaction.c | 20 ++++++++++++--- fs/btrfs/transaction.h | 3 +-- fs/btrfs/tree-log.c | 13 ++++++---- 5 files changed, 93 insertions(+), 14 deletions(-)fs/btrfs/btrfs_inode.h +2
-0@@ -44,6 +44,8 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +#define BTRFS_INODE_BTREE_IO_ERR 12 +#define BTRFS_INODE_BTREE_LOG_IO_ERR 13/* in memory btrfs inode */ struct btrfs_inode {fs/btrfs/extent_io.c +65
-4@@ -20,6 +20,7 @@#include "locking.h" #include "rcu-string.h" #include "backref.h" +#include "transaction.h" static struct kmem_cache *extent_state_cache;static struct kmem_cache *extent_buffer_cache;@@ -3606,6 +3607,68 @@ static void end_extent_buffer_writeback(struct extent_buffer *eb)wake_up_bit (&eb->bflags,EXTENT_BUFFER_WRITEBACK ); } +static void set_btree_ioerr (struct page *page,int err) +{ +struct extent_buffer *eb = (struct extent_buffer *)page->private; +const u64 start = eb->start; +const u64 end = eb->start + eb->len -1 ; +struct btrfs_fs_info *fs_info = eb->fs_info; +int ret; + +set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +SetPageError (page); + +/* +* If writeback for a btree extent that doesn't belong to a log tree +* failed, set the bit BTRFS_INODE_BTREE_IO_ERR in the inode btree. +* We do this because while the transaction is running and before it's +* committing (when we call filemap_fdata[write|wait]_range against +* the btree inode), we might have +* btree_inode->i_mapping->a_ops->writepages() called by the VM - if it +* returns an error or an error happens during writeback, when we're +* committing the transaction we wouldn't know about it, since the pages +* can be no longer dirty nor marked anymore for writeback (if a +* subsequent modification to the extent buffer didn't happen before the +* transaction commit), which makes filemap_fdata[write|wait]_range not +* able to find the pages tagged with SetPageError at transaction +* commit time. So if this happens we must abort the transaction, +* otherwise we commit a super block with btree roots that point to +* btree nodes/leafs whose content on disk is invalid - either garbage +* or the content of some node/leaf from a past generation that got +* cowed or deleted and is no longer valid. +* +* Note: setting AS_EIO/AS_ENOSPC in the btree inode's i_mapping would +* not be enough - we need to distinguish between log tree extents vs +* non-log tree extents, and the next filemap_fdatawait_range() call +* will catch and clear such errors in the mapping - and that call might +* be from a log sync and not from a transaction commit. Also, checking +* for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't +* done and would not be completely reliable, as the eb might be removed +* from memory and read back when trying to get it, which clears that +* flag right before reading the eb's pages from disk, making us not +* know about the previous write error. +* +* Using the BTRFS_INODE_BTREE_IO_ERR and BTRFS_INODE_BTREE_LOG_IO_ERR +* inode flags also makes us achieve the goal of AS_EIO/AS_ENOSPC when +* writepages() returns success, started writeback for all dirty pages +* and before filemap_fdatawait_range() is called, the writeback for +* all dirty pages had already finished with errors - because we were +* not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return +* success, as it could not know that writeback errors happened (the +* pages were no longer tagged for writeback). +*/ +ASSERT (fs_info->running_transaction); + ret =test_range_bit (&fs_info->running_transaction->dirty_pages, + start, end,EXTENT_NEED_WAIT |EXTENT_DIRTY , +1 ,NULL ); +if (ret) +set_bit (BTRFS_INODE_BTREE_IO_ERR , + &BTRFS_I (fs_info->btree_inode)->runtime_flags); +else +set_bit (BTRFS_INODE_BTREE_LOG_IO_ERR , + &BTRFS_I (fs_info->btree_inode)->runtime_flags); +} +static void end_bio_extent_buffer_writepage (struct bio *bio,int err) {struct bio_vec *bvec;@@ -3620,9 +3683,8 @@ static void end_bio_extent_buffer_writepage(struct bio *bio, int err) done =atomic_dec_and_test (&eb->io_pages);if (err ||test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);ClearPageUptodate (page); -SetPageError (page); +set_btree_ioerr (page, err <0 ? err : -EIO ); }end_page_writeback (page);@@ -3666,8 +3728,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, 0, epd->bio_flags, bio_flags); epd->bio_flags = bio_flags;if (ret) { -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); -SetPageError (p); +set_btree_ioerr (p, ret);end_page_writeback (p);if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb);fs/btrfs/transaction.c +17
-3@@ -844,6 +844,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;@@ -852,6 +853,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct inode *btree_inode = root->fs_info->btree_inode;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {@@ -865,6 +867,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (dirty_pages == &trans->transaction->dirty_pages) { +if (test_and_clear_bit (BTRFS_INODE_BTREE_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_LOG_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + } +return werr; }@@ -874,6 +887,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;@@ -883,7 +897,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;@@ -892,7 +906,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {@@ -900,7 +914,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }fs/btrfs/transaction.h +1
-2@@ -146,8 +146,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);@@ -167,6 +165,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);fs/btrfs/tree-log.c +8
-5@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] Btrfs: be aware of btree inode write errors to avoid fs corruption
Quoted 45 lines · Liu Bo
Quoted 10 lines · Filipe Manana
While we have a transaction ongoing, the VM might decide at any time to call
btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (evenQuoted 8 lines
if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).Good catch!
Quoted 14 lines
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's
i_mappingwould not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call tofilemap_fdatawait_range()will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flagEXTENT_BUFFER_IOERRat transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.Quoted 8 lines
Using the
BTRFS_INODE_BTREE_IO_ERRandBTRFS_INODE_BTREE_LOG_IO_ERRinode flags also makes us achieve the goal of AS_EIO/AS_ENOSPC whenwritepages()returns success, started writeback for all dirty pages and beforefilemap_fdatawait_range()is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC,filemap_fdatawait_range()would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
Quoted 5 lines
But there is a problem when the extent buffer with IO error is COWed and deleted, but the
BTRFS_INODE_BTREE_IO_ERRflag still remains in btree_inode'sruntime_flags, we'd still run intocleanup_transaction()as this patch expects. So I think we need to remove thatBTREE_IO_ERRflag in this case.
Thought about that, no good reason to not do it (yet at least). I'll think a bit about it and send a v2 if I can't find a reason.
Quoted 2 lines
Well, I notice that you don't clear rest pages' DIRTY in the error case,
Where exactly?
Quoted 4 lines
so it
can lead to hitting theBUG_ONinbtrfs_release_extent_buffer_page()when the eb with IO error is COWed by a new good eb and gets itself freed then. I'm making a patch to add missingclear_page_dirty_for_io().
clear_page_dirty_for_io() is already called by write_one_eb(), and immediately after it tags the page(s) for writeback.
If error happens during writeback, end_bio_extent_buffer_writepage() removes the writeback tag (from page and eb's flags).
So either I'm missing something, or you didn't notice all this.
thanks
Quoted 279 lines
thanks,
-liuboQuoted 267 lines
Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/btrfs_inode.h | 2 ++ fs/btrfs/extent_io.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- fs/btrfs/transaction.c | 20 ++++++++++++--- fs/btrfs/transaction.h | 3 +-- fs/btrfs/tree-log.c | 13 ++++++---- 5 files changed, 93 insertions(+), 14 deletions(-)fs/btrfs/btrfs_inode.h +2
-0@@ -44,6 +44,8 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +#define BTRFS_INODE_BTREE_IO_ERR 12 +#define BTRFS_INODE_BTREE_LOG_IO_ERR 13/* in memory btrfs inode */ struct btrfs_inode {fs/btrfs/extent_io.c +65
-4@@ -20,6 +20,7 @@#include "locking.h" #include "rcu-string.h" #include "backref.h" +#include "transaction.h" static struct kmem_cache *extent_state_cache;static struct kmem_cache *extent_buffer_cache;@@ -3606,6 +3607,68 @@ static void end_extent_buffer_writeback(struct extent_buffer *eb)wake_up_bit (&eb->bflags,EXTENT_BUFFER_WRITEBACK ); } +static void set_btree_ioerr (struct page *page,int err) +{ +struct extent_buffer *eb = (struct extent_buffer *)page->private; +const u64 start = eb->start; +const u64 end = eb->start + eb->len -1 ; +struct btrfs_fs_info *fs_info = eb->fs_info; +int ret; + +set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +SetPageError (page); + +/* +* If writeback for a btree extent that doesn't belong to a log tree +* failed, set the bit BTRFS_INODE_BTREE_IO_ERR in the inode btree. +* We do this because while the transaction is running and before it's +* committing (when we call filemap_fdata[write|wait]_range against +* the btree inode), we might have +* btree_inode->i_mapping->a_ops->writepages() called by the VM - if it +* returns an error or an error happens during writeback, when we're +* committing the transaction we wouldn't know about it, since the pages +* can be no longer dirty nor marked anymore for writeback (if a +* subsequent modification to the extent buffer didn't happen before the +* transaction commit), which makes filemap_fdata[write|wait]_range not +* able to find the pages tagged with SetPageError at transaction +* commit time. So if this happens we must abort the transaction, +* otherwise we commit a super block with btree roots that point to +* btree nodes/leafs whose content on disk is invalid - either garbage +* or the content of some node/leaf from a past generation that got +* cowed or deleted and is no longer valid. +* +* Note: setting AS_EIO/AS_ENOSPC in the btree inode's i_mapping would +* not be enough - we need to distinguish between log tree extents vs +* non-log tree extents, and the next filemap_fdatawait_range() call +* will catch and clear such errors in the mapping - and that call might +* be from a log sync and not from a transaction commit. Also, checking +* for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't +* done and would not be completely reliable, as the eb might be removed +* from memory and read back when trying to get it, which clears that +* flag right before reading the eb's pages from disk, making us not +* know about the previous write error. +* +* Using the BTRFS_INODE_BTREE_IO_ERR and BTRFS_INODE_BTREE_LOG_IO_ERR +* inode flags also makes us achieve the goal of AS_EIO/AS_ENOSPC when +* writepages() returns success, started writeback for all dirty pages +* and before filemap_fdatawait_range() is called, the writeback for +* all dirty pages had already finished with errors - because we were +* not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return +* success, as it could not know that writeback errors happened (the +* pages were no longer tagged for writeback). +*/ +ASSERT (fs_info->running_transaction); + ret =test_range_bit (&fs_info->running_transaction->dirty_pages, + start, end,EXTENT_NEED_WAIT |EXTENT_DIRTY , +1 ,NULL ); +if (ret) +set_bit (BTRFS_INODE_BTREE_IO_ERR , + &BTRFS_I (fs_info->btree_inode)->runtime_flags); +else +set_bit (BTRFS_INODE_BTREE_LOG_IO_ERR , + &BTRFS_I (fs_info->btree_inode)->runtime_flags); +} +static void end_bio_extent_buffer_writepage (struct bio *bio,int err) {struct bio_vec *bvec;@@ -3620,9 +3683,8 @@ static void end_bio_extent_buffer_writepage(struct bio *bio, int err) done =atomic_dec_and_test (&eb->io_pages);if (err ||test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);ClearPageUptodate (page); -SetPageError (page); +set_btree_ioerr (page, err <0 ? err : -EIO ); }end_page_writeback (page);@@ -3666,8 +3728,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, 0, epd->bio_flags, bio_flags); epd->bio_flags = bio_flags;if (ret) { -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); -SetPageError (p); +set_btree_ioerr (p, ret);end_page_writeback (p);if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb);fs/btrfs/transaction.c +17
-3@@ -844,6 +844,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;@@ -852,6 +853,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct inode *btree_inode = root->fs_info->btree_inode;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {@@ -865,6 +867,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (dirty_pages == &trans->transaction->dirty_pages) { +if (test_and_clear_bit (BTRFS_INODE_BTREE_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_LOG_IO_ERR , + &BTRFS_I (btree_inode)->runtime_flags)) + werr = werr ? werr : -EIO ; + } +return werr; }@@ -874,6 +887,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;@@ -883,7 +897,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;@@ -892,7 +906,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {@@ -900,7 +914,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }fs/btrfs/transaction.h +1
-2@@ -146,8 +146,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);@@ -167,6 +165,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);fs/btrfs/tree-log.c +8
-6@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid); --1.9.1
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v2 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 8 ++++++ fs/btrfs/extent_io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 3 +- fs/btrfs/transaction.c | 22 +++++++++++++-- fs/btrfs/transaction.h | 5 ++-- fs/btrfs/tree-log.c | 13 +++++---- 7 files changed, 111 insertions(+), 20 deletions(-)
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +8 -0
@@ -6221,6 +6221,14 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +/* +* The unwritten node/leaf (due to an IO error) isn't pointed to by any +* other node in a tree, so it's safe to forget about the write error +* and avoid a transaction abort. +*/ +if (test_and_clear_bit (EXTENT_BUFFER_WRITE_ERR , &buf->bflags)) +atomic_dec (&trans->transaction->eb_write_errors); +btrfs_put_block_group (cache); }
fs/btrfs/extent_io.c +69 -7
113 lines not on this page · raw message
fs/btrfs/extent_io.h +2 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
fs/btrfs/transaction.c +19 -3
@@ -193,6 +193,8 @@ loop:* commit the transaction. */ atomic_set (&cur_trans->use_count,2 ); +atomic_set (&cur_trans->eb_write_errors,0 ); +atomic_set (&cur_trans->log_eb_write_errors,0 ); cur_trans->start_time =get_seconds (); cur_trans->delayed_refs.href_root =RB_ROOT ;
@@ -844,6 +846,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;
@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +869,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (dirty_pages == &trans->transaction->dirty_pages) + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 ); +else + errors = !!atomic_add_unless ( + &trans->transaction->log_eb_write_errors,-1 ,0 ); + +ASSERT (errors >=0 ); +if (errors >0 && !werr) + werr = -EIO ; +return werr; }
@@ -874,6 +889,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;
@@ -883,7 +899,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;
@@ -892,7 +908,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {
@@ -900,7 +916,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }
fs/btrfs/transaction.h +3 -2
@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;
@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);
@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);
fs/btrfs/tree-log.c +8 -5
@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);
@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Signature · 1 line
1.9.1
PATCH v3 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 8 ++++++ fs/btrfs/extent_io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 3 +- fs/btrfs/transaction.c | 22 +++++++++++++-- fs/btrfs/transaction.h | 5 ++-- fs/btrfs/tree-log.c | 13 +++++---- 7 files changed, 111 insertions(+), 20 deletions(-)
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +8 -0
@@ -6221,6 +6221,14 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +/* +* The unwritten node/leaf (due to an IO error) isn't pointed to by any +* other node in a tree, so it's safe to forget about the write error +* and avoid a transaction abort. +*/ +if (test_and_clear_bit (EXTENT_BUFFER_WRITE_ERR , &buf->bflags)) +atomic_dec (&trans->transaction->eb_write_errors); +btrfs_put_block_group (cache); }
fs/btrfs/extent_io.c +69 -7
113 lines not on this page · raw message
fs/btrfs/extent_io.h +2 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
fs/btrfs/transaction.c +19 -3
@@ -193,6 +193,8 @@ loop:* commit the transaction. */ atomic_set (&cur_trans->use_count,2 ); +atomic_set (&cur_trans->eb_write_errors,0 ); +atomic_set (&cur_trans->log_eb_write_errors,0 ); cur_trans->start_time =get_seconds (); cur_trans->delayed_refs.href_root =RB_ROOT ;
@@ -844,6 +846,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;
@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +869,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (dirty_pages == &trans->transaction->dirty_pages) + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 ); +else + errors =atomic_xchg ( + &trans->transaction->log_eb_write_errors,0 ); + +ASSERT (errors >=0 ); +if (errors >0 && !werr) + werr = -EIO ; +return werr; }
@@ -874,6 +889,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;
@@ -883,7 +899,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;
@@ -892,7 +908,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {
@@ -900,7 +916,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }
fs/btrfs/transaction.h +3 -2
@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;
@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);
@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);
fs/btrfs/tree-log.c +8 -5
@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);
@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Signature · 1 line
1.9.1
PATCH v4 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 12 +++++++++ fs/btrfs/extent_io.c | 71 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 3 ++- fs/btrfs/transaction.c | 22 +++++++++++++--- fs/btrfs/transaction.h | 5 ++-- fs/btrfs/tree-log.c | 13 +++++---- 7 files changed, 110 insertions(+), 20 deletions(-)
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +12 -0
@@ -6221,6 +6221,18 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +/* +* The unwritten node/leaf (due to an IO error) isn't pointed to by any +* other node in a tree, so it's safe to forget about the write error +* and avoid a transaction abort. +*/ +if (test_and_clear_bit (EXTENT_BUFFER_WRITE_ERR , &buf->bflags)) { +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) +atomic_dec (&trans->transaction->log_eb_write_errors); +else +atomic_dec (&trans->transaction->eb_write_errors); + } +btrfs_put_block_group (cache); }
fs/btrfs/extent_io.c +64 -7
108 lines not on this page · raw message
fs/btrfs/extent_io.h +2 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
fs/btrfs/transaction.c +19 -3
@@ -193,6 +193,8 @@ loop:* commit the transaction. */ atomic_set (&cur_trans->use_count,2 ); +atomic_set (&cur_trans->eb_write_errors,0 ); +atomic_set (&cur_trans->log_eb_write_errors,0 ); cur_trans->start_time =get_seconds (); cur_trans->delayed_refs.href_root =RB_ROOT ;
@@ -844,6 +846,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;
@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +869,17 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) + errors =atomic_xchg ( + &trans->transaction->log_eb_write_errors,0 ); +else + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 ); + +ASSERT (errors >=0 ); +if (errors >0 && !werr) + werr = -EIO ; +return werr; }
@@ -874,6 +889,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;
@@ -883,7 +899,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;
@@ -892,7 +908,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {
@@ -900,7 +916,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }
fs/btrfs/transaction.h +3 -2
@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;
@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);
@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);
fs/btrfs/tree-log.c +8 -5
@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);
@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Signature · 1 line
1.9.1
PATCH v5 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 1 + fs/btrfs/extent_io.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/extent_io.h | 4 ++- fs/btrfs/transaction.c | 21 +++++++++-- fs/btrfs/transaction.h | 5 +-- fs/btrfs/tree-log.c | 13 ++++--- 7 files changed, 126 insertions(+), 20 deletions(-)
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +1 -0
@@ -6221,6 +6221,7 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +clear_extent_buffer_write_err (buf);btrfs_put_block_group (cache); }
fs/btrfs/extent_io.c +91 -7
138 lines not on this page · raw message
fs/btrfs/extent_io.h +3 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -314,6 +315,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +18 -3
@@ -193,6 +193,8 @@ loop:* commit the transaction. */ atomic_set (&cur_trans->use_count,2 ); +atomic_set (&cur_trans->eb_write_errors,0 ); +atomic_set (&cur_trans->log_eb_write_errors,0 ); cur_trans->start_time =get_seconds (); cur_trans->delayed_refs.href_root =RB_ROOT ;
@@ -844,6 +846,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root,* on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int err =0 ;
@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +869,16 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) + errors =atomic_xchg ( + &trans->transaction->log_eb_write_errors,0 ); +else + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 ); + +if (errors && !werr) + werr = -EIO ; +return werr; }
@@ -874,6 +888,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;
@@ -883,7 +898,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;
@@ -892,7 +907,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {
@@ -900,7 +915,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }
fs/btrfs/transaction.h +3 -2
@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;
@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);
@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);
fs/btrfs/tree-log.c +8 -5
@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);
@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;
@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Signature · 1 line
1.9.1
Re: [PATCH 2/2 v5] Btrfs: be aware of btree inode write errors to avoid fs corruption
On Wed, 24 Sep 2014 11:28:26 +0100, Filipe Manana wrote:
[SNIP]
Quoted 14 lines
int btrfs_wait_marked_extents(struct
btrfs_root*root,fs/btrfs/transaction.c +2
-0+struct btrfs_trans_handle *trans, struct extent_io_tree *dirty_pages, int mark) { int err = 0;@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
fs/btrfs/transaction.c int btrfs_wait_marked_extents(struct btrfs_root *root, · line 877
Quoted 9 lines
fs/btrfs/transaction.c +6
-0@@ -865,6 +869,16 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) + errors =atomic_xchg ( + &trans->transaction->log_eb_write_errors,0 ); +else + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 );
There is a bug in log tree commit case.
As we know, each fs/file tree has two log sub-transaction, when we are committing a log sub-transaction, the other one may be started by the other file sync tasks. It is very likely that there is no any error happens in the former, but some write errors happen in the latter. The above code might clear the number of that errors.
So I think the variant for log write error should be created for each log sub-transaction.
Thanks
Miao
Quoted 118 lines
fs/btrfs/transaction.c +8
-3+ +if (errors && !werr) + werr = -EIO ; +return werr; }@@ -874,6 +888,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;@@ -883,7 +898,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;@@ -892,7 +907,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {@@ -900,7 +915,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }fs/btrfs/transaction.h +3
-2@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);fs/btrfs/tree-log.c +8
-5@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);
Re: [PATCH 2/2 v5] Btrfs: be aware of btree inode write errors to avoid fs corruption
Quoted 32 lines · Miao Xie
On Wed, 24 Sep 2014 11:28:26 +0100, Filipe Manana wrote:
[SNIP]Quoted 14 lines
int btrfs_wait_marked_extents(struct
btrfs_root*root,fs/btrfs/transaction.c +2
-0+struct btrfs_trans_handle *trans, struct extent_io_tree *dirty_pages, int mark) { int err = 0;@@ -852,6 +855,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {fs/btrfs/transaction.c int btrfs_wait_marked_extents(struct btrfs_root *root, · line 877
Quoted 9 lines
fs/btrfs/transaction.c +6
-0@@ -865,6 +869,16 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) + errors =atomic_xchg ( + &trans->transaction->log_eb_write_errors,0 ); +else + errors =atomic_xchg (&trans->transaction->eb_write_errors,0 );There is a bug in log tree commit case.
As we know, each fs/file tree has two log sub-transaction, when we are committing a log sub-transaction, the other one may be started by the other file sync tasks. It is very likely that there is no any error happens in the former, but some write errors happen in the latter. The above code might clear the number of that errors.
Quoted 1 line
So I think the variant for log write error should be created for each log sub-transaction.
Right.
I'm fixing that and another issue I missed before.
thanks
Quoted 127 lines
Thanks
MiaoQuoted 108 lines
fs/btrfs/transaction.c +8
-3+ +if (errors && !werr) + werr = -EIO ; +return werr; }@@ -874,6 +888,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,* those extents are on disk for transaction or log commit */ static int btrfs_write_and_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark) {int ret;@@ -883,7 +898,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,blk_start_plug (&plug); ret =btrfs_write_marked_extents (root, dirty_pages, mark);blk_finish_plug (&plug); - ret2 =btrfs_wait_marked_extents (root, dirty_pages, mark); + ret2 =btrfs_wait_marked_extents (root, trans, dirty_pages, mark);if (ret)return ret;@@ -892,7 +907,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root,return 0 ; } -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, +static int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (!trans || !trans->transaction) {@@ -900,7 +915,7 @@ int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, btree_inode = root->fs_info->btree_inode;return filemap_write_and_wait (btree_inode->i_mapping); } -return btrfs_write_and_wait_marked_extents (root, +return btrfs_write_and_wait_marked_extents (root, trans, &trans->transaction->dirty_pages,EXTENT_DIRTY ); }fs/btrfs/transaction.h +3
-2@@ -46,6 +46,8 @@ struct btrfs_transaction {*/ atomic_t num_writers;atomic_t use_count; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors;/* Be protected by fs_info->trans_lock when we want to change it. */ enum btrfs_trans_state state;@@ -146,8 +148,6 @@ struct btrfs_trans_handle *btrfs_attach_transaction_barrier( struct btrfs_root *root);struct btrfs_trans_handle *btrfs_start_ioctl_transaction (struct btrfs_root *root);int btrfs_wait_for_commit (struct btrfs_root *root,u64 transid); -int btrfs_write_and_wait_transaction (struct btrfs_trans_handle *trans, -struct btrfs_root *root);void btrfs_add_dead_root (struct btrfs_root *root);int btrfs_defrag_root (struct btrfs_root *root);@@ -167,6 +167,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans,int btrfs_write_marked_extents (struct btrfs_root *root,struct extent_io_tree *dirty_pages,int mark);int btrfs_wait_marked_extents (struct btrfs_root *root, +struct btrfs_trans_handle *trans,struct extent_io_tree *dirty_pages,int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);fs/btrfs/tree-log.c +6
-3@@ -2583,7 +2583,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;@@ -2599,7 +2600,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, index2 = root_log_ctx.log_transid %2 ;if (atomic_read (&log_root_tree->log_commit[index2])) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);wait_log_commit (trans, log_root_tree, root_log_ctx.log_transid);btrfs_free_logged_extents (log, log_transid);@@ -2623,7 +2625,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,*/ if (btrfs_need_log_full_commit (root->fs_info, trans)) {blk_finish_plug (&plug); -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, + mark);btrfs_free_logged_extents (log, log_transid);mutex_unlock (&log_root_tree->log_mutex); ret = -EAGAIN ;fs/btrfs/tree-log.c int btrfs_sync_log(struct btrfs_trans_handle *trans, · line 2651
Quoted 10 lines
fs/btrfs/tree-log.c +2
-2@@ -2641,8 +2644,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,mutex_unlock (&log_root_tree->log_mutex); goto out_wake_log_root; } -btrfs_wait_marked_extents (log, &log->dirty_log_pages, mark); -btrfs_wait_marked_extents (log_root_tree, +btrfs_wait_marked_extents (log, trans, &log->dirty_log_pages, mark); +btrfs_wait_marked_extents (log_root_tree, trans, &log_root_tree->dirty_log_pages,EXTENT_NEW |EXTENT_DIRTY );btrfs_wait_logged_extents (log, log_transid);--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v6 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
fs/btrfs/ctree.h | 3 ++ fs/btrfs/disk-io.c | 7 +++- fs/btrfs/extent-tree.c | 1 + fs/btrfs/extent_io.c | 105 +++++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/extent_io.h | 4 +- fs/btrfs/transaction.c | 18 +++++++++ fs/btrfs/tree-log.c | 23 +++++++++++ fs/btrfs/tree-log.h | 2 + 8 files changed, 153 insertions(+), 10 deletions(-)
fs/btrfs/ctree.h +3 -0
@@ -1510,6 +1510,9 @@ struct btrfs_fs_info {atomic_t async_delalloc_pages;atomic_t open_ioctl_trans; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors[2 ]; +/* * this is used to protect the following list -- ordered_roots. */
fs/btrfs/disk-io.c +5 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
@@ -2271,6 +2271,9 @@ int open_ctree(struct super_block *sb,atomic_set (&fs_info->nr_async_bios,0 );atomic_set (&fs_info->defrag_running,0 );atomic_set (&fs_info->qgroup_op_seq,0 ); +atomic_set (&fs_info->eb_write_errors,0 ); +atomic_set (&fs_info->log_eb_write_errors[0 ],0 ); +atomic_set (&fs_info->log_eb_write_errors[1 ],0 );atomic64_set (&fs_info->tree_mod_seq,0 ); fs_info->sb = sb; fs_info->max_inline =8192 *1024 ;
fs/btrfs/extent-tree.c +1 -0
@@ -6221,6 +6221,7 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +clear_extent_buffer_write_err (buf);btrfs_put_block_group (cache); }
fs/btrfs/extent_io.c +98 -7
145 lines not on this page · raw message
fs/btrfs/extent_io.h +3 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -314,6 +315,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +18 -0
@@ -852,6 +852,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +866,23 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +atomic_t *log_errors = root->fs_info->log_eb_write_errors; + + errors =0 ; +if (mark &EXTENT_DIRTY ) + errors +=atomic_xchg (&log_errors[0 ],0 ); +if (mark &EXTENT_NEW ) + errors +=atomic_xchg (&log_errors[1 ],0 ); + }else { + errors =atomic_xchg (&root->fs_info->eb_write_errors,0 ); + } + +ASSERT (errors >=0 ); +if (errors >0 && !werr) + werr = -EIO ; +return werr; }
fs/btrfs/tree-log.c +23 -0
@@ -4591,3 +4591,26 @@ int btrfs_log_new_name(struct btrfs_trans_handle *trans, LLONG_MAX, 1, NULL); } +int extent_buffer_log_index (struct btrfs_root *root, +struct extent_buffer *eb) +{ +const u64 start = eb->start; +const u64 end = eb->start + eb->len -1 ; +int index; +int ret; + + ret =test_range_bit (&root->dirty_log_pages, start, end, +EXTENT_DIRTY ,1 ,NULL ); +if (ret) { + index =0 ; + }else { +#ifdef CONFIG_BTRFS_ASSERT + ret =test_range_bit (&root->dirty_log_pages, start, end, +EXTENT_NEW ,1 ,NULL ); +ASSERT (ret); +#endif + index =1 ; + } + +return index; +}
fs/btrfs/tree-log.h +2 -0
@@ -80,4 +80,6 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,int btrfs_log_new_name (struct btrfs_trans_handle *trans,struct inode *inode,struct inode *old_dir,struct dentry *parent); +int extent_buffer_log_index (struct btrfs_root *root, +struct extent_buffer *eb);#endif
Signature · 1 line
1.9.1
PATCH v7 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
fs/btrfs/ctree.h | 3 ++ fs/btrfs/disk-io.c | 7 +++- fs/btrfs/extent-tree.c | 4 +- fs/btrfs/extent_io.c | 101 +++++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/extent_io.h | 6 ++- fs/btrfs/transaction.c | 18 +++++++++ 6 files changed, 128 insertions(+), 11 deletions(-)
fs/btrfs/ctree.h +3 -0
@@ -1510,6 +1510,9 @@ struct btrfs_fs_info {atomic_t async_delalloc_pages;atomic_t open_ioctl_trans; +atomic_t eb_write_errors; +atomic_t log_eb_write_errors[2 ]; +/* * this is used to protect the following list -- ordered_roots. */
fs/btrfs/disk-io.c +5 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
@@ -2271,6 +2271,9 @@ int open_ctree(struct super_block *sb,atomic_set (&fs_info->nr_async_bios,0 );atomic_set (&fs_info->defrag_running,0 );atomic_set (&fs_info->qgroup_op_seq,0 ); +atomic_set (&fs_info->eb_write_errors,0 ); +atomic_set (&fs_info->log_eb_write_errors[0 ],0 ); +atomic_set (&fs_info->log_eb_write_errors[1 ],0 );atomic64_set (&fs_info->tree_mod_seq,0 ); fs_info->sb = sb; fs_info->max_inline =8192 *1024 ;
fs/btrfs/extent-tree.c +3 -1
@@ -6221,6 +6221,7 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +clear_extent_buffer_write_err (buf);btrfs_put_block_group (cache); }
@@ -7203,11 +7204,12 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else
fs/btrfs/extent_io.c +94 -7
141 lines not on this page · raw message
fs/btrfs/extent_io.h +5 -1
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -142,6 +143,8 @@ struct extent_buffer {atomic_t spinning_readers;atomic_t spinning_writers;int lock_nested; +/* meaningful only if the owner root is from a log tree */ +int log_index;/* protects write locks */ rwlock_t lock;
@@ -314,6 +317,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +18 -0
@@ -852,6 +852,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +int errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +866,23 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +atomic_t *log_errors = root->fs_info->log_eb_write_errors; + + errors =0 ; +if (mark &EXTENT_DIRTY ) + errors +=atomic_xchg (&log_errors[0 ],0 ); +if (mark &EXTENT_NEW ) + errors +=atomic_xchg (&log_errors[1 ],0 ); + }else { + errors =atomic_xchg (&root->fs_info->eb_write_errors,0 ); + } + +ASSERT (errors >=0 ); +if (errors >0 && !werr) + werr = -EIO ; +return werr; }
Signature · 1 line
1.9.1
PATCH v8 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
V8: Track the log eb write errors per root instead, and reset them on a
transaction commit.
fs/btrfs/ctree.h | 2 + fs/btrfs/disk-io.c | 7 +++- fs/btrfs/extent-tree.c | 4 +- fs/btrfs/extent_io.c | 100 +++++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/extent_io.h | 8 +++- fs/btrfs/transaction.c | 18 +++++++++ fs/btrfs/tree-log.c | 2 + 7 files changed, 129 insertions(+), 12 deletions(-)
fs/btrfs/ctree.h +2 -0
@@ -1509,6 +1509,7 @@ struct btrfs_fs_info {atomic_t nr_async_bios;atomic_t async_delalloc_pages;atomic_t open_ioctl_trans; +atomic_t eb_write_errors;/* * this is used to protect the following list -- ordered_roots.
@@ -1790,6 +1791,7 @@ struct btrfs_root {atomic_t log_writers;atomic_t log_commit[2 ];atomic_t log_batch; +atomic_t log_eb_write_errors[2 ];int log_transid;/* No matter the commit succeeds or not*/ int log_transid_committed;
fs/btrfs/disk-io.c +5 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
@@ -1277,6 +1277,8 @@ static void __setup_root(u32 nodesize, u32 sectorsize, u32 stripesize,atomic_set (&root->log_commit[1 ],0 );atomic_set (&root->log_writers,0 );atomic_set (&root->log_batch,0 ); +atomic_set (&root->log_eb_write_errors[0 ],0 ); +atomic_set (&root->log_eb_write_errors[1 ],0 );atomic_set (&root->orphan_inodes,0 );atomic_set (&root->refs,1 );atomic_set (&root->will_be_snapshoted,0 );
@@ -2271,6 +2273,7 @@ int open_ctree(struct super_block *sb,atomic_set (&fs_info->nr_async_bios,0 );atomic_set (&fs_info->defrag_running,0 );atomic_set (&fs_info->qgroup_op_seq,0 ); +atomic_set (&fs_info->eb_write_errors,0 );atomic64_set (&fs_info->tree_mod_seq,0 ); fs_info->sb = sb; fs_info->max_inline =8192 *1024 ;
fs/btrfs/extent-tree.c +3 -1
@@ -6221,6 +6221,7 @@ out:* anymore. */ clear_bit (EXTENT_BUFFER_CORRUPT , &buf->bflags); +clear_extent_buffer_write_err (buf);btrfs_put_block_group (cache); }
@@ -7203,11 +7204,12 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else
fs/btrfs/extent_io.c +93 -7
140 lines not on this page · raw message
fs/btrfs/extent_io.h +6 -2
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; + unsigned int lock_nested:1; +/* meaningful only if the owner root is from a log tree */ + unsigned int log_index:31;/* protects write locks */ rwlock_t lock;
@@ -314,6 +317,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +18 -0
@@ -852,6 +852,7 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +bool errors;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +866,23 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +int err0 =0 ; +int err1 =0 ; + +if (mark &EXTENT_DIRTY ) + err0 =atomic_xchg (&root->log_eb_write_errors[0 ],0 ); +if (mark &EXTENT_NEW ) + err1 =atomic_xchg (&root->log_eb_write_errors[1 ],0 ); + errors = err0 || err1; + }else { + errors =atomic_xchg (&root->fs_info->eb_write_errors,0 ) !=0 ; + } + +if (errors && !werr) + werr = -EIO ; +return werr; }
fs/btrfs/tree-log.c +2 -0
@@ -2750,6 +2750,8 @@ int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)if (root->log_root) {free_log_tree (trans, root->log_root); root->log_root =NULL ; +atomic_set (&root->log_eb_write_errors[0 ],0 ); +atomic_set (&root->log_eb_write_errors[1 ],0 ); }return 0 ; }
Signature · 1 line
1.9.1
PATCH v9 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
V8: Track the log eb write errors per root instead, and reset them on a
transaction commit.
V9: Don't decrement the error counters if the eb is deleted or re-written.
It is not safe because there's a time window when committing a transaction, between setting fs_info->current_transaction to NULL and checking the error counters in btrfs_write_and_wait_transaction(), where a new transaction can start and delete or re-write an eb that has the write error flag set. If this happens it means the previous transaction can write a superblock that refers to trees that point to unwritten nodes.
Replaced the counters with simple flags in the btree inode's runtime flags - essentially back to V1 but accounting for the 2 different log sub-transactions.
Removed access to an eb's parent root through BTRFS_I(eb->pages[0]->mapping->host)->root since it was not correct, as this always gives us the btree inode's root (objectid 1ULL). Instead use the field eb->log_index to know wether it's a log btree eb (and which sub- -transaction) or a non-log btree eb.
fs/btrfs/btrfs_inode.h | 11 ++++++++ fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 4 ++- fs/btrfs/extent_io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 8 ++++-- fs/btrfs/transaction.c | 22 +++++++++++++++ fs/btrfs/tree-log.c | 6 ++++ 7 files changed, 119 insertions(+), 12 deletions(-)
fs/btrfs/btrfs_inode.h +11 -0
@@ -44,6 +44,17 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +/* +* The following 3 bits are meant only for the btree inode. +* When any of them is set, it means an error happened while writing an +* extent buffer belonging to: +* 1) a non-log btree +* 2) a log btree and first log sub-transaction +* 3) a log btree and second log sub-transaction +*/ +#define BTRFS_INODE_BTREE_ERR 12 +#define BTRFS_INODE_BTREE_LOG1_ERR 13 +#define BTRFS_INODE_BTREE_LOG2_ERR 14/* in memory btrfs inode */ struct btrfs_inode {
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +3 -1
@@ -7203,17 +7203,19 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else set_extent_new (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }else { + buf->log_index =-1 ;set_extent_dirty (&trans->transaction->dirty_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }
fs/btrfs/extent_io.c +69 -7
113 lines not on this page · raw message
fs/btrfs/extent_io.h +6 -2
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; + unsigned int lock_nested:1; +/* >= 0 if eb belongs to a log tree, -1 otherwise */ +short log_index;/* protects write locks */ rwlock_t lock;
@@ -314,6 +317,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +22 -0
@@ -852,6 +852,8 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode); +bool errors = false;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +867,26 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +if ((mark &EXTENT_DIRTY ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , + &btree_ino->runtime_flags)) + errors = true; + +if ((mark &EXTENT_NEW ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , + &btree_ino->runtime_flags)) + errors = true; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_ERR , + &btree_ino->runtime_flags)) + errors = true; + } + +if (errors && !werr) + werr = -EIO ; +return werr; }
fs/btrfs/tree-log.c +6 -0
@@ -2748,8 +2748,14 @@ static void free_log_tree(struct btrfs_trans_handle *trans,int btrfs_free_log (struct btrfs_trans_handle *trans,struct btrfs_root *root) {if (root->log_root) { +struct inode *btree_inode = root->fs_info->btree_inode; +free_log_tree (trans, root->log_root); root->log_root =NULL ; +clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , + &BTRFS_I (btree_inode)->runtime_flags); +clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , + &BTRFS_I (btree_inode)->runtime_flags); }return 0 ; }
Signature · 1 line
1.9.1
PATCH v10 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new counters eb_write_errors and log_eb_write_errors in the transaction also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
V8: Track the log eb write errors per root instead, and reset them on a
transaction commit.
V9: Don't decrement the error counters if the eb is deleted or re-written.
It is not safe because there's a time window when committing a transaction, between setting fs_info->current_transaction to NULL and checking the error counters in btrfs_write_and_wait_transaction(), where a new transaction can start and delete or re-write an eb that has the write error flag set. If this happens it means the previous transaction can write a superblock that refers to trees that point to unwritten nodes.
Replaced the counters with simple flags in the btree inode's runtime flags - essentially back to V1 but accounting for the 2 different log sub-transactions.
Removed access to an eb's parent root through BTRFS_I(eb->pages[0]->mapping->host)->root since it was not correct, as this always gives us the btree inode's root (objectid 1ULL). Instead use the field eb->log_index to know wether it's a log btree eb (and which sub- -transaction) or a non-log btree eb.
V10: Clear the log eb write error flags in a more logical place (transaction
commit function).
fs/btrfs/btrfs_inode.h | 11 ++++++++ fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 4 ++- fs/btrfs/extent_io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 8 ++++-- fs/btrfs/transaction.c | 26 +++++++++++++++++ 6 files changed, 117 insertions(+), 12 deletions(-)
fs/btrfs/btrfs_inode.h +11 -0
@@ -44,6 +44,17 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +/* +* The following 3 bits are meant only for the btree inode. +* When any of them is set, it means an error happened while writing an +* extent buffer belonging to: +* 1) a non-log btree +* 2) a log btree and first log sub-transaction +* 3) a log btree and second log sub-transaction +*/ +#define BTRFS_INODE_BTREE_ERR 12 +#define BTRFS_INODE_BTREE_LOG1_ERR 13 +#define BTRFS_INODE_BTREE_LOG2_ERR 14/* in memory btrfs inode */ struct btrfs_inode {
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +3 -1
@@ -7203,17 +7203,19 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else set_extent_new (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }else { + buf->log_index =-1 ;set_extent_dirty (&trans->transaction->dirty_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }
fs/btrfs/extent_io.c +69 -7
113 lines not on this page · raw message
fs/btrfs/extent_io.h +6 -2
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; + unsigned int lock_nested:1; +/* >= 0 if eb belongs to a log tree, -1 otherwise */ +short log_index;/* protects write locks */ rwlock_t lock;
@@ -314,6 +317,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +26 -0
@@ -852,6 +852,8 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode); +bool errors = false;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +867,26 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +if ((mark &EXTENT_DIRTY ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , + &btree_ino->runtime_flags)) + errors = true; + +if ((mark &EXTENT_NEW ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , + &btree_ino->runtime_flags)) + errors = true; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_ERR , + &btree_ino->runtime_flags)) + errors = true; + } + +if (errors && !werr) + werr = -EIO ; +return werr; }
@@ -1651,6 +1673,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, {struct btrfs_transaction *cur_trans = trans->transaction;struct btrfs_transaction *prev_trans =NULL ; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode);int ret; ret =btrfs_run_ordered_operations (trans, root,0 );
@@ -1897,6 +1920,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,memcpy (root->fs_info->super_for_commit, root->fs_info->super_copy,sizeof (*root->fs_info->super_copy)); +clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , &btree_ino->runtime_flags); +clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , &btree_ino->runtime_flags); +spin_lock (&root->fs_info->trans_lock); cur_trans->state =TRANS_STATE_UNBLOCKED ; root->fs_info->running_transaction =NULL ;
Signature · 1 line
1.9.1
Re: [PATCH 2/2 v10] Btrfs: be aware of btree inode write errors to avoid fs corruption
fs/btrfs/extent_io.c static void end_extent_buffer_writeback(struct extent_buffer *eb) · line 3669
Quoted 12 lines · Filipe Manana
fs/btrfs/extent_io.c +12
-0+switch (eb->log_index) { +case -1 : +set_bit (BTRFS_INODE_BTREE_ERR , &btree_ino->runtime_flags); +break ; +case 0 : +set_bit (BTRFS_INODE_BTREE_LOG1_ERR , &btree_ino->runtime_flags); +break ; +case 1 : +set_bit (BTRFS_INODE_BTREE_LOG2_ERR , &btree_ino->runtime_flags); +break ; +default : +ASSERT (0 );/* unexpected, logic error */
I think we can afford a BUG() here, preceded by a message. The logic is pretty strict about the possible values so if we get here, something is really bad and we don't want to make it silent.
This could happen if the memory modules are faulty and tripping over random BUG_ONs is usually a sign of problems. I've seen that in the past with certain CPU types during stresstests and it definetely was worth knowing. (The BUG_ONs were in memory management, it's not a crime to use them, only in place of proper error hanling.)
fs/btrfs/extent_io.h struct extent_buffer { · line 145
Quoted 8 lines
fs/btrfs/extent_io.h +1
-1@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; + unsigned int lock_nested:1;
Please do not use bitfields next to atomic_t or spin_lock (or kref_t), this can lead to all sorts of funny problems on architectures that are not able to do atomic bit operations and have to do read-modify-write cycle. This leads to problems when it's on the same 8-byte word with an atomic/... and can corrupt it if the timing is right.
PATCH v11 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new 3 flags for the btree inode also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
V8: Track the log eb write errors per root instead, and reset them on a
transaction commit.
V9: Don't decrement the error counters if the eb is deleted or re-written.
It is not safe because there's a time window when committing a transaction, between setting fs_info->current_transaction to NULL and checking the error counters in btrfs_write_and_wait_transaction(), where a new transaction can start and delete or re-write an eb that has the write error flag set. If this happens it means the previous transaction can write a superblock that refers to trees that point to unwritten nodes.
Replaced the counters with simple flags in the btree inode's runtime flags - essentially back to V1 but accounting for the 2 different log sub-transactions.
Removed access to an eb's parent root through BTRFS_I(eb->pages[0]->mapping->host)->root since it was not correct, as this always gives us the btree inode's root (objectid 1ULL). Instead use the field eb->log_index to know wether it's a log btree eb (and which sub- -transaction) or a non-log btree eb.
V10: Clear the log eb write error flags in a more logical place (transaction
commit function).
V11: Updated commit message and a comment, replaced an ASSERT() with a BUG()
and changed eb->lock_nested to a short to keep the structure size.
fs/btrfs/btrfs_inode.h | 11 ++++++++ fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 4 ++- fs/btrfs/extent_io.c | 76 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 8 ++++-- fs/btrfs/transaction.c | 26 +++++++++++++++++ 6 files changed, 117 insertions(+), 12 deletions(-)
fs/btrfs/btrfs_inode.h +11 -0
@@ -44,6 +44,17 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +/* +* The following 3 bits are meant only for the btree inode. +* When any of them is set, it means an error happened while writing an +* extent buffer belonging to: +* 1) a non-log btree +* 2) a log btree and first log sub-transaction +* 3) a log btree and second log sub-transaction +*/ +#define BTRFS_INODE_BTREE_ERR 12 +#define BTRFS_INODE_BTREE_LOG1_ERR 13 +#define BTRFS_INODE_BTREE_LOG2_ERR 14/* in memory btrfs inode */ struct btrfs_inode {
fs/btrfs/disk-io.c +2 -2
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -683,7 +683,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +3 -1
@@ -7203,17 +7203,19 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else set_extent_new (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }else { + buf->log_index =-1 ;set_extent_dirty (&trans->transaction->dirty_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }
fs/btrfs/extent_io.c +69 -7
113 lines not on this page · raw message
fs/btrfs/extent_io.h +6 -2
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; +short lock_nested; +/* >= 0 if eb belongs to a log tree, -1 otherwise */ +short log_index;/* protects write locks */ rwlock_t lock;
@@ -314,6 +317,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, unsigned long src_offset, unsigned long len);void memset_extent_buffer (struct extent_buffer *eb,char c,unsigned long start,unsigned long len); +void clear_extent_buffer_write_err (struct extent_buffer *eb);void clear_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_dirty (struct extent_buffer *eb);int set_extent_buffer_uptodate (struct extent_buffer *eb);
fs/btrfs/transaction.c +26 -0
@@ -852,6 +852,8 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode); +bool errors = false;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -865,6 +867,26 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +if ((mark &EXTENT_DIRTY ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , + &btree_ino->runtime_flags)) + errors = true; + +if ((mark &EXTENT_NEW ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , + &btree_ino->runtime_flags)) + errors = true; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_ERR , + &btree_ino->runtime_flags)) + errors = true; + } + +if (errors && !werr) + werr = -EIO ; +return werr; }
@@ -1651,6 +1673,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, {struct btrfs_transaction *cur_trans = trans->transaction;struct btrfs_transaction *prev_trans =NULL ; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode);int ret; ret =btrfs_run_ordered_operations (trans, root,0 );
@@ -1897,6 +1920,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,memcpy (root->fs_info->super_for_commit, root->fs_info->super_copy,sizeof (*root->fs_info->super_copy)); +clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , &btree_ino->runtime_flags); +clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , &btree_ino->runtime_flags); +spin_lock (&root->fs_info->trans_lock); cur_trans->state =TRANS_STATE_UNBLOCKED ; root->fs_info->running_transaction =NULL ;
Signature · 1 line
1.9.1
PATCH v12 2/2 Btrfs: be aware of btree inode write errors to avoid fs corruption
In reply to Filipe MananaWhile we have a transaction ongoing, the VM might decide at any time to call btree_inode->i_mapping->a_ops->writepages(), which will start writeback of dirty pages belonging to btree nodes/leafs. This call might return an error or the writeback might finish with an error before we attempt to commit the running transaction. If this happens, we might have no way of knowing that such error happened when we are committing the transaction - because the pages might no longer be marked dirty nor tagged for writeback (if a subsequent modification to the extent buffer didn't happen before the transaction commit) which makes filemap_fdata[write|wait]_range unable to find such pages (even if they're marked with SetPageError).
So if this happens we must abort the transaction, otherwise we commit a super block with btree roots that point to btree nodes/leafs whose content on disk is invalid - either garbage or the content of some node/leaf from a past generation that got cowed or deleted and is no longer valid (for this later case we end up getting error messages like "parent transid verify failed on 10826481664 wanted 25748 found 29562" when reading btree nodes/leafs from disk).
Note that setting and checking AS_EIO/AS_ENOSPC in the btree inode's i_mapping would not be enough because we need to distinguish between log tree extents (not fatal) vs non-log tree extents (fatal) and because the next call to filemap_fdatawait_range() will catch and clear such errors in the mapping - and that call might be from a log sync and not from a transaction commit, which means we would not know about the error at transaction commit time. Also, checking for the eb flag EXTENT_BUFFER_IOERR at transaction commit time isn't done and would not be completely reliable, as the eb might be removed from memory and read back when trying to get it, which clears that flag right before reading the eb's pages from disk, making us not know about the previous write error.
Using the new 3 flags for the btree inode also makes us achieve the goal of AS_EIO/AS_ENOSPC when writepages() returns success, started writeback for all dirty pages and before filemap_fdatawait_range() is called, the writeback for all dirty pages had already finished with errors - because we were not using AS_EIO/AS_ENOSPC, filemap_fdatawait_range() would return success, as it could not know that writeback errors happened (the pages were no longer tagged for writeback).
---
V2: If an extent buffer's write failed but it's also deleted from the tree
before the transaction commits, don't abort the transaction with -EIO, since the unwritten node/leaf it represents can't be pointed to by any other node in a tree.
V3: Correct V2, missed unstaged changes.
V4: Use root's key to figure out which counter to update.
V5: Decrement the error counters too when an eb is made dirty again (the
next write attempt might succeed).
V6: Moved counters from transaction struct to fs_info struct, because there's
a (short) time window where fs_info->running_transaction is NULL. There's now 2 counters for log extent buffers too, each one representing a different log transaction.
V7: Track the eb's log index in the eb itself, otherwise it wasn't possible
to find it when writeback triggered from a transaction commit.
V8: Track the log eb write errors per root instead, and reset them on a
transaction commit.
V9: Don't decrement the error counters if the eb is deleted or re-written.
It is not safe because there's a time window when committing a transaction, between setting fs_info->current_transaction to NULL and checking the error counters in btrfs_write_and_wait_transaction(), where a new transaction can start and delete or re-write an eb that has the write error flag set. If this happens it means the previous transaction can write a superblock that refers to trees that point to unwritten nodes.
Replaced the counters with simple flags in the btree inode's runtime flags - essentially back to V1 but accounting for the 2 different log sub-transactions.
Removed access to an eb's parent root through BTRFS_I(eb->pages[0]->mapping->host)->root since it was not correct, as this always gives us the btree inode's root (objectid 1ULL). Instead use the field eb->log_index to know wether it's a log btree eb (and which sub- -transaction) or a non-log btree eb.
V10: Clear the log eb write error flags in a more logical place (transaction
commit function).
V11: Updated commit message and a comment, replaced an ASSERT() with a BUG()
and changed eb->lock_nested to a short to keep the structure size.
V12: Removed leftovers from previous versions (no longer necessary #include and
prototype in extent_io.h of no longer existing function) and updated parts from a comment that apply only to some past versions.
Rebased against latest integration branch (didn't apply cleanly) and re-tested.
fs/btrfs/btrfs_inode.h | 11 ++++++++ fs/btrfs/disk-io.c | 4 +-- fs/btrfs/extent-tree.c | 4 ++- fs/btrfs/extent_io.c | 74 +++++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/extent_io.h | 7 +++-- fs/btrfs/transaction.c | 26 ++++++++++++++++++ 6 files changed, 114 insertions(+), 12 deletions(-)
fs/btrfs/btrfs_inode.h +11 -0
@@ -44,6 +44,17 @@#define BTRFS_INODE_IN_DELALLOC_LIST 9#define BTRFS_INODE_READDIO_NEED_LOCK 10#define BTRFS_INODE_HAS_PROPS 11 +/* +* The following 3 bits are meant only for the btree inode. +* When any of them is set, it means an error happened while writing an +* extent buffer belonging to: +* 1) a non-log btree +* 2) a log btree and first log sub-transaction +* 3) a log btree and second log sub-transaction +*/ +#define BTRFS_INODE_BTREE_ERR 12 +#define BTRFS_INODE_BTREE_LOG1_ERR 13 +#define BTRFS_INODE_BTREE_LOG2_ERR 14/* in memory btrfs inode */ struct btrfs_inode {
fs/btrfs/disk-io.c +2 -2
@@ -607,7 +607,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, goto err; eb->read_mirror = mirror; -if (test_bit (EXTENT_BUFFER_IOERR , &eb->bflags)) { +if (test_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags)) { ret = -EIO ; goto err; }
@@ -680,7 +680,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror)struct btrfs_root *root =BTRFS_I (page->mapping->host)->root; eb = (struct extent_buffer *)page->private; -set_bit (EXTENT_BUFFER_IOERR , &eb->bflags); +set_bit (EXTENT_BUFFER_READ_ERR , &eb->bflags); eb->read_mirror = failed_mirror;atomic_dec (&eb->io_pages);if (test_and_clear_bit (EXTENT_BUFFER_READAHEAD , &eb->bflags))
fs/btrfs/extent-tree.c +3 -1
@@ -7235,17 +7235,19 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,btrfs_set_buffer_uptodate (buf);if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { + buf->log_index = root->log_transid %2 ;/* * we allow two log transactions at a time, use different * EXENT bit to differentiate dirty pages. */ -if (root->log_transid %2 ==0 ) +if (buf->log_index ==0 )set_extent_dirty (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS );else set_extent_new (&root->dirty_log_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }else { + buf->log_index =-1 ;set_extent_dirty (&trans->transaction->dirty_pages, buf->start, buf->start + buf->len -1 ,GFP_NOFS ); }
fs/btrfs/extent_io.c +67 -7
105 lines not on this page · raw message
fs/btrfs/extent_io.h +5 -2
@@ -41,9 +41,10 @@#define EXTENT_BUFFER_TREE_REF 5#define EXTENT_BUFFER_STALE 6#define EXTENT_BUFFER_WRITEBACK 7 -#define EXTENT_BUFFER_IOERR 8 +#define EXTENT_BUFFER_READ_ERR 8/* read IO error */ #define EXTENT_BUFFER_DUMMY 9#define EXTENT_BUFFER_IN_TREE 10 +#define EXTENT_BUFFER_WRITE_ERR 11/* write IO error */ /* these are flags for extent_clear_unlock_delalloc */ #define PAGE_UNLOCK (1 << 0)
@@ -141,7 +142,9 @@ struct extent_buffer {atomic_t blocking_readers;atomic_t spinning_readers;atomic_t spinning_writers; -int lock_nested; +short lock_nested; +/* >= 0 if eb belongs to a log tree, -1 otherwise */ +short log_index;/* protects write locks */ rwlock_t lock;
fs/btrfs/transaction.c +26 -0
@@ -851,6 +851,8 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,struct extent_state *cached_state =NULL ;u64 start =0 ;u64 end; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode); +bool errors = false;while (!find_first_extent_bit (dirty_pages, start, &start, &end,EXTENT_NEED_WAIT , &cached_state)) {
@@ -864,6 +866,26 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, }if (err) werr = err; + +if (root->root_key.objectid ==BTRFS_TREE_LOG_OBJECTID ) { +if ((mark &EXTENT_DIRTY ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , + &btree_ino->runtime_flags)) + errors = true; + +if ((mark &EXTENT_NEW ) && +test_and_clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , + &btree_ino->runtime_flags)) + errors = true; + }else { +if (test_and_clear_bit (BTRFS_INODE_BTREE_ERR , + &btree_ino->runtime_flags)) + errors = true; + } + +if (errors && !werr) + werr = -EIO ; +return werr; }
@@ -1629,6 +1651,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, {struct btrfs_transaction *cur_trans = trans->transaction;struct btrfs_transaction *prev_trans =NULL ; +struct btrfs_inode *btree_ino =BTRFS_I (root->fs_info->btree_inode);int ret;/* Stop the commit early if ->aborted is set */
@@ -1871,6 +1894,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,btrfs_update_commit_device_size (root->fs_info);btrfs_update_commit_device_bytes_used (root, cur_trans); +clear_bit (BTRFS_INODE_BTREE_LOG1_ERR , &btree_ino->runtime_flags); +clear_bit (BTRFS_INODE_BTREE_LOG2_ERR , &btree_ino->runtime_flags); +spin_lock (&root->fs_info->trans_lock); cur_trans->state =TRANS_STATE_UNBLOCKED ; root->fs_info->running_transaction =NULL ;
Signature · 1 line
1.9.1
Quoted 16 lines · Filipe Manana
If
submit_extent_page()fails inwrite_one_eb(), we end up with the current page not marked dirty anymore, unlocked and marked for writeback. But we never end up callingend_page_writeback()against the page, which will make calls tofilemap_fdatawait_range(e.g. at transaction commit time) hang forever waiting for the writeback bit to be cleared from the page.Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/extent_io.c | 1 + 1 file changed, 1 insertion(+)fs/btrfs/extent_io.c +0
-0
fs/btrfs/extent_io.c static noinline_for_stack int write_one_eb(struct extent_buffer *eb, · line 3671
Quoted 4 lines
fs/btrfs/extent_io.c +1
-0@@ -3668,6 +3668,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,if (ret) {set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);SetPageError (p); +end_page_writeback (p);
This is not always true, and it depends on the place where we get error in submit_extent_page(), whether it has built and submitted a bio, if it's true, case can be different as bio_endio will be called, and calling end_page_writeback() again will end up with panic.
thanks,
-liubo
Quoted 10 lines
fs/btrfs/extent_io.c +0
-0if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb); ret = -EIO ;Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 12 lines · Liu Bo
Quoted 11 lines · Filipe Manana
If
submit_extent_page()fails inwrite_one_eb(), we end up with the current page not marked dirty anymore, unlocked and marked for writeback. But we never end up callingend_page_writeback()against the page, which will make calls tofilemap_fdatawait_range(e.g. at transaction commit time) hang forever waiting for the writeback bit to be cleared from the page.Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/extent_io.c | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
fs/btrfs/extent_io.c static noinline_for_stack int write_one_eb(struct extent_buffer *eb, · line 3671
Quoted 9 lines
fs/btrfs/extent_io.c +1
-0@@ -3668,6 +3668,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,if (ret) {set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);SetPageError (p); +end_page_writeback (p);This is not always true, and it depends on the place where we get error in
submit_extent_page(), whether it has built and submitted a bio, if it's true, case can be different asbio_endiowill be called, and callingend_page_writeback()again will end up with panic.
No, it's always true when the caller is write_one_eb(). If submit_extent_page() returns an error, we're sure that the page wasn't added to a bio, because bio_ret is always not NULL (but *bio_ret can be). Also, if we call submit_one_bio() in submit_extent_page() (first if statement) , we know that the bio doesn't contain the page.
thanks
Quoted 18 lines
thanks,
-liuboQuoted 10 lines
fs/btrfs/extent_io.c +0
-1if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb); ret = -EIO ; --1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
Liu Bo
Reviewed-byQuoted 28 lines · Filipe David Manana
Quoted 12 lines · Liu Bo
Quoted 11 lines · Filipe Manana
If
submit_extent_page()fails inwrite_one_eb(), we end up with the current page not marked dirty anymore, unlocked and marked for writeback. But we never end up callingend_page_writeback()against the page, which will make calls tofilemap_fdatawait_range(e.g. at transaction commit time) hang forever waiting for the writeback bit to be cleared from the page.Signed-off-by Filipe Manana <[email protected]>--- fs/btrfs/extent_io.c | 1 + 1 file changed, 1 insertion(+)Quoted 14 lines
fs/btrfs/extent_io.c static noinline_for_stack int write_one_eb(struct extent_buffer *eb, · line 3671
Quoted 9 lines
fs/btrfs/extent_io.c +1
-0@@ -3668,6 +3668,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,if (ret) {set_bit (EXTENT_BUFFER_IOERR , &eb->bflags);SetPageError (p); +end_page_writeback (p);This is not always true, and it depends on the place where we get error in
submit_extent_page(), whether it has built and submitted a bio, if it's true, case can be different asbio_endiowill be called, and callingend_page_writeback()again will end up with panic.
Quoted 5 lines
No, it's always true when the caller is
write_one_eb(). Ifsubmit_extent_page()returns an error, we're sure that the page wasn't added to a bio, becausebio_retis always not NULL (but*bio_retcan be). Also, if we callsubmit_one_bio()insubmit_extent_page()(first if statement) , we know that the bio doesn't contain the page.
I see, you're right.
thanks,
-liubo
Quoted 30 lines
thanks
Quoted 18 lines
thanks,
-liuboQuoted 10 lines
fs/btrfs/extent_io.c +0
-1if (atomic_sub_and_test (num_pages - i, &eb->io_pages))end_extent_buffer_writeback (eb); ret = -EIO ; --1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlSignature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."