aboutsummaryrefslogtreecommitdiff
path: root/sys/conf/options
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2015-08-22 12:59:05 +0000
committerMark Murray <markm@FreeBSD.org>2015-08-22 12:59:05 +0000
commite866d8f05bb0becd9eb3562c6f75b8329fa27b9c (patch)
tree52609275855ad29d2bfae105777e35ddecf436a1 /sys/conf/options
parent1bb0c0bd8dfe33bb2d8a544a9afe9a59f846ebaf (diff)
downloadsrc-e866d8f05bb0becd9eb3562c6f75b8329fa27b9c.tar.gz
src-e866d8f05bb0becd9eb3562c6f75b8329fa27b9c.zip
Make the UMA harvesting go away completely if not wanted. Default to "not wanted".
Provide and document the RANDOM_ENABLE_UMA option. Change RANDOM_FAST to RANDOM_UMA to clarify the harvesting. Remove RANDOM_DEBUG option, replace with SDT probes. These will be of use to folks measuring the harvesting effect when deciding whether to use RANDOM_ENABLE_UMA. Requested by: scottl and others. Approved by: so (/dev/random blanket) Differential Revision: https://reviews.freebsd.org/D3197
Notes
Notes: svn path=/head/; revision=287023
Diffstat (limited to 'sys/conf/options')
-rw-r--r--sys/conf/options9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 089b1a20f72d..936abc95a229 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -945,17 +945,16 @@ RACCT_DEFAULT_TO_DISABLED opt_global.h
RCTL opt_global.h
# Random number generator(s)
-# The DEBUG option is in global.h as the random harvesting
-# puts probes all over the place, and it makes little sense
-# to pollute these headers with an extra include.
-RANDOM_DEBUG opt_random.h
-# Which CSPRNG hashes we get.
+# Which CSPRNG hash we get.
# If Yarrow is not chosen, Fortuna is selected.
RANDOM_YARROW opt_random.h
# With this, no entropy processor is loaded, but the entropy
# harvesting infrastructure is present. This means an entropy
# processor may be loaded as a module.
RANDOM_LOADABLE opt_random.h
+# This turns on high-rate and potentially expensive harvesting in
+# the uma slab allocator.
+RANDOM_ENABLE_UMA opt_global.h
# Intel em(4) driver
EM_MULTIQUEUE opt_em.h