public inbox for [email protected]
 help / color / mirror / Atom feed
From: Anuj Gupta <[email protected]>
To: [email protected], [email protected], [email protected]
Cc: [email protected], [email protected],
	[email protected], [email protected],
	[email protected], Kanchan Joshi <[email protected]>
Subject: [PATCH for-next v11 06/13] block: factor out blk_rq_map_bio_alloc helper
Date: Thu, 29 Sep 2022 17:36:25 +0530	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

From: Kanchan Joshi <[email protected]>

Move bio allocation logic from bio_map_user_iov to a new helper
blk_rq_map_bio_alloc. It is named so because functionality is opposite
of what is done inside blk_mq_map_bio_put. This is a prep patch.

Signed-off-by: Kanchan Joshi <[email protected]>
---
 block/blk-map.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/block/blk-map.c b/block/blk-map.c
index d913ef92a9fe..9e37a03b8a21 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -241,17 +241,10 @@ static void blk_mq_map_bio_put(struct bio *bio)
 	}
 }
 
-static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
-		gfp_t gfp_mask)
+static struct bio *blk_rq_map_bio_alloc(struct request *rq,
+		unsigned int nr_vecs, gfp_t gfp_mask)
 {
-	unsigned int max_sectors = queue_max_hw_sectors(rq->q);
-	unsigned int nr_vecs = iov_iter_npages(iter, BIO_MAX_VECS);
 	struct bio *bio;
-	int ret;
-	int j;
-
-	if (!iov_iter_count(iter))
-		return -EINVAL;
 
 	if (rq->cmd_flags & REQ_POLLED) {
 		blk_opf_t opf = rq->cmd_flags | REQ_ALLOC_CACHE;
@@ -259,13 +252,31 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
 		bio = bio_alloc_bioset(NULL, nr_vecs, opf, gfp_mask,
 					&fs_bio_set);
 		if (!bio)
-			return -ENOMEM;
+			return NULL;
 	} else {
 		bio = bio_kmalloc(nr_vecs, gfp_mask);
 		if (!bio)
-			return -ENOMEM;
+			return NULL;
 		bio_init(bio, NULL, bio->bi_inline_vecs, nr_vecs, req_op(rq));
 	}
+	return bio;
+}
+
+static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
+		gfp_t gfp_mask)
+{
+	unsigned int max_sectors = queue_max_hw_sectors(rq->q);
+	unsigned int nr_vecs = iov_iter_npages(iter, BIO_MAX_VECS);
+	struct bio *bio;
+	int ret;
+	int j;
+
+	if (!iov_iter_count(iter))
+		return -EINVAL;
+
+	bio = blk_rq_map_bio_alloc(rq, nr_vecs, gfp_mask);
+	if (bio == NULL)
+		return -ENOMEM;
 
 	while (iov_iter_count(iter)) {
 		struct page **pages, *stack_pages[UIO_FASTIOV];
-- 
2.25.1


  parent reply	other threads:[~2022-09-29 12:22 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20220929121630epcas5p3e1ed2c5251276d557f8f921e8186620f@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 00/13] Fixed-buffer for uring-cmd/passthru Anuj Gupta
     [not found]   ` <CGME20220929121634epcas5p27400b84f8a8b43a91c4199ec39d50b51@epcas5p2.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 01/13] io_uring: add io_uring_cmd_import_fixed Anuj Gupta
     [not found]   ` <CGME20220929121637epcas5p2ff344c7951037f79d117d000e405dd45@epcas5p2.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 02/13] io_uring: introduce fixed buffer support for io_uring_cmd Anuj Gupta
2022-09-30  1:26       ` Jens Axboe
     [not found]   ` <CGME20220929121640epcas5p400a71aa51f374f016e2143d0228879bc@epcas5p4.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 03/13] nvme: refactor nvme_add_user_metadata Anuj Gupta
     [not found]   ` <CGME20220929121643epcas5p4c58f6ebb794bde58981272cd33c69f9f@epcas5p4.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 04/13] nvme: refactor nvme_alloc_request Anuj Gupta
2022-09-29 13:25       ` Christoph Hellwig
     [not found]   ` <CGME20220929121647epcas5p2d4ca8ae0b83a1fce230914f586ee3cc0@epcas5p2.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 05/13] block: rename bio_map_put to blk_mq_map_bio_put Anuj Gupta
2022-09-29 13:25       ` Christoph Hellwig
     [not found]   ` <CGME20220929121650epcas5p424925af86ec6941bb53e5c102fd0ffc8@epcas5p4.samsung.com>
2022-09-29 12:06     ` Anuj Gupta [this message]
     [not found]   ` <CGME20220929121653epcas5p4ee82ef35b46d6686820dc4d870b6588e@epcas5p4.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 07/13] block: add blk_rq_map_user_bvec Anuj Gupta
2022-09-29 13:26       ` Christoph Hellwig
     [not found]   ` <CGME20220929121657epcas5p213b7a187fd77b0783adb4b9389579b44@epcas5p2.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 08/13] block: extend functionality to map bvec iterator Anuj Gupta
     [not found]   ` <CGME20220929121701epcas5p287a6d3f851626a5c7580d9a534432e9b@epcas5p2.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 09/13] nvme: pass ubuffer as an integer Anuj Gupta
2022-09-29 13:27       ` Christoph Hellwig
     [not found]   ` <CGME20220929121704epcas5p3415fd4782cbcffa7b1e6ddf774bebb03@epcas5p3.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 10/13] nvme: wire up fixed buffer support for nvme passthrough Anuj Gupta
     [not found]   ` <CGME20220929121709epcas5p325553d10a7ada7717c2f51ddb566a3e5@epcas5p3.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 11/13] block: add blk_rq_map_user_io Anuj Gupta
2022-09-29 13:28       ` Christoph Hellwig
     [not found]   ` <CGME20220929121713epcas5p1824ed0c48c9e9ceeb18954d9c23564ed@epcas5p1.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 12/13] scsi: Use blk_rq_map_user_io helper Anuj Gupta
2022-09-29 13:28       ` Christoph Hellwig
     [not found]   ` <CGME20220929121715epcas5p488759f34f6e55d940c6dca523e24f464@epcas5p4.samsung.com>
2022-09-29 12:06     ` [PATCH for-next v11 13/13] nvme: " Anuj Gupta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox