Commit 6dc4f100c175 ("block: allow bio_for_each_segment_all() to iterate over multi-page bvec") changes bio_for_each_segment_all() to use for-inside-for. This way breaks all bio_for_each_segment_all() call with error out branch via 'break', since now 'break' can only break from the inner loop. Fixes this issue by implementing bio_for_each_segment_all() via single 'for' loop, and now the logic is very similar with normal bvec iterator.
Showing the changes to include/linux (2 of 2 files). Show all
Unified · Split
| @@ -120,19 +120,23 @@ static inline bool bio_full(struct bio *bio) · 119 unmodified lines | ||
| 120 | 120 | return bio->bi_vcnt >= bio->bi_max_vecs; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | −#define mp_bvec_for_each_segment(bv, bvl, i, iter_all) \ | |
| 124 | − for (bv = bvec_init_iter_all(&iter_all); \ | |
| 125 | − (iter_all.done < (bvl)->bv_len) && \ | |
| 126 | − (mp_bvec_next_segment((bvl), &iter_all), 1); \ | |
| 127 | − iter_all.done += bv->bv_len, i += 1) | |
| 123 | +static inline bool bio_next_segment(const struct bio *bio, | |
| 124 | + struct bvec_iter_all *iter) | |
| 125 | +{ | |
| 126 | + if (iter->idx >= bio->bi_vcnt) | |
| 127 | + return false; | |
| 128 | + | |
| 129 | + bvec_advance(&bio->bi_io_vec[iter->idx], iter); | |
| 130 | + return true; | |
| 131 | +} | |
| 128 | 132 | |
| 129 | 133 | /* |
| 130 | 134 | * drivers should _never_ use the all version - the bio may have been split |
| 131 | 135 | * before it got to the driver and the driver won't own all of it |
| 132 | 136 | */ |
| 133 | −#define bio_for_each_segment_all(bvl, bio, i, iter_all) \ | |
| 134 | − for (i = 0, iter_all.idx = 0; iter_all.idx < (bio)->bi_vcnt; iter_all.idx++) \ | |
| 135 | − mp_bvec_for_each_segment(bvl, &((bio)->bi_io_vec[iter_all.idx]), i, iter_all) | |
| 137 | +#define bio_for_each_segment_all(bvl, bio, i, iter) \ | |
| 138 | + for (i = 0, bvl = bvec_init_iter_all(&iter); \ | |
| 139 | + bio_next_segment((bio), &iter); i++) | |
| 136 | 140 | |
| 137 | 141 | static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter, |
| 138 | 142 | unsigned bytes) |
| @@ -145,18 +145,18 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv, · 144 unmodified lines | ||
| 145 | 145 | |
| 146 | 146 | static inline struct bio_vec *bvec_init_iter_all(struct bvec_iter_all *iter_all) |
| 147 | 147 | { |
| 148 | − iter_all->bv.bv_page = NULL; | |
| 149 | 148 | iter_all->done = 0; |
| 149 | + iter_all->idx = 0; | |
| 150 | 150 | |
| 151 | 151 | return &iter_all->bv; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | −static inline void mp_bvec_next_segment(const struct bio_vec *bvec, | |
| 155 | − struct bvec_iter_all *iter_all) | |
| 154 | +static inline void bvec_advance(const struct bio_vec *bvec, | |
| 155 | + struct bvec_iter_all *iter_all) | |
| 156 | 156 | { |
| 157 | 157 | struct bio_vec *bv = &iter_all->bv; |
| 158 | 158 | |
| 159 | − if (bv->bv_page) { | |
| 159 | + if (iter_all->done) { | |
| 160 | 160 | bv->bv_page = nth_page(bv->bv_page, 1); |
| 161 | 161 | bv->bv_offset = 0; |
| 162 | 162 | } else { |
| @@ -165,6 +165,12 @@ static inline void mp_bvec_next_segment(const struct bio_vec *bvec, · 2 unmodified lines | ||
| 165 | 165 | } |
| 166 | 166 | bv->bv_len = min_t(unsigned int, PAGE_SIZE - bv->bv_offset, |
| 167 | 167 | bvec->bv_len - iter_all->done); |
| 168 | + iter_all->done += bv->bv_len; | |
| 169 | + | |
| 170 | + if (iter_all->done == bvec->bv_len) { | |
| 171 | + iter_all->idx++; | |
| 172 | + iter_all->done = 0; | |
| 173 | + } | |
| 168 | 174 | } |
| 169 | 175 | |
| 170 | 176 | /* |