Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

splvm should be enough to protect rnd sample queue and rnd_mempool 

as you can't use rnd_add_uint32 safely with >IPL_VM anyway.
This commit is contained in:
yamt 2004-11-29 13:33:37 +00:00
parent 19642544a8
commit 7acc501dd3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/rnd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rnd.c,v 1.43 2004/04/25 16:42:40 simonb Exp $ */
/* $NetBSD: rnd.c,v 1.44 2004/11/29 13:33:37 yamt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.43 2004/04/25 16:42:40 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.44 2004/11/29 13:33:37 yamt Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@ -109,7 +109,7 @@ typedef struct _rnd_sample_t {
/*
* The event queue. Fields are altered at an interrupt level.
* All accesses must be protected at splhigh().
* All accesses must be protected at splvm().
*/
volatile int rnd_timeout_pending;
SIMPLEQ_HEAD(, _rnd_sample_t) rnd_samples;
@ -126,7 +126,7 @@ struct selinfo rnd_selq;
volatile u_int32_t rnd_status;
/*
* Memory pool; accessed only at splhigh().
* Memory pool; accessed only at splvm().
*/
POOL_INIT(rnd_mempool, sizeof(rnd_sample_t), 0, 0, 0, "rndsample", NULL);
@ -134,7 +134,7 @@ POOL_INIT(rnd_mempool, sizeof(rnd_sample_t), 0, 0, 0, "rndsample", NULL);
* Our random pool. This is defined here rather than using the general
* purpose one defined in rndpool.c.
*
* Samples are collected and queued at splhigh() into a separate queue
* Samples are collected and queued at splvm() into a separate queue
* (rnd_samples, see above), and processed in a timeout routine; therefore,
* all other accesses to the random pool must be at splsoftclock() as well.
*/
@ -772,7 +772,7 @@ rnd_sample_allocate(rndsource_t *source)
rnd_sample_t *c;
int s;
s = splhigh();
s = splvm();
c = pool_get(&rnd_mempool, PR_WAITOK);
splx(s);
if (c == NULL)
@ -794,7 +794,7 @@ rnd_sample_allocate_isr(rndsource_t *source)
rnd_sample_t *c;
int s;
s = splhigh();
s = splvm();
c = pool_get(&rnd_mempool, 0);
splx(s);
if (c == NULL)
@ -813,7 +813,7 @@ rnd_sample_free(rnd_sample_t *c)
int s;
memset(c, 0, sizeof(rnd_sample_t));
s = splhigh();
s = splvm();
pool_put(&rnd_mempool, c);
splx(s);
}
@ -878,7 +878,7 @@ rnd_detach_source(rndsource_element_t *rs)
rndsource_t *source;
int s;
s = splhigh();
s = splvm();
LIST_REMOVE(rs, list);
@ -970,7 +970,7 @@ rnd_add_uint32(rndsource_element_t *rs, u_int32_t val)
/*
* State arrays are full. Queue this chunk on the processing queue.
*/
s = splhigh();
s = splvm();
SIMPLEQ_INSERT_HEAD(&rnd_samples, state, next);
rst->state = NULL;
@ -1027,9 +1027,9 @@ rnd_timeout(void *arg)
int s;
/*
* Sample queue is protected at splhigh(); go there briefly to dequeue.
* Sample queue is protected at splvm(); go there briefly to dequeue.
*/
s = splhigh();
s = splvm();
rnd_timeout_pending = 0;
sample = SIMPLEQ_FIRST(&rnd_samples);
@ -1061,8 +1061,8 @@ rnd_timeout(void *arg)
rnd_sample_free(sample);
/* Go back to splhigh to dequeue the next one.. */
s = splhigh();
/* Go back to splvm to dequeue the next one.. */
s = splvm();
sample = SIMPLEQ_FIRST(&rnd_samples);
}
splx(s);