bio bounce buffering fixes v3
Hi all,
this series fixes a few issues with the bio bounce buffering code.
Changes since v2:
- fix another issue found by the original reproducer
Changes since v1:
- go back to the previously tested approach without iov_iter.c changes that break small vectors
Diffstat:
bio.c | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-)
PATCH 1/2 block: handle huge zero folios in bio_free_folios
When CONFIG_PERSISTENT_HUGE_ZERO_FOLIO is enabled, iomap_dio_zero() can add a huge zero folio to a zeroing bio, which needs special treatment in bio_free_folios by also checking is_huge_zero_folio() in addition to is_zero_folio().
--- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
@@ -1302,7 +1302,7 @@ static void bio_free_folios(struct bio *bio)bio_for_each_bvec_all (bv, bio, i) {struct folio *folio =bvec_folio (bv); -if (!is_zero_folio (folio)) +if (!is_zero_folio (folio) && !is_huge_zero_folio (folio))folio_put (folio); } }
Signature · 1 line
2.53.0
PATCH 2/2 block: fix aligning of bounced dio read bios
In reply to Christoph Hellwigbio_iov_iter_align_down expects the "normal" biovec layout from vector 0, while bio_iov_iter_bounce_read abuses vector 0 for a bounce buffer allocation. Pass an explicit bvec to bio_iov_iter_align_down to deal with this case to avoid a double unpin.
Additionally we need to free the folio if no bio_vec could be added, and adjust the size of the first bio_vec that contains the bounce buffer when the I/O size is aligned down.
--- block/bio.c | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-)
block/bio.c +28 -23
@@ -1191,7 +1191,7 @@ void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter)* for the next iteration. */ static int bio_iov_iter_align_down (struct bio *bio,struct iov_iter *iter, -unsigned len_align_mask) +struct bio_vec *bv,unsigned len_align_mask) {size_t nbytes = bio->bi_iter.bi_size & len_align_mask;
@@ -1200,23 +1200,16 @@ static int bio_iov_iter_align_down(struct bio *bio, struct iov_iter *iter,iov_iter_revert (iter, nbytes); bio->bi_iter.bi_size -= nbytes; -do { -struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt -1 ]; - -if (nbytes < bv->bv_len) { - bv->bv_len -= nbytes; -break ; - } - +while (nbytes >= bv->bv_len) {if (bio_flagged (bio,BIO_PAGE_PINNED ))unpin_user_page (bv->bv_page); - bio->bi_vcnt--; +if (!--bio->bi_vcnt) +return -EFAULT ; nbytes -= bv->bv_len; - }while (nbytes); - -if (!bio->bi_vcnt) -return -EFAULT ; + bv--; + } + bv->bv_len -= nbytes;return 0 ; }
@@ -1276,7 +1269,8 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter,if (is_pci_p2pdma_page (bio->bi_io_vec->bv_page)) bio->bi_opf |=REQ_NOMERGE ; -return bio_iov_iter_align_down (bio, iter, len_align_mask); +return bio_iov_iter_align_down (bio, iter, + &bio->bi_io_vec[bio->bi_vcnt -1 ], len_align_mask); } static struct folio *folio_alloc_greedy(gfp_t gfp, size_t *size,
@@ -1360,7 +1354,8 @@ static int bio_iov_iter_bounce_write(struct bio *bio, struct iov_iter *iter,if (!bio->bi_iter.bi_size)return -ENOMEM ; -return bio_iov_iter_align_down (bio, iter, minsize -1 ); +return bio_iov_iter_align_down (bio, iter, + &bio->bi_io_vec[bio->bi_vcnt -1 ], minsize -1 ); } static int bio_iov_iter_bounce_read(struct bio *bio, struct iov_iter *iter,
@@ -1368,21 +1363,18 @@ static int bio_iov_iter_bounce_read(struct bio *bio, struct iov_iter *iter, {size_t len =min3 (iov_iter_count (iter), maxlen,SZ_1M );struct folio *folio; +ssize_t ret; folio =folio_alloc_greedy (GFP_KERNEL , &len, minsize);if (!folio)return -ENOMEM ; do { - ssize_t ret; - ret = iov_iter_extract_bvecs(iter, bio->bi_io_vec + 1, len, &bio->bi_vcnt, bio->bi_max_vecs - 1, 0); if (ret <= 0) { - if (!bio->bi_vcnt) { - folio_put(folio); - return ret; - } + if (!bio->bi_vcnt) + goto out_folio_put; break; } len -= ret;
@@ -1398,7 +1390,20 @@ static int bio_iov_iter_bounce_read(struct bio *bio, struct iov_iter *iter,bvec_set_folio (&bio->bi_io_vec[0 ], folio, bio->bi_iter.bi_size,0 );if (iov_iter_extract_will_pin (iter))bio_set_flag (bio,BIO_PAGE_PINNED ); -return bio_iov_iter_align_down (bio, iter, minsize -1 ); + +/* The first vec stores the bounce buffer, so do not subtract 1 here. */ + ret =bio_iov_iter_align_down (bio, iter, + &bio->bi_io_vec[bio->bi_vcnt], minsize -1 ); +if (ret) + goto out_folio_put; + +/* Update the bounc buffer bv_len to the aligned down size. */ + bio->bi_io_vec[0 ].bv_len = bio->bi_iter.bi_size; +return 0 ; + +out_folio_put: +folio_put (folio); +return ret; }/**
Signature · 1 line
2.53.0
Re: [PATCH 2/2] block: fix aligning of bounced dio read bios
Quoted 9 lines · Christoph Hellwig
bio_iov_iter_align_downexpects the "normal" biovec layout from vector 0, whilebio_iov_iter_bounce_readabuses vector 0 for a bounce buffer allocation. Pass an explicit bvec tobio_iov_iter_align_downto deal with this case to avoid a double unpin.Additionally we need to free the folio if no
bio_veccould be added, and adjust the size of the firstbio_vecthat contains the bounce buffer when the I/O size is aligned down.
Quoted 5 lines
Fixes e7b8b3c5b2a6 ("block: align down bounces bios")Reported-by 0wnerD1ed <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Tested-by 0wnerD1ed <[email protected]>Reviewed-by Keith Busch <[email protected]>
FYI, 0wnerDied created a GitHub Pull Request to add new blktests test cases as the regression tests of this fix patch [*]. Now review is ongoing for the test cases. If any one is interested in, feel free to chime in the review.
Quoted 10 lines · Christoph Hellwig
this series fixes a few issues with the bio bounce buffering code.
Changes since v2:
- fix another issue found by the original reproducerChanges since v1:
- go back to the previously tested approach withoutiov_iter.cchanges that break small vectors[...]
Applied, thanks!
[1/2] block: handle huge zero folios in bio_free_folios
commit: 4f221efff9b32fb4206f8db240a2b35a7d27696d
[2/2] block: fix aligning of bounced dio read bios
commit: df308a14585649f7683a560f5c94978ab4f8224dBest regards,
Signature · 1 line
Jens Axboe