[v5.15] possible deadlock in jbd2_journal_lock_updates

[syzbot]

Hello,

syzbot found the following issue on:

HEAD commit: d9b4a0c83a2d Linux 5.15.98
git tree: linux-5.15.y
console output: https://syzkaller.appspot.com/x/log.txt?x=140fb732c80000
kernel config: https://syzkaller.appspot.com/x/.config?x=2f8d9515b973b23b
dashboard link: https://syzkaller.appspot.com/bug?extid=435f1feb5dc6cb430303
compiler: Debian clang version 15.0.7, GNU ld (GNU Binutils for Debian) 2.35.2

Unfortunately, I don't have any reproducer for this issue yet.

Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/037cabbd3313/disk-d9b4a0c8.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/9967e551eb34/vmlinux-d9b4a0c8.xz
kernel image: https://storage.googleapis.com/syzbot-assets/a050c7a4fd99/bzImage-d9b4a0c8.xz

IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+435f1f...@syzkaller.appspotmail.com

======================================================
WARNING: possible circular locking dependency detected
5.15.98-syzkaller #0 Not tainted
------------------------------------------------------
syz-executor.0/13161 is trying to acquire lock:
ffff888024300170 (&journal->j_barrier){+.+.}-{3:3}, at: jbd2_journal_lock_updates+0x4a9/0x580 fs/jbd2/transaction.c:895

but task is already holding lock:
ffff8880242f6bd8 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6025

which lock already depends on the new lock.


the existing dependency chain (in reverse order) is:

-> #3 (&sbi->s_writepages_rwsem){++++}-{0:0}:
lock_acquire+0x1f6/0x560 kernel/locking/lockdep.c:5622
percpu_down_read+0x46/0x190 include/linux/percpu-rwsem.h:51
ext4_writepages+0x1f6/0x3eb0 fs/ext4/inode.c:2687
do_writepages+0x481/0x730 mm/page-writeback.c:2364
filemap_fdatawrite_wbc+0x1d6/0x230 mm/filemap.c:400
__filemap_fdatawrite_range mm/filemap.c:433 [inline]
filemap_write_and_wait_range+0x19e/0x280 mm/filemap.c:704
__iomap_dio_rw+0x897/0x1f40 fs/iomap/direct-io.c:557
iomap_dio_rw+0x38/0x80 fs/iomap/direct-io.c:672
ext4_dio_read_iter fs/ext4/file.c:77 [inline]
ext4_file_read_iter+0x530/0x6c0 fs/ext4/file.c:128
call_read_iter include/linux/fs.h:2095 [inline]
generic_file_splice_read+0x4ad/0x790 fs/splice.c:311
do_splice_to fs/splice.c:796 [inline]
splice_direct_to_actor+0x448/0xc10 fs/splice.c:870
do_splice_direct+0x285/0x3d0 fs/splice.c:979
do_sendfile+0x625/0xff0 fs/read_write.c:1249
__do_sys_sendfile64 fs/read_write.c:1317 [inline]
__se_sys_sendfile64+0x178/0x1e0 fs/read_write.c:1303
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x61/0xcb

-> #2 (&sb->s_type->i_mutex_key#9){++++}-{3:3}:
lock_acquire+0x1f6/0x560 kernel/locking/lockdep.c:5622
down_read+0x3b/0x50 kernel/locking/rwsem.c:1480
inode_lock_shared include/linux/fs.h:797 [inline]
ext4_bmap+0x4b/0x410 fs/ext4/inode.c:3159
bmap+0xa1/0xd0 fs/inode.c:1714
jbd2_journal_bmap fs/jbd2/journal.c:978 [inline]
__jbd2_journal_erase fs/jbd2/journal.c:1786 [inline]
jbd2_journal_flush+0x7a2/0xc90 fs/jbd2/journal.c:2492
ext4_ioctl_checkpoint fs/ext4/ioctl.c:847 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1265 [inline]
ext4_ioctl+0x335b/0x5db0 fs/ext4/ioctl.c:1277
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:874 [inline]
__se_sys_ioctl+0xf1/0x160 fs/ioctl.c:860
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x61/0xcb

