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

block: rename BIO_MAX_PAGES to BIO_MAX_VECS 



Ever since the addition of multipage bio_vecs BIO_MAX_PAGES has been
horribly confusingly misnamed.  Rename it to BIO_MAX_VECS to stop
confusing users of the bio API.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20210311110137.1132391-2-hch@lst.de


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

block/bio.c

+7 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct biovec_slab { 
	{ .nr_vecs = 16, .name = "biovec-16" },

	{ .nr_vecs = 64, .name = "biovec-64" },

	{ .nr_vecs = 128, .name = "biovec-128" },

	{ .nr_vecs = BIO_MAX_PAGES, .name = "biovec-max" },

	{ .nr_vecs = BIO_MAX_VECS, .name = "biovec-max" },

};



static struct biovec_slab *biovec_slab(unsigned short nr_vecs)
@@ -46,7 +46,7 @@ static struct biovec_slab *biovec_slab(unsigned short nr_vecs) 
		return &bvec_slabs[1];

	case 65 ... 128:

		return &bvec_slabs[2];

	case 129 ... BIO_MAX_PAGES:

	case 129 ... BIO_MAX_VECS:

		return &bvec_slabs[3];

	default:

		BUG();
@@ -151,9 +151,9 @@ static void bio_put_slab(struct bio_set *bs) 


void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned short nr_vecs)

{

	BIO_BUG_ON(nr_vecs > BIO_MAX_PAGES);

	BIO_BUG_ON(nr_vecs > BIO_MAX_VECS);



	if (nr_vecs == BIO_MAX_PAGES)

	if (nr_vecs == BIO_MAX_VECS)

		mempool_free(bv, pool);

	else if (nr_vecs > BIO_INLINE_VECS)

		kmem_cache_free(biovec_slab(nr_vecs)->slab, bv);
@@ -186,15 +186,15 @@ struct bio_vec *bvec_alloc(mempool_t *pool, unsigned short *nr_vecs, 
	/*

	 * Try a slab allocation first for all smaller allocations.  If that

	 * fails and __GFP_DIRECT_RECLAIM is set retry with the mempool.

	 * The mempool is sized to handle up to BIO_MAX_PAGES entries.

	 * The mempool is sized to handle up to BIO_MAX_VECS entries.

	 */

	if (*nr_vecs < BIO_MAX_PAGES) {

	if (*nr_vecs < BIO_MAX_VECS) {

		struct bio_vec *bvl;



		bvl = kmem_cache_alloc(bvs->slab, bvec_alloc_gfp(gfp_mask));

		if (likely(bvl) || !(gfp_mask & __GFP_DIRECT_RECLAIM))

			return bvl;

		*nr_vecs = BIO_MAX_PAGES;

		*nr_vecs = BIO_MAX_VECS;

	}



	return mempool_alloc(pool, gfp_mask);

block/blk-crypto-fallback.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static bool blk_crypto_split_bio_if_needed(struct bio **bio_ptr) 


	bio_for_each_segment(bv, bio, iter) {

		num_sectors += bv.bv_len >> SECTOR_SHIFT;

		if (++i == BIO_MAX_PAGES)

		if (++i == BIO_MAX_VECS)

			break;

	}

	if (num_sectors < bio_sectors(bio)) {

block/blk-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects) 
{

	sector_t pages = DIV_ROUND_UP_SECTOR_T(nr_sects, PAGE_SIZE / 512);



	return min(pages, (sector_t)BIO_MAX_PAGES);

	return min(pages, (sector_t)BIO_MAX_VECS);

}



static int __blkdev_issue_zero_pages(struct block_device *bdev,

block/blk-map.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, 
	if (!iov_iter_count(iter))

		return -EINVAL;



	bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, BIO_MAX_PAGES));

	bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, BIO_MAX_VECS));

	if (!bio)

		return -ENOMEM;

	bio->bi_opf |= req_op(rq);

block/bounce.c

+3 −3
Original line number Diff line number Diff line
@@ -229,10 +229,10 @@ static struct bio *bounce_clone_bio(struct bio *bio_src) 
	 *  - The point of cloning the biovec is to produce a bio with a biovec

	 *    the caller can modify: bi_idx and bi_bvec_done should be 0.

	 *

	 *  - The original bio could've had more than BIO_MAX_PAGES biovecs; if

	 *  - The original bio could've had more than BIO_MAX_VECS biovecs; if

	 *    we tried to clone the whole thing bio_alloc_bioset() would fail.

	 *    But the clone should succeed as long as the number of biovecs we

	 *    actually need to allocate is fewer than BIO_MAX_PAGES.

	 *    actually need to allocate is fewer than BIO_MAX_VECS.

	 *

	 *  - Lastly, bi_vcnt should not be looked at or relied upon by code

	 *    that does not own the bio - reason being drivers don't use it for
@@ -299,7 +299,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, 
	int sectors = 0;



	bio_for_each_segment(from, *bio_orig, iter) {

		if (i++ < BIO_MAX_PAGES)

		if (i++ < BIO_MAX_VECS)

			sectors += from.bv_len >> 9;

		if (page_to_pfn(from.bv_page) > q->limits.bounce_pfn)

			bounce = true;