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

Commit a91a2785 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Require subsystems to explicitly allocate bio_set integrity mempool 



MD and DM create a new bio_set for every metadevice. Each bio_set has an
integrity mempool attached regardless of whether the metadevice is
capable of passing integrity metadata. This is a waste of memory.

Instead we defer the allocation decision to MD and DM since we know at
metadevice creation time whether integrity passthrough is needed or not.

Automatic integrity mempool allocation can then be removed from
bioset_create() and we make an explicit integrity allocation for the
fs_bio_set.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reported-by: default avatarZdenek Kabelac <zkabelac@redhat.com>
Acked-by: default avatarMike Snitzer <snizer@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 82f04ab4

drivers/md/dm-table.c

+5 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct dm_table { 
	struct dm_target *targets;



	unsigned discards_supported:1;

	unsigned integrity_supported:1;



	/*

	 * Indicates the rw permissions for the new logical
@@ -859,7 +860,7 @@ int dm_table_alloc_md_mempools(struct dm_table *t) 
		return -EINVAL;

	}



	t->mempools = dm_alloc_md_mempools(type);

	t->mempools = dm_alloc_md_mempools(type, t->integrity_supported);

	if (!t->mempools)

		return -ENOMEM;
@@ -935,8 +936,10 @@ static int dm_table_prealloc_integrity(struct dm_table *t, struct mapped_device 
	struct dm_dev_internal *dd;



	list_for_each_entry(dd, devices, list)

		if (bdev_get_integrity(dd->dm_dev.bdev))

		if (bdev_get_integrity(dd->dm_dev.bdev)) {

			t->integrity_supported = 1;

			return blk_integrity_register(dm_disk(md), NULL);

		}



	return 0;

}

drivers/md/dm.c

+9 −3
Original line number Diff line number Diff line
@@ -2620,9 +2620,10 @@ int dm_noflush_suspending(struct dm_target *ti) 
}

EXPORT_SYMBOL_GPL(dm_noflush_suspending);



struct dm_md_mempools *dm_alloc_md_mempools(unsigned type)

struct dm_md_mempools *dm_alloc_md_mempools(unsigned type, unsigned integrity)

{

	struct dm_md_mempools *pools = kmalloc(sizeof(*pools), GFP_KERNEL);

	unsigned int pool_size = (type == DM_TYPE_BIO_BASED) ? 16 : MIN_IOS;



	if (!pools)

		return NULL;
@@ -2639,13 +2640,18 @@ struct dm_md_mempools *dm_alloc_md_mempools(unsigned type) 
	if (!pools->tio_pool)

		goto free_io_pool_and_out;



	pools->bs = (type == DM_TYPE_BIO_BASED) ?

		    bioset_create(16, 0) : bioset_create(MIN_IOS, 0);

	pools->bs = bioset_create(pool_size, 0);

	if (!pools->bs)

		goto free_tio_pool_and_out;



	if (integrity && bioset_integrity_create(pools->bs, pool_size))

		goto free_bioset_and_out;



	return pools;



free_bioset_and_out:

	bioset_free(pools->bs);



free_tio_pool_and_out:

	mempool_destroy(pools->tio_pool);

drivers/md/dm.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ void dm_kcopyd_exit(void); 
/*

 * Mempool operations

 */

struct dm_md_mempools *dm_alloc_md_mempools(unsigned type);

struct dm_md_mempools *dm_alloc_md_mempools(unsigned type, unsigned integrity);

void dm_free_md_mempools(struct dm_md_mempools *pools);



#endif

drivers/md/linear.c

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static int linear_run (mddev_t *mddev) 
	blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);

	mddev->queue->backing_dev_info.congested_fn = linear_congested;

	mddev->queue->backing_dev_info.congested_data = mddev;

	md_integrity_register(mddev);

	return 0;

	return md_integrity_register(mddev);

}



static void free_conf(struct rcu_head *head)

drivers/md/md.c

+6 −2
Original line number Diff line number Diff line
@@ -1803,8 +1803,12 @@ int md_integrity_register(mddev_t *mddev) 
			mdname(mddev));

		return -EINVAL;

	}

	printk(KERN_NOTICE "md: data integrity on %s enabled\n",

	printk(KERN_NOTICE "md: data integrity enabled on %s\n", mdname(mddev));

	if (bioset_integrity_create(mddev->bio_set, BIO_POOL_SIZE)) {

		printk(KERN_ERR "md: failed to create integrity pool for %s\n",

		       mdname(mddev));

		return -EINVAL;

	}

	return 0;

}

EXPORT_SYMBOL(md_integrity_register);