d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Storing to a pointer is (effectively) atomic; no need to protect this

Browse Source 
with splhigh(). However, the entropy-harvesting routine needs pretty
serious irq-protection, as it is called out of irq handlers etc.

Clues given by:	bde
This commit is contained in:
Mark Murray 2000-07-11 19:37:25 +00:00
parent d4c1816924
commit 4d0e6f79d6
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/random/harvest.c
View File

@ -47,22 +47,14 @@ static void (*reap)(struct timespec *, u_int64_t, u_int, u_int, u_int) = NULL;
void
random_init_harvester(void (*reaper)(struct timespec *, u_int64_t, u_int, u_int, u_int))
{
intrmask_t mask;
mask = splhigh();
reap = reaper;
splx(mask);
}
/* Deinitialise the harvester at unload time */
void
random_deinit_harvester(void)
{
intrmask_t mask;
mask = splhigh();
reap = NULL;
splx(mask);
}
/* Entropy harvesting routine. This is supposed to be fast; do */

4
sys/dev/random/yarrow.c
View File

@ -320,8 +320,8 @@ random_harvest_internal(struct timespec *nanotime, u_int64_t entropy,
#endif
if (origin < ENTROPYSOURCE) {
/* The reseed task must not be jumped on */
mask = splsofttq();
/* Called inside irq handlers; protect from interference */
mask = splhigh();
which = random_state.which;
pool = &random_state.pool[which];

8
sys/dev/randomdev/harvest.c
View File

@ -47,22 +47,14 @@ static void (*reap)(struct timespec *, u_int64_t, u_int, u_int, u_int) = NULL;
void
random_init_harvester(void (*reaper)(struct timespec *, u_int64_t, u_int, u_int, u_int))
{
intrmask_t mask;
mask = splhigh();
reap = reaper;
splx(mask);
}
/* Deinitialise the harvester at unload time */
void
random_deinit_harvester(void)
{
intrmask_t mask;
mask = splhigh();
reap = NULL;
splx(mask);
}
/* Entropy harvesting routine. This is supposed to be fast; do */

4
sys/dev/randomdev/yarrow.c
View File

@ -320,8 +320,8 @@ random_harvest_internal(struct timespec *nanotime, u_int64_t entropy,
#endif
if (origin < ENTROPYSOURCE) {
/* The reseed task must not be jumped on */
mask = splsofttq();
/* Called inside irq handlers; protect from interference */
mask = splhigh();
which = random_state.which;
pool = &random_state.pool[which];