Commit 7e284070 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull device mapper updates from Mike Snitzer:

 - Enable DM core bioset's per-cpu bio cache if QUEUE_FLAG_POLL set.
   This change improves DM's hipri bio polling (REQ_POLLED) performance
   by 7 - 20% depending on the system.

 - Update DM core to use jump_labels to further reduce cost of unlikely
   branches for zoned block devices, dm-stats and swap_bios throttling.

 - Various DM core changes to reduce bio-based DM overhead and simplify
   IO accounting.

 - Fundamental DM core improvements to dm_io reference counting and the
   elimination of using bio_split()+bio_chain() -- instead DM's
   bio-based IO accounting is updated to account that a split occurred.

 - Improve DM core's abnormal bio processing to do less work.

 - Improve DM core's hipri polling support to use a single list rather
   than an hlist.

 - Update DM core to pass NULL bdev to bio_alloc_clone() so that
   initialization that isn't useful for DM can be elided.

 - Add cond_resched to DM stats' various loops that loop over all
   entries.

 - Fix incorrect error code return from DM integrity's constructor.

 - Make DM crypt's printing of the key constant-time.

 - Update bio-based DM multipath to provide high-resolution timer to the
   Historical Service Time (HST) path selector.

* tag 'for-5.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (26 commits)
  dm: pass NULL bdev to bio_alloc_clone
  dm cache metadata: remove unnecessary variable in __dump_mapping
  dm mpath: provide high-resolution timer to HST for bio-based
  dm crypt: make printing of the key constant-time
  dm integrity: fix error code in dm_integrity_ctr()
  dm stats: add cond_resched when looping over entries
  dm: improve abnormal bio processing
  dm: simplify bio-based IO accounting further
  dm: put all polled dm_io instances into a single list
  dm: improve dm_io reference counting
  dm: don't grab target io reference in dm_zone_map_bio
  dm: improve bio splitting and associated IO accounting
  dm: switch to bdev based IO accounting interfaces
  dm: pass dm_io instance to dm_io_acct directly
  dm: don't pass bio to __dm_start_io_acct and dm_end_io_acct
  dm: use bio_sectors in dm_aceept_partial_bio
  dm: simplify basic targets
  dm: conditionally enable branching for less used features
  dm: introduce dm_{get,put}_live_table_bio called from dm_submit_bio
  dm: move hot dm_io members to same cacheline as dm_target_io
  ...
parents 780d8ce7 ca522482

drivers/md/dm-cache-metadata.c

+1 −2
Original line number Diff line number Diff line
@@ -1509,7 +1509,6 @@ int dm_cache_load_mappings(struct dm_cache_metadata *cmd, 


static int __dump_mapping(void *context, uint64_t cblock, void *leaf)

{

	int r = 0;

	__le64 value;

	dm_oblock_t oblock;

	unsigned flags;
@@ -1517,7 +1516,7 @@ static int __dump_mapping(void *context, uint64_t cblock, void *leaf) 
	memcpy(&value, leaf, sizeof(value));

	unpack_value(value, &oblock, &flags);



	return r;

	return 0;

}



static int __dump_mappings(struct dm_cache_metadata *cmd)

drivers/md/dm-core.h

+23 −15
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/ktime.h>

#include <linux/blk-mq.h>

#include <linux/blk-crypto-profile.h>

#include <linux/jump_label.h>



#include <trace/events/block.h>
@@ -154,6 +155,10 @@ static inline struct dm_stats *dm_get_stats(struct mapped_device *md) 
	return &md->stats;

}



DECLARE_STATIC_KEY_FALSE(stats_enabled);

DECLARE_STATIC_KEY_FALSE(swap_bios_enabled);

DECLARE_STATIC_KEY_FALSE(zoned_enabled);



static inline bool dm_emulate_zone_append(struct mapped_device *md)

{

	if (blk_queue_is_zoned(md->queue))
@@ -237,6 +242,12 @@ static inline void dm_tio_set_flag(struct dm_target_io *tio, unsigned int bit) 
	tio->flags |= (1U << bit);

}



