Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011067b0 authored by NeilBrown's avatar NeilBrown Committed by Jens Axboe
Browse files

blk: replace bioset_create_nobvec() with a flags arg to bioset_create() 



"flags" arguments are often seen as good API design as they allow
easy extensibility.
bioset_create_nobvec() is implemented internally as a variation in
flags passed to __bioset_create().

To support future extension, make the internal structure part of the
API.
i.e. add a 'flags' argument to bioset_create() and discard
bioset_create_nobvec().

Note that the bio_split allocations in drivers/md/raid* do not need
the bvec mempool - they should have used bioset_create_nobvec().

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@infradead.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent af67c31f

block/bio.c

+22 −38
Original line number Diff line number Diff line
@@ -1921,9 +1921,26 @@ void bioset_free(struct bio_set *bs) 
}

EXPORT_SYMBOL(bioset_free);



static struct bio_set *__bioset_create(unsigned int pool_size,

/**

 * bioset_create  - Create a bio_set

 * @pool_size:	Number of bio and bio_vecs to cache in the mempool

 * @front_pad:	Number of bytes to allocate in front of the returned bio

 * @flags:	Flags to modify behavior, currently only %BIOSET_NEED_BVECS

 *

 * Description:

 *    Set up a bio_set to be used with @bio_alloc_bioset. Allows the caller

 *    to ask for a number of bytes to be allocated in front of the bio.

 *    Front pad allocation is useful for embedding the bio inside

 *    another structure, to avoid allocating extra data to go with the bio.

 *    Note that the bio must be embedded at the END of that structure always,

 *    or things will break badly.

 *    If %BIOSET_NEED_BVECS is set in @flags, a separate pool will be allocated

 *    for allocating iovecs.  This pool is not needed e.g. for bio_clone_fast().

 *

 */

struct bio_set *bioset_create(unsigned int pool_size,

			      unsigned int front_pad,

				       bool create_bvec_pool)

			      int flags)

{

	unsigned int back_pad = BIO_INLINE_VECS * sizeof(struct bio_vec);

	struct bio_set *bs;
@@ -1948,7 +1965,7 @@ static struct bio_set *__bioset_create(unsigned int pool_size, 
	if (!bs->bio_pool)

		goto bad;



	if (create_bvec_pool) {

	if (flags & BIOSET_NEED_BVECS) {

		bs->bvec_pool = biovec_create_pool(pool_size);

		if (!bs->bvec_pool)

			goto bad;
@@ -1963,41 +1980,8 @@ static struct bio_set *__bioset_create(unsigned int pool_size, 
	bioset_free(bs);

	return NULL;

}



/**

 * bioset_create  - Create a bio_set

 * @pool_size:	Number of bio and bio_vecs to cache in the mempool

 * @front_pad:	Number of bytes to allocate in front of the returned bio

 *

 * Description:

 *    Set up a bio_set to be used with @bio_alloc_bioset. Allows the caller

 *    to ask for a number of bytes to be allocated in front of the bio.

 *    Front pad allocation is useful for embedding the bio inside

 *    another structure, to avoid allocating extra data to go with the bio.

 *    Note that the bio must be embedded at the END of that structure always,

 *    or things will break badly.

 */

struct bio_set *bioset_create(unsigned int pool_size, unsigned int front_pad)

{

	return __bioset_create(pool_size, front_pad, true);

}

EXPORT_SYMBOL(bioset_create);



/**

 * bioset_create_nobvec  - Create a bio_set without bio_vec mempool

 * @pool_size:	Number of bio to cache in the mempool

 * @front_pad:	Number of bytes to allocate in front of the returned bio

 *

 * Description:

 *    Same functionality as bioset_create() except that mempool is not

 *    created for bio_vecs. Saving some memory for bio_clone_fast() users.

 */

struct bio_set *bioset_create_nobvec(unsigned int pool_size, unsigned int front_pad)

{

	return __bioset_create(pool_size, front_pad, false);

}

EXPORT_SYMBOL(bioset_create_nobvec);



#ifdef CONFIG_BLK_CGROUP



/**
@@ -2112,7 +2096,7 @@ static int __init init_bio(void) 
	bio_integrity_init();

	biovec_init_slabs();



	fs_bio_set = bioset_create(BIO_POOL_SIZE, 0);

	fs_bio_set = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);

	if (!fs_bio_set)

		panic("bio: can't allocate bios\n");

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	if (q->id < 0)

		goto fail_q;



	q->bio_split = bioset_create(BIO_POOL_SIZE, 0);

	q->bio_split = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);

	if (!q->bio_split)

		goto fail_id;

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ static int drbd_create_mempools(void) 
		goto Enomem;



	/* mempools */

	drbd_md_io_bio_set = bioset_create(DRBD_MIN_POOL_PAGES, 0);

	drbd_md_io_bio_set = bioset_create(DRBD_MIN_POOL_PAGES, 0, BIOSET_NEED_BVECS);

	if (drbd_md_io_bio_set == NULL)

		goto Enomem;

drivers/md/bcache/super.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, 


	minor *= BCACHE_MINORS;



	if (!(d->bio_split = bioset_create(4, offsetof(struct bbio, bio))) ||

	if (!(d->bio_split = bioset_create(4, offsetof(struct bbio, bio), BIOSET_NEED_BVECS)) ||

	    !(d->disk = alloc_disk(BCACHE_MINORS))) {

		ida_simple_remove(&bcache_minor, minor);

		return -ENOMEM;
@@ -1516,7 +1516,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) 
				sizeof(struct bbio) + sizeof(struct bio_vec) *

				bucket_pages(c))) ||

	    !(c->fill_iter = mempool_create_kmalloc_pool(1, iter_size)) ||

	    !(c->bio_split = bioset_create(4, offsetof(struct bbio, bio))) ||

	    !(c->bio_split = bioset_create(4, offsetof(struct bbio, bio), BIOSET_NEED_BVECS)) ||

	    !(c->uuids = alloc_bucket_pages(GFP_KERNEL, c)) ||

	    !(c->moving_gc_wq = alloc_workqueue("bcache_gc",

						WQ_MEM_RECLAIM, 0)) ||

drivers/md/dm-crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -2677,7 +2677,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad;

	}



	cc->bs = bioset_create(MIN_IOS, 0);

	cc->bs = bioset_create(MIN_IOS, 0, BIOSET_NEED_BVECS);

	if (!cc->bs) {

		ti->error = "Cannot allocate crypt bioset";

		goto bad;