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 88C70148FE1; Sun, 28 Jul 2024 00:49:09 +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=1722127749; cv=none; b=YCqPe1sCf51Upi4xlaajSeXhgCmHx4PThuTylGquHweoo8+XsNPm53gQHmGUCk6LfNtuYq5nRgjgTvR+sOdxi4gPa8bBwnW1gIgd3bREWX2F0D7lKUZkEMw7Bs2s5jOH6CvIiSm1AAqHCRa10RLTPdgiQVQdvjAW2OwBjQKylIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722127749; c=relaxed/simple; bh=Mgb4zFWzHy/fzc3txWbBopF9nvKgAsOgRqLgP0KnuMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y48q4SrN9R76ctJ7P0VAgbi54WEHMAXzcqqnjoI42u8DpNdhJMcWx/0JViy2NM2BW60lJssEncTfrqwE+PkidkkzxPE4mOyR1cLQQVSm9QqGa6BsiBJJn8NEgwanY1E06HHIsMcb9ATOMKwd3YbgevCJxvARuGE88ayLBRDp2Cs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PQoWNZAZ; 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="PQoWNZAZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89AEEC4AF09; Sun, 28 Jul 2024 00:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722127749; bh=Mgb4zFWzHy/fzc3txWbBopF9nvKgAsOgRqLgP0KnuMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQoWNZAZtgClSEXT0JagdtkHHeizQL/YLt7qMeSAX0TX5gyaHhSN3/SgSRdWFPMnx KyJs8TVoJp6lGw3YVAQ5g2sFNhV8IQJN7oC7TrG1h8OguHBozPO2qS8SNkSjJzlE4/ VM2CGYmskORzZzfmZhTUEUjT15YNVEHZYtKyiRl6/yAQs1DSDO2PIbVLpvLmWHOeqw c1sL5e+T4DRhQLSvQNGyv/KOIZhCc9N4/MlVlNGv7z/Y1ZrYBECcTiRvm/7C12ZEdt iZ9pL5cskj8pexG8AcVD7I5M723xuwpjT6I1XjYHhWVLppbtvTW+9LTtp/ggq+RsjD Vir4d05ukKhig== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Kuai , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 4/6] md/raid5: avoid BUG_ON() while continue reshape after reassembling Date: Sat, 27 Jul 2024 20:48:57 -0400 Message-ID: <20240728004901.1704470-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728004901.1704470-1-sashal@kernel.org> References: <20240728004901.1704470-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.223 Content-Transfer-Encoding: 8bit From: Yu Kuai [ Upstream commit 305a5170dc5cf3d395bb4c4e9239bca6d0b54b49 ] Currently, mdadm support --revert-reshape to abort the reshape while reassembling, as the test 07revert-grow. However, following BUG_ON() can be triggerred by the test: kernel BUG at drivers/md/raid5.c:6278! invalid opcode: 0000 [#1] PREEMPT SMP PTI irq event stamp: 158985 CPU: 6 PID: 891 Comm: md0_reshape Not tainted 6.9.0-03335-g7592a0b0049a #94 RIP: 0010:reshape_request+0x3f1/0xe60 Call Trace: raid5_sync_request+0x43d/0x550 md_do_sync+0xb7a/0x2110 md_thread+0x294/0x2b0 kthread+0x147/0x1c0 ret_from_fork+0x59/0x70 ret_from_fork_asm+0x1a/0x30 Root cause is that --revert-reshape update the raid_disks from 5 to 4, while reshape position is still set, and after reassembling the array, reshape position will be read from super block, then during reshape the checking of 'writepos' that is caculated by old reshape position will fail. Fix this panic the easy way first, by converting the BUG_ON() to WARN_ON(), and stop the reshape if checkings fail. Noted that mdadm must fix --revert-shape as well, and probably md/raid should enhance metadata validation as well, however this means reassemble will fail and there must be user tools to fix the wrong metadata. Signed-off-by: Yu Kuai Signed-off-by: Song Liu Link: https://lore.kernel.org/r/20240611132251.1967786-13-yukuai1@huaweicloud.com Signed-off-by: Sasha Levin --- drivers/md/raid5.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 66167c4c7bc9e..7cdc6f20f5043 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6005,7 +6005,9 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk safepos = conf->reshape_safe; sector_div(safepos, data_disks); if (mddev->reshape_backwards) { - BUG_ON(writepos < reshape_sectors); + if (WARN_ON(writepos < reshape_sectors)) + return MaxSector; + writepos -= reshape_sectors; readpos += reshape_sectors; safepos += reshape_sectors; @@ -6023,14 +6025,18 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk * to set 'stripe_addr' which is where we will write to. */ if (mddev->reshape_backwards) { - BUG_ON(conf->reshape_progress == 0); + if (WARN_ON(conf->reshape_progress == 0)) + return MaxSector; + stripe_addr = writepos; - BUG_ON((mddev->dev_sectors & - ~((sector_t)reshape_sectors - 1)) - - reshape_sectors - stripe_addr - != sector_nr); + if (WARN_ON((mddev->dev_sectors & + ~((sector_t)reshape_sectors - 1)) - + reshape_sectors - stripe_addr != sector_nr)) + return MaxSector; } else { - BUG_ON(writepos != sector_nr + reshape_sectors); + if (WARN_ON(writepos != sector_nr + reshape_sectors)) + return MaxSector; + stripe_addr = sector_nr; } -- 2.43.0