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

Time to eat crow for me.

Browse Source 
I replaced the sx_* locks that Arthur used with regular mutexes; this turned out the be the wrong thing to do as the locks need to be sleepable. Revert this folly.

Submitted by:	Arthur Mesh <arthurmesh@gmail.com> (In original diff)
This commit is contained in:
Mark Murray 2013-10-08 18:48:11 +00:00
parent db3fcaf970
commit 623f70165f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/random/live_entropy_sources.c
View File

@ -53,10 +53,9 @@ LIST_HEAD(les_head, live_entropy_sources);
static struct les_head sources = LIST_HEAD_INITIALIZER(sources); static struct les_head sources = LIST_HEAD_INITIALIZER(sources);
/* /*
* The harvest mutex protects the consistency of the entropy fifos and * The live_lock protects the consistency of the "struct les_head sources"
* empty fifo and other associated structures.
*/ */
struct mtx live_mtx; static struct sx les_lock; /* need a sleepable lock */
void void
live_entropy_source_register(struct random_hardware_source *rsource) live_entropy_source_register(struct random_hardware_source *rsource)
@ -68,9 +67,9 @@ live_entropy_source_register(struct random_hardware_source *rsource)
les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK);
les->rsource = rsource; les->rsource = rsource;
mtx_lock(&live_mtx); sx_xlock(&les_lock);
LIST_INSERT_HEAD(&sources, les, entries); LIST_INSERT_HEAD(&sources, les, entries);
mtx_unlock(&live_mtx); sx_xunlock(&les_lock);
} }
void void
@ -80,13 +79,13 @@ live_entropy_source_deregister(struct random_hardware_source *rsource)
KASSERT(rsource != NULL, ("invalid input to %s", __func__)); KASSERT(rsource != NULL, ("invalid input to %s", __func__));
mtx_lock(&live_mtx); sx_xlock(&les_lock);
LIST_FOREACH(les, &sources, entries) LIST_FOREACH(les, &sources, entries)
if (les->rsource == rsource) { if (les->rsource == rsource) {
LIST_REMOVE(les, entries); LIST_REMOVE(les, entries);
break; break;
} }
mtx_unlock(&live_mtx); sx_xunlock(&les_lock);
if (les != NULL) if (les != NULL)
free(les, M_ENTROPY); free(les, M_ENTROPY);
} }
@ -99,7 +98,7 @@ live_entropy_source_handler(SYSCTL_HANDLER_ARGS)
count = error = 0; count = error = 0;
mtx_lock(&live_mtx); sx_slock(&les_lock);
if (LIST_EMPTY(&sources)) if (LIST_EMPTY(&sources))
error = SYSCTL_OUT(req, "", 0); error = SYSCTL_OUT(req, "", 0);
@ -116,7 +115,7 @@ live_entropy_source_handler(SYSCTL_HANDLER_ARGS)
} }
} }
mtx_unlock(&live_mtx); sx_sunlock(&les_lock);
return (error); return (error);
} }
@ -130,7 +129,7 @@ live_entropy_sources_init(void *unused)
NULL, 0, live_entropy_source_handler, "", NULL, 0, live_entropy_source_handler, "",
"List of Active Live Entropy Sources"); "List of Active Live Entropy Sources");
mtx_init(&live_mtx, "live entropy source mutex", NULL, MTX_DEF); sx_init(&les_lock, "live_entropy_sources");
} }
/* /*
@ -151,7 +150,7 @@ live_entropy_sources_feed(int rounds, event_proc_f entropy_processor)
struct live_entropy_sources *les; struct live_entropy_sources *les;
int i, n; int i, n;
mtx_lock(&live_mtx); sx_slock(&les_lock);
/* /*
* Walk over all of live entropy sources, and feed their output * Walk over all of live entropy sources, and feed their output
@ -180,14 +179,14 @@ live_entropy_sources_feed(int rounds, event_proc_f entropy_processor)
} }
mtx_unlock(&live_mtx); sx_sunlock(&les_lock);
} }
static void static void
live_entropy_sources_deinit(void *unused) live_entropy_sources_deinit(void *unused)
{ {
mtx_destroy(&live_mtx); sx_destroy(&les_lock);
} }
SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST,