From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Sep 2024 16:12:51 +0000 (-0700)
Subject: Merge tag 'for-6.12/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/e477dba5442c0af7acb9e8bbbbde1108a37ed39c

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
  ...
---

e477dba5442c0af7acb9e8bbbbde1108a37ed39c
diff --cc Documentation/admin-guide/device-mapper/dm-crypt.rst
index 48a48bd09372,cde1d5594b0d..9f8139ff97d6
--- a/Documentation/admin-guide/device-mapper/dm-crypt.rst
+++ b/Documentation/admin-guide/device-mapper/dm-crypt.rst
@@@ -160,20 -160,19 +160,24 @@@ iv_large_sector
     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
 +      Maximum size of read requests. When a request larger than this size
 +      is received, dm-crypt will split the request. The splitting improves
 +      concurrency (the split requests could be encrypted in parallel by multiple
 +      cores), but it also causes overhead. The user should tune this parameters to
 +      fit the actual workload.
 +
     max_write_size
 -      Maximum size of read or write requests. When a request larger than this size
 +      Maximum size of write requests. When a request larger than this size
        is received, dm-crypt will split the request. The splitting improves
        concurrency (the split requests could be encrypted in parallel by multiple
 -      cores), but it also causes overhead. The user should tune these parameters to
 +      cores), but it also causes overhead. The user should tune this parameters to
        fit the actual workload.