From: Kent Overstreet <koverstreet@google.com>
To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org,
dm-devel@redhat.com
Cc: Kent Overstreet <koverstreet@google.com>,
tj@kernel.org, axboe@kernel.dk, agk@redhat.com, neilb@suse.de,
drbd-dev@lists.linbit.com, vgoyal@redhat.com,
mpatocka@redhat.com, sage@newdream.net, yehuda@hq.newdream.net
Subject: [PATCH v5 08/12] block: Introduce new bio_split()
Date: Mon, 6 Aug 2012 15:08:37 -0700 [thread overview]
Message-ID: <1344290921-25154-9-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1344290921-25154-1-git-send-email-koverstreet@google.com>
The new bio_split() can split arbitrary bios - it's not restricted to
single page bios, like the old bio_split() (previously renamed to
bio_pair_split()). It also has different semantics - it doesn't allocate
a struct bio_pair, leaving it up to the caller to handle completions.
v5: Take out current->bio_list check and make it the caller's
responsibility, per Boaz
Signed-off-by: Kent Overstreet <koverstreet@google.com>
---
fs/bio.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/bio.h | 3 ++
2 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index 0470376..312e5de 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1537,6 +1537,102 @@ struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors)
EXPORT_SYMBOL(bio_pair_split);
/**
+ * bio_split - split a bio
+ * @bio: bio to split
+ * @sectors: number of sectors to split from the front of @bio
+ * @gfp: gfp mask
+ * @bs: bio set to allocate from
+ *
+ * Allocates and returns a new bio which represents @sectors from the start of
+ * @bio, and updates @bio to represent the remaining sectors.
+ *
+ * If bio_sectors(@bio) was less than or equal to @sectors, returns @bio
+ * unchanged.
+ *
+ * The newly allocated bio will point to @bio's bi_io_vec, if the split was on a
+ * bvec boundry; it is the caller's responsibility to ensure that @bio is not
+ * freed before the split.
+ *
+ * BIG FAT WARNING:
+ *
+ * If you're calling this from under generic_make_request() (i.e.
+ * current->bio_list != NULL), you should mask out __GFP_WAIT and punt to
+ * workqueue if the allocation fails. Otherwise, your code will probably
+ * deadlock.
+ *
+ * You can't allocate more than once from the same bio pool without submitting
+ * the previous allocations (so they'll eventually complete and deallocate
+ * themselves), but if you're under generic_make_request() those previous
+ * allocations won't submit until you return . And if you have to split bios,
+ * you should expect that some bios will require multiple splits.
+ */
+struct bio *bio_split(struct bio *bio, int sectors,
+ gfp_t gfp, struct bio_set *bs)
+{
+ unsigned idx, vcnt = 0, nbytes = sectors << 9;
+ struct bio_vec *bv;
+ struct bio *ret = NULL;
+
+ BUG_ON(sectors <= 0);
+
+ if (sectors >= bio_sectors(bio))
+ return bio;
+
+ trace_block_split(bdev_get_queue(bio->bi_bdev), bio,
+ bio->bi_sector + sectors);
+
+ bio_for_each_segment(bv, bio, idx) {
+ vcnt = idx - bio->bi_idx;
+
+ if (!nbytes) {
+ ret = bio_alloc_bioset(gfp, 0, bs);
+ if (!ret)
+ return NULL;
+
+ ret->bi_io_vec = bio_iovec(bio);
+ ret->bi_flags |= 1 << BIO_CLONED;
+ break;
+ } else if (nbytes < bv->bv_len) {
+ ret = bio_alloc_bioset(gfp, ++vcnt, bs);
+ if (!ret)
+ return NULL;
+
+ memcpy(ret->bi_io_vec, bio_iovec(bio),
+ sizeof(struct bio_vec) * vcnt);
+
+ ret->bi_io_vec[vcnt - 1].bv_len = nbytes;
+ bv->bv_offset += nbytes;
+ bv->bv_len -= nbytes;
+ break;
+ }
+
+ nbytes -= bv->bv_len;
+ }
+
+ ret->bi_bdev = bio->bi_bdev;
+ ret->bi_sector = bio->bi_sector;
+ ret->bi_size = sectors << 9;
+ ret->bi_rw = bio->bi_rw;
+ ret->bi_vcnt = vcnt;
+ ret->bi_max_vecs = vcnt;
+ ret->bi_end_io = bio->bi_end_io;
+ ret->bi_private = bio->bi_private;
+
+ bio->bi_sector += sectors;
+ bio->bi_size -= sectors << 9;
+ bio->bi_idx = idx;
+
+ if (bio_integrity(bio)) {
+ bio_integrity_clone(ret, bio, gfp, bs);
+ bio_integrity_trim(ret, 0, bio_sectors(ret));
+ bio_integrity_trim(bio, bio_sectors(ret), bio_sectors(bio));
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(bio_split);
+
+/**
* bio_sector_offset - Find hardware sector offset in bio
* @bio: bio to inspect
* @index: bio_vec index
diff --git a/include/linux/bio.h b/include/linux/bio.h
index fdcc8dc..2d06262 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -201,6 +201,9 @@ struct bio_pair {
atomic_t cnt;
int error;
};
+
+extern struct bio *bio_split(struct bio *bio, int sectors,
+ gfp_t gfp, struct bio_set *bs);
extern struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors);
extern void bio_pair_release(struct bio_pair *dbio);
--
1.7.7.3
next prev parent reply other threads:[~2012-08-06 22:09 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-06 22:08 [PATCH v5 00/12] Block cleanups Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 01/12] block: Generalized bio pool freeing Kent Overstreet
2012-08-08 22:25 ` Tejun Heo
2012-08-09 0:26 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 02/12] dm: Use bioset's front_pad for dm_rq_clone_bio_info Kent Overstreet
2012-08-08 22:06 ` Tejun Heo
2012-08-08 23:57 ` Kent Overstreet
2012-08-11 5:24 ` Joseph Glanville
2012-08-13 21:44 ` Kent Overstreet
2012-08-14 5:33 ` Jun'ichi Nomura
2012-08-15 20:46 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 03/12] block: Add bio_reset() Kent Overstreet
2012-08-08 22:11 ` Tejun Heo
2012-08-09 0:07 ` Kent Overstreet
2012-08-09 6:00 ` Tejun Heo
2012-08-09 6:06 ` Kent Overstreet
2012-08-09 6:30 ` Tejun Heo
2012-08-06 22:08 ` [PATCH v5 04/12] pktcdvd: Switch to bio_kmalloc() Kent Overstreet
2012-08-08 22:13 ` Tejun Heo
2012-08-09 0:08 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 05/12] block: Kill bi_destructor Kent Overstreet
2012-08-07 3:19 ` Mike Snitzer
2012-08-09 0:14 ` Kent Overstreet
2012-08-08 22:22 ` Tejun Heo
2012-08-09 0:21 ` Kent Overstreet
2012-08-09 6:05 ` Tejun Heo
2012-08-09 6:12 ` Kent Overstreet
2012-08-09 6:34 ` Tejun Heo
2012-08-15 22:19 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 06/12] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2012-08-08 22:28 ` Tejun Heo
2012-08-06 22:08 ` [PATCH v5 07/12] block: Rename bio_split() -> bio_pair_split() Kent Overstreet
2012-08-06 22:08 ` Kent Overstreet [this message]
2012-08-08 22:58 ` [PATCH v5 08/12] block: Introduce new bio_split() Tejun Heo
2012-08-09 1:19 ` Kent Overstreet
2012-08-09 6:44 ` Tejun Heo
2012-08-13 21:55 ` Kent Overstreet
2012-08-13 22:05 ` Tejun Heo
2012-08-08 23:05 ` Tejun Heo
2012-08-09 1:39 ` Kent Overstreet
2012-08-09 7:22 ` Tejun Heo
2012-08-09 7:33 ` Kent Overstreet
2012-08-09 17:32 ` Tejun Heo
2012-08-13 22:09 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 09/12] block: Rework bio_pair_split() Kent Overstreet
2012-08-08 23:09 ` Tejun Heo
2012-08-06 22:08 ` [PATCH v5 10/12] block: Add bio_clone_kmalloc() Kent Overstreet
2012-08-08 23:15 ` Tejun Heo
2012-08-09 1:57 ` Kent Overstreet
2012-08-09 6:55 ` Tejun Heo
2012-08-09 7:02 ` Kent Overstreet
2012-08-09 2:38 ` [PATCH] Consolidate bio_clone_bioset(), bio_kmalloc() Kent Overstreet
2012-08-09 6:56 ` Tejun Heo
2012-08-06 22:08 ` [PATCH v5 11/12] block: Add bio_clone_bioset() Kent Overstreet
2012-08-08 23:21 ` Tejun Heo
2012-08-09 2:56 ` Kent Overstreet
2012-08-09 6:52 ` Tejun Heo
2012-08-09 6:59 ` Kent Overstreet
2012-08-06 22:08 ` [PATCH v5 12/12] block: Only clone bio vecs that are in use Kent Overstreet
2012-08-06 23:16 ` [dm-devel] " Mikulas Patocka
2012-08-08 23:28 ` Tejun Heo
2012-08-08 23:47 ` Muthu Kumar
2012-08-09 3:19 ` Kent Overstreet
2012-08-09 3:25 ` Kent Overstreet
2012-08-10 1:50 ` Muthu Kumar
2012-08-09 7:01 ` Tejun Heo
2012-08-10 2:29 ` Muthu Kumar
2012-08-08 23:30 ` Tejun Heo
2012-08-09 3:06 ` Kent Overstreet
2012-08-09 17:37 ` Tejun Heo
2012-08-13 21:46 ` Kent Overstreet
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=1344290921-25154-9-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=neilb@suse.de \
--cc=sage@newdream.net \
--cc=tj@kernel.org \
--cc=vgoyal@redhat.com \
--cc=yehuda@hq.newdream.net \
/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
Powered by JetHome