Skip to content

Commit d4f1267

Browse files
chaseyugregkh
authored andcommitted
f2fs: fix false alarm of lockdep on cp_global_sem lock
commit 6a5e3de upstream. lockdep reported a potential deadlock: a) TCMU device removal context: - call del_gendisk() to get q->q_usage_counter - call start_flush_work() to get work_completion of wb->dwork b) f2fs writeback context: - in wb_workfn(), which holds work_completion of wb->dwork - call f2fs_balance_fs() to get sbi->gc_lock c) f2fs vfs_write context: - call f2fs_gc() to get sbi->gc_lock - call f2fs_write_checkpoint() to get sbi->cp_global_sem d) f2fs mount context: - call recover_fsync_data() to get sbi->cp_global_sem - call f2fs_check_and_fix_write_pointer() to call blkdev_report_zones() that goes down to blk_mq_alloc_request and get q->q_usage_counter Original callstack is in Closes tag. However, I think this is a false alarm due to before mount returns successfully (context d), we can not access file therein via vfs_write (context c). Let's introduce per-sb cp_global_sem_key, and assign the key for cp_global_sem, so that lockdep can recognize cp_global_sem from different super block correctly. A lot of work are done by Shin'ichiro Kawasaki, thanks a lot for the work. Fixes: c426d99 ("f2fs: Check write pointer consistency of open zones") Cc: stable@kernel.org Reported-and-tested-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Closes: https://lore.kernel.org/linux-f2fs-devel/20260218125237.3340441-1-shinichiro.kawasaki@wdc.com Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b2f3c48 commit d4f1267

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

fs/f2fs/f2fs.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,6 +2042,9 @@ struct f2fs_sb_info {
20422042
spinlock_t iostat_lat_lock;
20432043
struct iostat_lat_info *iostat_io_lat;
20442044
#endif
2045+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
2046+
struct lock_class_key cp_global_sem_key;
2047+
#endif
20452048
};
20462049

20472050
/* Definitions to access f2fs_sb_info */

fs/f2fs/super.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4953,6 +4953,11 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
49534953
init_f2fs_rwsem_trace(&sbi->gc_lock, sbi, LOCK_NAME_GC_LOCK);
49544954
mutex_init(&sbi->writepages);
49554955
init_f2fs_rwsem_trace(&sbi->cp_global_sem, sbi, LOCK_NAME_CP_GLOBAL);
4956+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
4957+
lockdep_register_key(&sbi->cp_global_sem_key);
4958+
lockdep_set_class(&sbi->cp_global_sem.internal_rwsem,
4959+
&sbi->cp_global_sem_key);
4960+
#endif
49564961
init_f2fs_rwsem_trace(&sbi->node_write, sbi, LOCK_NAME_NODE_WRITE);
49574962
init_f2fs_rwsem_trace(&sbi->node_change, sbi, LOCK_NAME_NODE_CHANGE);
49584963
spin_lock_init(&sbi->stat_lock);
@@ -5424,6 +5429,9 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
54245429
free_sb_buf:
54255430
kfree(raw_super);
54265431
free_sbi:
5432+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
5433+
lockdep_unregister_key(&sbi->cp_global_sem_key);
5434+
#endif
54275435
kfree(sbi);
54285436
sb->s_fs_info = NULL;
54295437

@@ -5505,6 +5513,9 @@ static void kill_f2fs_super(struct super_block *sb)
55055513
/* Release block devices last, after fscrypt_destroy_keyring(). */
55065514
if (sbi) {
55075515
destroy_device_list(sbi);
5516+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
5517+
lockdep_unregister_key(&sbi->cp_global_sem_key);
5518+
#endif
55085519
kfree(sbi);
55095520
sb->s_fs_info = NULL;
55105521
}

0 commit comments

Comments
 (0)