Skip to content

Commit 71075d2

Browse files
ChaitanayaKulkarniaxboe
authored andcommitted
blk-mq: add blk_rq_nr_bvec() helper
Add a new helper function blk_rq_nr_bvec() that returns the number of bvecs in a request. This count represents the number of iterations rq_for_each_bvec() would perform on a request. Drivers need to pre-allocate bvec arrays before iterating through a request's bvecs. Currently, they manually count bvecs using rq_for_each_bvec() in a loop, which is repetitive. The new helper centralizes this logic. This pattern exists in loop and zloop drivers, where multi-bio requests require copying bvecs into a contiguous array before creating an iov_iter for file operations. Update loop and zloop drivers to use the new helper, eliminating duplicate code. This patch also provides a clear API to avoid any potential misuse of blk_nr_phys_segments() for calculating the bvecs since, one bvec can have more than one segments and use of blk_nr_phys_segments() can lead to extra memory allocation :- [ 6155.673749] nullb_bio: 128K bio as ONE bvec: sector=0, size=131072 [ 6155.673846] null_blk: #### null_handle_data_transfer:1375 [ 6155.673850] null_blk: nr_bvec=1 blk_rq_nr_phys_segments=2 [ 6155.674263] null_blk: #### null_handle_data_transfer:1375 [ 6155.674267] null_blk: nr_bvec=1 blk_rq_nr_phys_segments=1 Reviewed-by: Niklas Cassel <cassel@kernel.org> Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 3e2cb9e commit 71075d2

3 files changed

Lines changed: 22 additions & 6 deletions

File tree

drivers/block/loop.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,10 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
348348
struct file *file = lo->lo_backing_file;
349349
struct bio_vec tmp;
350350
unsigned int offset;
351-
int nr_bvec = 0;
351+
unsigned int nr_bvec;
352352
int ret;
353353

354-
rq_for_each_bvec(tmp, rq, rq_iter)
355-
nr_bvec++;
354+
nr_bvec = blk_rq_nr_bvec(rq);
356355

357356
if (rq->bio != rq->biotail) {
358357

drivers/block/zloop.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ static void zloop_rw(struct zloop_cmd *cmd)
394394
struct bio_vec tmp;
395395
unsigned long flags;
396396
sector_t zone_end;
397-
int nr_bvec = 0;
397+
unsigned int nr_bvec;
398398
int ret;
399399

400400
atomic_set(&cmd->ref, 2);
@@ -487,8 +487,7 @@ static void zloop_rw(struct zloop_cmd *cmd)
487487
spin_unlock_irqrestore(&zone->wp_lock, flags);
488488
}
489489

490-
rq_for_each_bvec(tmp, rq, rq_iter)
491-
nr_bvec++;
490+
nr_bvec = blk_rq_nr_bvec(rq);
492491

493492
if (rq->bio != rq->biotail) {
494493
struct bio_vec *bvec;

include/linux/blk-mq.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,24 @@ static inline unsigned short blk_rq_nr_discard_segments(struct request *rq)
12131213
return max_t(unsigned short, rq->nr_phys_segments, 1);
12141214
}
12151215

1216+
/**
1217+
* blk_rq_nr_bvec - return number of bvecs in a request
1218+
* @rq: request to calculate bvecs for
1219+
*
1220+
* Returns the number of bvecs.
1221+
*/
1222+
static inline unsigned int blk_rq_nr_bvec(struct request *rq)
1223+
{
1224+
struct req_iterator rq_iter;
1225+
struct bio_vec bv;
1226+
unsigned int nr_bvec = 0;
1227+
1228+
rq_for_each_bvec(bv, rq, rq_iter)
1229+
nr_bvec++;
1230+
1231+
return nr_bvec;
1232+
}
1233+
12161234
int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,
12171235
struct scatterlist **last_sg);
12181236
static inline int blk_rq_map_sg(struct request *rq, struct scatterlist *sglist)

0 commit comments

Comments
 (0)