Date: Tue, 8 Oct 2013 18:48:11 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256159 - projects/random_number_generator/sys/dev/random Message-ID: <201310081848.r98ImBOA092666@svn.freebsd.org>
index | next in thread | raw e-mail
Author: markm Date: Tue Oct 8 18:48:11 2013 New Revision: 256159 URL: http://svnweb.freebsd.org/changeset/base/256159 Log: Time to eat crow for me. 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) Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Tue Oct 8 18:09:00 2013 (r256158) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Tue Oct 8 18:48:11 2013 (r256159) @@ -53,10 +53,9 @@ LIST_HEAD(les_head, live_entropy_sources static struct les_head sources = LIST_HEAD_INITIALIZER(sources); /* - * The harvest mutex protects the consistency of the entropy fifos and - * empty fifo and other associated structures. + * The live_lock protects the consistency of the "struct les_head sources" */ -struct mtx live_mtx; +static struct sx les_lock; /* need a sleepable lock */ void live_entropy_source_register(struct random_hardware_source *rsource) @@ -68,9 +67,9 @@ live_entropy_source_register(struct rand les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les->rsource = rsource; - mtx_lock(&live_mtx); + sx_xlock(&les_lock); LIST_INSERT_HEAD(&sources, les, entries); - mtx_unlock(&live_mtx); + sx_xunlock(&les_lock); } void @@ -80,13 +79,13 @@ live_entropy_source_deregister(struct ra KASSERT(rsource != NULL, ("invalid input to %s", __func__)); - mtx_lock(&live_mtx); + sx_xlock(&les_lock); LIST_FOREACH(les, &sources, entries) if (les->rsource == rsource) { LIST_REMOVE(les, entries); break; } - mtx_unlock(&live_mtx); + sx_xunlock(&les_lock); if (les != NULL) free(les, M_ENTROPY); } @@ -99,7 +98,7 @@ live_entropy_source_handler(SYSCTL_HANDL count = error = 0; - mtx_lock(&live_mtx); + sx_slock(&les_lock); if (LIST_EMPTY(&sources)) error = SYSCTL_OUT(req, "", 0); @@ -116,7 +115,7 @@ live_entropy_source_handler(SYSCTL_HANDL } } - mtx_unlock(&live_mtx); + sx_sunlock(&les_lock); return (error); } @@ -130,7 +129,7 @@ live_entropy_sources_init(void *unused) NULL, 0, live_entropy_source_handler, "", "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, ev struct live_entropy_sources *les; int i, n; - mtx_lock(&live_mtx); + sx_slock(&les_lock); /* * Walk over all of live entropy sources, and feed their output @@ -180,14 +179,14 @@ live_entropy_sources_feed(int rounds, ev } - mtx_unlock(&live_mtx); + sx_sunlock(&les_lock); } static void live_entropy_sources_deinit(void *unused) { - mtx_destroy(&live_mtx); + sx_destroy(&les_lock); } SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST,help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310081848.r98ImBOA092666>