Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   linan666@huaweicloud.com
To:     song@kernel.org
Cc:     linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
        linan122@huawei.com, yukuai3@huawei.com, yi.zhang@huawei.com,
        houtao1@huawei.com, yangerkun@huawei.com
Subject: [PATCH 2/2] md/raid10: handle replacement devices in fix_recovery_read_error
Date:   Tue, 27 Jun 2023 11:41:27 +0800
Message-Id: <20230627034127.4000994-3-linan666@huaweicloud.com>
In-Reply-To: <20230627034127.4000994-1-linan666@huaweicloud.com>
References: <20230627034127.4000994-1-linan666@huaweicloud.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Li Nan <linan122@huawei.com>

In fix_recovery_read_error(), the handling of replacement devices is
missing. Add it. If io error is from replacement, error this device
directly. If io error is from other device, just set badblocks for
replacement.

Signed-off-by: Li Nan <linan122@huawei.com>
---
 drivers/md/raid10.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 5105273f60e9..6d9025089455 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2551,7 +2551,7 @@ static void fix_recovery_read_error(struct r10bio *r10_bio)
 
 	while (sectors) {
 		int s = sectors;
-		struct md_rdev *rdev;
+		struct md_rdev *rdev, *repl;
 		sector_t addr;
 		int ok;
 
@@ -2559,6 +2559,7 @@ static void fix_recovery_read_error(struct r10bio *r10_bio)
 			s = PAGE_SIZE >> 9;
 
 		rdev = conf->mirrors[dr].rdev;
+		repl = conf->mirrors[dw].replacement;
 		addr = r10_bio->devs[0].addr + sect,
 		ok = sync_page_io(rdev,
 				  addr,
@@ -2580,6 +2581,9 @@ static void fix_recovery_read_error(struct r10bio *r10_bio)
 					set_bit(MD_RECOVERY_NEEDED,
 						&rdev->mddev->recovery);
 			}
+			if (repl && !sync_page_io(repl, addr, s << 9,
+			    pages[idx], REQ_OP_WRITE, false))
+				md_error(mddev, repl);
 		}
 		if (!ok) {
 			/* We don't worry if we cannot set a bad block -
@@ -2592,7 +2596,9 @@ static void fix_recovery_read_error(struct r10bio *r10_bio)
 				/* need bad block on destination too */
 				rdev = conf->mirrors[dw].rdev;
 				addr = r10_bio->devs[1].addr + sect;
-				if (!rdev_set_badblocks(rdev, addr, s, 0)) {
+				if (!rdev_set_badblocks(rdev, addr, s, 0) ||
+				    (repl &&
+				    !rdev_set_badblocks(repl, addr, s, 0))) {
 					/* just abort the recovery */
 					pr_notice("md/raid10:%s: recovery aborted due to read error\n",
 						  mdname(mddev));
-- 
2.39.2