From nobody Sun Dec 14 06:19:06 2025 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 E7D0A27A120; Mon, 28 Apr 2025 09:24:16 +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=1745832257; cv=none; b=KMlV31tGEdvf0ZHQx7Lso7f/f+dnGS4SSdG/lgBmm/fMv9xWcGxVHj7bYzjypZ90kBgAD8pIpXCQc3NsKWoUyHAsSy58QpupO/gBShxDId5JtvO8w3aG9VOxtia7rGkML4POzNfkJ/k+HSSDs1VthScH+RKbOXmGdWkBi9jhUeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745832257; c=relaxed/simple; bh=4dOjVeYpWJkKZa5Ph2IEMg0CPmd+dfHE5vq3NRZWLwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z1Y1bRJ8PryYDNNNDLUAsp7PNxtsIO7R1xacvHBc5s//aqd3y/b43qJ+cUhKYoet97Zz3CWUxkPc8yOrIoTDDjizMZ2EKepwLIjUFrJcRdVGbBWxYOh3rJ90om1CCoxe7XkVN212L/LsQww7tdik6SaQVKdudfBfH4sHFBmnn7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ce3VPJ07; 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="ce3VPJ07" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D8BCC4CEE9; Mon, 28 Apr 2025 09:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745832256; bh=4dOjVeYpWJkKZa5Ph2IEMg0CPmd+dfHE5vq3NRZWLwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ce3VPJ07DNrV5898GsmpRBIpv34v0Mn1piZte3fq+yUqHqi9q48o9CqXmaMiUVEcR znVULf9fBZG9hXk68O8UxP+wJzq7puvp9eL4agI5Vq7Hv78ajnkd6mpnzVDlI84znw VL1g+tFvIYAR54D2d2n4CL9TATFkhlFsNfVWgPjkNKj3g2yg2TMFMO9c1tTLc+SExB evAOhYpcMSEA8VIAeeAWLqYuRnn2BoO7hk6S+6O3gzb/PPsBE929l1xEtys5zX6LnO UgsP8OUpmVCFAKLp6eVl0pRPDVfXASUaLqX0isM3kIv1f6HDrI1eYBv0zEMsGD5ypt vHx1ExNlBVXSg== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni , Leon Romanovsky Subject: [PATCH v10 18/24] block: share more code for bio addition helper Date: Mon, 28 Apr 2025 12:22:24 +0300 Message-ID: <0b77dcad1eb6ccb9f5923a2999a89ef779394fb4.1745831017.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christoph Hellwig __bio_iov_iter_get_pages currently open codes adding pages to the bio, which duplicates a lot of code from bio_add_page. Add bio_add_page_int helper that pass down the same_page output argument so that __bio_iov_iter_get_pages can reuse the main add bio to page helpers. Note that I'd normally call these helper __bio_add_page, but the former is already taken for an exported API. Signed-off-by: Christoph Hellwig Tested-by: Jens Axboe Signed-off-by: Leon Romanovsky --- block/bio.c | 68 +++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/block/bio.c b/block/bio.c index 4e6c85a33d74..3047fa3f4b32 100644 --- a/block/bio.c +++ b/block/bio.c @@ -989,20 +989,9 @@ void __bio_add_page(struct bio *bio, struct page *page, } EXPORT_SYMBOL_GPL(__bio_add_page); =20 -/** - * bio_add_page - attempt to add page(s) to bio - * @bio: destination bio - * @page: start page to add - * @len: vec entry length, may cross pages - * @offset: vec entry offset relative to @page, may cross pages - * - * Attempt to add page(s) to the bio_vec maplist. This will only fail - * if either bio->bi_vcnt =3D=3D bio->bi_max_vecs or it's a cloned bio. - */ -int bio_add_page(struct bio *bio, struct page *page, - unsigned int len, unsigned int offset) +static int bio_add_page_int(struct bio *bio, struct page *page, + unsigned int len, unsigned int offset, bool *same_page) { - bool same_page =3D false; =20 if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED))) return 0; @@ -1011,7 +1000,7 @@ int bio_add_page(struct bio *bio, struct page *page, =20 if (bio->bi_vcnt > 0 && bvec_try_merge_page(&bio->bi_io_vec[bio->bi_vcnt - 1], - page, len, offset, &same_page)) { + page, len, offset, same_page)) { bio->bi_iter.bi_size +=3D len; return len; } @@ -1021,6 +1010,24 @@ int bio_add_page(struct bio *bio, struct page *page, __bio_add_page(bio, page, len, offset); return len; } + +/** + * bio_add_page - attempt to add page(s) to bio + * @bio: destination bio + * @page: start page to add + * @len: vec entry length, may cross pages + * @offset: vec entry offset relative to @page, may cross pages + * + * Attempt to add page(s) to the bio_vec maplist. Will only fail if the + * bio is full, or it is incorrectly used on a cloned bio. + */ +int bio_add_page(struct bio *bio, struct page *page, + unsigned int len, unsigned int offset) +{ + bool same_page =3D false; + + return bio_add_page_int(bio, page, len, offset, &same_page); +} EXPORT_SYMBOL(bio_add_page); =20 void bio_add_folio_nofail(struct bio *bio, struct folio *folio, size_t len, @@ -1088,27 +1095,6 @@ void bio_iov_bvec_set(struct bio *bio, const struct = iov_iter *iter) bio_set_flag(bio, BIO_CLONED); } =20 -static int bio_iov_add_folio(struct bio *bio, struct folio *folio, size_t = len, - size_t offset) -{ - bool same_page =3D false; - - if (WARN_ON_ONCE(bio->bi_iter.bi_size > UINT_MAX - len)) - return -EIO; - - if (bio->bi_vcnt > 0 && - bvec_try_merge_page(&bio->bi_io_vec[bio->bi_vcnt - 1], - folio_page(folio, 0), len, offset, - &same_page)) { - bio->bi_iter.bi_size +=3D len; - if (same_page && bio_flagged(bio, BIO_PAGE_PINNED)) - unpin_user_folio(folio, 1); - return 0; - } - bio_add_folio_nofail(bio, folio, len, offset); - return 0; -} - static unsigned int get_contig_folio_len(unsigned int *num_pages, struct page **pages, unsigned int i, struct folio *folio, size_t left, @@ -1203,6 +1189,8 @@ static int __bio_iov_iter_get_pages(struct bio *bio, = struct iov_iter *iter) for (left =3D size, i =3D 0; left > 0; left -=3D len, i +=3D num_pages) { struct page *page =3D pages[i]; struct folio *folio =3D page_folio(page); + struct page *first_page =3D folio_page(folio, 0); + bool same_page =3D false; =20 folio_offset =3D ((size_t)folio_page_idx(folio, page) << PAGE_SHIFT) + offset; @@ -1215,7 +1203,15 @@ static int __bio_iov_iter_get_pages(struct bio *bio,= struct iov_iter *iter) len =3D get_contig_folio_len(&num_pages, pages, i, folio, left, offset); =20 - bio_iov_add_folio(bio, folio, len, folio_offset); + if (bio_add_page_int(bio, first_page, len, folio_offset, + &same_page) !=3D len) { + ret =3D -EINVAL; + break; + } + + if (same_page && bio_flagged(bio, BIO_PAGE_PINNED)) + unpin_user_folio(folio, 1); + offset =3D 0; } =20 --=20 2.49.0