svn commit: r247423 - stable/9/sys/kern

[John Baldwin]

Author: jhb
Date: Wed Feb 27 22:02:40 2013
New Revision: 247423
URL: http://svnweb.freebsd.org/changeset/base/247423

Log:
  MFC 240921:
  Add optional entropy harvesting for software interrupts in swi_sched()
  as controlled by kern.random.sys.harvest.swi.  SWI harvesting feeds into
  the interrupt FIFO and each event is estimated as providing a single bit of
  entropy.

Modified:
  stable/9/sys/kern/kern_intr.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_intr.c
==============================================================================
--- stable/9/sys/kern/kern_intr.c	Wed Feb 27 21:58:06 2013	(r247422)
+++ stable/9/sys/kern/kern_intr.c	Wed Feb 27 22:02:40 2013	(r247423)
@@ -1144,11 +1144,21 @@ swi_sched(void *cookie, int flags)
 {
 	struct intr_handler *ih = (struct intr_handler *)cookie;
 	struct intr_event *ie = ih->ih_event;
+	struct intr_entropy entropy;
 	int error;
 
 	CTR3(KTR_INTR, "swi_sched: %s %s need=%d", ie->ie_name, ih->ih_name,
 	    ih->ih_need);
 
+	if (harvest.swi) {
+		CTR2(KTR_INTR, "swi_sched: pid %d (%s) gathering entropy",
+		    curproc->p_pid, curthread->td_name);
+		entropy.event = (uintptr_t)ih;
+		entropy.td = curthread;
+		random_harvest(&entropy, sizeof(entropy), 1, 0,
+		    RANDOM_INTERRUPT);
+	}
+
 	/*
 	 * Set ih_need for this handler so that if the ithread is already
 	 * running it will execute this handler on the next pass.  Otherwise,