From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72951C0015E for ; Sun, 2 Jul 2023 19:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231757AbjGBTmk (ORCPT ); Sun, 2 Jul 2023 15:42:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231702AbjGBTmK (ORCPT ); Sun, 2 Jul 2023 15:42:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CE7B173C; Sun, 2 Jul 2023 12:41:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7143360B45; Sun, 2 Jul 2023 19:40:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33E03C433CA; Sun, 2 Jul 2023 19:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326839; bh=Z92YERXKt3EpcjKH4xmFAbnh7i2EELBBDERjr4stugg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mbgu2yBKb+bvMXcCxJEmMz6b/ABTOaVaPxIEmfVBU5xmM18e6aahFzZ6vlG0249Gd Yzh7YjK6b46Brx28pEvCy1Sy9Gbd3HuwMTJ6hdRPQPP9nEd5HZgWv9bbuIyGSu+Hrj 66+xI54sbSr6enA8oa5c5m0NzFFT/09g/b+7DSn9w47uRfiTzHlsh1pXkJxFR2KiGN WfqU3EJJi9M6ihBolEpLYlyaRl1brG0Iwco4BVewNAddhcnOOeO7xbDZ4xrJr/sI+i 5VhAhYgy6DvOwavMJGmJmXxdJluWZJYEl5M8EN88MLO1xoqHLPjk2xBroOQRg4wWd5 VJbud0T7E0n5w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Kuai , Peter Neuwirth , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 07/15] md: fix data corruption for raid456 when reshape restart while grow up Date: Sun, 2 Jul 2023 15:40:12 -0400 Message-Id: <20230702194020.1776895-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702194020.1776895-1-sashal@kernel.org> References: <20230702194020.1776895-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.1 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yu Kuai [ Upstream commit 873f50ece41aad5c4f788a340960c53774b5526e ] Currently, if reshape is interrupted, echo "reshape" to sync_action will restart reshape from scratch, for example: echo frozen > sync_action echo reshape > sync_action This will corrupt data before reshape_position if the array is growing, fix the problem by continue reshape from reshape_position. Reported-by: Peter Neuwirth Link: https://lore.kernel.org/linux-raid/e2f96772-bfbc-f43b-6da1-f520e5164536@online.de/ Signed-off-by: Yu Kuai Signed-off-by: Song Liu Link: https://lore.kernel.org/r/20230512015610.821290-3-yukuai1@huaweicloud.com Signed-off-by: Sasha Levin --- drivers/md/md.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 8e344b4b34446..544ccb4461a9e 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4804,11 +4804,21 @@ action_store(struct mddev *mddev, const char *page, size_t len) return -EINVAL; err = mddev_lock(mddev); if (!err) { - if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) + if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) { err = -EBUSY; - else { + } else if (mddev->reshape_position == MaxSector || + mddev->pers->check_reshape == NULL || + mddev->pers->check_reshape(mddev)) { clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); err = mddev->pers->start_reshape(mddev); + } else { + /* + * If reshape is still in progress, and + * md_check_recovery() can continue to reshape, + * don't restart reshape because data can be + * corrupted for raid456. + */ + clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); } mddev_unlock(mddev); } -- 2.39.2