From: Kent Overstreet <koverstreet@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kent Overstreet <koverstreet@google.com>, axboe@kernel.dk
Subject: [PATCH 05/27] block: Add bio_advance()
Date: Tue, 19 Feb 2013 16:22:19 -0800 [thread overview]
Message-ID: <1361319761-23873-6-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1361319761-23873-1-git-send-email-koverstreet@google.com>
This is prep work for immutable bio vecs; we first want to centralize
where bvecs are modified.
Next two patches convert some existing code to use this function.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
---
fs/bio.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/linux/bio.h | 2 ++
include/linux/blk_types.h | 2 ++
3 files changed, 45 insertions(+)
diff --git a/fs/bio.c b/fs/bio.c
index 40aa96e..7edc08d 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -752,6 +752,47 @@ int bio_add_page(struct bio *bio, struct page *page, unsigned int len,
}
EXPORT_SYMBOL(bio_add_page);
+/**
+ * bio_advance - increment/complete a bio by some number of bytes
+ * @bio: bio to advance
+ * @bytes: number of bytes to complete
+ *
+ * This updates bi_sector, bi_size and bi_idx; if the number of bytes to
+ * complete doesn't align with a bvec boundary, then bv_len and bv_offset will
+ * be updated on the last bvec as well.
+ *
+ * @bio will then represent the remaining, uncompleted portion of the io.
+ */
+void bio_advance(struct bio *bio, unsigned bytes)
+{
+ if (bio_integrity(bio))
+ bio_integrity_advance(bio, bytes);
+
+ bio->bi_sector += bytes >> 9;
+ bio->bi_size -= bytes;
+
+ if (bio->bi_rw & BIO_NO_ADVANCE_ITER_MASK)
+ return;
+
+ while (bytes) {
+ if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
+ WARN_ONCE(1, "bio idx %d >= vcnt %d\n",
+ bio->bi_idx, bio->bi_vcnt);
+ break;
+ }
+
+ if (bytes >= bio_iovec(bio)->bv_len) {
+ bytes -= bio_iovec(bio)->bv_len;
+ bio->bi_idx++;
+ } else {
+ bio_iovec(bio)->bv_len -= bytes;
+ bio_iovec(bio)->bv_offset += bytes;
+ bytes = 0;
+ }
+ }
+}
+EXPORT_SYMBOL(bio_advance);
+
struct bio_map_data {
struct bio_vec *iovecs;
struct sg_iovec *sgvecs;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 669b1cb..fcb4dba 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -248,6 +248,8 @@ extern void bio_endio(struct bio *, int);
struct request_queue;
extern int bio_phys_segments(struct request_queue *, struct bio *);
+extern void bio_advance(struct bio *, unsigned);
+
extern void bio_init(struct bio *);
extern void bio_reset(struct bio *);
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index cdf1119..c178d25 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -197,6 +197,8 @@ enum rq_flag_bits {
REQ_SECURE)
#define REQ_CLONE_MASK REQ_COMMON_MASK
+#define BIO_NO_ADVANCE_ITER_MASK (REQ_DISCARD|REQ_WRITE_SAME)
+
/* This mask is used for both bio and request merge checking */
#define REQ_NOMERGE_FLAGS \
(REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA)
--
1.7.12
next prev parent reply other threads:[~2013-02-20 0:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 0:22 [PATCH 00/27] Block cleanups - prep work for immutable bio vecs/dio rewrite Kent Overstreet
2013-02-20 0:22 ` [PATCH 01/27] block: Reorder struct bio_set Kent Overstreet
2013-02-20 0:22 ` [PATCH 02/27] block: Avoid deadlocks with bio allocation by stacking drivers Kent Overstreet
2013-02-20 0:22 ` [PATCH 03/27] block: Fix a buffer overrun in bio_integrity_split() Kent Overstreet
2013-02-20 0:22 ` [PATCH 04/27] block: Convert integrity to bvec_alloc_bs() Kent Overstreet
2013-05-09 19:43 ` Bjorn Helgaas
2013-02-20 0:22 ` Kent Overstreet [this message]
2013-02-20 0:22 ` [PATCH 06/27] block: Refactor blk_update_request() Kent Overstreet
2013-02-20 0:22 ` [PATCH 07/27] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2013-02-20 0:22 ` [PATCH 08/27] block: Add bio_end_sector() Kent Overstreet
2013-02-20 0:22 ` [PATCH 09/27] block: Use bio_sectors() more consistently Kent Overstreet
2013-02-20 16:43 ` Ed Cashin
2013-02-20 0:22 ` [PATCH 10/27] block: Change bio_split() to respect the current value of bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 11/27] block: Remove bi_idx references Kent Overstreet
2013-02-20 0:22 ` [PATCH 12/27] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 13/27] block: Add submit_bio_wait(), remove from md Kent Overstreet
2013-02-20 0:22 ` [PATCH 14/27] raid10: Use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 15/27] raid1: use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 16/27] raid5: " Kent Overstreet
2013-02-20 0:22 ` [PATCH 17/27] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 18/27] block: Add bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 19/27] pktcdvd: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 20/27] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 21/27] raid1: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 22/27] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2013-02-20 0:22 ` [PATCH 23/27] block: Add bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 24/27] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 25/27] block: Add bio_alloc_pages() Kent Overstreet
2013-02-20 0:22 ` [PATCH 26/27] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2013-03-26 18:11 ` Andrew Morton
2013-03-26 19:42 ` Kent Overstreet
2013-02-20 0:22 ` [PATCH 27/27] bio-integrity: Add explicit field for owner of bip_buf 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=1361319761-23873-6-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®