modules: enable more device-mapper modules for modern LVM/Stratis-Storage.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

16 files changed, 54 insertions, 51 deletions

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 84a66681..41c39f04 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos"
-
diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index a81d1151..81666b37 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 634a2ea9..41c39f04 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index 84a66681..41c39f04 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos"
-
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 84a66681..41c39f04 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos"
-
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 634a2ea9..41c39f04 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index a81d1151..81666b37 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index d70ad2ec..81666b37 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/arch/s390/modules_load b/arch/s390/modules_load
index 84a66681..41c39f04 100644
--- a/arch/s390/modules_load
+++ b/arch/s390/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos"
-
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index a81d1151..81666b37 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index d70ad2ec..81666b37 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/arch/um/modules_load b/arch/um/modules_load
index a9e9e583..350f2572 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
@@ -27,4 +27,3 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 
 # Filesystems
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos"
-
diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index ffbb999b..36fff7a0 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -4,8 +4,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index 50c6a93a..6813bfc5 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)
diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 2f57c9c0..8b8b54f3 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -720,20 +720,40 @@ CONFIG_MD_RAID456=m
 # CONFIG_MULTICORE_RAID456 is not set
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BUFIO=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CRYPT=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 # CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_DELAY=m
+CONFIG_DM_ERA=m
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MIRROR=m
-# CONFIG_DM_MULTIPATH is not set
+CONFIG_DM_MQ_DEFAULT=y
 # CONFIG_DM_MULTIPATH_EMC is not set
 # CONFIG_DM_MULTIPATH_HP is not set
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
 # CONFIG_DM_MULTIPATH_RDAC is not set
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_RAID45=m
+CONFIG_DM_RAID=m
 CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_SWITCH=m
+CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=m
-CONFIG_DM_LOG_USERSPACE=m
-# CONFIG_DM_MULTIPATH_QL is not set
-# CONFIG_DM_MULTIPATH_ST is not set
 
 #
 # Fusion MPT device support
@@ -4424,14 +4444,6 @@ CONFIG_IGB_HWMON=y
 CONFIG_NAMESPACES=y
 CONFIG_EVENT_TRACING=y
 CONFIG_KPROBE_EVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_RAID=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -4485,7 +4497,6 @@ CONFIG_VHOST_NET=m
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_NFS_USE_LEGACY_DNS=y
 CONFIG_NFSD_DEPRECATED=y
-CONFIG_DM_RAID45=m
 CONFIG_VGA_ARB_MAX_GPUS=64
 CONFIG_SLAB=y
 CONFIG_IP_VS_PROTO_SCTP=y
diff --git a/defaults/modules_load b/defaults/modules_load
index 09b647b3..d30c1a36 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -3,8 +3,8 @@
 # RAID
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_LVM="dm-mod dm-snapshot dm-mirror dm-bbr dm-bufio dm-crypt dm-delay dm-flakey dm-log dm-log-userspace dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin dm-service-time dm-thin-pool dm-persistent-data libcrc32c dm-zero"
-MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath"
+MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
+MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity dm-zero dm-persistent-data ${MODULES_MDADM}"
 MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length dm-service-time"
 
 # Hardware (IDE/SCSI/SATA/NVMe)