Commit 4815519e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.10/dm-changes' of... 

Merge tag 'for-5.10/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper updates from Mike Snitzer:

 - Improve DM core's bio splitting to use blk_max_size_offset(). Also
   fix bio splitting for bios that were deferred to the worker thread
   due to a DM device being suspended.

 - Remove DM core's special handling of NVMe devices now that block core
   has internalized efficiencies drivers previously needed to be
   concerned about (via now removed direct_make_request).

 - Fix request-based DM to not bounce through indirect dm_submit_bio;
   instead have block core make direct call to blk_mq_submit_bio().

 - Various DM core cleanups to simplify and improve code.

 - Update DM cryot to not use drivers that set
   CRYPTO_ALG_ALLOCATES_MEMORY.

 - Fix DM raid's raid1 and raid10 discard limits for the purposes of
   linux-stable. But then remove DM raid's discard limits settings now
   that MD raid can efficiently handle large discards.

 - A couple small cleanups across various targets.

* tag 'for-5.10/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: fix request-based DM to not bounce through indirect dm_submit_bio
  dm: remove special-casing of bio-based immutable singleton target on NVMe
  dm: export dm_copy_name_and_uuid
  dm: fix comment in __dm_suspend()
  dm: fold dm_process_bio() into dm_submit_bio()
  dm: fix missing imposition of queue_limits from dm_wq_work() thread
  dm snap persistent: simplify area_io()
  dm thin metadata: Remove unused local variable when create thin and snap
  dm raid: remove unnecessary discard limits for raid10
  dm raid: fix discard limits for raid1 and raid10
  dm crypt: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY
  dm: use dm_table_get_device_name() where appropriate in targets
  dm table: make 'struct dm_table' definition accessible to all of DM core
  dm: eliminate need for start_io_acct() forward declaration
  dm: simplify __process_abnormal_io()
  dm: push use of on-stack flush_bio down to __send_empty_flush()
  dm: optimize max_io_len() by inlining max_io_len_target_boundary()
  dm: push md->immutable_target optimization down to __process_bio()
  dm: change max_io_len() to use blk_max_size_offset()
  dm table: stack 'chunk_sectors' limit to account for target-specific splitting
parents 6e4dc3d5 681cc5e8

block/blk-mq.c

+0 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,6 @@ queue_exit: 
	blk_queue_exit(q);

	return BLK_QC_T_NONE;

}

EXPORT_SYMBOL_GPL(blk_mq_submit_bio); /* only for request based dm */



void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,

		     unsigned int hctx_idx)

drivers/md/dm-cache-target.c

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static enum cache_metadata_mode get_cache_mode(struct cache *cache) 


static const char *cache_device_name(struct cache *cache)

{

	return dm_device_name(dm_table_get_md(cache->ti->table));

	return dm_table_device_name(cache->ti->table);

}



static void notify_mode_switch(struct cache *cache, enum cache_metadata_mode mode)

drivers/md/dm-core.h

+54 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/kthread.h>

#include <linux/ktime.h>

#include <linux/genhd.h>

#include <linux/blk-mq.h>



#include <trace/events/block.h>
@@ -25,9 +26,11 @@ struct dm_kobject_holder { 
};



/*

 * DM core internal structure that used directly by dm.c and dm-rq.c

 * DM targets must _not_ deference a mapped_device to directly access its members!

 * DM core internal structures used directly by dm.c, dm-rq.c and dm-table.c.

 * DM targets must _not_ deference a mapped_device or dm_table to directly

 * access their members!

 */



struct mapped_device {

	struct mutex suspend_lock;
@@ -119,6 +122,55 @@ void disable_discard(struct mapped_device *md); 
void disable_write_same(struct mapped_device *md);

void disable_write_zeroes(struct mapped_device *md);



static inline sector_t dm_get_size(struct mapped_device *md)

{

	return get_capacity(md->disk);

}



static inline struct dm_stats *dm_get_stats(struct mapped_device *md)

{

	return &md->stats;

}



#define DM_TABLE_MAX_DEPTH 16



struct dm_table {

	struct mapped_device *md;

	enum dm_queue_mode type;



	/* btree table */

	unsigned int depth;

	unsigned int counts[DM_TABLE_MAX_DEPTH]; /* in nodes */

	sector_t *index[DM_TABLE_MAX_DEPTH];



	unsigned int num_targets;

	unsigned int num_allocated;

	sector_t *highs;

	struct dm_target *targets;



	struct target_type *immutable_target_type;



	bool integrity_supported:1;

	bool singleton:1;

	unsigned integrity_added:1;



