From nobody Mon Sep 29 20:17:11 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B034BC00140 for ; Tue, 16 Aug 2022 00:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244773AbiHPAgp (ORCPT ); Mon, 15 Aug 2022 20:36:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348778AbiHPAcY (ORCPT ); Mon, 15 Aug 2022 20:32:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9C0E186EAC; Mon, 15 Aug 2022 13:36:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F1A34611D2; Mon, 15 Aug 2022 20:36:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECDE1C433D7; Mon, 15 Aug 2022 20:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660595817; bh=ODX781OjagjZqRdZMPht02M+391MRlrl9iZmqo9YD4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1bhdNSAJkF0WWVAVcVka9ci/VRIhD/bY/MCPW6J9CkRy/sZwPSw1K26h0LXlTM+DP JGWWZzf7B0o2nvzB/6ZjJlxrJFeXC9dL27uzvMwOQYyJFBkJuhQG/O2sbSZCBZp27Y fhIibtjLDYU6i8v7GtxN+k2d/PSNY0VsI6wvPXxI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Keith Busch , Jens Axboe , Sasha Levin Subject: [PATCH 5.19 0884/1157] block: ensure iov_iter advances for added pages Date: Mon, 15 Aug 2022 20:04:00 +0200 Message-Id: <20220815180514.793517975@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Keith Busch [ Upstream commit 325347d965e7ccf5424a05398807a6d801846612 ] There are cases where a bio may not accept additional pages, and the iov needs to advance to the last data length that was accepted. The zone append used to handle this correctly, but was inadvertently broken when the setup was made common with the normal r/w case. Fixes: 576ed9135489c ("block: use bio_add_page in bio_iov_iter_get_pages") Fixes: c58c0074c54c2 ("block/bio: remove duplicate append pages code") Signed-off-by: Keith Busch Link: https://lore.kernel.org/r/20220712153256.2202024-1-kbusch@fb.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/bio.c b/block/bio.c index ee5fe1bb015e..eb7cc591ee93 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1211,6 +1211,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, = struct iov_iter *iter) ssize_t size, left; unsigned len, i; size_t offset; + int ret =3D 0; =20 /* * Move page array up in the allocated memory for the bio vecs as far as @@ -1226,7 +1227,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, = struct iov_iter *iter) =20 for (left =3D size, i =3D 0; left > 0; left -=3D len, i++) { struct page *page =3D pages[i]; - int ret; =20 len =3D min_t(size_t, PAGE_SIZE - offset, left); if (bio_op(bio) =3D=3D REQ_OP_ZONE_APPEND) @@ -1237,13 +1237,13 @@ static int __bio_iov_iter_get_pages(struct bio *bio= , struct iov_iter *iter) =20 if (ret) { bio_put_pages(pages + i, left, offset); - return ret; + break; } offset =3D 0; } =20 - iov_iter_advance(iter, size); - return 0; + iov_iter_advance(iter, size - left); + return ret; } =20 /** --=20 2.35.1