From nobody Sun Feb 8 18:34:14 2026 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 47FE227898D; Sun, 24 Mar 2024 23:37:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323451; cv=none; b=rqD5G9s+Wlk+mAGkzAQpxtbq4apnCRImZ8A1oYl9YROo2aJs1mh0dlIAdoyeJlw2ZRBYCS/a2nfVF6ne6IeprHB8t2xZA0k9gF6Mo7PgPbPU0M4oOAfIVOmYNGgPbPJIoeNQ93XRLf9DzVj7PM4+rZe8oqIylbOsdjs//uuq0rI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323451; c=relaxed/simple; bh=1iglNrylsU2Jo217moQ36heLo5ehGv/yQsgFmZHd4EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tr++4zWHnuZWfoubFxIL+fA9QTcK43d8hzJ53nq7DrB7kuWQm6zhT1BBjj6Jn4+1NXQ8c5LKSFAnkTukJoTMurZ5z2Ihvbx+eDAIp21qZ54SNS6ddkVo/ZXOJAIvTn5a/3y3CQJohGSF50xGZgGrmPJc5PyBlxebzNEc2zR9e38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Se9Ote8G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Se9Ote8G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F9B3C433F1; Sun, 24 Mar 2024 23:37:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323451; bh=1iglNrylsU2Jo217moQ36heLo5ehGv/yQsgFmZHd4EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Se9Ote8Gt1p/Pd+X+xJdHA8U1VYFlVQDVwsxQtLAg18xW6+DVEZQ+LwflaoRjE2x9 IgFzQRjVYwY/wFVfw/wC5pW3lP2no/V7ecIssdJylDETqKG5XFfZyYTvXKaGZvZWR7 hmuc1/RaBFHtHhYqs0oAEidFJw36hvcL1/vH59CNpm8FNH9eWlR6Q2REE+/a96vtzx THFNVWmjXtWJ1boTrpZmAsUXE6wgcijU4T0JxA8EtEr5m8bQSHukd636ICHGUmkOO8 wzRcfqcpeQ4Iav7VX7qB30pe1CIHbaKT2e4IMrq/uiJKf1PHyU3ccVULzfhmGnaYCa sw3X5J89ubM6w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ming Lei , Patrick Plenefisch , Mike Snitzer , Sasha Levin Subject: [PATCH 5.15 154/317] dm raid: fix false positive for requeue needed during reshape Date: Sun, 24 Mar 2024 19:32:14 -0400 Message-ID: <20240324233458.1352854-155-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ming Lei [ Upstream commit b25b8f4b8ecef0f48c05f0c3572daeabefe16526 ] An empty flush doesn't have a payload, so it should never be looked at when considering to possibly requeue a bio for the case when a reshape is in progress. Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target") Reported-by: Patrick Plenefisch Signed-off-by: Ming Lei Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-raid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 8d489933d5792..04769fb20cf7f 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3329,14 +3329,14 @@ static int raid_map(struct dm_target *ti, struct bi= o *bio) struct mddev *mddev =3D &rs->md; =20 /* - * If we're reshaping to add disk(s)), ti->len and + * If we're reshaping to add disk(s), ti->len and * mddev->array_sectors will differ during the process * (ti->len > mddev->array_sectors), so we have to requeue * bios with addresses > mddev->array_sectors here or * there will occur accesses past EOD of the component * data images thus erroring the raid set. */ - if (unlikely(bio_end_sector(bio) > mddev->array_sectors)) + if (unlikely(bio_has_data(bio) && bio_end_sector(bio) > mddev->array_sect= ors)) return DM_MAPIO_REQUEUE; =20 md_handle_request(mddev, bio); --=20 2.43.0