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

Commit 395c72a7 authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: Generalized bio pool freeing 



With the old code, when you allocate a bio from a bio pool you have to
implement your own destructor that knows how to find the bio pool the
bio was originally allocated from.

This adds a new field to struct bio (bi_pool) and changes
bio_alloc_bioset() to use it. This makes various bio destructors
unnecessary, so they're then deleted.

v6: Explain the temporary if statement in bio_put

Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
CC: Alasdair Kergon <agk@redhat.com>
CC: Nicholas Bellinger <nab@linux-iscsi.org>
CC: Lars Ellenberg <lars.ellenberg@linbit.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent eeea3ac9

drivers/block/drbd/drbd_main.c

+1 −12
Original line number Diff line number Diff line
@@ -162,23 +162,12 @@ static const struct block_device_operations drbd_ops = { 
	.release = drbd_release,

};



static void bio_destructor_drbd(struct bio *bio)

{

	bio_free(bio, drbd_md_io_bio_set);

}



struct bio *bio_alloc_drbd(gfp_t gfp_mask)

{

	struct bio *bio;



	if (!drbd_md_io_bio_set)

		return bio_alloc(gfp_mask, 1);



	bio = bio_alloc_bioset(gfp_mask, 1, drbd_md_io_bio_set);

	if (!bio)

		return NULL;

	bio->bi_destructor = bio_destructor_drbd;

	return bio;

	return bio_alloc_bioset(gfp_mask, 1, drbd_md_io_bio_set);

}



#ifdef __CHECKER__

drivers/md/dm-crypt.c

+0 −9
Original line number Diff line number Diff line
@@ -798,14 +798,6 @@ static int crypt_convert(struct crypt_config *cc, 
	return 0;

}



static void dm_crypt_bio_destructor(struct bio *bio)

{

	struct dm_crypt_io *io = bio->bi_private;

	struct crypt_config *cc = io->cc;



	bio_free(bio, cc->bs);

}



/*

 * Generate a new unfragmented bio with the given size

 * This should never violate the device limitations
@@ -974,7 +966,6 @@ static void clone_init(struct dm_crypt_io *io, struct bio *clone) 
	clone->bi_end_io  = crypt_endio;

	clone->bi_bdev    = cc->dev->bdev;

	clone->bi_rw      = io->base_bio->bi_rw;

	clone->bi_destructor = dm_crypt_bio_destructor;

}



static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)

drivers/md/dm-io.c

+0 −11
Original line number Diff line number Diff line
@@ -249,16 +249,6 @@ static void vm_dp_init(struct dpages *dp, void *data) 
	dp->context_ptr = data;

}



static void dm_bio_destructor(struct bio *bio)

{

	unsigned region;

	struct io *io;



	retrieve_io_and_region_from_bio(bio, &io, &region);



	bio_free(bio, io->client->bios);

}



/*

 * Functions for getting the pages from kernel memory.

 */
@@ -317,7 +307,6 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, 
		bio->bi_sector = where->sector + (where->count - remaining);

		bio->bi_bdev = where->bdev;

		bio->bi_end_io = endio;

		bio->bi_destructor = dm_bio_destructor;

		store_io_and_region_in_bio(bio, io, region);



		if (rw & REQ_DISCARD) {

drivers/md/dm.c

+0 −20
Original line number Diff line number Diff line
@@ -681,11 +681,6 @@ static void clone_endio(struct bio *bio, int error) 
		}

	}



	/*

	 * Store md for cleanup instead of tio which is about to get freed.

	 */

	bio->bi_private = md->bs;



	free_tio(md, tio);

	bio_put(bio);

	dec_pending(io, error);
