Skip to content

Commit d18d917

Browse files
Ming Leiaxboe
authored andcommitted
block: introduce bio_for_each_bvec() and rq_for_each_bvec()
bio_for_each_bvec() is used for iterating over multi-page bvec for bio split & merge code. rq_for_each_bvec() can be used for drivers which may handle the multi-page bvec directly, so far loop is one perfect use case. Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Omar Sandoval <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 3d75ca0 commit d18d917

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

include/linux/bio.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,16 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
156156
#define bio_for_each_segment(bvl, bio, iter) \
157157
__bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
158158

159+
#define __bio_for_each_bvec(bvl, bio, iter, start) \
160+
for (iter = (start); \
161+
(iter).bi_size && \
162+
((bvl = mp_bvec_iter_bvec((bio)->bi_io_vec, (iter))), 1); \
163+
bio_advance_iter((bio), &(iter), (bvl).bv_len))
164+
165+
/* iterate over multi-page bvec */
166+
#define bio_for_each_bvec(bvl, bio, iter) \
167+
__bio_for_each_bvec(bvl, bio, iter, (bio)->bi_iter)
168+
159169
#define bio_iter_last(bvec, iter) ((iter).bi_size == (bvec).bv_len)
160170

161171
static inline unsigned bio_segments(struct bio *bio)

include/linux/blkdev.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,10 @@ struct req_iterator {
792792
__rq_for_each_bio(_iter.bio, _rq) \
793793
bio_for_each_segment(bvl, _iter.bio, _iter.iter)
794794

795+
#define rq_for_each_bvec(bvl, _rq, _iter) \
796+
__rq_for_each_bio(_iter.bio, _rq) \
797+
bio_for_each_bvec(bvl, _iter.bio, _iter.iter)
798+
795799
#define rq_iter_last(bvec, _iter) \
796800
(_iter.bio->bi_next == NULL && \
797801
bio_iter_last(bvec, _iter.iter))

0 commit comments

Comments
 (0)