Skip to contentSkip to conversation

block: don't use for-inside-for in bio_for_each_segment_all

PATCH Applied Ming Lei 4 participants 5 messages Apr 8, 2019 – Apr 11, 2019

Subsystems (3)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH v3 1/1 block: don't use for-inside-for in bio_for_each_segment_all

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.

Cc Qu Wenruo <[email protected]>
Cc Omar Sandoval <[email protected]>
Cc Christoph Hellwig <[email protected]>
Reported-and-Tested-by Qu Wenruo <[email protected]>
Fixes 6dc4f100c175 ("block: allow bio_for_each_segment_all() to iterate over multi-page bvec")

---
V3:
- don't rename for avoiding conflict with hch's patches
V2:
- address comments: avoid explicated expressiones in macro, naming

 include/linux/bio.h  | 20 ++++++++++++--------
 include/linux/bvec.h | 14 ++++++++++----
 2 files changed, 22 insertions(+), 12 deletions(-)
include/linux/bio.h +12 -8
index bb6090aa165d..e584673c1881 100644
@@ -120,19 +120,23 @@ static inline bool bio_full(struct bio *bio)
 	return bio->bi_vcnt >= bio->bi_max_vecs;
 }
 
-#define mp_bvec_for_each_segment(bv, bvl, i, iter_all)			\
-	for (bv = bvec_init_iter_all(&iter_all);			\
-		(iter_all.done < (bvl)->bv_len) &&			\
-		(mp_bvec_next_segment((bvl), &iter_all), 1);		\
-		iter_all.done += bv->bv_len, i += 1)
+static inline bool bio_next_segment(const struct bio *bio,
+				    struct bvec_iter_all *iter)
+{
+	if (iter->idx >= bio->bi_vcnt)
+		return false;
+
+	bvec_advance(&bio->bi_io_vec[iter->idx], iter);
+	return true;
+}
 
 /*
  * drivers should _never_ use the all version - the bio may have been split
  * before it got to the driver and the driver won't own all of it
  */
-#define bio_for_each_segment_all(bvl, bio, i, iter_all)		\
-	for (i = 0, iter_all.idx = 0; iter_all.idx < (bio)->bi_vcnt; iter_all.idx++)	\
-		mp_bvec_for_each_segment(bvl, &((bio)->bi_io_vec[iter_all.idx]), i, iter_all)
+#define bio_for_each_segment_all(bvl, bio, i, iter)			\
+	for (i = 0, bvl = bvec_init_iter_all(&iter);			\
+	     bio_next_segment((bio), &iter); i++)
 
 static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
 				    unsigned bytes)
include/linux/bvec.h +10 -4
index f6275c4da13a..3bc91879e1e2 100644
@@ -145,18 +145,18 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv,
 
 static inline struct bio_vec *bvec_init_iter_all(struct bvec_iter_all *iter_all)
 {
-	iter_all->bv.bv_page = NULL;
 	iter_all->done = 0;
+	iter_all->idx = 0;
 
 	return &iter_all->bv;
 }
 
-static inline void mp_bvec_next_segment(const struct bio_vec *bvec,
-					struct bvec_iter_all *iter_all)
+static inline void bvec_advance(const struct bio_vec *bvec,
+				struct bvec_iter_all *iter_all)
 {
 	struct bio_vec *bv = &iter_all->bv;
 
-	if (bv->bv_page) {
+	if (iter_all->done) {
 		bv->bv_page = nth_page(bv->bv_page, 1);
 		bv->bv_offset = 0;
 	} else {
@@ -165,6 +165,12 @@ static inline void mp_bvec_next_segment(const struct bio_vec *bvec,
 	}
 	bv->bv_len = min_t(unsigned int, PAGE_SIZE - bv->bv_offset,
 			   bvec->bv_len - iter_all->done);
+	iter_all->done += bv->bv_len;
+
+	if (iter_all->done == bvec->bv_len) {
+		iter_all->idx++;
+		iter_all->done = 0;
+	}
 }
 
 /*
Signature · 1 line
2.9.5
Reviewed-by on v3 1/1
#1 lore raw

Looks good,

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
maintainer Applied
#2 lore raw
In reply to Ming Lei
Quoted 11 lines · Ming Lei

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.

Applied, thanks Ming.

Signature · 1 line
Jens Axboe
#3 lore raw
Quoted 9 lines · Jens Axboe
Quoted 8 lines · Ming Lei

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.

Quoted 5 lines
Quoted 3 lines

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.

Applied, thanks Ming.

What's the merge target please? This affects btrfs testing so I wonder if we should start adding workarounds or just wait for the next rc. Thanks.

maintainer
#4 lore raw
Quoted 14 lines · David Sterba
Quoted 13 lines · Jens Axboe
Quoted 11 lines · Ming Lei

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.

Quoted 5 lines
Quoted 1 line

Applied, thanks Ming.

What's the merge target please? This affects btrfs testing so I wonder if we should start adding workarounds or just wait for the next rc. Thanks.

It's queued up in my for-linus, so it's for this series. It'll go upstream tomorrow.

Signature · 1 line
Jens Axboe