From nobody Wed Dec 17 01:07:50 2025 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (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 3EA447F47F for ; Thu, 18 Jul 2024 09:44:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721295851; cv=none; b=X4kyJjzvgVo1J/d4dpdWO0UENMnxso6nWCQKfQqlbPpFsd4lUqBS9FkknolKCGmGogCMIWPFKa+DbOdjTIrbP3WuDt+415mmcTLyWJR5uNX5vcEBVlzuizsVJvYqsmzRAxqKyxR3xGsNRHmM1sRsHt+9wvT9BnGYuzZo5MxGppw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721295851; c=relaxed/simple; bh=SvwI1DIplhMjMtLmPow6061mOYop5TfX4h2cEZYPO3E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ORX0oTH5nYZV7P4KZGrOj4aE/Vu1mYFhjx/XpGxUS+IbYy0sdCV38YnU+/2+TewwzM5/OWXZQ2Av4vSTUrFxS5ILWDLhdTAY954HOQucPnJh4xNdB33IAUw6aGO5y++mPMBQRnRsIIseV0wglbUQi0+rUqRRIQIITTIP7WXJ0u4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=FOnbss9g; arc=none smtp.client-ip=91.218.175.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="FOnbss9g" X-Envelope-To: tytso@mit.edu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721295844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VTXNakot6fFVM3BBXblMUSXLT44vEFf+YFIeQYft0Jw=; b=FOnbss9gjN3qJqWtheT6SQoQlleYpg+k6BBfcQaXH4vQzlANFydH1+XEy2ub6zVjq6GOA3 dXSYknJa82feMHAMW+nPS5tldQOYvNkq9GK+MkAlEhHVhCvAKwlRNzjcpmAhRNgOWT5UyF piYM+47qwbi4v4q4l2qu3NnJcICZhyI= X-Envelope-To: adilger@dilger.ca X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: luis.henriques@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH] ext4: fix access to uninitialised lock in fc replay path Date: Thu, 18 Jul 2024 10:43:56 +0100 Message-ID: <20240718094356.7863-1-luis.henriques@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The following kernel trace can be triggered with fstest generic/629 when executed against a filesystem with fast-commit feature enabled: INFO: trying to register non-static key. The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator. CPU: 0 PID: 866 Comm: mount Not tainted 6.10.0+ #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.2-3-gd= 478f380-prebuilt.qemu.org 04/01/2014 Call Trace: dump_stack_lvl+0x66/0x90 register_lock_class+0x759/0x7d0 __lock_acquire+0x85/0x2630 ? __find_get_block+0xb4/0x380 lock_acquire+0xd1/0x2d0 ? __ext4_journal_get_write_access+0xd5/0x160 _raw_spin_lock+0x33/0x40 ? __ext4_journal_get_write_access+0xd5/0x160 __ext4_journal_get_write_access+0xd5/0x160 ext4_reserve_inode_write+0x61/0xb0 __ext4_mark_inode_dirty+0x79/0x270 ? ext4_ext_replay_set_iblocks+0x2f8/0x450 ext4_ext_replay_set_iblocks+0x330/0x450 ext4_fc_replay+0x14c8/0x1540 ? jread+0x88/0x2e0 ? rcu_is_watching+0x11/0x40 do_one_pass+0x447/0xd00 jbd2_journal_recover+0x139/0x1b0 jbd2_journal_load+0x96/0x390 ext4_load_and_init_journal+0x253/0xd40 ext4_fill_super+0x2cc6/0x3180 ... In the replay path there's an attempt to lock sbi->s_bdev_wb_lock in function ext4_check_bdev_write_error(). Unfortunately, at this point this spinlock has not been initialized yet. Moving it's initialization to an earlier point in __ext4_fill_super() fixes this splat. Signed-off-by: Luis Henriques (SUSE) --- fs/ext4/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index c682fb927b64..d615a41ada0e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5325,6 +5325,8 @@ static int __ext4_fill_super(struct fs_context *fc, s= truct super_block *sb) INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */ mutex_init(&sbi->s_orphan_lock); =20 + spin_lock_init(&sbi->s_bdev_wb_lock); + ext4_fast_commit_init(sb); =20 sb->s_root =3D NULL; @@ -5546,7 +5548,6 @@ static int __ext4_fill_super(struct fs_context *fc, s= truct super_block *sb) * Save the original bdev mapping's wb_err value which could be * used to detect the metadata async write error. */ - spin_lock_init(&sbi->s_bdev_wb_lock); errseq_check_and_advance(&sb->s_bdev->bd_mapping->wb_err, &sbi->s_bdev_wb_err); EXT4_SB(sb)->s_mount_state |=3D EXT4_ORPHAN_FS;