-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'random-5.17-for-linus' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/crng/random
Pull random number generator updates from Jason Donenfeld:
"These a bit more numerous than usual for the RNG, due to folks
resubmitting patches that had been pending prior and generally renewed
interest.
There are a few categories of patches in here:
1) Dominik Brodowski and I traded a series back and forth for a some
weeks that fixed numerous issues related to seeds being provided
at extremely early boot by the firmware, before other parts of the
kernel or of the RNG have been initialized, both fixing some
crashes and addressing correctness around early boot randomness.
One of these is marked for stable.
2) I replaced the RNG's usage of SHA-1 with BLAKE2s in the entropy
extractor, and made the construction a bit safer and more
standard. This was sort of a long overdue low hanging fruit, as we
were supposed to have phased out SHA-1 usage quite some time ago
(even if all we needed here was non-invertibility). Along the way
it also made extraction 131% faster. This required a bit of
Kconfig and symbol plumbing to make things work well with the
crypto libraries, which is one of the reasons why I'm sending you
this pull early in the cycle.
3) I got rid of a truly superfluous call to RDRAND in the hot path,
which resulted in a whopping 370% increase in performance.
4) Sebastian Andrzej Siewior sent some patches regarding PREEMPT_RT,
the full series of which wasn't ready yet, but the first two
preparatory cleanups were good on their own. One of them touches
files in kernel/irq/, which is the other reason why I'm sending
you this pull early in the cycle.
5) Other assorted correctness fixes from Eric Biggers, Jann Horn,
Mark Brown, Dominik Brodowski, and myself"
* 'random-5.17-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random:
random: don't reset crng_init_cnt on urandom_read()
random: avoid superfluous call to RDRAND in CRNG extraction
random: early initialization of ChaCha constants
random: use IS_ENABLED(CONFIG_NUMA) instead of ifdefs
random: harmonize "crng init done" messages
random: mix bootloader randomness into pool
random: do not throw away excess input to crng_fast_load
random: do not re-init if crng_reseed completes before primary init
random: fix crash on multiple early calls to add_bootloader_randomness()
random: do not sign extend bytes for rotation when mixing
random: use BLAKE2s instead of SHA1 in extraction
lib/crypto: blake2s: include as built-in
random: fix data race on crng init time
random: fix data race on crng_node_pool
irq: remove unused flags argument from __handle_irq_event_percpu()
random: remove unused irq_flags argument from add_interrupt_randomness()
random: document add_hwgenerator_randomness() with other input functions
MAINTAINERS: add git tree for random.c- Loading branch information
Showing
23 changed files
with
341 additions
and
309 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,7 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| /* | ||
| * BLAKE2s digest algorithm, ARM scalar implementation | ||
| * | ||
| * Copyright 2020 Google LLC | ||
| */ | ||
|
|
||
| #include <crypto/internal/blake2s.h> | ||
| #include <crypto/internal/hash.h> | ||
|
|
||
| #include <linux/module.h> | ||
|
|
||
| /* defined in blake2s-core.S */ | ||
| EXPORT_SYMBOL(blake2s_compress_arch); | ||
|
|
||
| static int crypto_blake2s_update_arm(struct shash_desc *desc, | ||
| const u8 *in, unsigned int inlen) | ||
| { | ||
| return crypto_blake2s_update(desc, in, inlen, blake2s_compress_arch); | ||
| } | ||
|
|
||
| static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out) | ||
| { | ||
| return crypto_blake2s_final(desc, out, blake2s_compress_arch); | ||
| } | ||
|
|
||
| #define BLAKE2S_ALG(name, driver_name, digest_size) \ | ||
| { \ | ||
| .base.cra_name = name, \ | ||
| .base.cra_driver_name = driver_name, \ | ||
| .base.cra_priority = 200, \ | ||
| .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, \ | ||
| .base.cra_blocksize = BLAKE2S_BLOCK_SIZE, \ | ||
| .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx), \ | ||
| .base.cra_module = THIS_MODULE, \ | ||
| .digestsize = digest_size, \ | ||
| .setkey = crypto_blake2s_setkey, \ | ||
| .init = crypto_blake2s_init, \ | ||
| .update = crypto_blake2s_update_arm, \ | ||
| .final = crypto_blake2s_final_arm, \ | ||
| .descsize = sizeof(struct blake2s_state), \ | ||
| } | ||
|
|
||
| static struct shash_alg blake2s_arm_algs[] = { | ||
| BLAKE2S_ALG("blake2s-128", "blake2s-128-arm", BLAKE2S_128_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-160", "blake2s-160-arm", BLAKE2S_160_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-224", "blake2s-224-arm", BLAKE2S_224_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-256", "blake2s-256-arm", BLAKE2S_256_HASH_SIZE), | ||
| }; | ||
|
|
||
| static int __init blake2s_arm_mod_init(void) | ||
| { | ||
| return IS_REACHABLE(CONFIG_CRYPTO_HASH) ? | ||
| crypto_register_shashes(blake2s_arm_algs, | ||
| ARRAY_SIZE(blake2s_arm_algs)) : 0; | ||
| } | ||
|
|
||
| static void __exit blake2s_arm_mod_exit(void) | ||
| { | ||
| if (IS_REACHABLE(CONFIG_CRYPTO_HASH)) | ||
| crypto_unregister_shashes(blake2s_arm_algs, | ||
| ARRAY_SIZE(blake2s_arm_algs)); | ||
| } | ||
|
|
||
| module_init(blake2s_arm_mod_init); | ||
| module_exit(blake2s_arm_mod_exit); | ||
|
|
||
| MODULE_DESCRIPTION("BLAKE2s digest algorithm, ARM scalar implementation"); | ||
| MODULE_LICENSE("GPL"); | ||
| MODULE_AUTHOR("Eric Biggers <ebiggers@google.com>"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-128"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-128-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256-arm"); | ||
| EXPORT_SYMBOL(blake2s_compress); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| /* | ||
| * BLAKE2s digest algorithm, ARM scalar implementation | ||
| * | ||
| * Copyright 2020 Google LLC | ||
| */ | ||
|
|
||
| #include <crypto/internal/blake2s.h> | ||
| #include <crypto/internal/hash.h> | ||
|
|
||
| #include <linux/module.h> | ||
|
|
||
| static int crypto_blake2s_update_arm(struct shash_desc *desc, | ||
| const u8 *in, unsigned int inlen) | ||
| { | ||
| return crypto_blake2s_update(desc, in, inlen, blake2s_compress); | ||
| } | ||
|
|
||
| static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out) | ||
| { | ||
| return crypto_blake2s_final(desc, out, blake2s_compress); | ||
| } | ||
|
|
||
| #define BLAKE2S_ALG(name, driver_name, digest_size) \ | ||
| { \ | ||
| .base.cra_name = name, \ | ||
| .base.cra_driver_name = driver_name, \ | ||
| .base.cra_priority = 200, \ | ||
| .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, \ | ||
| .base.cra_blocksize = BLAKE2S_BLOCK_SIZE, \ | ||
| .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx), \ | ||
| .base.cra_module = THIS_MODULE, \ | ||
| .digestsize = digest_size, \ | ||
| .setkey = crypto_blake2s_setkey, \ | ||
| .init = crypto_blake2s_init, \ | ||
| .update = crypto_blake2s_update_arm, \ | ||
| .final = crypto_blake2s_final_arm, \ | ||
| .descsize = sizeof(struct blake2s_state), \ | ||
| } | ||
|
|
||
| static struct shash_alg blake2s_arm_algs[] = { | ||
| BLAKE2S_ALG("blake2s-128", "blake2s-128-arm", BLAKE2S_128_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-160", "blake2s-160-arm", BLAKE2S_160_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-224", "blake2s-224-arm", BLAKE2S_224_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-256", "blake2s-256-arm", BLAKE2S_256_HASH_SIZE), | ||
| }; | ||
|
|
||
| static int __init blake2s_arm_mod_init(void) | ||
| { | ||
| return IS_REACHABLE(CONFIG_CRYPTO_HASH) ? | ||
| crypto_register_shashes(blake2s_arm_algs, | ||
| ARRAY_SIZE(blake2s_arm_algs)) : 0; | ||
| } | ||
|
|
||
| static void __exit blake2s_arm_mod_exit(void) | ||
| { | ||
| if (IS_REACHABLE(CONFIG_CRYPTO_HASH)) | ||
| crypto_unregister_shashes(blake2s_arm_algs, | ||
| ARRAY_SIZE(blake2s_arm_algs)); | ||
| } | ||
|
|
||
| module_init(blake2s_arm_mod_init); | ||
| module_exit(blake2s_arm_mod_exit); | ||
|
|
||
| MODULE_DESCRIPTION("BLAKE2s digest algorithm, ARM scalar implementation"); | ||
| MODULE_LICENSE("GPL"); | ||
| MODULE_AUTHOR("Eric Biggers <ebiggers@google.com>"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-128"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-128-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224-arm"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256-arm"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 OR MIT | ||
| /* | ||
| * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. | ||
| */ | ||
|
|
||
| #include <crypto/internal/blake2s.h> | ||
| #include <crypto/internal/simd.h> | ||
| #include <crypto/internal/hash.h> | ||
|
|
||
| #include <linux/types.h> | ||
| #include <linux/kernel.h> | ||
| #include <linux/module.h> | ||
| #include <linux/sizes.h> | ||
|
|
||
| #include <asm/cpufeature.h> | ||
| #include <asm/processor.h> | ||
|
|
||
| static int crypto_blake2s_update_x86(struct shash_desc *desc, | ||
| const u8 *in, unsigned int inlen) | ||
| { | ||
| return crypto_blake2s_update(desc, in, inlen, blake2s_compress); | ||
| } | ||
|
|
||
| static int crypto_blake2s_final_x86(struct shash_desc *desc, u8 *out) | ||
| { | ||
| return crypto_blake2s_final(desc, out, blake2s_compress); | ||
| } | ||
|
|
||
| #define BLAKE2S_ALG(name, driver_name, digest_size) \ | ||
| { \ | ||
| .base.cra_name = name, \ | ||
| .base.cra_driver_name = driver_name, \ | ||
| .base.cra_priority = 200, \ | ||
| .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, \ | ||
| .base.cra_blocksize = BLAKE2S_BLOCK_SIZE, \ | ||
| .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx), \ | ||
| .base.cra_module = THIS_MODULE, \ | ||
| .digestsize = digest_size, \ | ||
| .setkey = crypto_blake2s_setkey, \ | ||
| .init = crypto_blake2s_init, \ | ||
| .update = crypto_blake2s_update_x86, \ | ||
| .final = crypto_blake2s_final_x86, \ | ||
| .descsize = sizeof(struct blake2s_state), \ | ||
| } | ||
|
|
||
| static struct shash_alg blake2s_algs[] = { | ||
| BLAKE2S_ALG("blake2s-128", "blake2s-128-x86", BLAKE2S_128_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-160", "blake2s-160-x86", BLAKE2S_160_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-224", "blake2s-224-x86", BLAKE2S_224_HASH_SIZE), | ||
| BLAKE2S_ALG("blake2s-256", "blake2s-256-x86", BLAKE2S_256_HASH_SIZE), | ||
| }; | ||
|
|
||
| static int __init blake2s_mod_init(void) | ||
| { | ||
| if (IS_REACHABLE(CONFIG_CRYPTO_HASH) && boot_cpu_has(X86_FEATURE_SSSE3)) | ||
| return crypto_register_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs)); | ||
| return 0; | ||
| } | ||
|
|
||
| static void __exit blake2s_mod_exit(void) | ||
| { | ||
| if (IS_REACHABLE(CONFIG_CRYPTO_HASH) && boot_cpu_has(X86_FEATURE_SSSE3)) | ||
| crypto_unregister_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs)); | ||
| } | ||
|
|
||
| module_init(blake2s_mod_init); | ||
| module_exit(blake2s_mod_exit); | ||
|
|
||
| MODULE_ALIAS_CRYPTO("blake2s-128"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-128-x86"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-160-x86"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-224-x86"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256"); | ||
| MODULE_ALIAS_CRYPTO("blake2s-256-x86"); | ||
| MODULE_LICENSE("GPL v2"); |
Oops, something went wrong.