summarylogtreecommitdiffstats
path: root/0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch
diff options
context:
space:
mode:
Diffstat (limited to '0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch')
-rw-r--r--0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch b/0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch
new file mode 100644
index 000000000000..768851474be3
--- /dev/null
+++ b/0004-crypto-lib-remove-unneeded-selection-of-XOR_BLOCKS.patch
@@ -0,0 +1,40 @@
+From e120a63532946bad71dc6255579a3219a9caf66c Mon Sep 17 00:00:00 2001
+From: Eric Biggers <ebiggers@google.com>
+Date: Thu, 25 Aug 2022 22:04:56 -0700
+Subject: [PATCH 04/73] crypto: lib - remove unneeded selection of XOR_BLOCKS
+
+commit 874b301985ef2f89b8b592ad255e03fb6fbfe605 upstream.
+
+CRYPTO_LIB_CHACHA_GENERIC doesn't need to select XOR_BLOCKS. It perhaps
+was thought that it's needed for __crypto_xor, but that's not the case.
+
+Enabling XOR_BLOCKS is problematic because the XOR_BLOCKS code runs a
+benchmark when it is initialized. That causes a boot time regression on
+systems that didn't have it enabled before.
+
+Therefore, remove this unnecessary and problematic selection.
+
+Fixes: e56e18985596 ("lib/crypto: add prompts back to crypto libraries")
+Cc: stable@vger.kernel.org
+Signed-off-by: Eric Biggers <ebiggers@google.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/crypto/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
+index 2082af43d51f..0717a0dcefed 100644
+--- a/lib/crypto/Kconfig
++++ b/lib/crypto/Kconfig
+@@ -33,7 +33,6 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA
+
+ config CRYPTO_LIB_CHACHA_GENERIC
+ tristate
+- select XOR_BLOCKS
+ help
+ This symbol can be depended upon by arch implementations of the
+ ChaCha library interface that require the generic code as a
+--
+2.37.3
+