random: initialize the non-blocking pool via add_hwgenerator_randomness()
If we have a hardware RNG and are using the in-kernel rngd, we should use this to initialize the non-blocking pool so that getrandom(2) doesn't block unnecessarily. Cc: stable@kernel.org Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Родитель
1a695a905c
Коммит
3371f3da08
|
@ -1849,12 +1849,18 @@ void add_hwgenerator_randomness(const char *buffer, size_t count,
|
||||||
{
|
{
|
||||||
struct entropy_store *poolp = &input_pool;
|
struct entropy_store *poolp = &input_pool;
|
||||||
|
|
||||||
/* Suspend writing if we're above the trickle threshold.
|
if (unlikely(nonblocking_pool.initialized == 0))
|
||||||
* We'll be woken up again once below random_write_wakeup_thresh,
|
poolp = &nonblocking_pool;
|
||||||
* or when the calling thread is about to terminate.
|
else {
|
||||||
*/
|
/* Suspend writing if we're above the trickle
|
||||||
wait_event_interruptible(random_write_wait, kthread_should_stop() ||
|
* threshold. We'll be woken up again once below
|
||||||
|
* random_write_wakeup_thresh, or when the calling
|
||||||
|
* thread is about to terminate.
|
||||||
|
*/
|
||||||
|
wait_event_interruptible(random_write_wait,
|
||||||
|
kthread_should_stop() ||
|
||||||
ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
|
ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
|
||||||
|
}
|
||||||
mix_pool_bytes(poolp, buffer, count);
|
mix_pool_bytes(poolp, buffer, count);
|
||||||
credit_entropy_bits(poolp, entropy);
|
credit_entropy_bits(poolp, entropy);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче