mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Fix the read blocking so that it is interruptable and slow down the rate of console warning spamming while blocked.

Browse Source 
Approved by:	so (/dev/random blanket)
This commit is contained in:
Mark Murray 2015-07-19 16:05:30 +00:00
parent d657959305
commit dbefaadca8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=285692
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/random/randomdev.c
View File

@ -163,22 +163,28 @@ int
read_random_uio(struct uio *uio, bool nonblock)
{
uint8_t *random_buf;
int error;
int error, spamcount;
ssize_t read_len, total_read, c;
random_buf = malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK);
random_alg_context.ra_pre_read();
/* (Un)Blocking logic */
error = 0;
spamcount = 0;
/* (Un)Blocking logic */
while (!random_alg_context.ra_seeded()) {
if (nonblock) {
error = EWOULDBLOCK;
break;
}
tsleep(&random_alg_context, 0, "randseed", hz/10);
/* keep tapping away at the pre-read until we seed/unblock. */
random_alg_context.ra_pre_read();
printf("random: %s unblock wait\n", __func__);
/* Only bother the console every 10 seconds or so */
if (spamcount == 0)
printf("random: %s unblock wait\n", __func__);
spamcount = (spamcount + 1)%100;
error = tsleep(&random_alg_context, PCATCH, "randseed", hz/10);
if ((error == ERESTART | error == EINTR))
break;
}
if (error == 0) {
#if !defined(RANDOM_DUMMY)