-> #1 (&journal->j_checkpoint_mutex){+.+.}-{3:3}:
lock_acquire+0x1f6/0x560 kernel/locking/lockdep.c:5622
__mutex_lock_common+0x1da/0x25a0 kernel/locking/mutex.c:596
mutex_lock_io_nested+0x45/0x60 kernel/locking/mutex.c:777
jbd2_journal_flush+0x290/0xc90 fs/jbd2/journal.c:2464
ext4_ioctl_checkpoint fs/ext4/ioctl.c:847 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1265 [inline]
ext4_ioctl+0x335b/0x5db0 fs/ext4/ioctl.c:1277
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:874 [inline]
__se_sys_ioctl+0xf1/0x160 fs/ioctl.c:860
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x61/0xcb

-> #0 (&journal->j_barrier){+.+.}-{3:3}:
check_prev_add kernel/locking/lockdep.c:3053 [inline]
check_prevs_add kernel/locking/lockdep.c:3172 [inline]
validate_chain+0x1646/0x58b0 kernel/locking/lockdep.c:3787
__lock_acquire+0x1295/0x1ff0 kernel/locking/lockdep.c:5011
lock_acquire+0x1f6/0x560 kernel/locking/lockdep.c:5622
__mutex_lock_common+0x1da/0x25a0 kernel/locking/mutex.c:596
__mutex_lock kernel/locking/mutex.c:729 [inline]
mutex_lock_nested+0x17/0x20 kernel/locking/mutex.c:743
jbd2_journal_lock_updates+0x4a9/0x580 fs/jbd2/transaction.c:895
ext4_change_inode_journal_flag+0x1a8/0x6e0 fs/ext4/inode.c:6026
ext4_ioctl_setflags fs/ext4/ioctl.c:447 [inline]
ext4_fileattr_set+0xe6e/0x17d0 fs/ext4/ioctl.c:762
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:700
ioctl_setflags fs/ioctl.c:732 [inline]
do_vfs_ioctl+0x1d85/0x2b70 fs/ioctl.c:843
__do_sys_ioctl fs/ioctl.c:872 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:860
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x61/0xcb

other info that might help us debug this:

Chain exists of:
&journal->j_barrier --> &sb->s_type->i_mutex_key#9 --> &sbi->s_writepages_rwsem

Possible unsafe locking scenario:

