nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

random: cap jitter samples per bit to factor of HZ

Browse source 
Currently the jitter mechanism will require two timer ticks per
iteration, and it requires N iterations per bit. This N is determined
with a small measurement, and if it's too big, it won't waste time with
jitter entropy because it'd take too long or not have sufficient entropy
anyway.

With the current max N of 32, there are large timeouts on systems with a
small CONFIG_HZ. Rather than set that maximum to 32, instead choose a
factor of CONFIG_HZ. In this case, 1/30 seems to yield sane values for
different configurations of CONFIG_HZ.

Reported-by: Vladimir Murzin <vladimir.murzin@arm.com>
Fixes: 78c768e619 ("random: vary jitter iterations based on cycle counter speed")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jason A. Donenfeld 2022-07-13 17:11:15 +02:00 committed by Linus Torvalds
parent 51a6fa0732
commit 829d680e82
1 changed files with 1 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/char/random.c
View file

@ -1174,7 +1174,7 @@ static void __cold entropy_timer(struct timer_list *timer)
*/ */
static void __cold try_to_generate_entropy(void) static void __cold try_to_generate_entropy(void)
{ {
enum { NUM_TRIAL_SAMPLES = 8192, MAX_SAMPLES_PER_BIT = 32 }; enum { NUM_TRIAL_SAMPLES = 8192, MAX_SAMPLES_PER_BIT = HZ / 30 };
struct entropy_timer_state stack; struct entropy_timer_state stack;
unsigned int i, num_different = 0; unsigned int i, num_different = 0;
unsigned long last = random_get_entropy(); unsigned long last = random_get_entropy();