aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-01-13 21:13:01 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2021-01-13 21:13:01 +0000
commit074a91f746bd80498a4c815aa795e5dc51b12121 (patch)
treec68c976bb5f5244ce3f6eb9066d6a7ab98676b89
parent44117554b1ee8edd66d7383c17802d5799fd18f2 (diff)
downloadsrc-074a91f746bd.tar.gz
src-074a91f746bd.zip
Enable accelerated AES-XTS software crypto in GENERIC.
In particular, using GELI on a root filesystem will only use accelerated software crypto drivers if they are available before the root filesystem is mounted. While these modules can be loaded from the loader, including them in GENERIC provides a better out-of-the-box experience for users. Both aesni(4) and armv8crypto(4) provide accelerated implementations of the default cipher used by GELI (AES-XTS) in addition to other ciphers. Reviewed by: mhorne, allanjude, markj Differential Revision: https://reviews.freebsd.org/D28100
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/arm64/conf/GENERIC1
-rw-r--r--sys/i386/conf/GENERIC1
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 1ccd06669951..393fec26d423 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -315,6 +315,7 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device crypto # core crypto support
+device aesni # AES-NI OpenCrypto module
device loop # Network loopback
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG
diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 463271d1db26..d1ad101975de 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -217,6 +217,7 @@ device aw_rtc # Allwinner Real-time Clock
device mv_rtc # Marvell Real-time Clock
# Crypto accelerators
+device armv8crypto # ARMv8 OpenCrypto module
device safexcel # Inside Secure EIP-97
# Watchdog controllers
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index eac3a0af6c82..b65235ca9668 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -287,6 +287,7 @@ device wpi # Intel 3945ABG wireless NICs.
# Pseudo devices.
device crypto # core crypto support
+device aesni # AES-NI OpenCrypto module
device loop # Network loopback
device padlock_rng # VIA Padlock RNG
device rdrand_rng # Intel Bull Mountain RNG