Skip to content

Commit 61187fc

Browse files
Zhihao Chengtytso
authored andcommitted
jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev
JBD2 makes sure journal data is fallen on fs device by sync_blockdev(), however, other process could intercept the EIO information from bdev's mapping, which leads journal recovering successful even EIO occurs during data written back to fs device. We found this problem in our product, iscsi + multipath is chosen for block device of ext4. Unstable network may trigger kpartx to rescan partitions in device mapper layer. Detailed process is shown as following: mount kpartx irq jbd2_journal_recover do_one_pass memcpy(nbh->b_data, obh->b_data) // copy data to fs dev from journal mark_buffer_dirty // mark bh dirty vfs_read generic_file_read_iter // dio filemap_write_and_wait_range __filemap_fdatawrite_range do_writepages block_write_full_folio submit_bh_wbc >> EIO occurs in disk << end_buffer_async_write mark_buffer_write_io_error mapping_set_error set_bit(AS_EIO, &mapping->flags) // set! filemap_check_errors test_and_clear_bit(AS_EIO, &mapping->flags) // clear! err2 = sync_blockdev filemap_write_and_wait filemap_check_errors test_and_clear_bit(AS_EIO, &mapping->flags) // false err2 = 0 Filesystem is mounted successfully even data from journal is failed written into disk, and ext4/ocfs2 could become corrupted. Fix it by comparing the wb_err state in fs block device before recovering and after recovering. A reproducer can be found in the kernel bugzilla referenced below. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217888 Cc: [email protected] Signed-off-by: Zhihao Cheng <[email protected]> Signed-off-by: Zhang Yi <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 484fd6c commit 61187fc

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

fs/jbd2/recovery.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ int jbd2_journal_recover(journal_t *journal)
289289
journal_superblock_t * sb;
290290

291291
struct recovery_info info;
292+
errseq_t wb_err;
293+
struct address_space *mapping;
292294

293295
memset(&info, 0, sizeof(info));
294296
sb = journal->j_superblock;
@@ -306,6 +308,9 @@ int jbd2_journal_recover(journal_t *journal)
306308
return 0;
307309
}
308310

311+
wb_err = 0;
312+
mapping = journal->j_fs_dev->bd_inode->i_mapping;
313+
errseq_check_and_advance(&mapping->wb_err, &wb_err);
309314
err = do_one_pass(journal, &info, PASS_SCAN);
310315
if (!err)
311316
err = do_one_pass(journal, &info, PASS_REVOKE);
@@ -327,6 +332,9 @@ int jbd2_journal_recover(journal_t *journal)
327332

328333
jbd2_journal_clear_revoke(journal);
329334
err2 = sync_blockdev(journal->j_fs_dev);
335+
if (!err)
336+
err = err2;
337+
err2 = errseq_check_and_advance(&mapping->wb_err, &wb_err);
330338
if (!err)
331339
err = err2;
332340
/* Make sure all replayed data is on permanent storage */

0 commit comments

Comments
 (0)