From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@fb.com>, Christoph Hellwig <hch@infradead.org>,
Kent Overstreet <kent.overstreet@gmail.com>
Cc: David Sterba <dsterba@suse.cz>, Huang Ying <ying.huang@intel.com>,
Mike Snitzer <snitzer@redhat.com>,
linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
Theodore Ts'o <tytso@mit.edu>,
"Darrick J . Wong" <darrick.wong@oracle.com>,
Coly Li <colyli@suse.de>, Filipe Manana <fdmanana@gmail.com>,
Randy Dunlap <rdunlap@infradead.org>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V7 11/24] block: introduce bio_for_each_bvec()
Date: Wed, 27 Jun 2018 20:45:35 +0800 [thread overview]
Message-ID: <20180627124548.3456-12-ming.lei@redhat.com> (raw)
In-Reply-To: <20180627124548.3456-1-ming.lei@redhat.com>
This helper is used for iterating over multipage bvec for bio
splitting/merge,
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
include/linux/bio.h | 34 +++++++++++++++++++++++++++++++---
include/linux/bvec.h | 36 ++++++++++++++++++++++++++++++++----
2 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 21d07858ddef..551444bd9795 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -80,6 +80,9 @@
#define bio_data_dir(bio) \
(op_is_write(bio_op(bio)) ? WRITE : READ)
+#define bio_iter_mp_iovec(bio, iter) \
+ mp_bvec_iter_bvec((bio)->bi_io_vec, (iter))
+
/*
* Check whether this bio carries any data or not. A NULL bio is allowed.
*/
@@ -165,8 +168,8 @@ static inline bool bio_full(struct bio *bio)
#define bio_for_each_segment_all(bvl, bio, i) \
for (i = 0, bvl = (bio)->bi_io_vec; i < (bio)->bi_vcnt; i++, bvl++)
-static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
- unsigned bytes)
+static inline void __bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
+ unsigned bytes, bool mp)
{
iter->bi_sector += bytes >> 9;
@@ -174,11 +177,26 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
iter->bi_size -= bytes;
iter->bi_done += bytes;
} else {
- bvec_iter_advance(bio->bi_io_vec, iter, bytes);
+ if (!mp)
+ bvec_iter_advance(bio->bi_io_vec, iter, bytes);
+ else
+ mp_bvec_iter_advance(bio->bi_io_vec, iter, bytes);
/* TODO: It is reasonable to complete bio with error here. */
}
}
+static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
+ unsigned bytes)
+{
+ __bio_advance_iter(bio, iter, bytes, false);
+}
+
+static inline void bio_advance_mp_iter(struct bio *bio, struct bvec_iter *iter,
+ unsigned bytes)
+{
+ __bio_advance_iter(bio, iter, bytes, true);
+}
+
static inline bool bio_rewind_iter(struct bio *bio, struct bvec_iter *iter,
unsigned int bytes)
{
@@ -202,6 +220,16 @@ static inline bool bio_rewind_iter(struct bio *bio, struct bvec_iter *iter,
#define bio_for_each_segment(bvl, bio, iter) \
__bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
+#define __bio_for_each_bvec(bvl, bio, iter, start) \
+ for (iter = (start); \
+ (iter).bi_size && \
+ ((bvl = bio_iter_mp_iovec((bio), (iter))), 1); \
+ bio_advance_mp_iter((bio), &(iter), (bvl).bv_len))
+
+/* returns one real segment(multipage bvec) each time */
+#define bio_for_each_bvec(bvl, bio, iter) \
+ __bio_for_each_bvec(bvl, bio, iter, (bio)->bi_iter)
+
#define bio_iter_last(bvec, iter) ((iter).bi_size == (bvec).bv_len)
static inline unsigned bio_segments(struct bio *bio)
diff --git a/include/linux/bvec.h b/include/linux/bvec.h
index 03a12fbb90d8..417d44cf1e82 100644
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
@@ -126,8 +126,16 @@ struct bvec_iter {
.bv_offset = bvec_iter_offset((bvec), (iter)), \
})
-static inline bool bvec_iter_advance(const struct bio_vec *bv,
- struct bvec_iter *iter, unsigned bytes)
+#define mp_bvec_iter_bvec(bvec, iter) \
+((struct bio_vec) { \
+ .bv_page = mp_bvec_iter_page((bvec), (iter)), \
+ .bv_len = mp_bvec_iter_len((bvec), (iter)), \
+ .bv_offset = mp_bvec_iter_offset((bvec), (iter)), \
+})
+
+static inline bool __bvec_iter_advance(const struct bio_vec *bv,
+ struct bvec_iter *iter,
+ unsigned bytes, bool mp)
{
if (WARN_ONCE(bytes > iter->bi_size,
"Attempted to advance past end of bvec iter\n")) {
@@ -136,8 +144,14 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv,
}
while (bytes) {
- unsigned iter_len = bvec_iter_len(bv, *iter);
- unsigned len = min(bytes, iter_len);
+ unsigned len;
+
+ if (mp)
+ len = mp_bvec_iter_len(bv, *iter);
+ else
+ len = bvec_iter_len(bv, *iter);
+
+ len = min(bytes, len);
bytes -= len;
iter->bi_size -= len;
@@ -176,6 +190,20 @@ static inline bool bvec_iter_rewind(const struct bio_vec *bv,
return true;
}
+static inline bool bvec_iter_advance(const struct bio_vec *bv,
+ struct bvec_iter *iter,
+ unsigned bytes)
+{
+ return __bvec_iter_advance(bv, iter, bytes, false);
+}
+
+static inline bool mp_bvec_iter_advance(const struct bio_vec *bv,
+ struct bvec_iter *iter,
+ unsigned bytes)
+{
+ return __bvec_iter_advance(bv, iter, bytes, true);
+}
+
#define for_each_bvec(bvl, bio_vec, iter, start) \
for (iter = (start); \
(iter).bi_size && \
--
2.9.5
next prev parent reply other threads:[~2018-06-27 12:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-27 12:45 [PATCH V7 00/24] block: support multipage bvec Ming Lei
2018-06-27 12:45 ` [PATCH V7 01/24] dm: use bio_split() when splitting out the already processed bio Ming Lei
2018-06-27 13:17 ` Mike Snitzer
2018-06-27 12:45 ` [PATCH V7 02/24] bcache: don't clone bio in bch_data_verify Ming Lei
2018-06-27 12:45 ` [PATCH V7 03/24] exofs: use bio_clone_fast in _write_mirror Ming Lei
2018-06-27 12:45 ` [PATCH V7 04/24] block: remove bio_clone_kmalloc Ming Lei
2018-06-27 12:45 ` [PATCH V7 05/24] md: remove a bogus comment Ming Lei
2018-06-27 12:45 ` [PATCH V7 06/24] block: unexport bio_clone_bioset Ming Lei
2018-06-27 12:45 ` [PATCH V7 07/24] block: simplify bio_check_pages_dirty Ming Lei
2018-06-27 12:45 ` [PATCH V7 08/24] block: bio_set_pages_dirty can't see NULL bv_page in a valid bio_vec Ming Lei
2018-06-27 12:45 ` [PATCH V7 09/24] block: use bio_add_page in bio_iov_iter_get_pages Ming Lei
2018-06-27 12:45 ` [PATCH V7 10/24] block: introduce multipage page bvec helpers Ming Lei
2018-06-27 15:59 ` kbuild test robot
2018-11-09 11:15 ` Ming Lei
2018-06-27 12:45 ` Ming Lei [this message]
2018-06-27 12:45 ` [PATCH V7 12/24] block: use bio_for_each_bvec() to compute multipage bvec count Ming Lei
2018-06-27 12:45 ` [PATCH V7 13/24] block: use bio_for_each_bvec() to map sg Ming Lei
2018-06-27 12:45 ` [PATCH V7 14/24] block: introduce bvec_last_segment() Ming Lei
2018-06-27 12:45 ` [PATCH V7 15/24] fs/buffer.c: use bvec iterator to truncate the bio Ming Lei
2018-06-27 12:45 ` [PATCH V7 16/24] btrfs: use bvec_last_segment to get bio's last page Ming Lei
2018-06-27 12:45 ` [PATCH V7 17/24] btrfs: move bio_pages_all() to btrfs Ming Lei
2018-06-27 12:45 ` [PATCH V7 18/24] block: introduce bio_bvecs() Ming Lei
2018-06-27 12:45 ` [PATCH V7 19/24] block: loop: pass multipage bvec to iov_iter Ming Lei
2018-06-27 12:45 ` [PATCH V7 20/24] bcache: avoid to use bio_for_each_segment_all() in bch_bio_alloc_pages() Ming Lei
2018-06-27 15:55 ` Coly Li
2018-06-28 1:28 ` Ming Lei
2018-06-28 2:01 ` Coly Li
2018-06-27 12:45 ` [PATCH V7 21/24] block: allow bio_for_each_segment_all() to iterate over multipage bvec Ming Lei
2018-06-27 12:45 ` [PATCH V7 22/24] block: enable multipage bvecs Ming Lei
2018-06-27 12:45 ` [PATCH V7 23/24] block: always define BIO_MAX_PAGES as 256 Ming Lei
2018-06-27 12:45 ` [PATCH V7 24/24] block: document usage of bio iterator helpers Ming Lei
2018-06-27 18:13 ` Randy Dunlap
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=20180627124548.3456-12-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@fb.com \
--cc=colyli@suse.de \
--cc=darrick.wong@oracle.com \
--cc=dsterba@suse.cz \
--cc=fdmanana@gmail.com \
--cc=hch@infradead.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rdunlap@infradead.org \
--cc=snitzer@redhat.com \
--cc=tytso@mit.edu \
--cc=ying.huang@intel.com \
/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).