From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9ACB938887C for ; Wed, 22 Jul 2026 18:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784746757; cv=none; b=HoK8rgU6fs5JEyxd8NvxeUKZC0hvdoKH4K0J0/CPLKpPg0dedCN0U9UMepn8Yh7utKIeRg4R2uW0iSgzFW0BPbsNewwiKNKLZ0MRpG9sNcypXVcbVsNM7cS+lhlquFcJx/8cYJOV/EnfCWs2T62rKGU/oK7UkOhhimbgQ1lOWO4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784746757; c=relaxed/simple; bh=B1aIegApdgScj51bEIGVKX+FENfztmE4q/fjJ31TwzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kTk8RXMFz1bFDCI28KtSChJWW5iChRfzzLn3j5mk2D0ksgFOdirgZhX9T0PhQlRInIYTGu3ohQNgW2AmMyV6i1e4tDISytKV7Oz/LCEuT7nE2mSYhZmUUt/d5bMa4ohX6TlQX7lziGAf2n6VfCnmv3+fIoNWWYJ8Eg9YQtNSGg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meshstor.io; spf=pass smtp.mailfrom=meshstor.io; dkim=pass (2048-bit key) header.d=meshstor.io header.i=@meshstor.io header.b=YG3QqS7J; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meshstor.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meshstor.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meshstor.io header.i=@meshstor.io header.b="YG3QqS7J" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-490cf322ed0so94472185e9.1 for ; Wed, 22 Jul 2026 11:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meshstor.io; s=google; t=1784746749; x=1785351549; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vP39KbYqkNNRmuPyaoPhdZlQ+sTmuJQGW6DJY4lSzaU=; b=YG3QqS7Jid6IqJYT0W7IiR1qx0yowOy6yEbFhcrhAtS3pKtMdicZN82yqP+/8j0Hhl hf2tGciLP7iSxi/MovmA5oJLfV4L7DaEnA+J3Xop0aDrc8Uzb53Y/lhJoR6dABf5MpGd bE80Cyj0DHk1mTrQOaGh9JRDTnFGNlk0BEkx4irU0EZq4N/8pxv9fVFGsGEQQYidwuPw 5Ka1UuYw99pGXAYaP5Z6miKfuA6guPZDTvvj0qlqK2GEoOvsV5/s052JTkFrcGYeaWjM 4ZiGgdfbhyUGN8eQk8gJafo4CwRzSAj8VaXAN/20FDG4mv3q5HZwhGyP1aPXdGxIF/Hf lhIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784746749; x=1785351549; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=vP39KbYqkNNRmuPyaoPhdZlQ+sTmuJQGW6DJY4lSzaU=; b=a2HLx/AvY9mT+5lbvU1ikCxVkZ89kKtieLKUQ42OSQaaCCOXhkhyqkOTPxTH2OuHFc Fg48fj42HxIZNoggOz9eIhtKkv62bwD2I0X0MdghGTJpEkV70n1TfJTI7FYUO8F4z5gj TGtedGBzXN8UfG8pyHHDDU6nL3/R7FWN3S203eMgVI76eUipHW01ClhFZhXmTdGIHorr URxGeHZH0BqK6rizwu8VHCt/Q6TMpJKxJRr9zIl/6Syt8oFy122JkNvuMVUMkxiomhu/ v1gLi5Rq6LPVTKIM6wtVQqKZEBvfq9aTRwat4rKYBmfndJmzdQ+XR34PEnZPTvHuU3by nh7A== X-Forwarded-Encrypted: i=1; AHgh+RryKLeXs4rPVzRJ25s3zG5q780HI9nDpP9YzRAAXJRsB2UxgPa2GWi0RBVepp/W8ZJGIXNIRjIONsOnyY4=@vger.kernel.org X-Gm-Message-State: AOJu0Yya2BCJB0ymmg8Q5chu0naYdQ2Z5R0vi0SvP1cdaqbjH97mTSXK MGCQb5AKfGVgRc2uzNUdqlt1N9hFhHdopnI3RfVqytfTdzelBBZBbcfGGnpdH9Ih0g== X-Gm-Gg: AR+sD10LA1TBAI60DfRCU9VmCGnhISlKdDEatH6Bzfuuu579OZX/ZRTaoMCVHroUYfZ cS+gy9uu9j1NzENyaYxweP4COjen9PyCJZepaSYgSF9QktPWsXPcJU4Avbzz/55gpKjlNQi8vgZ 9v6R9ZnvEU8fX5gQqlKlzkK8PiZFTKxL+dIWDVLVRI0HpdRBrHgo0x8yfXXU5KyoBJ4DlnuWbXw 92eekTqwCxw+RcF9X64BCWPUs5SHbw4d8DWp3xnJIGn+mAb+BjMrFb14q0PuORjXjFTRShDTVwd UIJ1KWlzMZoLWWUg1Bj2QUqsHOaKgIqB9BrxnRyXx+cAwKBSF+G/WZ1S8DCj6IpqEOEz1XambUI JecvFYYHp6F9aIMFToXhCZ99CzJJ2ZQ1Re5/7/9v88zfIfl3DR7i3MC0EzAcFxoJHDJ3B8PZ0mF uybRv5KN2kLJLHFOQZrPWhS1MDIwG+ZR4tjHGrjdEPn2BProE= X-Received: by 2002:a05:600c:5490:b0:495:6130:7805 with SMTP id 5b1f17b1804b1-49561307a51mr135357485e9.14.1784746749133; Wed, 22 Jul 2026 11:59:09 -0700 (PDT) Received: from ai-pc ([46.172.241.174]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-495730353d9sm13740055e9.12.2026.07.22.11.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 11:59:08 -0700 (PDT) From: Mykola Marzhan To: Jens Axboe , Song Liu , Yu Kuai , Keith Busch , Christoph Hellwig , Sagi Grimberg , linux-block@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Li Nan , Xiao Ni , Guoqing Jiang , Leon Romanovsky , Jason Gunthorpe , Kiran Kumar Modukuri , Chaitanya Kulkarni , Logan Gunthorpe , Bjorn Helgaas , Shivaji Kant , Pranjal Shrivastava , Henrique Carvalho , linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v4 5/9] md/raid1,raid10: factor out raid1_write_error() helper Date: Wed, 22 Jul 2026 20:58:37 +0200 Message-ID: <20260722185841.449934-6-mykola@meshstor.io> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260722185841.449934-1-mykola@meshstor.io> References: <20260722185841.449934-1-mykola@meshstor.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Logan Gunthorpe Factor out a common raid1_write_error() helper from raid1.c and raid10.c. This will help reduce code duplication in subsequent patches. Signed-off-by: Logan Gunthorpe Signed-off-by: Mykola Marzhan --- drivers/md/raid1-10.c | 13 +++++++++++++ drivers/md/raid1.c | 13 ++----------- drivers/md/raid10.c | 10 +--------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c index 56a56a4da4f8..cee21452e066 100644 --- a/drivers/md/raid1-10.c +++ b/drivers/md/raid1-10.c @@ -303,3 +303,16 @@ static inline bool raid1_should_handle_error(struct bio *bio) return !(bio->bi_opf & (REQ_RAHEAD | REQ_NOWAIT)) && bio->bi_status != BLK_STS_INVAL; } + +static inline void raid1_write_error(struct mddev *mddev, struct md_rdev *rdev, + struct bio *bio, bool allow_failfast) +{ + set_bit(WriteErrorSeen, &rdev->flags); + + if (!test_and_set_bit(WantReplacement, &rdev->flags)) + set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); + + if (allow_failfast && test_bit(FailFast, &rdev->flags) && + (bio->bi_opf & MD_FAILFAST)) + md_error(mddev, rdev); +} diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 7d769b6460ca..f07edeac6e5a 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -483,17 +483,8 @@ static void raid1_end_write_request(struct bio *bio) * 'one mirror IO has finished' event handler: */ if (bio->bi_status && !ignore_error) { - set_bit(WriteErrorSeen, &rdev->flags); - if (!test_and_set_bit(WantReplacement, &rdev->flags)) - set_bit(MD_RECOVERY_NEEDED, & - conf->mddev->recovery); - - if (test_bit(FailFast, &rdev->flags) && - (bio->bi_opf & MD_FAILFAST) && - /* We never try FailFast to WriteMostly devices */ - !test_bit(WriteMostly, &rdev->flags)) { - md_error(r1_bio->mddev, rdev); - } + raid1_write_error(conf->mddev, rdev, bio, + !test_bit(WriteMostly, &rdev->flags)); /* * When the device is faulty, it is not necessary to diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 0a3cfdd3f5df..5b63175fb382 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -482,16 +482,8 @@ static void raid10_end_write_request(struct bio *bio) */ md_error(rdev->mddev, rdev); else { - set_bit(WriteErrorSeen, &rdev->flags); - if (!test_and_set_bit(WantReplacement, &rdev->flags)) - set_bit(MD_RECOVERY_NEEDED, - &rdev->mddev->recovery); - dec_rdev = 0; - if (test_bit(FailFast, &rdev->flags) && - (bio->bi_opf & MD_FAILFAST)) { - md_error(rdev->mddev, rdev); - } + raid1_write_error(rdev->mddev, rdev, bio, true); /* * When the device is faulty, it is not necessary to -- 2.52.0