rng stable patches from 5.19-rc2
cover rng stable patches from 5.19-rc2
Hi Greg,
These three patches from 5.19-rc2 failed to automatically apply. The following series should work okay.
Note that these are already part of the 4.9, 4.14, 4.19, 5.4 backport I did for later this week.
Jason
Jason A. Donenfeld (3):
random: avoid checking crng_ready() twice in random_init()
random: mark bootloader randomness code as __init
random: account for arch randomness in bits
drivers/char/random.c | 15 +++++++-------- include/linux/random.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/3 random: avoid checking crng_ready() twice in random_init()
commit 9b29b6b20376ab64e1b043df6301d8a92378e631 upstream.
The current flow expands to:
if (crng_ready())
...
else if (...)
if (!crng_ready())
...The second crng_ready() call is redundant, but can't so easily be optimized out by the compiler.
This commit simplifies that to:
if (crng_ready()
...
else if (...)
...--- drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/random.c +1 -1
@@ -834,7 +834,7 @@ int __init random_init(const char *command_line)if (crng_ready ())crng_reseed ();else if (trust_cpu) -credit_init_bits (arch_bytes *8 ); +_credit_init_bits (arch_bytes *8 );return 0 ; }
Signature · 1 line
2.35.1
PATCH 2/3 random: mark bootloader randomness code as __init
In reply to Jason A. Donenfeldcommit 39e0f991a62ed5efabd20711a7b6e7da92603170 upstream.
add_bootloader_randomness() and the variables it touches are only used during __init and not after, so mark these as __init. At the same time, unexport this, since it's only called by other __init code that's built-in.
--- drivers/char/random.c | 7 +++---- include/linux/random.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/char/random.c +3 -4
@@ -785,8 +785,8 @@ static void __cold _credit_init_bits(size_t bits)* **********************************************************************/ -static bool trust_cpu__ro_after_init =IS_ENABLED (CONFIG_RANDOM_TRUST_CPU ); -static bool trust_bootloader__ro_after_init =IS_ENABLED (CONFIG_RANDOM_TRUST_BOOTLOADER ); +static bool trust_cpu__initdata =IS_ENABLED (CONFIG_RANDOM_TRUST_CPU ); +static bool trust_bootloader__initdata =IS_ENABLED (CONFIG_RANDOM_TRUST_BOOTLOADER );static int __init parse_trust_cpu (char *arg) {return kstrtobool (arg, &trust_cpu);
@@ -882,13 +882,12 @@ EXPORT_SYMBOL_GPL(add_hwgenerator_randomness);* Handle random seed passed by bootloader, and credit it if * CONFIG_RANDOM_TRUST_BOOTLOADER is set. */ -void __cold add_bootloader_randomness (const void *buf,size_t len) +void __init add_bootloader_randomness (const void *buf,size_t len) {mix_pool_bytes (buf, len);if (trust_bootloader)credit_init_bits (len *8 ); } -EXPORT_SYMBOL_GPL (add_bootloader_randomness);struct fast_pool {struct work_struct mix;
include/linux/random.h +1 -1
@@ -13,7 +13,7 @@struct notifier_block ;void add_device_randomness (const void *buf,size_t len); -void add_bootloader_randomness (const void *buf,size_t len); +void __init add_bootloader_randomness (const void *buf,size_t len); void add_input_randomness(unsigned int type, unsigned int code, unsigned int value) __latent_entropy; void add_interrupt_randomness(int irq) __latent_entropy;
Signature · 1 line
2.35.1
PATCH 3/3 random: account for arch randomness in bits
In reply to Jason A. Donenfeldcommit 77fc95f8c0dc9e1f8e620ec14d2fb65028fb7adc upstream.
Rather than accounting in bytes and multiplying (shifting), we can just account in bits and avoid the shift. The main motivation for this is there are other patches in flux that expand this code a bit, and avoiding the duplication of "* 8" everywhere makes things a bit clearer.
--- drivers/char/random.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/random.c +4 -4
@@ -809,7 +809,7 @@ early_param("random.trust_bootloader", parse_trust_bootloader);int __init random_init (const char *command_line) {ktime_t now =ktime_get_real (); -unsigned int i, arch_bytes; +unsigned int i, arch_bits;unsigned long entropy;#if defined(LATENT_ENTROPY_PLUGIN )
@@ -817,12 +817,12 @@ int __init random_init(const char *command_line)_mix_pool_bytes (compiletime_seed,sizeof (compiletime_seed));#endif -for (i =0 , arch_bytes =BLAKE2S_BLOCK_SIZE ; +for (i =0 , arch_bits =BLAKE2S_BLOCK_SIZE *8 ; i <BLAKE2S_BLOCK_SIZE ; i +=sizeof (entropy)) {if (!arch_get_random_seed_long_early (&entropy) && !arch_get_random_long_early (&entropy)) { entropy =random_get_entropy (); - arch_bytes -=sizeof (entropy); + arch_bits -=sizeof (entropy) *8 ; }_mix_pool_bytes (&entropy,sizeof (entropy)); }
@@ -834,7 +834,7 @@ int __init random_init(const char *command_line)if (crng_ready ())crng_reseed ();else if (trust_cpu) -_credit_init_bits (arch_bytes *8 ); +_credit_init_bits (arch_bits);return 0 ; }
Signature · 1 line
2.35.1
Greg KH
maintainerQuoted 4 lines · Jason A. Donenfeld
Hi Greg,
These three patches from 5.19-rc2 failed to automatically apply. The following series should work okay.
All now queued up, thanks.
Quoted 2 lines
Note that these are already part of the 4.9, 4.14, 4.19, 5.4 backport I did for later this week.
Great, thanks for adding them there too.
greg k-h