Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern entropy: Downgrade consolidation warning from print...



details:   https://anonhg.NetBSD.org/src/rev/53320b0c5a9f
branches:  trunk
changeset: 1017834:53320b0c5a9f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jan 11 02:18:40 2021 +0000

description:
entropy: Downgrade consolidation warning from printf to LOG_DEBUG.

Candidate fix for PR kern/55458.  This message is rather technical,
and so is unlikely to be acted on by anyone not debugging the kernel
anyway.  Most likely, on any system where it is a real problem, there
will be another (less technical) entropy warning anyway.

diffstat:

 sys/kern/kern_entropy.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 55f5031f8416 -r 53320b0c5a9f sys/kern/kern_entropy.c
--- a/sys/kern/kern_entropy.c   Mon Jan 11 00:28:28 2021 +0000
+++ b/sys/kern/kern_entropy.c   Mon Jan 11 02:18:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_entropy.c,v 1.25 2020/12/11 03:00:09 thorpej Exp $        */
+/*     $NetBSD: kern_entropy.c,v 1.26 2021/01/11 02:18:40 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.25 2020/12/11 03:00:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.26 2021/01/11 02:18:40 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -106,6 +106,7 @@
 #include <sys/sha1.h>          /* for boot seed checksum */
 #include <sys/stdint.h>
 #include <sys/sysctl.h>
+#include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/xcall.h>
@@ -1026,7 +1027,7 @@
        E->pending -= diff;
        if (__predict_false(E->needed > 0)) {
                if (ratecheck(&lasttime, &interval))
-                       printf("entropy: WARNING:"
+                       log(LOG_DEBUG, "entropy: WARNING:"
                            " consolidating less than full entropy\n");
        }
 



Home | Main Index | Thread Index | Old Index