Commit 49add496 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: pass a block_device and opf to bio_init 



Pass the block_device that we plan to use this bio for and the
operation to bio_init to optimize the assignment.  A NULL block_device
can be passed, both for the passthrough case on a raw request_queue and
to temporarily avoid refactoring some nasty code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220124091107.642561-19-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 07888c66

block/bio.c

+13 −14
Original line number Diff line number Diff line
@@ -249,12 +249,12 @@ static void bio_free(struct bio *bio) 
 * they must remember to pair any call to bio_init() with bio_uninit()

 * when IO has completed, or when the bio is released.

 */

void bio_init(struct bio *bio, struct bio_vec *table,

	      unsigned short max_vecs)

void bio_init(struct bio *bio, struct block_device *bdev, struct bio_vec *table,

	      unsigned short max_vecs, unsigned int opf)

{

	bio->bi_next = NULL;

	bio->bi_bdev = NULL;

	bio->bi_opf = 0;

	bio->bi_bdev = bdev;

	bio->bi_opf = opf;

	bio->bi_flags = 0;

	bio->bi_ioprio = 0;

	bio->bi_write_hint = 0;
@@ -268,6 +268,8 @@ void bio_init(struct bio *bio, struct bio_vec *table, 
#ifdef CONFIG_BLK_CGROUP

	bio->bi_blkg = NULL;

	bio->bi_issue.value = 0;

	if (bdev)

		bio_associate_blkg(bio);

#ifdef CONFIG_BLK_CGROUP_IOCOST

	bio->bi_iocost_cost = 0;

#endif
@@ -504,17 +506,14 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs, 
		if (unlikely(!bvl))

			goto err_free;



		bio_init(bio, bvl, nr_vecs);

		bio_init(bio, bdev, bvl, nr_vecs, opf);

	} else if (nr_vecs) {

		bio_init(bio, bio->bi_inline_vecs, BIO_INLINE_VECS);

		bio_init(bio, bdev, bio->bi_inline_vecs, BIO_INLINE_VECS, opf);

	} else {

		bio_init(bio, NULL, 0);

		bio_init(bio, bdev, NULL, 0, opf);

	}



	bio->bi_pool = bs;

	if (bdev)

		bio_set_dev(bio, bdev);

	bio->bi_opf = opf;

	return bio;



err_free:
@@ -542,7 +541,8 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned short nr_iovecs) 
	bio = kmalloc(struct_size(bio, bi_inline_vecs, nr_iovecs), gfp_mask);

	if (unlikely(!bio))

		return NULL;

	bio_init(bio, nr_iovecs ? bio->bi_inline_vecs : NULL, nr_iovecs);

	bio_init(bio, NULL, nr_iovecs ? bio->bi_inline_vecs : NULL, nr_iovecs,

		 0);

	bio->bi_pool = NULL;

	return bio;

}
@@ -1756,9 +1756,8 @@ struct bio *bio_alloc_kiocb(struct kiocb *kiocb, struct block_device *bdev, 
		cache->free_list = bio->bi_next;

		cache->nr--;

		put_cpu();

		bio_init(bio, nr_vecs ? bio->bi_inline_vecs : NULL, nr_vecs);

		bio_set_dev(bio, bdev);

		bio->bi_opf = opf;

		bio_init(bio, bdev, nr_vecs ? bio->bi_inline_vecs : NULL,

			 nr_vecs, opf);

		bio->bi_pool = bs;

		bio_set_flag(bio, BIO_PERCPU_CACHE);

		return bio;

block/blk-flush.c

+1 −3
Original line number Diff line number Diff line
@@ -460,9 +460,7 @@ int blkdev_issue_flush(struct block_device *bdev) 
{

	struct bio bio;



	bio_init(&bio, NULL, 0);

	bio_set_dev(&bio, bdev);

	bio.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;

	bio_init(&bio, bdev, NULL, 0, REQ_OP_WRITE | REQ_PREFLUSH);

	return submit_bio_wait(&bio);

}

EXPORT_SYMBOL(blkdev_issue_flush);

block/blk-zoned.c

+1 −4
Original line number Diff line number Diff line
@@ -238,10 +238,7 @@ static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask) 
{

	struct bio bio;



	bio_init(&bio, NULL, 0);

	bio_set_dev(&bio, bdev);

	bio.bi_opf = REQ_OP_ZONE_RESET_ALL | REQ_SYNC;



	bio_init(&bio, bdev, NULL, 0, REQ_OP_ZONE_RESET_ALL | REQ_SYNC);

	return submit_bio_wait(&bio);

}

block/fops.c

+9 −9
Original line number Diff line number Diff line
@@ -75,8 +75,13 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb, 
			return -ENOMEM;

	}



	bio_init(&bio, vecs, nr_pages);

	bio_set_dev(&bio, bdev);

	if (iov_iter_rw(iter) == READ) {

		bio_init(&bio, bdev, vecs, nr_pages, REQ_OP_READ);

		if (iter_is_iovec(iter))

			should_dirty = true;

	} else {

		bio_init(&bio, bdev, vecs, nr_pages, dio_bio_write_op(iocb));

	}

	bio.bi_iter.bi_sector = pos >> SECTOR_SHIFT;

	bio.bi_write_hint = iocb->ki_hint;

	bio.bi_private = current;
@@ -88,14 +93,9 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb, 
		goto out;

	ret = bio.bi_iter.bi_size;



	if (iov_iter_rw(iter) == READ) {

		bio.bi_opf = REQ_OP_READ;

		if (iter_is_iovec(iter))

			should_dirty = true;

	} else {

		bio.bi_opf = dio_bio_write_op(iocb);

	if (iov_iter_rw(iter) == WRITE)

		task_io_account_write(ret);

	}



	if (iocb->ki_flags & IOCB_NOWAIT)

		bio.bi_opf |= REQ_NOWAIT;

	if (iocb->ki_flags & IOCB_HIPRI)

drivers/block/floppy.c

+1 −3
Original line number Diff line number Diff line
@@ -4129,15 +4129,13 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive) 


	cbdata.drive = drive;



	bio_init(&bio, &bio_vec, 1);

	bio_set_dev(&bio, bdev);

	bio_init(&bio, bdev, &bio_vec, 1, REQ_OP_READ);

	bio_add_page(&bio, page, block_size(bdev), 0);



	bio.bi_iter.bi_sector = 0;

	bio.bi_flags |= (1 << BIO_QUIET);

	bio.bi_private = &cbdata;

	bio.bi_end_io = floppy_rb0_cb;

	bio_set_op_attrs(&bio, REQ_OP_READ, 0);



	init_completion(&cbdata.complete);