Skip to content

Commit 9de71ed

Browse files
chaseyuJaegeuk Kim
authored and
Jaegeuk Kim
committed
f2fs: quota: fix potential deadlock
xfstest generic/587 reports a deadlock issue as below: ====================================================== WARNING: possible circular locking dependency detected 5.14.0-rc1 Freescale#69 Not tainted ------------------------------------------------------ repquota/8606 is trying to acquire lock: ffff888022ac9320 (&sb->s_type->i_mutex_key#18){+.+.}-{3:3}, at: f2fs_quota_sync+0x207/0x300 [f2fs] but task is already holding lock: ffff8880084bcde8 (&sbi->quota_sem){.+.+}-{3:3}, at: f2fs_quota_sync+0x59/0x300 [f2fs] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> Freescale#2 (&sbi->quota_sem){.+.+}-{3:3}: __lock_acquire+0x648/0x10b0 lock_acquire+0x128/0x470 down_read+0x3b/0x2a0 f2fs_quota_sync+0x59/0x300 [f2fs] f2fs_quota_on+0x48/0x100 [f2fs] do_quotactl+0x5e3/0xb30 __x64_sys_quotactl+0x23a/0x4e0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae -> Freescale#1 (&sbi->cp_rwsem){++++}-{3:3}: __lock_acquire+0x648/0x10b0 lock_acquire+0x128/0x470 down_read+0x3b/0x2a0 f2fs_unlink+0x353/0x670 [f2fs] vfs_unlink+0x1c7/0x380 do_unlinkat+0x413/0x4b0 __x64_sys_unlinkat+0x50/0xb0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae -> #0 (&sb->s_type->i_mutex_key#18){+.+.}-{3:3}: check_prev_add+0xdc/0xb30 validate_chain+0xa67/0xb20 __lock_acquire+0x648/0x10b0 lock_acquire+0x128/0x470 down_write+0x39/0xc0 f2fs_quota_sync+0x207/0x300 [f2fs] do_quotactl+0xaff/0xb30 __x64_sys_quotactl+0x23a/0x4e0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae other info that might help us debug this: Chain exists of: &sb->s_type->i_mutex_key#18 --> &sbi->cp_rwsem --> &sbi->quota_sem Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&sbi->quota_sem); lock(&sbi->cp_rwsem); lock(&sbi->quota_sem); lock(&sb->s_type->i_mutex_key#18); *** DEADLOCK *** 3 locks held by repquota/8606: #0: ffff88801efac0e0 (&type->s_umount_key#53){++++}-{3:3}, at: user_get_super+0xd9/0x190 Freescale#1: ffff8880084bc380 (&sbi->cp_rwsem){++++}-{3:3}, at: f2fs_quota_sync+0x3e/0x300 [f2fs] Freescale#2: ffff8880084bcde8 (&sbi->quota_sem){.+.+}-{3:3}, at: f2fs_quota_sync+0x59/0x300 [f2fs] stack backtrace: CPU: 6 PID: 8606 Comm: repquota Not tainted 5.14.0-rc1 Freescale#69 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: dump_stack_lvl+0xce/0x134 dump_stack+0x17/0x20 print_circular_bug.isra.0.cold+0x239/0x253 check_noncircular+0x1be/0x1f0 check_prev_add+0xdc/0xb30 validate_chain+0xa67/0xb20 __lock_acquire+0x648/0x10b0 lock_acquire+0x128/0x470 down_write+0x39/0xc0 f2fs_quota_sync+0x207/0x300 [f2fs] do_quotactl+0xaff/0xb30 __x64_sys_quotactl+0x23a/0x4e0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f883b0b4efe The root cause is ABBA deadlock of inode lock and cp_rwsem, reorder locks in f2fs_quota_sync() as below to fix this issue: - lock inode - lock cp_rwsem - lock quota_sem Fixes: db6ec53 ("f2fs: add a rw_sem to cover quota flag changes") Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 1ffc8f5 commit 9de71ed

File tree

1 file changed

+48
-36
lines changed

1 file changed

+48
-36
lines changed

