Premapped buffers don't require a generic bio_vec since these have already been dma mapped. Repurpose the bi_io_vec space for the dma token as they are mutually exclusive, and provide setup to support dma tokens.
In order to use this, a driver must implement the dma_map blk-mq op, in which case it must be aware that any given bio may be using a dma_tag instead of a bio_vec. Suggested-by: Keith Busch <[email protected]> Signed-off-by: Pavel Begunkov <[email protected]> --- block/bio.c | 21 +++++++++++++++++++++ block/blk-merge.c | 23 +++++++++++++++++++++++ block/blk.h | 3 ++- block/fops.c | 2 ++ include/linux/bio.h | 19 ++++++++++++++++--- include/linux/blk_types.h | 8 +++++++- 6 files changed, 71 insertions(+), 5 deletions(-) diff --git a/block/bio.c b/block/bio.c index 7b13bdf72de0..8793f1ee559d 100644 --- a/block/bio.c +++ b/block/bio.c @@ -843,6 +843,11 @@ static int __bio_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp) bio_clone_blkg_association(bio, bio_src); } + if (bio_flagged(bio_src, BIO_DMA_TOKEN)) { + bio->dma_token = bio_src->dma_token; + bio_set_flag(bio, BIO_DMA_TOKEN); + } + if (bio_crypt_clone(bio, bio_src, gfp) < 0) return -ENOMEM; if (bio_integrity(bio_src) && @@ -1167,6 +1172,18 @@ void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter) bio_set_flag(bio, BIO_CLONED); } +void bio_iov_dma_token_set(struct bio *bio, struct iov_iter *iter) +{ + WARN_ON_ONCE(bio->bi_max_vecs); + + bio->dma_token = iter->dma_token; + bio->bi_vcnt = 0; + bio->bi_iter.bi_bvec_done = iter->iov_offset; + bio->bi_iter.bi_size = iov_iter_count(iter); + bio->bi_opf |= REQ_NOMERGE; + bio_set_flag(bio, BIO_DMA_TOKEN); +} + static unsigned int get_contig_folio_len(unsigned int *num_pages, struct page **pages, unsigned int i, struct folio *folio, size_t left, @@ -1349,6 +1366,10 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter, bio_iov_bvec_set(bio, iter); iov_iter_advance(iter, bio->bi_iter.bi_size); return 0; + } else if (iov_iter_is_dma_token(iter)) { + bio_iov_dma_token_set(bio, iter); + iov_iter_advance(iter, bio->bi_iter.bi_size); + return 0; } if (iov_iter_extract_will_pin(iter)) diff --git a/block/blk-merge.c b/block/blk-merge.c index d3115d7469df..c02a5f9c99e6 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -328,6 +328,29 @@ int bio_split_io_at(struct bio *bio, const struct queue_limits *lim, unsigned nsegs = 0, bytes = 0, gaps = 0; struct bvec_iter iter; + if (bio_flagged(bio, BIO_DMA_TOKEN)) { + int offset = offset_in_page(bio->bi_iter.bi_bvec_done); + + nsegs = ALIGN(bio->bi_iter.bi_size + offset, PAGE_SIZE); + nsegs >>= PAGE_SHIFT; + + if (offset & lim->dma_alignment || bytes & len_align_mask) + return -EINVAL; + + if (bio->bi_iter.bi_size > max_bytes) { + bytes = max_bytes; + nsegs = (bytes + offset) >> PAGE_SHIFT; + goto split; + } else if (nsegs > lim->max_segments) { + nsegs = lim->max_segments; + bytes = PAGE_SIZE * nsegs - offset; + goto split; + } + + *segs = nsegs; + return 0; + } + bio_for_each_bvec(bv, bio, iter) { if (bv.bv_offset & lim->dma_alignment || bv.bv_len & len_align_mask) diff --git a/block/blk.h b/block/blk.h index e4c433f62dfc..2c72f2630faf 100644 --- a/block/blk.h +++ b/block/blk.h @@ -398,7 +398,8 @@ static inline struct bio *__bio_split_to_limits(struct bio *bio, switch (bio_op(bio)) { case REQ_OP_READ: case REQ_OP_WRITE: - if (bio_may_need_split(bio, lim)) + if (bio_may_need_split(bio, lim) || + bio_flagged(bio, BIO_DMA_TOKEN)) return bio_split_rw(bio, lim, nr_segs); *nr_segs = 1; return bio; diff --git a/block/fops.c b/block/fops.c index 5e3db9fead77..41f8795874a9 100644 --- a/block/fops.c +++ b/block/fops.c @@ -354,6 +354,8 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb, * bio_iov_iter_get_pages() and set the bvec directly. */ bio_iov_bvec_set(bio, iter); + } else if (iov_iter_is_dma_token(iter)) { + bio_iov_dma_token_set(bio, iter); } else { ret = blkdev_iov_iter_get_pages(bio, iter, bdev); if (unlikely(ret)) diff --git a/include/linux/bio.h b/include/linux/bio.h index c75a9b3672aa..f83342640e71 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -108,16 +108,26 @@ static inline bool bio_next_segment(const struct bio *bio, #define bio_for_each_segment_all(bvl, bio, iter) \ for (bvl = bvec_init_iter_all(&iter); bio_next_segment((bio), &iter); ) +static inline void bio_advance_iter_dma_token(struct bvec_iter *iter, + unsigned int bytes) +{ + iter->bi_bvec_done += bytes; + iter->bi_size -= bytes; +} + static inline void bio_advance_iter(const struct bio *bio, struct bvec_iter *iter, unsigned int bytes) { iter->bi_sector += bytes >> 9; - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -= bytes; - else + } else if (bio_flagged(bio, BIO_DMA_TOKEN)) { + bio_advance_iter_dma_token(iter, bytes); + } else { bvec_iter_advance(bio->bi_io_vec, iter, bytes); /* TODO: It is reasonable to complete bio with error here. */ + } } /* @bytes should be less or equal to bvec[i->bi_idx].bv_len */ @@ -129,6 +139,8 @@ static inline void bio_advance_iter_single(const struct bio *bio, if (bio_no_advance_iter(bio)) iter->bi_size -= bytes; + else if (bio_flagged(bio, BIO_DMA_TOKEN)) + bio_advance_iter_dma_token(iter, bytes); else bvec_iter_advance_single(bio->bi_io_vec, iter, bytes); } @@ -398,7 +410,7 @@ static inline void bio_wouldblock_error(struct bio *bio) */ static inline int bio_iov_vecs_to_alloc(struct iov_iter *iter, int max_segs) { - if (iov_iter_is_bvec(iter)) + if (iov_iter_is_bvec(iter) || iov_iter_is_dma_token(iter)) return 0; return iov_iter_npages(iter, max_segs); } @@ -452,6 +464,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter, unsigned len_align_mask); void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter); +void bio_iov_dma_token_set(struct bio *bio, struct iov_iter *iter); void __bio_release_pages(struct bio *bio, bool mark_dirty); extern void bio_set_pages_dirty(struct bio *bio); extern void bio_check_pages_dirty(struct bio *bio); diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index cbbcb9051ec3..3bc7f89d4e66 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -275,7 +275,12 @@ struct bio { atomic_t __bi_cnt; /* pin count */ - struct bio_vec *bi_io_vec; /* the actual vec list */ + union { + struct bio_vec *bi_io_vec; /* the actual vec list */ + /* Driver specific dma map, present only with BIO_DMA_TOKEN */ + struct dma_token *dma_token; + }; + struct bio_set *bi_pool; }; @@ -315,6 +320,7 @@ enum { BIO_REMAPPED, BIO_ZONE_WRITE_PLUGGING, /* bio handled through zone write plugging */ BIO_EMULATES_ZONE_APPEND, /* bio emulates a zone append operation */ + BIO_DMA_TOKEN, /* Using premmaped dma buffers */ BIO_FLAG_LAST }; -- 2.52.0
