[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241031033114.3845582-6-yukuai1@huaweicloud.com>
Date: Thu, 31 Oct 2024 11:31:12 +0800
From: Yu Kuai <yukuai1@...weicloud.com>
To: song@...nel.org,
mariusz.tkaczyk@...el.com
Cc: linux-raid@...r.kernel.org,
linux-kernel@...r.kernel.org,
yukuai3@...wei.com,
yukuai1@...weicloud.com,
yi.zhang@...wei.com,
yangerkun@...wei.com
Subject: [PATCH RESEND 5/7] md/raid1: don't wait for Faulty rdev in wait_blocked_rdev()
From: Yu Kuai <yukuai3@...wei.com>
Faulty rdev should never be accessed anymore, hence there is no point to
wait for bad block to be acknowledged in this case while handling write
request.
Signed-off-by: Yu Kuai <yukuai3@...wei.com>
Tested-by: Mariusz Tkaczyk <mariusz.tkaczyk@...ux.intel.com>
---
drivers/md/raid1.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 1679c1e9b3d5..cd3e94dceabc 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1425,25 +1425,16 @@ static bool wait_blocked_rdev(struct mddev *mddev, struct bio *bio)
if (!rdev)
continue;
- if (test_bit(Blocked, &rdev->flags)) {
- if (bio->bi_opf & REQ_NOWAIT)
- return false;
-
- mddev_add_trace_msg(rdev->mddev, "raid1 wait rdev %d blocked",
- rdev->raid_disk);
- atomic_inc(&rdev->nr_pending);
- md_wait_for_blocked_rdev(rdev, rdev->mddev);
- goto retry;
- }
-
/* don't write here until the bad block is acknowledged */
if (test_bit(WriteErrorSeen, &rdev->flags) &&
rdev_has_badblock(rdev, bio->bi_iter.bi_sector,
- bio_sectors(bio)) < 0) {
+ bio_sectors(bio)) < 0)
+ set_bit(BlockedBadBlocks, &rdev->flags);
+
+ if (rdev_blocked(rdev)) {
if (bio->bi_opf & REQ_NOWAIT)
return false;
- set_bit(BlockedBadBlocks, &rdev->flags);
mddev_add_trace_msg(rdev->mddev, "raid1 wait rdev %d blocked",
rdev->raid_disk);
atomic_inc(&rdev->nr_pending);
--
2.39.2
Powered by blists - more mailing lists