From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 406FB3DBD41 for ; Wed, 20 May 2026 11:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779276561; cv=none; b=lqPYBkZ0skPlVXAIWYMpTZNT+H/6Jyqo8Gh3AbGDow6vSYcFqd3afUQnxqvZCbIwe2y7LlT0KOXSuHVRlyljgtNORZjx3aJ6nTu7pjW+4S9TIfEdNfjA+K2wiXZEbcYL1UP85sZpuGEd4JiPgvtVrkr6NzM1G3pWfkUUkH+suBQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779276561; c=relaxed/simple; bh=w0btheImwUkdJTIUMkfY8EpS0gKsYmLsN5xTR0xS9s4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t+KPSglhZWJsUU9BLq8B8E14tSPMb+LuNstvSTB1T9DSIiO8NJiaZ5pV0raPVBAYAGad4xAdt/KLM/GR3amIZb8c0FKnwQupXLfEYa0Ce+Ht52sqgG1uApSyWnDkxEFC9Vl7CswEAaSiTn5xVROiIKof9l1m7mc8DTqjOPBMqcE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GfY7hF3p; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GfY7hF3p" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 339FD1F0089D; Wed, 20 May 2026 11:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779276559; bh=xjlYfk1jCoBthVg+m1zWO9F2+T8g13ZGm0mx/7BFsek=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GfY7hF3pAOUZnu2GPHMeAtLX+zFYgv/hKtd93jC2fSeVpFYOGkn9Ttu9P4BZDdRW0 ISnq3Oxpycku32nMU6ldIHVNkrPamx/hzzzdtQGuoyJeLC2ZWUpQmMN+uaLf0PeEXQ cTvGZBkPx+M9Xp675HyuL34w9nR2cClMwSsO0nCdw/kzOBEBsfIMphmlsgFjd9HIDc 4OyIPNtilCqBesZGbGkBQ31zlnwUu17GJliMfrNvSPCiv8Xz8GYk8oJxt4cmn42HN0 zyOqOOKnCa4u7p12aq3sQ/DZmbWRAXMjlVLuWlmisjeD+h/zYsCwEFciZBDBplT3ua ZCdphsKFdZmcw== From: Sasha Levin To: stable@vger.kernel.org Cc: Chao Yu , stable@kernel.org, Shin'ichiro Kawasaki , Jaegeuk Kim , Sasha Levin Subject: [PATCH 6.1.y] f2fs: fix false alarm of lockdep on cp_global_sem lock Date: Wed, 20 May 2026 07:29:17 -0400 Message-ID: <20260520112917.3439771-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051239-spoon-mouth-0b30@gregkh> References: <2026051239-spoon-mouth-0b30@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chao Yu [ Upstream commit 6a5e3de9c2bb0b691d16789a5d19e9276a09b308 ] 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: c426d99127b1 ("f2fs: Check write pointer consistency of open zones") Cc: stable@kernel.org Reported-and-tested-by: Shin'ichiro Kawasaki Closes: https://lore.kernel.org/linux-f2fs-devel/20260218125237.3340441-1-shinichiro.kawasaki@wdc.com Signed-off-by: Shin'ichiro Kawasaki Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim [ re-anchored lockdep_register_key after init_f2fs_rwsem and placed lockdep_unregister_key before kfree(sbi) in f2fs_put_super instead of kill_f2fs_super ] Signed-off-by: Sasha Levin --- fs/f2fs/f2fs.h | 3 +++ fs/f2fs/super.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index bbb86e2156989..9f561f0b6aaf9 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1851,6 +1851,9 @@ struct f2fs_sb_info { spinlock_t iostat_lat_lock; struct iostat_lat_info *iostat_io_lat; #endif +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lock_class_key cp_global_sem_key; +#endif }; #ifdef CONFIG_F2FS_FAULT_INJECTION diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index d4be332bab3b5..9f9df99871714 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1686,6 +1686,9 @@ static void f2fs_put_super(struct super_block *sb) kvfree(sbi->write_io[i]); #if IS_ENABLED(CONFIG_UNICODE) utf8_unload(sb->s_encoding); +#endif +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_unregister_key(&sbi->cp_global_sem_key); #endif kfree(sbi); } @@ -4182,6 +4185,11 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) init_f2fs_rwsem(&sbi->gc_lock); mutex_init(&sbi->writepages); init_f2fs_rwsem(&sbi->cp_global_sem); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_register_key(&sbi->cp_global_sem_key); + lockdep_set_class(&sbi->cp_global_sem.internal_rwsem, + &sbi->cp_global_sem_key); +#endif init_f2fs_rwsem(&sbi->node_write); init_f2fs_rwsem(&sbi->node_change); spin_lock_init(&sbi->stat_lock); @@ -4645,6 +4653,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) free_sbi: if (sbi->s_chksum_driver) crypto_free_shash(sbi->s_chksum_driver); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + lockdep_unregister_key(&sbi->cp_global_sem_key); +#endif kfree(sbi); /* give only one another chance */ -- 2.53.0