jbd2: Fix wrongly judgement for buffer head removing while doing checkpoint
authorZhihao Cheng <chengzhihao1@huawei.com>
Tue, 6 Jun 2023 13:59:26 +0000 (21:59 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 11 Jul 2023 03:09:21 +0000 (23:09 -0400)
commite34c8dd238d0c9368b746480f313055f5bab5040
tree4e0595ef99c7d66c53627b13a936e45b83eb1838
parentb98dba273a0e47dbfade89c9af73c5b012a4eabb
jbd2: Fix wrongly judgement for buffer head removing while doing checkpoint

Following process,

jbd2_journal_commit_transaction
// there are several dirty buffer heads in transaction->t_checkpoint_list
          P1                   wb_workfn
jbd2_log_do_checkpoint
 if (buffer_locked(bh)) // false
                            __block_write_full_page
                             trylock_buffer(bh)
                             test_clear_buffer_dirty(bh)
 if (!buffer_dirty(bh))
  __jbd2_journal_remove_checkpoint(jh)
   if (buffer_write_io_error(bh)) // false
                             >> bh IO error occurs <<
 jbd2_cleanup_journal_tail
  __jbd2_update_log_tail
   jbd2_write_superblock
   // The bh won't be replayed in next mount.
, which could corrupt the ext4 image, fetch a reproducer in [Link].

Since writeback process clears buffer dirty after locking buffer head,
we can fix it by try locking buffer and check dirtiness while buffer is
locked, the buffer head can be removed if it is neither dirty nor locked.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=217490
Fixes: 470decc613ab ("[PATCH] jbd2: initial copy of files from jbd")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230606135928.434610-5-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/jbd2/checkpoint.c