Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 22b56c2964386ddced252be407150b22f85e209e

Authored by Pavel Begunkov
Committed by Jens Axboe
1 parent 6b6667aa4d

bio: optimise bvec iteration 

__bio_for_each_bvec(), __bio_for_each_segment() and bio_copy_data_iter()
fall under conditions of bvec_iter_advance_single(), which is a faster
and slimmer version of bvec_iter_advance(). Add
bio_advance_iter_single() and convert them.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

Showing 2 changed files with 17 additions and 4 deletions Side-by-side Diff

... ... @@ -1212,8 +1212,8 @@
1212 1212  
1213 1213 flush_dcache_page(dst_bv.bv_page);
1214 1214  
1215   - bio_advance_iter(src, src_iter, bytes);
1216   - bio_advance_iter(dst, dst_iter, bytes);
  1215 + bio_advance_iter_single(src, src_iter, bytes);
  1216 + bio_advance_iter_single(dst, dst_iter, bytes);
1217 1217 }
1218 1218 }
1219 1219 EXPORT_SYMBOL(bio_copy_data_iter);
... ... @@ -148,11 +148,24 @@
148 148 /* TODO: It is reasonable to complete bio with error here. */
149 149 }
150 150  
  151 +/* @bytes should be less or equal to bvec[i->bi_idx].bv_len */
  152 +static inline void bio_advance_iter_single(const struct bio *bio,
  153 + struct bvec_iter *iter,
  154 + unsigned int bytes)
  155 +{
  156 + iter->bi_sector += bytes >> 9;
  157 +
  158 + if (bio_no_advance_iter(bio))
  159 + iter->bi_size -= bytes;
  160 + else
  161 + bvec_iter_advance_single(bio->bi_io_vec, iter, bytes);
  162 +}
  163 +
151 164 #define __bio_for_each_segment(bvl, bio, iter, start) \
152 165 for (iter = (start); \
153 166 (iter).bi_size && \
154 167 ((bvl = bio_iter_iovec((bio), (iter))), 1); \
155   - bio_advance_iter((bio), &(iter), (bvl).bv_len))
  168 + bio_advance_iter_single((bio), &(iter), (bvl).bv_len))
156 169  
157 170 #define bio_for_each_segment(bvl, bio, iter) \
158 171 __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter)
... ... @@ -161,7 +174,7 @@
161 174 for (iter = (start); \
162 175 (iter).bi_size && \
163 176 ((bvl = mp_bvec_iter_bvec((bio)->bi_io_vec, (iter))), 1); \
164   - bio_advance_iter((bio), &(iter), (bvl).bv_len))
  177 + bio_advance_iter_single((bio), &(iter), (bvl).bv_len))
165 178  
166 179 /* iterate over multi-page bvec */
167 180 #define bio_for_each_bvec(bvl, bio, iter) \