Skip to content

Commit 2c559b3

Browse files
Heming Zhao via Ocfs2-develgregkh
authored andcommitted
ocfs2: fix defrag path triggering jbd2 ASSERT
commit 60eed1e upstream. code path: ocfs2_ioctl_move_extents ocfs2_move_extents ocfs2_defrag_extent __ocfs2_move_extent + ocfs2_journal_access_di + ocfs2_split_extent //sub-paths call jbd2_journal_restart + ocfs2_journal_dirty //crash by jbs2 ASSERT crash stacks: PID: 11297 TASK: ffff974a676dcd00 CPU: 67 COMMAND: "defragfs.ocfs2" #0 [ffffb25d8dad3900] machine_kexec at ffffffff8386fe01 STMicroelectronics#1 [ffffb25d8dad3958] __crash_kexec at ffffffff8395959d STMicroelectronics#2 [ffffb25d8dad3a20] crash_kexec at ffffffff8395a45d STMicroelectronics#3 [ffffb25d8dad3a38] oops_end at ffffffff83836d3f STMicroelectronics#4 [ffffb25d8dad3a58] do_trap at ffffffff83833205 STMicroelectronics#5 [ffffb25d8dad3aa0] do_invalid_op at ffffffff83833aa6 STMicroelectronics#6 [ffffb25d8dad3ac0] invalid_op at ffffffff84200d18 [exception RIP: jbd2_journal_dirty_metadata+0x2ba] RIP: ffffffffc09ca54a RSP: ffffb25d8dad3b70 RFLAGS: 00010207 RAX: 0000000000000000 RBX: ffff9706eedc5248 RCX: 0000000000000000 RDX: 0000000000000001 RSI: ffff97337029ea28 RDI: ffff9706eedc5250 RBP: ffff9703c3520200 R8: 000000000f46b0b2 R9: 0000000000000000 R10: 0000000000000001 R11: 00000001000000fe R12: ffff97337029ea28 R13: 0000000000000000 R14: ffff9703de59bf60 R15: ffff9706eedc5250 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 STMicroelectronics#7 [ffffb25d8dad3ba8] ocfs2_journal_dirty at ffffffffc137fb95 [ocfs2] STMicroelectronics#8 [ffffb25d8dad3be8] __ocfs2_move_extent at ffffffffc139a950 [ocfs2] STMicroelectronics#9 [ffffb25d8dad3c80] ocfs2_defrag_extent at ffffffffc139b2d2 [ocfs2] Analysis This bug has the same root cause of 'commit 7f27ec9 ("ocfs2: call ocfs2_journal_access_di() before ocfs2_journal_dirty() in ocfs2_write_end_nolock()")'. For this bug, jbd2_journal_restart() is called by ocfs2_split_extent() during defragmenting. How to fix For ocfs2_split_extent() can handle journal operations totally by itself. Caller doesn't need to call journal access/dirty pair, and caller only needs to call journal start/stop pair. The fix method is to remove journal access/dirty from __ocfs2_move_extent(). The discussion for this patch: https://oss.oracle.com/pipermail/ocfs2-devel/2023-February/000647.html Link: https://lkml.kernel.org/r/20230217003717.32469-1-heming.zhao@suse.com Signed-off-by: Heming Zhao <heming.zhao@suse.com> Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Changwei Ge <gechangwei@live.cn> Cc: Gang He <ghe@suse.com> Cc: Jun Piao <piaojun@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e9f2013 commit 2c559b3

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

fs/ocfs2/move_extents.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ static int __ocfs2_move_extent(handle_t *handle,
107107
*/
108108
replace_rec.e_flags = ext_flags & ~OCFS2_EXT_REFCOUNTED;
109109

110-
ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode),
111-
context->et.et_root_bh,
112-
OCFS2_JOURNAL_ACCESS_WRITE);
113-
if (ret) {
114-
mlog_errno(ret);
115-
goto out;
116-
}
117-
118110
ret = ocfs2_split_extent(handle, &context->et, path, index,
119111
&replace_rec, context->meta_ac,
120112
&context->dealloc);
@@ -123,8 +115,6 @@ static int __ocfs2_move_extent(handle_t *handle,
123115
goto out;
124116
}
125117

126-
ocfs2_journal_dirty(handle, context->et.et_root_bh);
127-
128118
context->new_phys_cpos = new_p_cpos;
129119

130120
/*

0 commit comments

Comments
 (0)