@@ -1032,11 +1027,6 @@ static void __map_bio(struct dm_target *ti, struct bio *clone, 
		/* error the io and bail out, or requeue it if needed */

		md = tio->io->md;

		dec_pending(tio->io, r);

		/*

		 * Store bio_set for cleanup.

		 */

		clone->bi_end_io = NULL;

		clone->bi_private = md->bs;

		bio_put(clone);

		free_tio(md, tio);

	} else if (r) {
@@ -1055,13 +1045,6 @@ struct clone_info { 
	unsigned short idx;

};



static void dm_bio_destructor(struct bio *bio)

{

	struct bio_set *bs = bio->bi_private;



	bio_free(bio, bs);

}



/*

 * Creates a little bio that just does part of a bvec.

 */
@@ -1073,7 +1056,6 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector, 
	struct bio_vec *bv = bio->bi_io_vec + idx;



	clone = bio_alloc_bioset(GFP_NOIO, 1, bs);

	clone->bi_destructor = dm_bio_destructor;

	*clone->bi_io_vec = *bv;



	clone->bi_sector = sector;
@@ -1105,7 +1087,6 @@ static struct bio *clone_bio(struct bio *bio, sector_t sector, 


	clone = bio_alloc_bioset(GFP_NOIO, bio->bi_max_vecs, bs);

	__bio_clone(clone, bio);

	clone->bi_destructor = dm_bio_destructor;

	clone->bi_sector = sector;

	clone->bi_idx = idx;

	clone->bi_vcnt = idx + bv_count;
@@ -1150,7 +1131,6 @@ static void __issue_target_request(struct clone_info *ci, struct dm_target *ti, 
	 */

	clone = bio_alloc_bioset(GFP_NOIO, ci->bio->bi_max_vecs, ci->md->bs);

	__bio_clone(clone, ci->bio);

	clone->bi_destructor = dm_bio_destructor;

	if (len) {

		clone->bi_sector = ci->sector;

		clone->bi_size = to_bytes(len);

drivers/md/md.c

+4 −24
Original line number Diff line number Diff line
@@ -155,32 +155,17 @@ static int start_readonly; 
 * like bio_clone, but with a local bio set

 */



static void mddev_bio_destructor(struct bio *bio)

{

	struct mddev *mddev, **mddevp;



	mddevp = (void*)bio;

	mddev = mddevp[-1];



	bio_free(bio, mddev->bio_set);

}



struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,

			    struct mddev *mddev)

{

	struct bio *b;

	struct mddev **mddevp;



	if (!mddev || !mddev->bio_set)

		return bio_alloc(gfp_mask, nr_iovecs);



	b = bio_alloc_bioset(gfp_mask, nr_iovecs,

			     mddev->bio_set);

	b = bio_alloc_bioset(gfp_mask, nr_iovecs, mddev->bio_set);

	if (!b)

		return NULL;

	mddevp = (void*)b;

	mddevp[-1] = mddev;

	b->bi_destructor = mddev_bio_destructor;

	return b;

}

EXPORT_SYMBOL_GPL(bio_alloc_mddev);
@@ -189,18 +174,14 @@ struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask, 
			    struct mddev *mddev)

{

	struct bio *b;

	struct mddev **mddevp;



	if (!mddev || !mddev->bio_set)

		return bio_clone(bio, gfp_mask);



	b = bio_alloc_bioset(gfp_mask, bio->bi_max_vecs,

			     mddev->bio_set);

	b = bio_alloc_bioset(gfp_mask, bio->bi_max_vecs, mddev->bio_set);

	if (!b)

		return NULL;

	mddevp = (void*)b;

	mddevp[-1] = mddev;

	b->bi_destructor = mddev_bio_destructor;



	__bio_clone(b, bio);

	if (bio_integrity(bio)) {

		int ret;
@@ -5006,8 +4987,7 @@ int md_run(struct mddev *mddev) 
	}



	if (mddev->bio_set == NULL)

		mddev->bio_set = bioset_create(BIO_POOL_SIZE,

					       sizeof(struct mddev *));

		mddev->bio_set = bioset_create(BIO_POOL_SIZE, 0);



	spin_lock(&pers_lock);

	pers = find_pers(mddev->level, mddev->clevel);