Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177700234
D21308.1795072877.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None
D21308.1795072877.diff
View Options
Index: head/sys/dev/random/darn.c
===================================================================
--- head/sys/dev/random/darn.c
+++ head/sys/dev/random/darn.c
@@ -137,6 +137,12 @@
return (error);
}
-DEV_MODULE(darn, darn_modevent, NULL);
+static moduledata_t darn_mod = {
+ "darn",
+ darn_modevent,
+ 0
+};
+
+DECLARE_MODULE(darn, darn_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH);
MODULE_VERSION(darn, 1);
-MODULE_DEPEND(darn, random_device, 1, 1, 1);
+MODULE_DEPEND(darn, random_harvestq, 1, 1, 1);
Index: head/sys/dev/random/ivy.c
===================================================================
--- head/sys/dev/random/ivy.c
+++ head/sys/dev/random/ivy.c
@@ -164,6 +164,12 @@
return (error);
}
-DEV_MODULE(rdrand, rdrand_modevent, NULL);
+static moduledata_t rdrand_mod = {
+ "rdrand",
+ rdrand_modevent,
+ 0
+};
+
+DECLARE_MODULE(rdrand, rdrand_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH);
MODULE_VERSION(rdrand, 1);
-MODULE_DEPEND(rdrand, random_device, 1, 1, 1);
+MODULE_DEPEND(rdrand, random_harvestq, 1, 1, 1);
Index: head/sys/dev/random/nehemiah.c
===================================================================
--- head/sys/dev/random/nehemiah.c
+++ head/sys/dev/random/nehemiah.c
@@ -146,6 +146,12 @@
return (error);
}
-DEV_MODULE(nehemiah, nehemiah_modevent, NULL);
+static moduledata_t nehemiah_mod = {
+ "nehemiah",
+ nehemiah_modevent,
+ 0
+};
+
+DECLARE_MODULE(nehemiah, nehemiah_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH);
MODULE_VERSION(nehemiah, 1);
-MODULE_DEPEND(nehemiah, random_device, 1, 1, 1);
+MODULE_DEPEND(nehemiah, random_harvestq, 1, 1, 1);
Index: head/sys/dev/random/random_harvestq.c
===================================================================
--- head/sys/dev/random/random_harvestq.c
+++ head/sys/dev/random/random_harvestq.c
@@ -447,7 +447,7 @@
printf("random: no preloaded entropy cache\n");
}
}
-SYSINIT(random_device_prime, SI_SUB_RANDOM, SI_ORDER_FOURTH, random_harvestq_prime, NULL);
+SYSINIT(random_device_prime, SI_SUB_RANDOM, SI_ORDER_MIDDLE, random_harvestq_prime, NULL);
/* ARGSUSED */
static void
@@ -555,5 +555,61 @@
hc_source_mask &= ~(1 << source);
}
+
+void
+random_source_register(struct random_source *rsource)
+{
+ struct random_sources *rrs;
+
+ KASSERT(rsource != NULL, ("invalid input to %s", __func__));
+
+ rrs = malloc(sizeof(*rrs), M_ENTROPY, M_WAITOK);
+ rrs->rrs_source = rsource;
+
+ random_harvest_register_source(rsource->rs_source);
+
+ printf("random: registering fast source %s\n", rsource->rs_ident);
+ LIST_INSERT_HEAD(&source_list, rrs, rrs_entries);
+}
+
+void
+random_source_deregister(struct random_source *rsource)
+{
+ struct random_sources *rrs = NULL;
+
+ KASSERT(rsource != NULL, ("invalid input to %s", __func__));
+
+ random_harvest_deregister_source(rsource->rs_source);
+
+ LIST_FOREACH(rrs, &source_list, rrs_entries)
+ if (rrs->rrs_source == rsource) {
+ LIST_REMOVE(rrs, rrs_entries);
+ break;
+ }
+ if (rrs != NULL)
+ free(rrs, M_ENTROPY);
+}
+
+static int
+random_source_handler(SYSCTL_HANDLER_ARGS)
+{
+ struct random_sources *rrs;
+ struct sbuf sbuf;
+ int error, count;
+
+ sbuf_new_for_sysctl(&sbuf, NULL, 64, req);
+ count = 0;
+ LIST_FOREACH(rrs, &source_list, rrs_entries) {
+ sbuf_cat(&sbuf, (count++ ? ",'" : "'"));
+ sbuf_cat(&sbuf, rrs->rrs_source->rs_ident);
+ sbuf_cat(&sbuf, "'");
+ }
+ error = sbuf_finish(&sbuf);
+ sbuf_delete(&sbuf);
+ return (error);
+}
+SYSCTL_PROC(_kern_random, OID_AUTO, random_sources, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
+ NULL, 0, random_source_handler, "A",
+ "List of active fast entropy sources.");
MODULE_VERSION(random_harvestq, 1);
Index: head/sys/dev/random/randomdev.c
===================================================================
--- head/sys/dev/random/randomdev.c
+++ head/sys/dev/random/randomdev.c
@@ -410,62 +410,6 @@
return (error);
}
-void
-random_source_register(struct random_source *rsource)
-{
- struct random_sources *rrs;
-
- KASSERT(rsource != NULL, ("invalid input to %s", __func__));
-
- rrs = malloc(sizeof(*rrs), M_ENTROPY, M_WAITOK);
- rrs->rrs_source = rsource;
-
- random_harvest_register_source(rsource->rs_source);
-
- printf("random: registering fast source %s\n", rsource->rs_ident);
- LIST_INSERT_HEAD(&source_list, rrs, rrs_entries);
-}
-
-void
-random_source_deregister(struct random_source *rsource)
-{
- struct random_sources *rrs = NULL;
-
- KASSERT(rsource != NULL, ("invalid input to %s", __func__));
-
- random_harvest_deregister_source(rsource->rs_source);
-
- LIST_FOREACH(rrs, &source_list, rrs_entries)
- if (rrs->rrs_source == rsource) {
- LIST_REMOVE(rrs, rrs_entries);
- break;
- }
- if (rrs != NULL)
- free(rrs, M_ENTROPY);
-}
-
-static int
-random_source_handler(SYSCTL_HANDLER_ARGS)
-{
- struct random_sources *rrs;
- struct sbuf sbuf;
- int error, count;
-
- sbuf_new_for_sysctl(&sbuf, NULL, 64, req);
- count = 0;
- LIST_FOREACH(rrs, &source_list, rrs_entries) {
- sbuf_cat(&sbuf, (count++ ? ",'" : "'"));
- sbuf_cat(&sbuf, rrs->rrs_source->rs_ident);
- sbuf_cat(&sbuf, "'");
- }
- error = sbuf_finish(&sbuf);
- sbuf_delete(&sbuf);
- return (error);
-}
-SYSCTL_PROC(_kern_random, OID_AUTO, random_sources, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
- NULL, 0, random_source_handler, "A",
- "List of active fast entropy sources.");
-
/* ARGSUSED */
static int
randomdev_modevent(module_t mod __unused, int type, void *data __unused)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Nov 19, 7:21 AM (23 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41841083
Default Alt Text
D21308.1795072877.diff (5 KB)
Attached To
Mode
D21308: random(4): Reorder configuration of random source modules
Attached
Detach File
Event Timeline