From owner-svn-src-head@freebsd.org  Fri Aug 24 14:53:43 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9493D108C042;
 Fri, 24 Aug 2018 14:53:43 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A0AC8930A;
 Fri, 24 Aug 2018 14:53:43 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B18F128A2;
 Fri, 24 Aug 2018 14:53:43 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7OErhSf010223;
 Fri, 24 Aug 2018 14:53:43 GMT (envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7OErhXf010222;
 Fri, 24 Aug 2018 14:53:43 GMT (envelope-from markm@FreeBSD.org)
Message-Id: <201808241453.w7OErhXf010222@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markm set sender to
 markm@FreeBSD.org using -f
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 24 Aug 2018 14:53:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338292 - head/sys/dev/random
X-SVN-Group: head
X-SVN-Commit-Author: markm
X-SVN-Commit-Paths: head/sys/dev/random
X-SVN-Commit-Revision: 338292
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2018 14:53:43 -0000

Author: markm
Date: Fri Aug 24 14:53:42 2018
New Revision: 338292
URL: https://svnweb.freebsd.org/changeset/base/338292

Log:
  Fix braino of mine where the reseeds would happen far too often,
  making the kernel process way too busy.
  
  PR:             230808
  Submitted by:   Conrad Meyer <cem@FreeBSD.org>
  Reported by:    Danilo Egea Gondolfo <danilo@FreeBSD.org>
  Reviewed by:	cem,delphij
  Approved by:	re(rgrimes)
  Approved by:	so(delphij)
  MFC after:      1 Month
  Security:	Yes
  Differential Revision:	https://reviews.freebsd.org/D16872

Modified:
  head/sys/dev/random/fortuna.c

Modified: head/sys/dev/random/fortuna.c
==============================================================================
--- head/sys/dev/random/fortuna.c	Fri Aug 24 10:50:19 2018	(r338291)
+++ head/sys/dev/random/fortuna.c	Fri Aug 24 14:53:42 2018	(r338292)
@@ -371,7 +371,7 @@ random_fortuna_pre_read(void)
 	if (fortuna_state.fs_pool[0].fsp_length >= fortuna_state.fs_minpoolsize
 #ifdef _KERNEL
 	    /* FS&K - Use 'getsbinuptime()' to prevent reseed-spamming. */
-	    && (now - fortuna_state.fs_lasttime > hz/10)
+	    && (now - fortuna_state.fs_lasttime > SBT_1S/10)
 #endif
 	) {
 #ifdef _KERNEL