Commit e477dba5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull device mapper updates from Mikulas Patocka:

 - Misc VDO fixes

 - Remove unused declarations dm_get_rq_mapinfo() and dm_zone_map_bio()

 - Dm-delay: Improve kernel documentation

 - Dm-crypt: Allow to specify the integrity key size as an option

 - Dm-bufio: Remove pointless NULL check

 - Small code cleanups: Use ERR_CAST; remove unlikely() around IS_ERR;
   use __assign_bit

 - Dm-integrity: Fix gcc 5 warning; convert comma to semicolon; fix
   smatch warning

 - Dm-integrity: Support recalculation in the 'I' mode

 - Revert "dm: requeue IO if mapping table not yet available"

 - Dm-crypt: Small refactoring to make the code more readable

 - Dm-cache: Remove pointless error check

 - Dm: Fix spelling errors

 - Dm-verity: Restart or panic on an I/O error if restart or panic was
   requested

 - Dm-verity: Fallback to platform keyring also if key in trusted
   keyring is rejected

* tag 'for-6.12/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (26 commits)
  dm verity: fallback to platform keyring also if key in trusted keyring is rejected
  dm-verity: restart or panic on an I/O error
  dm: fix spelling errors
  dm-cache: remove pointless error check
  dm vdo: handle unaligned discards correctly
  dm vdo indexer: Convert comma to semicolon
  dm-crypt: Use common error handling code in crypt_set_keyring_key()
  dm-crypt: Use up_read() together with key_put() only once in crypt_set_keyring_key()
  Revert "dm: requeue IO if mapping table not yet available"
  dm-integrity: check mac_size against HASH_MAX_DIGESTSIZE in sb_mac()
  dm-integrity: support recalculation in the 'I' mode
  dm integrity: Convert comma to semicolon
  dm integrity: fix gcc 5 warning
  dm: Make use of __assign_bit() API
  dm integrity: Remove extra unlikely helper
  dm: Convert to use ERR_CAST()
  dm bufio: Remove NULL check of list_entry()
  dm-crypt: Allow to specify the integrity key size as option
  dm: Remove unused declaration and empty definition "dm_zone_map_bio"
  dm delay: enhance kernel documentation
  ...
parents b6c49fca 579b2ba4

Documentation/admin-guide/device-mapper/delay.rst

+32 −9
Original line number Diff line number Diff line
@@ -3,29 +3,52 @@ dm-delay 
========



Device-Mapper's "delay" target delays reads and/or writes

and maps them to different devices.

and/or flushs and optionally maps them to different devices.



Parameters::

Arguments::



    <device> <offset> <delay> [<write_device> <write_offset> <write_delay>

			       [<flush_device> <flush_offset> <flush_delay>]]



With separate write parameters, the first set is only used for reads.

Table line has to either have 3, 6 or 9 arguments:



3: apply offset and delay to read, write and flush operations on device



6: apply offset and delay to device, also apply write_offset and write_delay

   to write and flush operations on optionally different write_device with

   optionally different sector offset



9: same as 6 arguments plus define flush_offset and flush_delay explicitely

   on/with optionally different flush_device/flush_offset.



Offsets are specified in sectors.



Delays are specified in milliseconds.





Example scripts

===============



::



	#!/bin/sh

	# Create device delaying rw operation for 500ms

	echo "0 `blockdev --getsz $1` delay $1 0 500" | dmsetup create delayed

	#

	# Create mapped device named "delayed" delaying read, write and flush operations for 500ms.

	#

	dmsetup create delayed --table  "0 `blockdev --getsz $1` delay $1 0 500"



::

	#!/bin/sh

	#

	# Create mapped device delaying write and flush operations for 400ms and

	# splitting reads to device $1 but writes and flushs to different device $2

	# to different offsets of 2048 and 4096 sectors respectively.

	#

	dmsetup create delayed --table "0 `blockdev --getsz $1` delay $1 2048 0 $2 4096 400"



::

	#!/bin/sh

	# Create device delaying only write operation for 500ms and

	# splitting reads and writes to different devices $1 $2

	echo "0 `blockdev --getsz $1` delay $1 0 0 $2 0 500" | dmsetup create delayed
 
	#

	# Create mapped device delaying reads for 50ms, writes for 100ms and flushs for 333ms

	# onto the same backing device at offset 0 sectors.

	#

	dmsetup create delayed --table "0 `blockdev --getsz $1` delay $1 0 50 $2 0 100 $1 0 333"

Documentation/admin-guide/device-mapper/dm-crypt.rst

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ iv_large_sectors 
   The <iv_offset> must be multiple of <sector_size> (in 512 bytes units)

   if this flag is specified.



integrity_key_size:<bytes>

   Use an integrity key of <bytes> size instead of using an integrity key size

   of the digest size of the used HMAC algorithm.





Module parameters::

   max_read_size

Documentation/admin-guide/device-mapper/vdo.rst

+6 −1
Original line number Diff line number Diff line
@@ -251,6 +251,11 @@ The messages are: 
		by the vdostats userspace program to interpret the output

		buffer.



	config:

		Outputs useful vdo configuration information. Mostly used

		by users who want to recreate a similar VDO volume and

		want to know the creation configuration used.



	dump:

		Dumps many internal structures to the system log. This is

		not always safe to run, so it should only be used to debug

drivers/md/dm-bufio.c

+0 −3
Original line number Diff line number Diff line
@@ -529,9 +529,6 @@ static struct dm_buffer *list_to_buffer(struct list_head *l) 
{

	struct lru_entry *le = list_entry(l, struct lru_entry, list);



	if (!le)

		return NULL;



	return le_to_buffer(le);

}

drivers/md/dm-cache-target.c

+1 −5
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ static void mg_copy(struct work_struct *ws) 
			 */

			bool rb = bio_detain_shared(mg->cache, mg->op->oblock, mg->overwrite_bio);



			BUG_ON(rb); /* An exclussive lock must _not_ be held for this block */

			BUG_ON(rb); /* An exclusive lock must _not_ be held for this block */

			mg->overwrite_bio = NULL;

			inc_io_migrations(mg->cache);

			mg_full_copy(ws);
@@ -3200,8 +3200,6 @@ static int parse_cblock_range(struct cache *cache, const char *str, 
	 * Try and parse form (ii) first.

	 */

	r = sscanf(str, "%llu-%llu%c", &b, &e, &dummy);

	if (r < 0)

		return r;



	if (r == 2) {

		result->begin = to_cblock(b);
@@ -3213,8 +3211,6 @@ static int parse_cblock_range(struct cache *cache, const char *str, 
	 * That didn't work, try form (i).

	 */

	r = sscanf(str, "%llu%c", &b, &dummy);

	if (r < 0)

		return r;



	if (r == 1) {

		result->begin = to_cblock(b);