static inline bool dm_tio_is_normal(struct dm_target_io *tio)

{

	return (dm_tio_flagged(tio, DM_TIO_INSIDE_DM_IO) &&

		!dm_tio_flagged(tio, DM_TIO_IS_DUPLICATE_BIO));

}



/*

 * One of these is allocated per original bio.

 * It contains the first clone used for that original.
@@ -245,16 +256,20 @@ static inline void dm_tio_set_flag(struct dm_target_io *tio, unsigned int bit) 
struct dm_io {

	unsigned short magic;

	blk_short_t flags;

	atomic_t io_count;

	struct mapped_device *md;

	struct bio *orig_bio;

	blk_status_t status;

	spinlock_t lock;

	unsigned long start_time;

	void *data;

	struct hlist_node node;

	struct task_struct *map_task;

	struct dm_io *next;

	struct dm_stats_aux stats_aux;

	blk_status_t status;

	atomic_t io_count;

	struct mapped_device *md;



	/* The three fields represent mapped part of original bio */

	struct bio *orig_bio;

	unsigned int sector_offset; /* offset to end of orig_bio */

	unsigned int sectors;



	/* last member of dm_target_io is 'struct bio' */

	struct dm_target_io tio;

};
@@ -263,8 +278,8 @@ struct dm_io { 
 * dm_io flags

 */

enum {

	DM_IO_START_ACCT,

	DM_IO_ACCOUNTED

	DM_IO_ACCOUNTED,

	DM_IO_WAS_SPLIT

};



static inline bool dm_io_flagged(struct dm_io *io, unsigned int bit)
@@ -277,13 +292,6 @@ static inline void dm_io_set_flag(struct dm_io *io, unsigned int bit) 
	io->flags |= (1U << bit);

}



static inline void dm_io_inc_pending(struct dm_io *io)

{

	atomic_inc(&io->io_count);

}



void dm_io_dec_pending(struct dm_io *io, blk_status_t error);



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 −3
Original line number Diff line number Diff line
@@ -3439,6 +3439,11 @@ static int crypt_map(struct dm_target *ti, struct bio *bio) 
	return DM_MAPIO_SUBMITTED;

}



static char hex2asc(unsigned char c)

{

	return c + '0' + ((unsigned)(9 - c) >> 4 & 0x27);

}



static void crypt_status(struct dm_target *ti, status_type_t type,

			 unsigned status_flags, char *result, unsigned maxlen)

{
@@ -3457,9 +3462,12 @@ static void crypt_status(struct dm_target *ti, status_type_t type, 
		if (cc->key_size > 0) {

			if (cc->key_string)

				DMEMIT(":%u:%s", cc->key_size, cc->key_string);

			else

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

					DMEMIT("%02x", cc->key[i]);

			else {

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

					DMEMIT("%c%c", hex2asc(cc->key[i] >> 4),

					       hex2asc(cc->key[i] & 0xf));

				}

			}

		} else

			DMEMIT("-");

drivers/md/dm-delay.c

+1 −2
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ static int delay_map(struct dm_target *ti, struct bio *bio) 
	}

	delayed->class = c;

	bio_set_dev(bio, c->dev->bdev);

	if (bio_sectors(bio))

	bio->bi_iter.bi_sector = c->start + dm_target_offset(ti, bio->bi_iter.bi_sector);



	return delay_bio(dc, c, bio);

drivers/md/dm-flakey.c

+1 −3
Original line number Diff line number Diff line
@@ -280,9 +280,7 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio) 
	struct flakey_c *fc = ti->private;



	bio_set_dev(bio, fc->dev->bdev);

	if (bio_sectors(bio) || op_is_zone_mgmt(bio_op(bio)))

		bio->bi_iter.bi_sector =

			flakey_map_sector(ti, bio->bi_iter.bi_sector);

	bio->bi_iter.bi_sector = flakey_map_sector(ti, bio->bi_iter.bi_sector);

}



static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc)