Skip to content

Commit 61e6295

Browse files
committed
Merge tag 'for-7.0/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device mapper updates from Mikulas Patocka: - dm-verity: - various optimizations and fixes related to forward error correction - add a .dm-verity keyring - dm-integrity: fix bugs with growing a device in bitmap mode - dm-mpath: - fix leaking fake timeout requests - fix UAF bug caused by stale rq->bio - fix minor bugs in device creation - dm-core: - fix a bug related to blkg association - avoid unnecessary blk-crypto work on invalid keys - dm-bufio: - dm-bufio cleanup and optimization (reducing hash table lookups) - various other minor fixes and cleanups * tag 'for-7.0/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (35 commits) dm mpath: make pg_init_delay_msecs settable Revert "dm: fix a race condition in retrieve_deps" dm mpath: Add missing dm_put_device when failing to get scsi dh name dm vdo encodings: clean up header and version functions dm: use bio_clone_blkg_association dm: fix excessive blk-crypto operations for invalid keys dm-verity: fix section mismatch error dm-unstripe: fix mapping bug when there are multiple targets in a table dm-integrity: fix recalculation in bitmap mode dm-bufio: avoid redundant buffer_tree lookups dm-bufio: merge cache_put() into cache_put_and_wake() selftests: add dm-verity keyring selftests dm-verity: add dm-verity keyring dm: clear cloned request bio pointer when last clone bio completes dm-verity: fix up various workqueue-related comments dm-verity: switch to bio_advance_iter_single() dm-verity: consolidate the BH and normal work structs dm: add WQ_PERCPU to alloc_workqueue users dm-integrity: fix a typo in the code for write/discard race dm: use READ_ONCE in dm_blk_report_zones ...
2 parents 1e0ea4d + 218b169 commit 61e6295

40 files changed

Lines changed: 1300 additions & 333 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Table line examples:
433433
8192 1960886272 linear 8:0 0 2048 # previous data segment
434434

435435
# Mapping table for e.g. raid5_rs reshape causing the size of the raid device to double-fold once the reshape finishes.
436-
# Check the status output (e.g. "dmsetup status $RaidDev") for progess.
436+
# Check the status output (e.g. "dmsetup status $RaidDev") for progress.
437437

438438
0 $((2 * 1960886272)) raid raid5 7 0 region_size 2048 data_offset 8192 delta_disk 1 2 /dev/dm-0 /dev/dm-1 /dev/dm-2 /dev/dm-3
439439

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,13 @@ Kernel parameters
13721372
For details see:
13731373
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
13741374

1375+
dm_verity.keyring_unsealed=
1376+
[KNL] When set to 1, leave the dm-verity keyring
1377+
unsealed after initialization so userspace can
1378+
provision keys. Once the keyring is restricted
1379+
it becomes active and is searched during signature
1380+
verification.
1381+
13751382
driver_async_probe= [KNL]
13761383
List of driver names to be probed asynchronously. *
13771384
matches with all driver names. If * is specified, the

drivers/md/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,8 @@ config DM_VERITY
549549
select CRYPTO_HASH
550550
select CRYPTO_LIB_SHA256
551551
select DM_BUFIO
552+
select REED_SOLOMON if DM_VERITY_FEC
553+
select REED_SOLOMON_DEC8 if DM_VERITY_FEC
552554
help
553555
This device-mapper target creates a read-only device that
554556
transparently validates the data on one underlying device against
@@ -598,8 +600,6 @@ config DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING
598600
config DM_VERITY_FEC
599601
bool "Verity forward error correction support"
600602
depends on DM_VERITY
601-
select REED_SOLOMON
602-
select REED_SOLOMON_DEC8
603603
help
604604
Add forward error correction support to dm-verity. This option
605605
makes it possible to use pre-generated error correction data to

0 commit comments

Comments
 (0)