From 09e3a05f96fc495044e3b62f20f17be028be89c3 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 10 Feb 2020 18:29:47 +0000 Subject: [PATCH] fixup! Rewrite entropy subsystem. --- sys/kern/kern_entropy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_entropy.c b/sys/kern/kern_entropy.c index 2575990d2039..972722c9e7aa 100644 --- a/sys/kern/kern_entropy.c +++ b/sys/kern/kern_entropy.c @@ -888,13 +888,14 @@ static void entropy_softintr(void *cookie) { struct entropy_cpu *ec; + int s; /* - * Acquire the per-CPU state. Other users can lock this only - * while soft interrupts are blocked. Cause hard interrupts to - * drop samples on the floor. + * Acquire the per-CPU state. Block higher-priority softints. + * Cause hard interrupts to drop samples on the floor. */ ec = percpu_getref(entropy_percpu); + s = splsoftserial(); KASSERT(!ec->ec_locked); ec->ec_locked = true; __insn_barrier(); @@ -912,6 +913,7 @@ entropy_softintr(void *cookie) KASSERT(ec->ec_locked); __insn_barrier(); ec->ec_locked = false; + splx(s); percpu_putref(entropy_percpu); }