Skip to content

Commit a5c0042

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: quota: fix potential deadlock
As Yi Zhuang reported in bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=214299 There is potential deadlock during quota data flush as below: Thread A: Thread B: f2fs_dquot_acquire down_read(&sbi->quota_sem) f2fs_write_checkpoint block_operations f2fs_look_all down_write(&sbi->cp_rwsem) f2fs_quota_write f2fs_write_begin __do_map_lock f2fs_lock_op down_read(&sbi->cp_rwsem) __need_flush_qutoa down_write(&sbi->quota_sem) This patch changes block_operations() to use trylock, if it fails, it means there is potential quota data updater, in this condition, let's flush quota data first and then trylock again to check dirty status of quota data. The side effect is: in heavy race condition (e.g. multi quota data upaters vs quota data flusher), it may decrease the probability of synchronizing quota data successfully in checkpoint() due to limited retry time of quota flush. Reported-by: Yi Zhuang <zhuangyi1@huawei.com> Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 92d602b commit a5c0042

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

fs/f2fs/checkpoint.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,8 @@ static bool __need_flush_quota(struct f2fs_sb_info *sbi)
11621162
if (!is_journalled_quota(sbi))
11631163
return false;
11641164

1165-
down_write(&sbi->quota_sem);
1165+
if (!down_write_trylock(&sbi->quota_sem))
1166+
return true;
11661167
if (is_sbi_flag_set(sbi, SBI_QUOTA_SKIP_FLUSH)) {
11671168
ret = false;
11681169
} else if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_REPAIR)) {

0 commit comments

Comments
 (0)