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

Commit 1e2a410f authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: Ues bi_pool for bio_integrity_alloc() 



Now that bios keep track of where they were allocated from,
bio_integrity_alloc_bioset() becomes redundant.

Remove bio_integrity_alloc_bioset() and drop bio_set argument from the
related functions and make them use bio->bi_pool.

Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 395c72a7

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, 
		__bio_clone(bio, bio_src);



		if (bio_integrity(bio_src) &&

		    bio_integrity_clone(bio, bio_src, gfp_mask, bs))

		    bio_integrity_clone(bio, bio_src, gfp_mask))

			goto free_and_out;



		if (bio_ctr && bio_ctr(bio, bio_src, data))

drivers/md/dm.c

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector, 
	clone->bi_flags |= 1 << BIO_CLONED;



	if (bio_integrity(bio)) {

		bio_integrity_clone(clone, bio, GFP_NOIO, bs);

		bio_integrity_clone(clone, bio, GFP_NOIO);

		bio_integrity_trim(clone,

				   bio_sector_offset(bio, idx, offset), len);

	}
@@ -1094,7 +1094,7 @@ static struct bio *clone_bio(struct bio *bio, sector_t sector, 
	clone->bi_flags &= ~(1 << BIO_SEG_VALID);



	if (bio_integrity(bio)) {

		bio_integrity_clone(clone, bio, GFP_NOIO, bs);

		bio_integrity_clone(clone, bio, GFP_NOIO);



		if (idx != bio->bi_idx || clone->bi_size < bio->bi_size)

			bio_integrity_trim(clone,

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask, 
	if (bio_integrity(bio)) {

		int ret;



		ret = bio_integrity_clone(b, bio, gfp_mask, mddev->bio_set);

		ret = bio_integrity_clone(b, bio, gfp_mask);



		if (ret < 0) {

			bio_put(b);

fs/bio-integrity.c

+15 −29
Original line number Diff line number Diff line
@@ -70,23 +70,25 @@ static inline int use_bip_pool(unsigned int idx) 
}



/**

 * bio_integrity_alloc_bioset - Allocate integrity payload and attach it to bio

 * bio_integrity_alloc - Allocate integrity payload and attach it to bio

 * @bio:	bio to attach integrity metadata to

 * @gfp_mask:	Memory allocation mask

 * @nr_vecs:	Number of integrity metadata scatter-gather elements

 * @bs:		bio_set to allocate from

 *

 * Description: This function prepares a bio for attaching integrity

 * metadata.  nr_vecs specifies the maximum number of pages containing

 * integrity metadata that can be attached.

 */

struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio,

struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,

						  gfp_t gfp_mask,

							 unsigned int nr_vecs,

							 struct bio_set *bs)

						  unsigned int nr_vecs)

{

	struct bio_integrity_payload *bip;

	unsigned int idx = vecs_to_idx(nr_vecs);

	struct bio_set *bs = bio->bi_pool;



	if (!bs)

		bs = fs_bio_set;



	BUG_ON(bio == NULL);

	bip = NULL;
@@ -114,37 +116,22 @@ struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio, 


	return bip;

}

EXPORT_SYMBOL(bio_integrity_alloc_bioset);



/**

 * bio_integrity_alloc - Allocate integrity payload and attach it to bio

 * @bio:	bio to attach integrity metadata to

 * @gfp_mask:	Memory allocation mask

 * @nr_vecs:	Number of integrity metadata scatter-gather elements

 *

 * Description: This function prepares a bio for attaching integrity

 * metadata.  nr_vecs specifies the maximum number of pages containing

 * integrity metadata that can be attached.

 */

struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio,

						  gfp_t gfp_mask,

						  unsigned int nr_vecs)

{

	return bio_integrity_alloc_bioset(bio, gfp_mask, nr_vecs, fs_bio_set);

}

EXPORT_SYMBOL(bio_integrity_alloc);



/**

 * bio_integrity_free - Free bio integrity payload

 * @bio:	bio containing bip to be freed

 * @bs:		bio_set this bio was allocated from

 *

 * Description: Used to free the integrity portion of a bio. Usually

 * called from bio_free().

 */

void bio_integrity_free(struct bio *bio, struct bio_set *bs)

void bio_integrity_free(struct bio *bio)

{

	struct bio_integrity_payload *bip = bio->bi_integrity;

	struct bio_set *bs = bio->bi_pool;



	if (!bs)

		bs = fs_bio_set;



	BUG_ON(bip == NULL);
@@ -730,19 +717,18 @@ EXPORT_SYMBOL(bio_integrity_split); 
 * @bio:	New bio

 * @bio_src:	Original bio

 * @gfp_mask:	Memory allocation mask

 * @bs:		bio_set to allocate bip from

 *

 * Description:	Called to allocate a bip when cloning a bio

 */

int bio_integrity_clone(struct bio *bio, struct bio *bio_src,

			gfp_t gfp_mask, struct bio_set *bs)

			gfp_t gfp_mask)

{

	struct bio_integrity_payload *bip_src = bio_src->bi_integrity;

	struct bio_integrity_payload *bip;



	BUG_ON(bip_src == NULL);



	bip = bio_integrity_alloc_bioset(bio, gfp_mask, bip_src->bip_vcnt, bs);

	bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt);



	if (bip == NULL)

		return -EIO;

fs/bio.c

+3 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ void bio_free(struct bio *bio, struct bio_set *bs) 
		bvec_free_bs(bs, bio->bi_io_vec, BIO_POOL_IDX(bio));



	if (bio_integrity(bio))

		bio_integrity_free(bio, bs);

		bio_integrity_free(bio);



	/*

	 * If we have front padding, adjust the bio pointer before freeing
@@ -341,7 +341,7 @@ EXPORT_SYMBOL(bio_alloc); 
static void bio_kmalloc_destructor(struct bio *bio)

{

	if (bio_integrity(bio))

		bio_integrity_free(bio, fs_bio_set);

		bio_integrity_free(bio);

	kfree(bio);

}
@@ -480,7 +480,7 @@ struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask) 
	if (bio_integrity(bio)) {

		int ret;



		ret = bio_integrity_clone(b, bio, gfp_mask, fs_bio_set);

		ret = bio_integrity_clone(b, bio, gfp_mask);



		if (ret < 0) {

			bio_put(b);