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 0CC1A11710 for ; Mon, 11 Sep 2023 15:15:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82785C433C9; Mon, 11 Sep 2023 15:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694445349; bh=V+VCU+SU2w0510C0YoHImuLkwBcrDYiBNisetO0w0Pc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRCNS1n0cSaZwGxe6VycrHMt+QGtlfAV5H+737GJupF3Itj1gritAH7ojhpqlE0vB mJEUJnR3jUMN78lMjP1GUlCAxVXtEKSIMCOS9x9Ao31+0rNGnvQVVKuo3Vt7TxnW4G SJsLJ1F3CDQ4MPEJQBofWlho2CMYGNPY90Tcai40= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yu Kuai , Xueshi Hu , Song Liu , Sasha Levin Subject: [PATCH 6.1 316/600] md/raid1: free the r1bio before waiting for blocked rdev Date: Mon, 11 Sep 2023 15:45:49 +0200 Message-ID: <20230911134643.002804112@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230911134633.619970489@linuxfoundation.org> References: <20230911134633.619970489@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xueshi Hu [ Upstream commit 992db13a4aee766c8bfbf046ad15c2db5fa7cab8 ] Raid1 reshape will change mempool and r1conf::raid_disks which are needed to free r1bio. allow_barrier() make a concurrent raid1_reshape() possible. So, free the in-flight r1bio before waiting blocked rdev. Fixes: 6bfe0b499082 ("md: support blocking writes to an array on device failure") Reviewed-by: Yu Kuai Signed-off-by: Xueshi Hu Link: https://lore.kernel.org/r/20230814135356.1113639-3-xueshi.hu@smartx.com Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/raid1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index ac64c587191b9..433db7007f88b 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1370,6 +1370,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, return; } + retry_write: r1_bio = alloc_r1bio(mddev, bio); r1_bio->sectors = max_write_sectors; @@ -1385,7 +1386,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, */ disks = conf->raid_disks * 2; - retry_write: blocked_rdev = NULL; rcu_read_lock(); max_sectors = r1_bio->sectors; @@ -1465,7 +1465,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, for (j = 0; j < i; j++) if (r1_bio->bios[j]) rdev_dec_pending(conf->mirrors[j].rdev, mddev); - r1_bio->state = 0; + free_r1bio(r1_bio); allow_barrier(conf, bio->bi_iter.bi_sector); if (bio->bi_opf & REQ_NOWAIT) { -- 2.40.1