From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, Theodore Ts'o <tytso@mit.edu>,
Omar Sandoval <osandov@fb.com>, Sagi Grimberg <sagi@grimberg.me>,
Dave Chinner <dchinner@redhat.com>,
Kent Overstreet <kent.overstreet@gmail.com>,
Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, Shaohua Li <shli@kernel.org>,
linux-raid@vger.kernel.org, David Sterba <dsterba@suse.com>,
linux-btrfs@vger.kernel.org,
"Darrick J . Wong" <darrick.wong@oracle.com>,
linux-xfs@vger.kernel.org, Gao Xiang <gaoxiang25@huawei.com>,
Christoph Hellwig <hch@lst.de>,
linux-ext4@vger.kernel.org, Coly Li <colyli@suse.de>,
linux-bcache@vger.kernel.org, Boaz Harrosh <ooo@electrozaur.com>,
Bob Peterson <rpeterso@redhat.com>,
cluster-devel@redhat.com, Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V11 13/19] block: move bounce_clone_bio into bio.c
Date: Wed, 21 Nov 2018 11:23:21 +0800 [thread overview]
Message-ID: <20181121032327.8434-14-ming.lei@redhat.com> (raw)
In-Reply-To: <20181121032327.8434-1-ming.lei@redhat.com>
We will reuse bounce_clone_bio() for cloning bio in case of
!blk_queue_cluster(q), so move this helper into bio.c and
rename it as bio_clone_bioset().
No function change.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/bio.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
block/blk.h | 2 ++
block/bounce.c | 70 +---------------------------------------------------------
3 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/block/bio.c b/block/bio.c
index 2680aa42a625..0f1635b9ec50 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -647,6 +647,75 @@ struct bio *bio_clone_fast(struct bio *bio, gfp_t gfp_mask, struct bio_set *bs)
}
EXPORT_SYMBOL(bio_clone_fast);
+/* block core only helper */
+struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,
+ struct bio_set *bs)
+{
+ struct bvec_iter iter;
+ struct bio_vec bv;
+ struct bio *bio;
+
+ /*
+ * Pre immutable biovecs, __bio_clone() used to just do a memcpy from
+ * bio_src->bi_io_vec to bio->bi_io_vec.
+ *
+ * We can't do that anymore, because:
+ *
+ * - The point of cloning the biovec is to produce a bio with a biovec
+ * the caller can modify: bi_idx and bi_bvec_done should be 0.
+ *
+ * - The original bio could've had more than BIO_MAX_PAGES biovecs; if
+ * we tried to clone the whole thing bio_alloc_bioset() would fail.
+ * But the clone should succeed as long as the number of biovecs we
+ * actually need to allocate is fewer than BIO_MAX_PAGES.
+ *
+ * - Lastly, bi_vcnt should not be looked at or relied upon by code
+ * that does not own the bio - reason being drivers don't use it for
+ * iterating over the biovec anymore, so expecting it to be kept up
+ * to date (i.e. for clones that share the parent biovec) is just
+ * asking for trouble and would force extra work on
+ * __bio_clone_fast() anyways.
+ */
+
+ bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs);
+ if (!bio)
+ return NULL;
+ bio->bi_disk = bio_src->bi_disk;
+ bio->bi_opf = bio_src->bi_opf;
+ bio->bi_ioprio = bio_src->bi_ioprio;
+ bio->bi_write_hint = bio_src->bi_write_hint;
+ bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector;
+ bio->bi_iter.bi_size = bio_src->bi_iter.bi_size;
+
+ switch (bio_op(bio)) {
+ case REQ_OP_DISCARD:
+ case REQ_OP_SECURE_ERASE:
+ case REQ_OP_WRITE_ZEROES:
+ break;
+ case REQ_OP_WRITE_SAME:
+ bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0];
+ break;
+ default:
+ bio_for_each_segment(bv, bio_src, iter)
+ bio->bi_io_vec[bio->bi_vcnt++] = bv;
+ break;
+ }
+
+ if (bio_integrity(bio_src)) {
+ int ret;
+
+ ret = bio_integrity_clone(bio, bio_src, gfp_mask);
+ if (ret < 0) {
+ bio_put(bio);
+ return NULL;
+ }
+ }
+
+ bio_clone_blkcg_association(bio, bio_src);
+
+ return bio;
+}
+
/**
* bio_add_pc_page - attempt to add page to bio
* @q: the target queue
diff --git a/block/blk.h b/block/blk.h
index 816a9abb87cd..31c0e45aba3a 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -336,6 +336,8 @@ static inline int blk_iolatency_init(struct request_queue *q) { return 0; }
struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp);
+struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, struct bio_set *bs);
+
#ifdef CONFIG_BLK_DEV_ZONED
void blk_queue_free_zone_bitmaps(struct request_queue *q);
#else
diff --git a/block/bounce.c b/block/bounce.c
index 7338041e3042..4947c36173b2 100644
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -215,74 +215,6 @@ static void bounce_end_io_read_isa(struct bio *bio)
__bounce_end_io_read(bio, &isa_page_pool);
}
-static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask,
- struct bio_set *bs)
-{
- struct bvec_iter iter;
- struct bio_vec bv;
- struct bio *bio;
-
- /*
- * Pre immutable biovecs, __bio_clone() used to just do a memcpy from
- * bio_src->bi_io_vec to bio->bi_io_vec.
- *
- * We can't do that anymore, because:
- *
- * - The point of cloning the biovec is to produce a bio with a biovec
- * the caller can modify: bi_idx and bi_bvec_done should be 0.
- *
- * - The original bio could've had more than BIO_MAX_PAGES biovecs; if
- * we tried to clone the whole thing bio_alloc_bioset() would fail.
- * But the clone should succeed as long as the number of biovecs we
- * actually need to allocate is fewer than BIO_MAX_PAGES.
- *
- * - Lastly, bi_vcnt should not be looked at or relied upon by code
- * that does not own the bio - reason being drivers don't use it for
- * iterating over the biovec anymore, so expecting it to be kept up
- * to date (i.e. for clones that share the parent biovec) is just
- * asking for trouble and would force extra work on
- * __bio_clone_fast() anyways.
- */
-
- bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs);
- if (!bio)
- return NULL;
- bio->bi_disk = bio_src->bi_disk;
- bio->bi_opf = bio_src->bi_opf;
- bio->bi_ioprio = bio_src->bi_ioprio;
- bio->bi_write_hint = bio_src->bi_write_hint;
- bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector;
- bio->bi_iter.bi_size = bio_src->bi_iter.bi_size;
-
- switch (bio_op(bio)) {
- case REQ_OP_DISCARD:
- case REQ_OP_SECURE_ERASE:
- case REQ_OP_WRITE_ZEROES:
- break;
- case REQ_OP_WRITE_SAME:
- bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0];
- break;
- default:
- bio_for_each_segment(bv, bio_src, iter)
- bio->bi_io_vec[bio->bi_vcnt++] = bv;
- break;
- }
-
- if (bio_integrity(bio_src)) {
- int ret;
-
- ret = bio_integrity_clone(bio, bio_src, gfp_mask);
- if (ret < 0) {
- bio_put(bio);
- return NULL;
- }
- }
-
- bio_clone_blkcg_association(bio, bio_src);
-
- return bio;
-}
-
static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
mempool_t *pool)
{
@@ -311,7 +243,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
generic_make_request(*bio_orig);
*bio_orig = bio;
}
- bio = bounce_clone_bio(*bio_orig, GFP_NOIO, passthrough ? NULL :
+ bio = bio_clone_bioset(*bio_orig, GFP_NOIO, passthrough ? NULL :
&bounce_bio_set);
bio_for_each_segment_all(to, bio, i, iter_all) {
--
2.9.5
next prev parent reply other threads:[~2018-11-21 3:27 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 3:23 [PATCH V11 00/19] block: support multi-page bvec Ming Lei
2018-11-21 3:23 ` [PATCH V11 01/19] block: don't use bio->bi_vcnt to figure out segment number Ming Lei
2018-11-21 3:23 ` [PATCH V11 02/19] block: introduce multi-page bvec helpers Ming Lei
2018-11-21 13:19 ` Christoph Hellwig
2018-11-21 15:06 ` Ming Lei
2018-11-21 16:08 ` Christoph Hellwig
2018-11-22 1:09 ` Ming Lei
2018-11-21 3:23 ` [PATCH V11 03/19] block: introduce bio_for_each_bvec() Ming Lei
2018-11-21 13:32 ` Christoph Hellwig
2018-11-21 15:31 ` Ming Lei
2018-11-21 16:10 ` Christoph Hellwig
2018-11-21 17:12 ` Christoph Hellwig
2018-11-22 10:15 ` Ming Lei
2018-11-22 10:23 ` Christoph Hellwig
2018-11-22 10:30 ` Christoph Hellwig
2018-11-22 14:57 ` Ming Lei
2018-11-22 1:17 ` Ming Lei
2018-11-21 3:23 ` [PATCH V11 04/19] block: use bio_for_each_bvec() to compute multi-page bvec count Ming Lei
2018-11-21 3:23 ` [PATCH V11 05/19] block: use bio_for_each_bvec() to map sg Ming Lei
2018-11-21 3:23 ` [PATCH V11 06/19] block: introduce bvec_last_segment() Ming Lei
2018-11-21 3:23 ` [PATCH V11 07/19] fs/buffer.c: use bvec iterator to truncate the bio Ming Lei
2018-11-22 10:58 ` Christoph Hellwig
2018-11-23 1:48 ` Ming Lei
2018-11-21 3:23 ` [PATCH V11 08/19] btrfs: use bvec_last_segment to get bio's last page Ming Lei
2018-11-21 3:23 ` [PATCH V11 09/19] btrfs: move bio_pages_all() to btrfs Ming Lei
2018-11-21 3:23 ` [PATCH V11 10/19] block: loop: pass multi-page bvec to iov_iter Ming Lei
2018-11-21 14:00 ` Christoph Hellwig
2018-11-21 3:23 ` [PATCH V11 11/19] bcache: avoid to use bio_for_each_segment_all() in bch_bio_alloc_pages() Ming Lei
2018-11-21 14:01 ` Christoph Hellwig
2018-11-21 3:23 ` [PATCH V11 12/19] block: allow bio_for_each_segment_all() to iterate over multi-page bvec Ming Lei
2018-11-21 14:02 ` Christoph Hellwig
2018-11-22 11:03 ` Christoph Hellwig
2018-11-23 2:19 ` Ming Lei
2018-11-21 3:23 ` Ming Lei [this message]
2018-11-21 3:23 ` [PATCH V11 14/19] block: handle non-cluster bio out of blk_bio_segment_split Ming Lei
2018-11-21 14:33 ` Christoph Hellwig
2018-11-21 15:37 ` Ming Lei
2018-11-21 16:11 ` Christoph Hellwig
2018-11-21 17:46 ` Christoph Hellwig
2018-11-22 9:33 ` Ming Lei
2018-11-22 10:04 ` Christoph Hellwig
2018-11-22 10:26 ` Ming Lei
2018-11-22 10:40 ` Christoph Hellwig
2018-11-22 10:32 ` Ming Lei
2018-11-22 10:41 ` Christoph Hellwig
2018-11-22 10:46 ` Ming Lei
2018-11-22 10:47 ` Christoph Hellwig
2018-11-21 3:23 ` [PATCH V11 15/19] block: enable multipage bvecs Ming Lei
2018-11-21 14:55 ` Christoph Hellwig
2018-11-21 15:48 ` Ming Lei
2018-11-21 16:12 ` Christoph Hellwig
2018-11-23 10:50 ` Ming Lei
2018-11-21 3:23 ` [PATCH V11 16/19] block: always define BIO_MAX_PAGES as 256 Ming Lei
2018-11-21 3:23 ` [PATCH V11 17/19] block: document usage of bio iterator helpers Ming Lei
2018-11-21 7:45 ` Nikolay Borisov
2018-11-21 14:34 ` Christoph Hellwig
2018-11-21 3:23 ` [PATCH V11 18/19] block: kill QUEUE_FLAG_NO_SG_MERGE Ming Lei
2018-11-21 3:23 ` [PATCH V11 19/19] block: kill BLK_MQ_F_SG_MERGE Ming Lei
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 \
--in-reply-to=20181121032327.8434-14-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=cluster-devel@redhat.com \
--cc=colyli@suse.de \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=gaoxiang25@huawei.com \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ooo@electrozaur.com \
--cc=osandov@fb.com \
--cc=rpeterso@redhat.com \
--cc=sagi@grimberg.me \
--cc=shli@kernel.org \
--cc=snitzer@redhat.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).