	/*

	 * Indicates the rw permissions for the new logical

	 * device.  This should be a combination of FMODE_READ

	 * and FMODE_WRITE.

	 */

	fmode_t mode;



	/* a list of devices used by this table */

	struct list_head devices;



	/* events get handed up using this callback */

	void (*event_fn)(void *);

	void *event_context;



	struct dm_md_mempools *mempools;

};



static inline struct completion *dm_get_completion_from_kobject(struct kobject *kobj)

{

	return &container_of(kobj, struct dm_kobject_holder, kobj)->completion;

drivers/md/dm-crypt.c

+11 −6
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ static int crypt_iv_lmk_ctr(struct crypt_config *cc, struct dm_target *ti, 
		return -EINVAL;

	}



	lmk->hash_tfm = crypto_alloc_shash("md5", 0, 0);

	lmk->hash_tfm = crypto_alloc_shash("md5", 0,

					   CRYPTO_ALG_ALLOCATES_MEMORY);

	if (IS_ERR(lmk->hash_tfm)) {

		ti->error = "Error initializing LMK hash";

		return PTR_ERR(lmk->hash_tfm);
@@ -586,7 +587,8 @@ static int crypt_iv_tcw_ctr(struct crypt_config *cc, struct dm_target *ti, 
		return -EINVAL;

	}



	tcw->crc32_tfm = crypto_alloc_shash("crc32", 0, 0);

	tcw->crc32_tfm = crypto_alloc_shash("crc32", 0,

					    CRYPTO_ALG_ALLOCATES_MEMORY);

	if (IS_ERR(tcw->crc32_tfm)) {

		ti->error = "Error initializing CRC32 in TCW";

		return PTR_ERR(tcw->crc32_tfm);
@@ -773,7 +775,8 @@ static int crypt_iv_elephant_ctr(struct crypt_config *cc, struct dm_target *ti, 
	struct iv_elephant_private *elephant = &cc->iv_gen_private.elephant;

	int r;



	elephant->tfm = crypto_alloc_skcipher("ecb(aes)", 0, 0);

	elephant->tfm = crypto_alloc_skcipher("ecb(aes)", 0,

					      CRYPTO_ALG_ALLOCATES_MEMORY);

	if (IS_ERR(elephant->tfm)) {

		r = PTR_ERR(elephant->tfm);

		elephant->tfm = NULL;
@@ -2154,7 +2157,8 @@ static int crypt_alloc_tfms_skcipher(struct crypt_config *cc, char *ciphermode) 
		return -ENOMEM;



	for (i = 0; i < cc->tfms_count; i++) {

		cc->cipher_tfm.tfms[i] = crypto_alloc_skcipher(ciphermode, 0, 0);

		cc->cipher_tfm.tfms[i] = crypto_alloc_skcipher(ciphermode, 0,

						CRYPTO_ALG_ALLOCATES_MEMORY);

		if (IS_ERR(cc->cipher_tfm.tfms[i])) {

			err = PTR_ERR(cc->cipher_tfm.tfms[i]);

			crypt_free_tfms(cc);
@@ -2180,7 +2184,8 @@ static int crypt_alloc_tfms_aead(struct crypt_config *cc, char *ciphermode) 
	if (!cc->cipher_tfm.tfms)

		return -ENOMEM;



	cc->cipher_tfm.tfms_aead[0] = crypto_alloc_aead(ciphermode, 0, 0);

	cc->cipher_tfm.tfms_aead[0] = crypto_alloc_aead(ciphermode, 0,

						CRYPTO_ALG_ALLOCATES_MEMORY);

	if (IS_ERR(cc->cipher_tfm.tfms_aead[0])) {

		err = PTR_ERR(cc->cipher_tfm.tfms_aead[0]);

		crypt_free_tfms(cc);
@@ -2667,7 +2672,7 @@ static int crypt_ctr_auth_cipher(struct crypt_config *cc, char *cipher_api) 
		return -ENOMEM;

	strncpy(mac_alg, start, end - start);



	mac = crypto_alloc_ahash(mac_alg, 0, 0);

	mac = crypto_alloc_ahash(mac_alg, 0, CRYPTO_ALG_ALLOCATES_MEMORY);

	kfree(mac_alg);



	if (IS_ERR(mac))

drivers/md/dm-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2044,7 +2044,7 @@ out: 


	return r;

}



EXPORT_SYMBOL_GPL(dm_copy_name_and_uuid);



/**

 * dm_early_create - create a mapped device in early boot.

CRA Git | Maintained and supported by SUSTech CRA and CCSE