fs/f2fs/super.c

+48-36
Original file line numberDiff line numberDiff line change
@@ -2518,64 +2518,76 @@ static int f2fs_enable_quotas(struct super_block *sb)
25182518
return 0;
25192519
}
25202520

2521+
static int f2fs_quota_sync_file(struct f2fs_sb_info *sbi, int type)
2522+
{
2523+
struct quota_info *dqopt = sb_dqopt(sbi->sb);
2524+
struct address_space *mapping = dqopt->files[type]->i_mapping;
2525+
int ret = 0;
2526+
2527+
ret = dquot_writeback_dquots(sbi->sb, type);
2528+
if (ret)
2529+
goto out;
2530+
2531+
ret = filemap_fdatawrite(mapping);
2532+
if (ret)
2533+
goto out;
2534+
2535+
/* if we are using journalled quota */
2536+
if (is_journalled_quota(sbi))
2537+
goto out;
2538+
2539+
ret = filemap_fdatawait(mapping);
2540+
2541+
truncate_inode_pages(&dqopt->files[type]->i_data, 0);
2542+
out:
2543+
if (ret)
2544+
set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
2545+
return ret;
2546+
}
2547+
25212548
int f2fs_quota_sync(struct super_block *sb, int type)
25222549
{
25232550
struct f2fs_sb_info *sbi = F2FS_SB(sb);
25242551
struct quota_info *dqopt = sb_dqopt(sb);
25252552
int cnt;
25262553
int ret;
25272554

2528-
/*
2529-
* do_quotactl
2530-
* f2fs_quota_sync
2531-
* down_read(quota_sem)
2532-
* dquot_writeback_dquots()
2533-
* f2fs_dquot_commit
2534-
* block_operation
2535-
* down_read(quota_sem)
2536-
*/
2537-
f2fs_lock_op(sbi);
2538-
2539-
down_read(&sbi->quota_sem);
2540-
ret = dquot_writeback_dquots(sb, type);
2541-
if (ret)
2542-
goto out;
2543-
25442555
/*
25452556
* Now when everything is written we can discard the pagecache so
25462557
* that userspace sees the changes.
25472558
*/
25482559
for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
2549-
struct address_space *mapping;
25502560

25512561
if (type != -1 && cnt != type)
25522562
continue;
2553-
if (!sb_has_quota_active(sb, cnt))
2554-
continue;
25552563

2556-
mapping = dqopt->files[cnt]->i_mapping;
2564+
if (!sb_has_quota_active(sb, type))
2565+
return 0;
25572566

2558-
ret = filemap_fdatawrite(mapping);
2559-
if (ret)
2560-
goto out;
2567+
inode_lock(dqopt->files[cnt]);
25612568

2562-
/* if we are using journalled quota */
2563-
if (is_journalled_quota(sbi))
2564-
continue;
2569+
/*
2570+
* do_quotactl
2571+
* f2fs_quota_sync
2572+
* down_read(quota_sem)
2573+
* dquot_writeback_dquots()
2574+
* f2fs_dquot_commit
2575+
* block_operation
2576+
* down_read(quota_sem)
2577+
*/
2578+
f2fs_lock_op(sbi);
2579+
down_read(&sbi->quota_sem);
25652580

2566-
ret = filemap_fdatawait(mapping);
2567-
if (ret)
2568-
set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
2581+
ret = f2fs_quota_sync_file(sbi, cnt);
2582+
2583+
up_read(&sbi->quota_sem);
2584+
f2fs_unlock_op(sbi);
25692585

2570-
inode_lock(dqopt->files[cnt]);
2571-
truncate_inode_pages(&dqopt->files[cnt]->i_data, 0);
25722586
inode_unlock(dqopt->files[cnt]);
2587+
2588+
if (ret)
2589+
break;
25732590
}
2574-
out:
2575-
if (ret)
2576-
set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
2577-
up_read(&sbi->quota_sem);
2578-
f2fs_unlock_op(sbi);
25792591
return ret;
25802592
}
25812593

0 commit comments

Comments
 (0)