summaryrefslogtreecommitdiff
path: root/sys/dev/rnd.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2020-05-31 06:23:59 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2020-05-31 06:23:59 +0000
commit25b4125b327f17225a5de582ccfd640025bb27d3 (patch)
treeee95f79a0d69f6e2f59cafc1268e14b289657fb1 /sys/dev/rnd.c
parentb53b5d52307ccca87e152ec67a8c103119b09eb3 (diff)
introduce "cpu_rnd_messybits" for use instead of nanotime in dev/rnd.c.
rnd.c uses nanotime to get access to some bits that change quickly between events that it can mix into the entropy pool. it doesn't use nanotime to get a monotonically increasing set or ordered and accurate timestamps, it just wants something with bits that change. there's been discussions for years about letting rnd use a clock that's super fast to read, but not necessarily accurate, but it wasn't until recently that i figured out it wasn't interested in time at all, so things like keeping a fast clock coherent between cpu cores or correct according to ntp is unecessary. this means we can just let rnd read the cycle counters on cpus and things will be fine. cpus with cycle counters that vary in their speed and arent kept consistent between cores may even be desirable in this context. so this is the first step in converting rnd.c to reading cycle counter. it copies the nanotime backend to each arch, and they can replace it with something MD as a second step later on. djm@ suggested rnd_messybytes, but we landed on cpu_rnd_messybits. thanks to visa for his eyes. ok deraadt@ visa@ deraadt@ says he will help handle any MD fallout that occurs.
Diffstat (limited to 'sys/dev/rnd.c')
-rw-r--r--sys/dev/rnd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 8802965514a..ae68999910c 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd.c,v 1.219 2020/05/29 04:42:24 deraadt Exp $ */
+/* $OpenBSD: rnd.c,v 1.220 2020/05/31 06:23:56 dlg Exp $ */
/*
* Copyright (c) 2011 Theo de Raadt.
@@ -177,13 +177,11 @@ void
enqueue_randomness(u_int val)
{
struct rand_event *rep;
- struct timespec ts;
int e;
- nanotime(&ts);
e = (atomic_inc_int_nv(&rnd_event_prod) - 1) & (QEVLEN-1);
rep = &rnd_event_space[e];
- rep->re_time += ts.tv_nsec ^ (ts.tv_sec << 20);
+ rep->re_time += cpu_rnd_messybits();
rep->re_val += val;
if (rnd_cold) {