Skip to content

Commit 9dd5052

Browse files
chaseyugregkh
authored andcommitted
f2fs: quota: fix potential deadlock
[ Upstream commit 9de71ed ] xfstest generic/587 reports a deadlock issue as below: ====================================================== WARNING: possible circular locking dependency detected 5.14.0-rc1 #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: -> #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 -> #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 #1: ffff8880084bc380 (&sbi->cp_rwsem){++++}-{3:3}, at: f2fs_quota_sync+0x3e/0x300 [f2fs] #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 #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]> Signed-off-by: Sasha Levin <[email protected]>
1 parent a60ccb6 commit 9dd5052

File tree

1 file changed

+48
-36
lines changed

1 file changed

+48
-36
lines changed

fs/f2fs/super.c

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,64 +2399,76 @@ static int f2fs_enable_quotas(struct super_block *sb)
23992399
return 0;
24002400
}
24012401

2402+
static int f2fs_quota_sync_file(struct f2fs_sb_info *sbi, int type)
2403+
{
2404+
struct quota_info *dqopt = sb_dqopt(sbi->sb);
2405+
struct address_space *mapping = dqopt->files[type]->i_mapping;
2406+
int ret = 0;
2407+
2408+
ret = dquot_writeback_dquots(sbi->sb, type);
2409+
if (ret)
2410+
goto out;
2411+
2412+
ret = filemap_fdatawrite(mapping);
2413+
if (ret)
2414+
goto out;
2415+
2416+
/* if we are using journalled quota */
2417+
if (is_journalled_quota(sbi))
2418+
goto out;
2419+
2420+
ret = filemap_fdatawait(mapping);
2421+
2422+
truncate_inode_pages(&dqopt->files[type]->i_data, 0);
2423+
out:
2424+
if (ret)
2425+
set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
2426+
return ret;
2427+
}
2428+
24022429
int f2fs_quota_sync(struct super_block *sb, int type)
24032430
{
24042431
struct f2fs_sb_info *sbi = F2FS_SB(sb);
24052432
struct quota_info *dqopt = sb_dqopt(sb);
24062433
int cnt;
24072434
int ret;
24082435

2409-
/*
2410-
* do_quotactl
2411-
* f2fs_quota_sync
2412-
* down_read(quota_sem)
2413-
* dquot_writeback_dquots()
2414-
* f2fs_dquot_commit
2415-
* block_operation
2416-
* down_read(quota_sem)
2417-
*/
2418-
f2fs_lock_op(sbi);
2419-
2420-
down_read(&sbi->quota_sem);
2421-
ret = dquot_writeback_dquots(sb, type);
2422-
if (ret)
2423-
goto out;
2424-
24252436
/*
24262437
* Now when everything is written we can discard the pagecache so
24272438
* that userspace sees the changes.
24282439
*/
24292440
for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
2430-
struct address_space *mapping;
24312441

24322442
if (type != -1 && cnt != type)
24332443
continue;
2434-
if (!sb_has_quota_active(sb, cnt))
2435-
continue;
24362444

2437-
mapping = dqopt->files[cnt]->i_mapping;
2445+
if (!sb_has_quota_active(sb, type))
2446+
return 0;
24382447

2439-
ret = filemap_fdatawrite(mapping);
2440-
if (ret)
2441-
goto out;
2448+
inode_lock(dqopt->files[cnt]);
24422449

2443-
/* if we are using journalled quota */
2444-
if (is_journalled_quota(sbi))
2445-
continue;
2450+
/*
2451+
* do_quotactl
2452+
* f2fs_quota_sync
2453+
* down_read(quota_sem)
2454+
* dquot_writeback_dquots()
2455+
* f2fs_dquot_commit
2456+
* block_operation
2457+
* down_read(quota_sem)
2458+
*/
2459+
f2fs_lock_op(sbi);
2460+
down_read(&sbi->quota_sem);
24462461

2447-
ret = filemap_fdatawait(mapping);
2448-
if (ret)
2449-
set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
2462+
ret = f2fs_quota_sync_file(sbi, cnt);
2463+
2464+
up_read(&sbi->quota_sem);
2465+
f2fs_unlock_op(sbi);
24502466

2451-
inode_lock(dqopt->files[cnt]);
2452-
truncate_inode_pages(&dqopt->files[cnt]->i_data, 0);
24532467
inode_unlock(dqopt->files[cnt]);
2468+
2469+
if (ret)
2470+
break;
24542471
}
2455-
out:
2456-
if (ret)
2457-
set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
2458-
up_read(&sbi->quota_sem);
2459-
f2fs_unlock_op(sbi);
24602472
return ret;
24612473
}
24622474

0 commit comments

Comments
 (0)