From patchwork Fri Apr 18 06:47:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056843 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D272CC369AB for ; Fri, 18 Apr 2025 06:49:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA4DC2800CE; Fri, 18 Apr 2025 02:49:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A226E2800D1; Fri, 18 Apr 2025 02:49:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8261E2800CE; Fri, 18 Apr 2025 02:49:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 54C892800C8 for ; Fri, 18 Apr 2025 02:49:08 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4BEBE8134B for ; Fri, 18 Apr 2025 06:49:09 +0000 (UTC) X-FDA: 83346237618.10.2B72A48 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf16.hostedemail.com (Postfix) with ESMTP id B6F97180005 for ; Fri, 18 Apr 2025 06:49:07 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=b8xsLgZW; spf=pass (imf16.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744958947; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8cLIyacvLhTreh8gF/Aa6K4pXr5Yx0Q0wjZ2YLBnFvw=; b=i6YkfnASkn/AdKRNekTID0PyAW5KsGYOK15j1rPW8eT/GeYxvofYMmW224i5BXwC2aMdKS U3oPDQsztyhQEYIpDLcIyRsBclwsUjr/Aj6RVRnPqisjiip4z9Vf7m8Qd7xDiNLw4pvWIn 9GO2JRO399KR6xxoc+ikrJ/SGf2YS54= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=b8xsLgZW; spf=pass (imf16.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744958947; a=rsa-sha256; cv=none; b=1HcbdJhCcbVxuWDdUieNQszDzVh4W//fe506AcmNqRZaeEp0Pk2B5S2pFBjVMnoz9Rz+VK xD//HnfqmA9bHjvB56CgUgiZftXxfLj2Wq6PG2QUfy0WJJ7S0ERsECibpL6r4Jjm/zR7BA /Rc1FEWBfIbk02EcgWmi4/wdIpzK3wc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id AE1BA68480; Fri, 18 Apr 2025 06:48:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B367C4CEE7; Fri, 18 Apr 2025 06:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958946; bh=FGXDsNA0sR7G/5v+LnwSm5/sUMLhEeMj7l+/Osc6L2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b8xsLgZWIx/US9R6pj3eRnpqPtX+d8I55kJMo6U7/IDuuX/AwydFE+tN8fIDWjOc9 Dn8YJI4xhLUzIwm4/jrvXHxnREOauqrN77cGM+D6lLNrik5e+pWaW9422xm1PN5a92 x4i7bARpGCzIWHO5ftNP5UUMQYq5y3ulySQeGmD1qdncWWC4KQMUR7pme/1Kp2YqRv pROXVYAzPeSUUbddwd5uuRoY8QX+1ASGEgfB0jZL/K0F0itHqPMAAl+356idT0cdWF sEBLLpbayG4diDeAAyf3NCNHSxdfVNqMn/DkttF2SHa9pZVtwnBoTacdQ9+sd1SHQe ENtJZuoTsdpVQ== 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?b?SsOpcsO0bWUgR2xp?= =?utf-8?b?c3Nl?= , 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 v8 18/24] block: share more code for bio addition helper Date: Fri, 18 Apr 2025 09:47:48 +0300 Message-ID: <753430b79ac788786ea065dac648fa662d4666b9.1744825142.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B6F97180005 X-Stat-Signature: w3pkyp9wf86xh674ggkk977tck14merk X-HE-Tag: 1744958947-50367 X-HE-Meta: U2FsdGVkX19u0qVT0zOV02eqIaTQd7vpNKkeJzEd3H+9AUulZQrWovrkVtOUbCQC++jlxFa901vS+Cpfg+tfkB/jd6ubWzuJQcTUDmEfdx2uyaMmF0Hw5326aAQkSxqI7p6s3A1OTEtdLhKC+WpI9/Ng7+Aw+grP8cX2kw3f5u0pXPYJk/v7UUirj+vf1l8cObFjw9DfLojSf4piV/nBsXMwNJw2a7mHEo5Pfh3c7J4tVIgPoM7zT+r3uonN2AtjQt1/alJ1Sii7VMF84CfxWpynqgJnDfZ5VfWYIlnkkI4s7sQ6l44MWPvAmaq6vaMpZx4pSz6NdXNdbnldNLh8xEWVhfcUXZszwAh50S1HOazB7t+CcjWBxON+8FC4Jgq9xWmJGuS5uCaGWUoYwzb+Y8v5kOLqBj/nr3psLGhY2uyM+N7OjAvbf6EaOg3ZSqLzyw08QILBomIJzGLaKoiwnZNPIA8H6/nOJCUQH9tIrmTpuFQR0gT3pCiniBUdR9x7odkwaICHOhqqFioHFT1NRZAS1USoPDJDHE2SVxpgCvOSbEaruw4zJocWDXTMuhAVNl8bnCODFEXf8FTErAs51TTy6G40UW0IdqQHO6wN1Xj+u089O98H1Zd1z+Vnu12IqKx8nfVXENlRiWucjow3ZKFcmxqEeazfmt1KvPfPTy8zcP4Sm2iY+NX6vs3vbcmQnAfVdrjukDXw4Rz1Br3gEMg5eYSwvGhq3DDsMr6dNGLmi5KvijuuNZ3XzTku2r/lK87xtF23KU+bcC1B3X+nFQJrwK2XvEuKPXAl1/zSxQv+7O8/qXRtwfYIr3KXINVgZYR4qsJ0Qdcumd7fVHstCrKTP+4uEyiBk9+MKKs3lPXQTEO/sWbcVXbmdTnkzVMcfXjWOLTjd4+eLBWy1vkuiAk4Sk5NdfHzlVonfuMFYaTTjtsGKKD5Y3qCFfLT1nfi/SyIMKT68beBdD6pVyH mnDpXnpN mk5/VYrX/MNmcEAJ7D8nKLQMQ+CXEioaFDzSr+0axl/TkeADdKCtpw8evZA/DnEyub15X8kju5ywv/nlM3GiRfwB1vaMkVwMUT878bT2q3vuuuwAtks5JJ4aM4Z6iTUd8bfmQgV2hbU0ahiiEI0dbpYhtPoB5Oz31vOPvu0x5GH/+zG/vd9hv6x0yrBLKeM7aRXv9K/RiCFKb6xKA87hWhoHmMrZpnnEZ0LJA0bDcB36a5ow= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Signed-off-by: Chaitanya Kulkarni 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); -/** - * 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 == 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 = false; 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, 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 += 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 = false; + + return bio_add_page_int(bio, page, len, offset, &same_page); +} EXPORT_SYMBOL(bio_add_page); 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); } -static int bio_iov_add_folio(struct bio *bio, struct folio *folio, size_t len, - size_t offset) -{ - bool same_page = 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 += 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 = size, i = 0; left > 0; left -= len, i += num_pages) { struct page *page = pages[i]; struct folio *folio = page_folio(page); + struct page *first_page = folio_page(folio, 0); + bool same_page = false; folio_offset = ((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 = get_contig_folio_len(&num_pages, pages, i, folio, left, offset); - bio_iov_add_folio(bio, folio, len, folio_offset); + if (bio_add_page_int(bio, first_page, len, folio_offset, + &same_page) != len) { + ret = -EINVAL; + break; + } + + if (same_page && bio_flagged(bio, BIO_PAGE_PINNED)) + unpin_user_folio(folio, 1); + offset = 0; }