]> git.baikalelectronics.ru Git - kernel.git/commit
jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer
authorzhangyi (F) <yi.zhang@huawei.com>
Thu, 13 Feb 2020 06:38:21 +0000 (14:38 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 13 Feb 2020 17:06:28 +0000 (12:06 -0500)
commitd43a2419e505136e2fc186ebee8c4ce78d5541ee
tree6b3f4495d2fff1bf2231e903fd2c93620195ad20
parent8972222139eca8520f47e0a235dbaeba3dd9f291
jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer

Commit cf36aeeb6d25 ("jbd2: clear dirty flag when revoking a buffer from
an older transaction") set the BH_Freed flag when forgetting a metadata
buffer which belongs to the committing transaction, it indicate the
committing process clear dirty bits when it is done with the buffer. But
it also clear the BH_Mapped flag at the same time, which may trigger
below NULL pointer oops when block_size < PAGE_SIZE.

rmdir 1             kjournald2                 mkdir 2
                    jbd2_journal_commit_transaction
    commit transaction N
jbd2_journal_forget
set_buffer_freed(bh1)
                    jbd2_journal_commit_transaction
                     commit transaction N+1
                     ...
                     clear_buffer_mapped(bh1)
                                               ext4_getblk(bh2 ummapped)
                                               ...
                                               grow_dev_page
                                                init_page_buffers
                                                 bh1->b_private=NULL
                                                 bh2->b_private=NULL
                     jbd2_journal_put_journal_head(jh1)
                      __journal_remove_journal_head(hb1)
       jh1 is NULL and trigger oops

*) Dir entry block bh1 and bh2 belongs to one page, and the bh2 has
   already been unmapped.

For the metadata buffer we forgetting, we should always keep the mapped
flag and clear the dirty flags is enough, so this patch pick out the
these buffers and keep their BH_Mapped flag.

Link: https://lore.kernel.org/r/20200213063821.30455-3-yi.zhang@huawei.com
Fixes: cf36aeeb6d25 ("jbd2: clear dirty flag when revoking a buffer from an older transaction")
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
fs/jbd2/commit.c