CPU0 CPU1
---- ----
lock(&sbi->s_writepages_rwsem);
lock(&sb->s_type->i_mutex_key#9);
lock(&sbi->s_writepages_rwsem);
lock(&journal->j_barrier);

*** DEADLOCK ***

4 locks held by syz-executor.0/13161:
#0: ffff8880242f4460 (sb_writers#5){.+.+}-{0:0}, at: mnt_want_write_file+0x5a/0x1f0 fs/namespace.c:421
#1: ffff88804c97b5c8 (&sb->s_type->i_mutex_key#9){++++}-{3:3}, at: inode_lock include/linux/fs.h:787 [inline]
#1: ffff88804c97b5c8 (&sb->s_type->i_mutex_key#9){++++}-{3:3}, at: vfs_fileattr_set+0x135/0xd30 fs/ioctl.c:685
#2: ffff88804c97b768 (mapping.invalidate_lock){++++}-{3:3}, at: filemap_invalidate_lock include/linux/fs.h:832 [inline]
#2: ffff88804c97b768 (mapping.invalidate_lock){++++}-{3:3}, at: ext4_change_inode_journal_flag+0x115/0x6e0 fs/ext4/inode.c:6017
#3: ffff8880242f6bd8 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6025

stack backtrace:
CPU: 0 PID: 13161 Comm: syz-executor.0 Not tainted 5.15.98-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x1e3/0x2cb lib/dump_stack.c:106
check_noncircular+0x2f8/0x3b0 kernel/locking/lockdep.c:2133
check_prev_add kernel/locking/lockdep.c:3053 [inline]
check_prevs_add kernel/locking/lockdep.c:3172 [inline]
validate_chain+0x1646/0x58b0 kernel/locking/lockdep.c:3787
__lock_acquire+0x1295/0x1ff0 kernel/locking/lockdep.c:5011
lock_acquire+0x1f6/0x560 kernel/locking/lockdep.c:5622
__mutex_lock_common+0x1da/0x25a0 kernel/locking/mutex.c:596
__mutex_lock kernel/locking/mutex.c:729 [inline]
mutex_lock_nested+0x17/0x20 kernel/locking/mutex.c:743
jbd2_journal_lock_updates+0x4a9/0x580 fs/jbd2/transaction.c:895
ext4_change_inode_journal_flag+0x1a8/0x6e0 fs/ext4/inode.c:6026
ext4_ioctl_setflags fs/ext4/ioctl.c:447 [inline]
ext4_fileattr_set+0xe6e/0x17d0 fs/ext4/ioctl.c:762
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:700
ioctl_setflags fs/ioctl.c:732 [inline]
do_vfs_ioctl+0x1d85/0x2b70 fs/ioctl.c:843
__do_sys_ioctl fs/ioctl.c:872 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:860
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x61/0xcb
RIP: 0033:0x7f0143b1b0f9
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f014208d168 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007f0143c3af80 RCX: 00007f0143b1b0f9
RDX: 0000000020000380 RSI: 0000000040086602 RDI: 0000000000000004
RBP: 00007f0143b76ae9 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007ffd662959df R14: 00007f014208d300 R15: 0000000000022000
</TASK>


---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzk...@googlegroups.com.

syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

[syzbot]

Hello,

syzbot found the following issue on:

HEAD commit: 42616e0f09fb Linux 6.1.15
git tree: linux-6.1.y
console output: https://syzkaller.appspot.com/x/log.txt?x=17f2bf9cc80000
kernel config: https://syzkaller.appspot.com/x/.config?x=690b9ff41783cd73
dashboard link: https://syzkaller.appspot.com/bug?extid=163e6a010d5422a65abb

compiler: Debian clang version 15.0.7, GNU ld (GNU Binutils for Debian) 2.35.2

Unfortunately, I don't have any reproducer for this issue yet.

Downloadable assets:

disk image: https://storage.googleapis.com/syzbot-assets/7aca0b4cb788/disk-42616e0f.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/458e15d5fc53/vmlinux-42616e0f.xz
kernel image: https://storage.googleapis.com/syzbot-assets/7d3a81dd294e/bzImage-42616e0f.xz

IMPORTANT: if you fix the issue, please add the following tag to the commit:

Reported-by: syzbot+163e6a...@syzkaller.appspotmail.com

======================================================
WARNING: possible circular locking dependency detected

6.1.15-syzkaller #0 Not tainted
------------------------------------------------------
syz-executor.2/26556 is trying to acquire lock:
ffff8880281f4170 (&journal->j_barrier){+.+.}-{3:3}, at: jbd2_journal_lock_updates+0x2a8/0x370 fs/jbd2/transaction.c:904

but task is already holding lock:

ffff8880281f2b98 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6087

which lock already depends on the new lock.


the existing dependency chain (in reverse order) is:

-> #3 (&sbi->s_writepages_rwsem){++++}-{0:0}:

lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
percpu_down_write+0x50/0x2e0 kernel/locking/percpu-rwsem.c:227
ext4_ind_migrate+0x254/0x760 fs/ext4/migrate.c:624
ext4_ioctl_setflags fs/ext4/ioctl.c:696 [inline]
ext4_fileattr_set+0xe9b/0x1770 fs/ext4/ioctl.c:1004
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:696
ioctl_setflags fs/ioctl.c:728 [inline]
do_vfs_ioctl+0x1cd1/0x2a90 fs/ioctl.c:839
__do_sys_ioctl fs/ioctl.c:868 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:856

do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80

entry_SYSCALL_64_after_hwframe+0x63/0xcd

-> #2 (&sb->s_type->i_mutex_key#8){++++}-{3:3}:
lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
down_read+0x39/0x50 kernel/locking/rwsem.c:1509
inode_lock_shared include/linux/fs.h:766 [inline]
ext4_bmap+0x4b/0x410 fs/ext4/inode.c:3171
bmap+0xa1/0xd0 fs/inode.c:1798
jbd2_journal_bmap fs/jbd2/journal.c:977 [inline]
__jbd2_journal_erase fs/jbd2/journal.c:1789 [inline]
jbd2_journal_flush+0x5b5/0xc40 fs/jbd2/journal.c:2492
ext4_ioctl_checkpoint fs/ext4/ioctl.c:1082 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1590 [inline]
ext4_ioctl+0x3a7d/0x61c0 fs/ext4/ioctl.c:1610
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:870 [inline]
__se_sys_ioctl+0xf1/0x160 fs/ioctl.c:856

do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80

entry_SYSCALL_64_after_hwframe+0x63/0xcd

-> #1 (&journal->j_checkpoint_mutex){+.+.}-{3:3}:

lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
__mutex_lock_common+0x1d4/0x2520 kernel/locking/mutex.c:603
mutex_lock_io_nested+0x43/0x60 kernel/locking/mutex.c:833
jbd2_journal_flush+0x29b/0xc40 fs/jbd2/journal.c:2464
ext4_ioctl_checkpoint fs/ext4/ioctl.c:1082 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1590 [inline]
ext4_ioctl+0x3a7d/0x61c0 fs/ext4/ioctl.c:1610
vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:870 [inline]
__se_sys_ioctl+0xf1/0x160 fs/ioctl.c:856

do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80

entry_SYSCALL_64_after_hwframe+0x63/0xcd

-> #0 (&journal->j_barrier){+.+.}-{3:3}:

check_prev_add kernel/locking/lockdep.c:3097 [inline]
check_prevs_add kernel/locking/lockdep.c:3216 [inline]
validate_chain+0x1667/0x58e0 kernel/locking/lockdep.c:3831
__lock_acquire+0x125b/0x1f80 kernel/locking/lockdep.c:5055
lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
__mutex_lock_common+0x1d4/0x2520 kernel/locking/mutex.c:603
__mutex_lock kernel/locking/mutex.c:747 [inline]
mutex_lock_nested+0x17/0x20 kernel/locking/mutex.c:799
jbd2_journal_lock_updates+0x2a8/0x370 fs/jbd2/transaction.c:904
ext4_change_inode_journal_flag+0x1a8/0x6e0 fs/ext4/inode.c:6088
ext4_ioctl_setflags fs/ext4/ioctl.c:687 [inline]
ext4_fileattr_set+0xe04/0x1770 fs/ext4/ioctl.c:1004
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:696
ioctl_setflags fs/ioctl.c:728 [inline]
do_vfs_ioctl+0x1cd1/0x2a90 fs/ioctl.c:839
__do_sys_ioctl fs/ioctl.c:868 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:856

do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80

entry_SYSCALL_64_after_hwframe+0x63/0xcd

other info that might help us debug this:

Chain exists of:

&journal->j_barrier --> &sb->s_type->i_mutex_key#8 --> &sbi->s_writepages_rwsem

Possible unsafe locking scenario:

CPU0 CPU1
---- ----
lock(&sbi->s_writepages_rwsem);

lock(&sb->s_type->i_mutex_key#8);

lock(&sbi->s_writepages_rwsem);
lock(&journal->j_barrier);

*** DEADLOCK ***

4 locks held by syz-executor.2/26556:
#0: ffff8880281f0460 (sb_writers#4){.+.+}-{0:0}, at: mnt_want_write_file+0x5a/0x1f0 fs/namespace.c:437
#1: ffff88805068ca38 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: inode_lock include/linux/fs.h:756 [inline]
#1: ffff88805068ca38 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: vfs_fileattr_set+0x135/0xd30 fs/ioctl.c:681
#2: ffff88805068cbd8 (mapping.invalidate_lock){++++}-{3:3}, at: filemap_invalidate_lock include/linux/fs.h:801 [inline]
#2: ffff88805068cbd8 (mapping.invalidate_lock){++++}-{3:3}, at: ext4_change_inode_journal_flag+0x115/0x6e0 fs/ext4/inode.c:6079
#3: ffff8880281f2b98 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6087

stack backtrace:
CPU: 1 PID: 26556 Comm: syz-executor.2 Not tainted 6.1.15-syzkaller #0

Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023
Call Trace:
<TASK>
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x1e3/0x2cb lib/dump_stack.c:106

check_noncircular+0x2fa/0x3b0 kernel/locking/lockdep.c:2177
check_prev_add kernel/locking/lockdep.c:3097 [inline]
check_prevs_add kernel/locking/lockdep.c:3216 [inline]
validate_chain+0x1667/0x58e0 kernel/locking/lockdep.c:3831
__lock_acquire+0x125b/0x1f80 kernel/locking/lockdep.c:5055
lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
__mutex_lock_common+0x1d4/0x2520 kernel/locking/mutex.c:603
__mutex_lock kernel/locking/mutex.c:747 [inline]
mutex_lock_nested+0x17/0x20 kernel/locking/mutex.c:799
jbd2_journal_lock_updates+0x2a8/0x370 fs/jbd2/transaction.c:904
ext4_change_inode_journal_flag+0x1a8/0x6e0 fs/ext4/inode.c:6088
ext4_ioctl_setflags fs/ext4/ioctl.c:687 [inline]
ext4_fileattr_set+0xe04/0x1770 fs/ext4/ioctl.c:1004
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:696
ioctl_setflags fs/ioctl.c:728 [inline]
do_vfs_ioctl+0x1cd1/0x2a90 fs/ioctl.c:839
__do_sys_ioctl fs/ioctl.c:868 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:856

do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80

entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7f821a68c0f9

Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48

RSP: 002b:00007f821b356168 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007f821a7abf80 RCX: 00007f821a68c0f9
RDX: 0000000020000140 RSI: 0000000040086602 RDI: 0000000000000005
RBP: 00007f821a6e7ae9 R08: 0000000000000000 R09: 0000000000000000

R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000

R13: 00007ffd1ad7e38f R14: 00007f821b356300 R15: 0000000000022000

[syzbot]

syzbot has found a reproducer for the following issue on:

HEAD commit: d9b4a0c83a2d Linux 5.15.98
git tree: linux-5.15.y

console output: https://syzkaller.appspot.com/x/log.txt?x=166e107cc80000
kernel config: https://syzkaller.appspot.com/x/.config?x=b57cfa804330c3b7

dashboard link: https://syzkaller.appspot.com/bug?extid=435f1feb5dc6cb430303
compiler: Debian clang version 15.0.7, GNU ld (GNU Binutils for Debian) 2.35.2

userspace arch: arm64
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15919184c80000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=137ed60ac80000

Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/8088989394e3/disk-d9b4a0c8.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/2651d6753959/vmlinux-d9b4a0c8.xz
kernel image: https://storage.googleapis.com/syzbot-assets/f3fa3f994f9a/Image-d9b4a0c8.gz.xz

IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+435f1f...@syzkaller.appspotmail.com

warning: checkpointing journal with EXT4_IOC_CHECKPOINT_FLAG_ZEROOUT can be slow

======================================================
WARNING: possible circular locking dependency detected
5.15.98-syzkaller #0 Not tainted
------------------------------------------------------

syz-executor984/4054 is trying to acquire lock:
ffff0000d38c0170 (&journal->j_barrier){+.+.}-{3:3}, at: jbd2_journal_lock_updates+0x3f0/0x4b4 fs/jbd2/transaction.c:895

but task is already holding lock:

ffff0000d38bcbd8 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x154/0x648 fs/ext4/inode.c:6025

which lock already depends on the new lock.


the existing dependency chain (in reverse order) is:

-> #4 (&sbi->s_writepages_rwsem){++++}-{0:0}:
percpu_down_write+0xd8/0x3b0 kernel/locking/percpu-rwsem.c:217
ext4_change_inode_journal_flag+0x154/0x648 fs/ext4/inode.c:6025
ext4_ioctl_setflags fs/ext4/ioctl.c:447 [inline]
ext4_fileattr_set+0xb7c/0x12e0 fs/ext4/ioctl.c:762
vfs_fileattr_set+0x708/0xad0 fs/ioctl.c:700
do_vfs_ioctl+0x1634/0x2a38
__do_sys_ioctl fs/ioctl.c:872 [inline]
__se_sys_ioctl fs/ioctl.c:860 [inline]
__arm64_sys_ioctl+0xe4/0x1c8 fs/ioctl.c:860
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

-> #3 (mapping.invalidate_lock){++++}-{3:3}:
down_write+0x110/0x260 kernel/locking/rwsem.c:1533
filemap_invalidate_lock include/linux/fs.h:832 [inline]
ext4_setattr+0xa8c/0x1490 fs/ext4/inode.c:5443
notify_change+0xae4/0xd80 fs/attr.c:426
do_truncate+0x1bc/0x288 fs/open.c:65
do_sys_ftruncate+0x288/0x31c fs/open.c:193
__do_sys_ftruncate fs/open.c:204 [inline]
__se_sys_ftruncate fs/open.c:202 [inline]
__arm64_sys_ftruncate+0x60/0x74 fs/open.c:202
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

-> #2 (&sb->s_type->i_mutex_key#9){++++}-{3:3}:

down_read+0xbc/0x11c kernel/locking/rwsem.c:1480
inode_lock_shared include/linux/fs.h:797 [inline]
ext4_bmap+0x58/0x36c fs/ext4/inode.c:3159
bmap+0xa8/0xe8 fs/inode.c:1714

jbd2_journal_bmap fs/jbd2/journal.c:978 [inline]
__jbd2_journal_erase fs/jbd2/journal.c:1786 [inline]

jbd2_journal_flush+0x63c/0xaa0 fs/jbd2/journal.c:2492

ext4_ioctl_checkpoint fs/ext4/ioctl.c:847 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1265 [inline]

ext4_ioctl+0x3448/0x675c fs/ext4/ioctl.c:1277

vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:874 [inline]

__se_sys_ioctl fs/ioctl.c:860 [inline]
__arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:860
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

-> #1 (&journal->j_checkpoint_mutex){+.+.}-{3:3}:

__mutex_lock_common+0x194/0x2154 kernel/locking/mutex.c:596
mutex_lock_io_nested+0xcc/0x12c kernel/locking/mutex.c:777
jbd2_journal_flush+0x210/0xaa0 fs/jbd2/journal.c:2464

ext4_ioctl_checkpoint fs/ext4/ioctl.c:847 [inline]
__ext4_ioctl fs/ext4/ioctl.c:1265 [inline]

ext4_ioctl+0x3448/0x675c fs/ext4/ioctl.c:1277

vfs_ioctl fs/ioctl.c:51 [inline]
__do_sys_ioctl fs/ioctl.c:874 [inline]

__se_sys_ioctl fs/ioctl.c:860 [inline]
__arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:860
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

-> #0 (&journal->j_barrier){+.+.}-{3:3}:
check_prev_add kernel/locking/lockdep.c:3053 [inline]
check_prevs_add kernel/locking/lockdep.c:3172 [inline]

validate_chain kernel/locking/lockdep.c:3787 [inline]
__lock_acquire+0x32cc/0x7620 kernel/locking/lockdep.c:5011
lock_acquire+0x2b8/0x894 kernel/locking/lockdep.c:5622
__mutex_lock_common+0x194/0x2154 kernel/locking/mutex.c:596
__mutex_lock kernel/locking/mutex.c:729 [inline]
mutex_lock_nested+0xa4/0xf8 kernel/locking/mutex.c:743
jbd2_journal_lock_updates+0x3f0/0x4b4 fs/jbd2/transaction.c:895
ext4_change_inode_journal_flag+0x15c/0x648 fs/ext4/inode.c:6026
ext4_ioctl_setflags fs/ext4/ioctl.c:447 [inline]
ext4_fileattr_set+0xb7c/0x12e0 fs/ext4/ioctl.c:762
vfs_fileattr_set+0x708/0xad0 fs/ioctl.c:700
do_vfs_ioctl+0x1634/0x2a38
__do_sys_ioctl fs/ioctl.c:872 [inline]
__se_sys_ioctl fs/ioctl.c:860 [inline]
__arm64_sys_ioctl+0xe4/0x1c8 fs/ioctl.c:860
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

other info that might help us debug this:

Chain exists of:

&journal->j_barrier --> mapping.invalidate_lock --> &sbi->s_writepages_rwsem

Possible unsafe locking scenario:

CPU0 CPU1
---- ----
lock(&sbi->s_writepages_rwsem);

lock(mapping.invalidate_lock);

lock(&sbi->s_writepages_rwsem);
lock(&journal->j_barrier);

*** DEADLOCK ***

4 locks held by syz-executor984/4054:
#0: ffff0000d38ba460 (sb_writers#3){.+.+}-{0:0}, at: mnt_want_write_file+0x64/0x1e8 fs/namespace.c:421
#1: ffff0000dbdd67a0 (&sb->s_type->i_mutex_key#9){++++}-{3:3}, at: inode_lock include/linux/fs.h:787 [inline]
#1: ffff0000dbdd67a0 (&sb->s_type->i_mutex_key#9){++++}-{3:3}, at: vfs_fileattr_set+0x110/0xad0 fs/ioctl.c:685
#2: ffff0000dbdd6940 (mapping.invalidate_lock){++++}-{3:3}, at: filemap_invalidate_lock include/linux/fs.h:832 [inline]
#2: ffff0000dbdd6940 (mapping.invalidate_lock){++++}-{3:3}, at: ext4_change_inode_journal_flag+0xf0/0x648 fs/ext4/inode.c:6017
#3: ffff0000d38bcbd8 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x154/0x648 fs/ext4/inode.c:6025

stack backtrace:
CPU: 0 PID: 4054 Comm: syz-executor984 Not tainted 5.15.98-syzkaller #0

Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023

Call trace:
dump_backtrace+0x0/0x530 arch/arm64/kernel/stacktrace.c:152
show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:216
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0x108/0x170 lib/dump_stack.c:106
dump_stack+0x1c/0x58 lib/dump_stack.c:113
print_circular_bug+0x150/0x1b8 kernel/locking/lockdep.c:2011
check_noncircular+0x2cc/0x378 kernel/locking/lockdep.c:2133

check_prev_add kernel/locking/lockdep.c:3053 [inline]
check_prevs_add kernel/locking/lockdep.c:3172 [inline]

validate_chain kernel/locking/lockdep.c:3787 [inline]
__lock_acquire+0x32cc/0x7620 kernel/locking/lockdep.c:5011
lock_acquire+0x2b8/0x894 kernel/locking/lockdep.c:5622
__mutex_lock_common+0x194/0x2154 kernel/locking/mutex.c:596
__mutex_lock kernel/locking/mutex.c:729 [inline]
mutex_lock_nested+0xa4/0xf8 kernel/locking/mutex.c:743
jbd2_journal_lock_updates+0x3f0/0x4b4 fs/jbd2/transaction.c:895
ext4_change_inode_journal_flag+0x15c/0x648 fs/ext4/inode.c:6026
ext4_ioctl_setflags fs/ext4/ioctl.c:447 [inline]
ext4_fileattr_set+0xb7c/0x12e0 fs/ext4/ioctl.c:762
vfs_fileattr_set+0x708/0xad0 fs/ioctl.c:700
do_vfs_ioctl+0x1634/0x2a38
__do_sys_ioctl fs/ioctl.c:872 [inline]
__se_sys_ioctl fs/ioctl.c:860 [inline]
__arm64_sys_ioctl+0xe4/0x1c8 fs/ioctl.c:860
__invoke_syscall arch/arm64/kernel/syscall.c:38 [inline]
invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:52
el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142
do_el0_svc+0x58/0x14c arch/arm64/kernel/syscall.c:181
el0_svc+0x7c/0x1f0 arch/arm64/kernel/entry-common.c:596
el0t_64_sync_handler+0x84/0xe4 arch/arm64/kernel/entry-common.c:614
el0t_64_sync+0x1a0/0x1a4 <unknown>:584

[syzbot]

syzbot has found a reproducer for the following issue on:

HEAD commit: 42616e0f09fb Linux 6.1.15
git tree: linux-6.1.y

console output: https://syzkaller.appspot.com/x/log.txt?x=14480ff4c80000

kernel config: https://syzkaller.appspot.com/x/.config?x=690b9ff41783cd73
dashboard link: https://syzkaller.appspot.com/bug?extid=163e6a010d5422a65abb
compiler: Debian clang version 15.0.7, GNU ld (GNU Binutils for Debian) 2.35.2

syz repro: https://syzkaller.appspot.com/x/repro.syz?x=14f2f77ac80000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1317c192c80000

Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/db869f2ed2bd/disk-42616e0f.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/37951bbe5829/vmlinux-42616e0f.xz
kernel image: https://storage.googleapis.com/syzbot-assets/23aa1a75ce0f/bzImage-42616e0f.xz

IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+163e6a...@syzkaller.appspotmail.com

warning: checkpointing journal with EXT4_IOC_CHECKPOINT_FLAG_ZEROOUT can be slow

======================================================
WARNING: possible circular locking dependency detected
6.1.15-syzkaller #0 Not tainted
------------------------------------------------------

syz-executor134/3628 is trying to acquire lock:
ffff88807edb6170 (&journal->j_barrier){+.+.}-{3:3}, at: jbd2_journal_lock_updates+0x2a8/0x370 fs/jbd2/transaction.c:904

but task is already holding lock:

ffff88807edb4b98 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6087

which lock already depends on the new lock.


the existing dependency chain (in reverse order) is:

-> #4 (&sbi->s_writepages_rwsem){++++}-{0:0}:

lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
percpu_down_write+0x50/0x2e0 kernel/locking/percpu-rwsem.c:227

ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6087

ext4_ioctl_setflags fs/ext4/ioctl.c:687 [inline]
ext4_fileattr_set+0xe04/0x1770 fs/ext4/ioctl.c:1004
vfs_fileattr_set+0x8ee/0xd30 fs/ioctl.c:696
ioctl_setflags fs/ioctl.c:728 [inline]
do_vfs_ioctl+0x1cd1/0x2a90 fs/ioctl.c:839
__do_sys_ioctl fs/ioctl.c:868 [inline]
__se_sys_ioctl+0x81/0x160 fs/ioctl.c:856
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd

-> #3 (mapping.invalidate_lock){++++}-{3:3}:
lock_acquire+0x231/0x620 kernel/locking/lockdep.c:5668
down_write+0x36/0x60 kernel/locking/rwsem.c:1562
filemap_invalidate_lock include/linux/fs.h:801 [inline]
ext4_setattr+0xec7/0x1a00 fs/ext4/inode.c:5475
notify_change+0xdcd/0x1080 fs/attr.c:482
do_truncate+0x21c/0x300 fs/open.c:65
do_sys_ftruncate+0x2e2/0x380 fs/open.c:193

&journal->j_barrier --> mapping.invalidate_lock --> &sbi->s_writepages_rwsem

Possible unsafe locking scenario:

CPU0 CPU1
---- ----
lock(&sbi->s_writepages_rwsem);

lock(mapping.invalidate_lock);

lock(&sbi->s_writepages_rwsem);
lock(&journal->j_barrier);

*** DEADLOCK ***

4 locks held by syz-executor134/3628:
#0: ffff88807edb2460 (sb_writers#4){.+.+}-{0:0}, at: mnt_want_write_file+0x5a/0x1f0 fs/namespace.c:437
#1: ffff888071d3a218 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: inode_lock include/linux/fs.h:756 [inline]
#1: ffff888071d3a218 (&sb->s_type->i_mutex_key#8){++++}-{3:3}, at: vfs_fileattr_set+0x135/0xd30 fs/ioctl.c:681
#2: ffff888071d3a3b8 (mapping.invalidate_lock){++++}-{3:3}, at: filemap_invalidate_lock include/linux/fs.h:801 [inline]
#2: ffff888071d3a3b8 (mapping.invalidate_lock){++++}-{3:3}, at: ext4_change_inode_journal_flag+0x115/0x6e0 fs/ext4/inode.c:6079
#3: ffff88807edb4b98 (&sbi->s_writepages_rwsem){++++}-{0:0}, at: ext4_change_inode_journal_flag+0x1a0/0x6e0 fs/ext4/inode.c:6087

stack backtrace:
CPU: 1 PID: 3628 Comm: syz-executor134 Not tainted 6.1.15-syzkaller #0

RIP: 0033:0x7fd25dd72049
Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007ffe33c7a678 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00000

[syzbot]

syzbot suspects this issue could be fixed by backporting the following commit:

commit 62913ae96de747091c4dacd06d158e7729c1a76d
git tree: upstream
Author: Theodore Ts'o <ty...@mit.edu>
Date: Wed Mar 8 04:15:49 2023 +0000

ext4, jbd2: add an optimized bmap for the journal inode

bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=134a7fef680000
kernel config: https://syzkaller.appspot.com/x/.config?x=9ed8b3ec03e8c126
dashboard link: https://syzkaller.appspot.com/bug?extid=163e6a010d5422a65abb
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=14905724c80000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=14e8e7b2c80000


Please keep in mind that other backports might be required as well.

For information about bisection process see: https://goo.gl/tpsmEJ#bisection