From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5CEF05E23A; Wed, 27 Mar 2024 11:23:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711538632; cv=none; b=nIsZfU3A3U2HAhHshqLFdEVMMH1E3dxEdeZr24gZPhQgm5LJX6phSVLlfiIvTJWqX1geQNssOxPME1tN6pKcfsbMg7xfd4pmtdcQIcRG5qurUHxD5Nh4kTCJNoUX/z1H/FJEq84Tdc34sOu8dZ0mOaR0Vv0vNgzSZCACNEf8vQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711538632; c=relaxed/simple; bh=4/oRhlWq5DTNbelyynkNhJmzeiV28FY3/GY21baSEEs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZVElJxy6CBGNSJGg4reUCmbuOtSeLUHocIkq1t86kY0YO6x2JTH2bAFYCZ1puuR+Utu9lfIXkpNV8o8HX8dg5ex33AANC8fViIJ6kuOGO23PaFbNdsScPhFlI6hZ78WN0/Ka3GMbNxad0RfnBpYu+OcO90LBzXfg/7eaTocbXlM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Rob1Lm07; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Rob1Lm07" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84727C433C7; Wed, 27 Mar 2024 11:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711538632; bh=4/oRhlWq5DTNbelyynkNhJmzeiV28FY3/GY21baSEEs=; h=From:To:Cc:Subject:Date:Reply-To:From; b=Rob1Lm07FhiN+h1PXdb/6Vokzkui9dcwCo73+SuMatSwlQmN/wnGwhmQGLfDiLXKn n8d7CJLDlMbjyNYH7wI5P9sEtmKe4UMx1j6hePCTo5bpbToP6tLm0QNioIF6EJKHv+ Iy3rDMBfPlmj69iI8lHNnqnP+MDUky1xDFYI0FtG2XKpH8OXGKUSa4GeGCUK8FAGIG gQqdbqGs8ju8wfdOBhfobmZStaRW6G9rQ9kTOKo59WjPScEu8MBV2Ph+ae/fgqI/oU rfS4nibt8WlY70xot6JfZBb8AgBfrTTLjG6Q5O7QL7H0w5DgHKuwOewygJuNh7Vfl1 BRxkvvOHiG0Xw== From: Sasha Levin To: stable-commits@vger.kernel.org, yukuai3@huawei.com Cc: Alasdair Kergon , Mike Snitzer , Mikulas Patocka , dm-devel@lists.linux.dev Subject: Patch "dm-raid: fix lockdep waring in "pers->hot_add_disk"" has been added to the 6.7-stable tree Date: Wed, 27 Mar 2024 07:23:50 -0400 Message-ID: <20240327112350.2780357-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Reply-To: stable@vger.kernel.org Content-Transfer-Encoding: 8bit This is a note to let you know that I've just added the patch titled dm-raid: fix lockdep waring in "pers->hot_add_disk" to the 6.7-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: dm-raid-fix-lockdep-waring-in-pers-hot_add_disk.patch and it can be found in the queue-6.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. commit 319d615c8b877a8c284797811fcfedf1e2e9b023 Author: Yu Kuai Date: Tue Mar 5 15:23:06 2024 +0800 dm-raid: fix lockdep waring in "pers->hot_add_disk" [ Upstream commit 95009ae904b1e9dca8db6f649f2d7c18a6e42c75 ] The lockdep assert is added by commit a448af25becf ("md/raid10: remove rcu protection to access rdev from conf") in print_conf(). And I didn't notice that dm-raid is calling "pers->hot_add_disk" without holding 'reconfig_mutex'. "pers->hot_add_disk" read and write many fields that is protected by 'reconfig_mutex', and raid_resume() already grab the lock in other contex. Hence fix this problem by protecting "pers->host_add_disk" with the lock. Fixes: 9092c02d9435 ("DM RAID: Add ability to restore transiently failed devices on resume") Fixes: a448af25becf ("md/raid10: remove rcu protection to access rdev from conf") Cc: stable@vger.kernel.org # v6.7+ Signed-off-by: Yu Kuai Signed-off-by: Xiao Ni Acked-by: Mike Snitzer Signed-off-by: Song Liu Link: https://lore.kernel.org/r/20240305072306.2562024-10-yukuai1@huaweicloud.com Signed-off-by: Sasha Levin diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 063f1266ec462..d97355e9b9a6e 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -4091,7 +4091,9 @@ static void raid_resume(struct dm_target *ti) * Take this opportunity to check whether any failed * devices are reachable again. */ + mddev_lock_nointr(mddev); attempt_restore_of_faulty_devices(rs); + mddev_unlock(mddev); } if (test_and_clear_bit(RT_FLAG_RS_SUSPENDED, &rs->runtime_flags)) {