[src/trunk]: src/sys Add cpu_rng, a framework for simple on-CPU random number...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Add cpu_rng, a framework for simple on-CPU random number...
From: tls <tls%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:59:33 +0000
details:   https://anonhg.NetBSD.org/src/rev/c00a9cef68f6
branches:  trunk
changeset: 343789:c00a9cef68f6
user:      tls <tls%NetBSD.org@localhost>
date:      Sat Feb 27 00:09:44 2016 +0000

description:
Add cpu_rng, a framework for simple on-CPU random number generators.

diffstat:

 sys/arch/amd64/include/Makefile  |   4 +-
 sys/arch/amd64/include/cpu_rng.h |   8 ++++
 sys/arch/amd64/include/types.h   |   3 +-
 sys/arch/i386/include/Makefile   |   4 +-
 sys/arch/i386/include/cpu_rng.h  |   8 ++++
 sys/arch/i386/include/types.h    |   4 +-
 sys/arch/x86/conf/files.x86      |   3 +-
 sys/arch/x86/include/Makefile    |   3 +-
 sys/arch/x86/include/cpu_rng.h   |  42 +++++++++++++++++++++
 sys/arch/x86/x86/cpu_rng.c       |  66 +++++++++++++++++++++++++++++++++
 sys/kern/kern_rndq.c             |  79 ++++++++++++++++++++++++++++++++-------
 11 files changed, 202 insertions(+), 22 deletions(-)

diffs (truncated from 376 to 300 lines):

diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/amd64/include/Makefile
--- a/sys/arch/amd64/include/Makefile   Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/amd64/include/Makefile   Sat Feb 27 00:09:44 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.18 2014/07/23 18:19:43 alnsn Exp $
+#      $NetBSD: Makefile,v 1.19 2016/02/27 00:09:44 tls Exp $
 
 INCSDIR= /usr/include/amd64
 
 INCS=  ansi.h aout_machdep.h asm.h \
        bootinfo.h bswap.h byte_swap.h \
-       cdefs.h cpu.h \
+       cdefs.h cpu.h cpu_rng.h\
        disklabel.h \
        elf_machdep.h endian.h endian_machdep.h \
        float.h fpu.h frame.h frame_regs.h \
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/amd64/include/cpu_rng.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/include/cpu_rng.h  Sat Feb 27 00:09:44 2016 +0000
@@ -0,0 +1,8 @@
+/*      $NetBSD: cpu_rng.h,v 1.1 2016/02/27 00:09:45 tls Exp $   */
+
+#ifndef _AMD64_CPU_RNG_H_
+#define _AMD64_CPU_RNG_H_
+
+#include <x86/cpu_rng.h>
+
+#endif
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/amd64/include/types.h
--- a/sys/arch/amd64/include/types.h    Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/amd64/include/types.h    Sat Feb 27 00:09:44 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.50 2016/01/23 22:31:19 christos Exp $      */
+/*     $NetBSD: types.h,v 1.51 2016/02/27 00:09:45 tls Exp $   */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -94,6 +94,7 @@
 #define        __HAVE_TLS_VARIANT_II
 #define        __HAVE_COMMON___TLS_GET_ADDR
 #define        __HAVE_INTR_CONTROL
+#define        __HAVE_CPU_RNG
 
 #ifdef _KERNEL_OPT
 #define        __HAVE_RAS
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/i386/include/Makefile
--- a/sys/arch/i386/include/Makefile    Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/i386/include/Makefile    Sat Feb 27 00:09:44 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.43 2014/07/23 18:19:44 alnsn Exp $
+#      $NetBSD: Makefile,v 1.44 2016/02/27 00:09:45 tls Exp $
 
 INCSDIR= /usr/include/i386
 
 INCS=  ansi.h aout_machdep.h apmvar.h asm.h \
        bioscall.h bootinfo.h bswap.h byte_swap.h \
-       cdefs.h cpu.h cputypes.h \
+       cdefs.h cpu.h cpu_rng.h cputypes.h \
        disklabel.h \
        elf_machdep.h endian.h endian_machdep.h \
        fenv.h float.h frame.h freebsd_machdep.h \
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/i386/include/cpu_rng.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/include/cpu_rng.h   Sat Feb 27 00:09:44 2016 +0000
@@ -0,0 +1,8 @@
+/*     $NetBSD: cpu_rng.h,v 1.1 2016/02/27 00:09:45 tls Exp $  */
+
+#ifndef _I386_CPU_RNG_H_
+#define _I386_CPU_RNG_H_
+
+#include <x86/cpu_rng.h>
+
+#endif
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/i386/include/types.h
--- a/sys/arch/i386/include/types.h     Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/i386/include/types.h     Sat Feb 27 00:09:44 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.86 2016/01/24 18:21:50 christos Exp $      */
+/*     $NetBSD: types.h,v 1.87 2016/02/27 00:09:45 tls Exp $   */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -112,6 +112,8 @@
 #define        __HAVE_SYSCALL_INTERN
 #define        __HAVE_MINIMAL_EMUL
 #define        __HAVE_OLD_DISKLABEL
+#define        __HAVE_CPU_RNG
+
 #if defined(_KERNEL)
 /*
  * Processors < i586 do not have cmpxchg8b, and we compile for i486
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/x86/conf/files.x86       Sat Feb 27 00:09:44 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.x86,v 1.86 2016/01/28 01:09:56 christos Exp $
+#      $NetBSD: files.x86,v 1.87 2016/02/27 00:09:45 tls Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -27,6 +27,7 @@
 device cpu: cpufeaturebus
 attach cpu at cpubus
 file   arch/x86/x86/cpu.c              cpu
+file   arch/x86/x86/cpu_rng.c          cpu
 
 device acpicpu: acpi
 attach acpicpu at cpufeaturebus
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/x86/include/Makefile
--- a/sys/arch/x86/include/Makefile     Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/arch/x86/include/Makefile     Sat Feb 27 00:09:44 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2014/02/11 20:17:16 dsl Exp $
+#      $NetBSD: Makefile,v 1.20 2016/02/27 00:09:45 tls Exp $
 
 INCSDIR=/usr/include/x86
 
@@ -7,6 +7,7 @@
        cacheinfo.h \
        cpu.h \
        cpu_extended_state.h \
+       cpu_rng.h \
        cpu_ucode.h \
        cputypes.h \
        cpuvar.h \
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/x86/include/cpu_rng.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x86/include/cpu_rng.h    Sat Feb 27 00:09:44 2016 +0000
@@ -0,0 +1,42 @@
+/* $NetBSD: cpu_rng.h,v 1.1 2016/02/27 00:09:45 tls Exp $ */
+
+#ifndef _X86_CPU_RNG_H_
+#define _X86_CPU_RNG_H_
+
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Thor Lancelot Simon.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+typedef uint64_t cpu_rng_t;
+
+bool cpu_rng_init(void);
+size_t cpu_rng(cpu_rng_t *);
+
+#endif /* _X86_CPU_RNG_H_ */
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/arch/x86/x86/cpu_rng.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x86/x86/cpu_rng.c        Sat Feb 27 00:09:44 2016 +0000
@@ -0,0 +1,66 @@
+/* $NetBSD: cpu_rng.c,v 1.1 2016/02/27 00:09:45 tls Exp $ */
+
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Thor Lancelot Simon.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
+
+#include <x86/specialreg.h>
+
+#include <machine/cpufunc.h>
+#include <machine/cpuvar.h>
+#include <machine/cpu_rng.h>
+
+static enum {
+       CPU_RNG_NONE = 0,
+       CPU_RNG_RDRAND,
+       CPU_RNG_RDSEED,
+       CPU_RNG_VIA } cpu_rng_mode __read_mostly = CPU_RNG_NONE;
+
+bool
+cpu_rng_init(void)
+{
+       return false;
+}
+
+size_t
+cpu_rng(cpu_rng_t *out)
+{
+       switch (cpu_rng_mode) {
+       case CPU_RNG_NONE:
+       case CPU_RNG_RDSEED:
+       case CPU_RNG_RDRAND:
+       case CPU_RNG_VIA:
+               return 0;
+       default:
+               panic("cpu_rng: unknown mode %d", (int)cpu_rng_mode);
+       }
+}
diff -r 1a9cba6bfdbf -r c00a9cef68f6 sys/kern/kern_rndq.c
--- a/sys/kern/kern_rndq.c      Fri Feb 26 21:20:17 2016 +0000
+++ b/sys/kern/kern_rndq.c      Sat Feb 27 00:09:44 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_rndq.c,v 1.81 2016/02/17 19:44:40 riastradh Exp $ */
+/*     $NetBSD: kern_rndq.c,v 1.82 2016/02/27 00:09:45 tls Exp $       */
 
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.81 2016/02/17 19:44:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.82 2016/02/27 00:09:45 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -59,6 +59,10 @@
 #include <compat/sys/rnd.h>
 #endif
 
+#if defined(__HAVE_CPU_RNG)
+#include <machine/cpu_rng.h>
+#endif
+
 #if defined(__HAVE_CPU_COUNTER)
 #include <machine/cpu_counter.h>
 #endif
@@ -185,17 +189,6 @@
        rnd_printing = 0;
 }
 
-void
-rnd_init_softint(void)
-{
-
-       rnd_process = softint_establish(SOFTINT_SERIAL|SOFTINT_MPSAFE,
-           rnd_intr, NULL);
-       rnd_wakeup = softint_establish(SOFTINT_CLOCK|SOFTINT_MPSAFE,
-           rnd_wake, NULL);
-       rnd_schedule_process();
-}
-
 /*
  * Generate a 32-bit counter.
  */
@@ -412,6 +405,38 @@
        return ret;
 }
 
+#if defined(__HAVE_CPU_RNG)
+static struct {
+       kmutex_t        lock;   /* unfortunately, must protect krndsource */
+       krndsource_t    source;
+} rnd_cpu __cacheline_aligned;
+       
+static void
+rnd_cpu_get(size_t bytes, void *priv)
Prev by Date: [src/trunk]: src/usr.bin/make Let makefiles decide if depend file gets a meta...
Next by Date: [src/trunk]: src/sys/arch/x86/x86 Add RDSEED and RDRAND backends for cpu_rng ...
Previous by Thread: [src/trunk]: src/usr.bin/make Let makefiles decide if depend file gets a meta...
Next by Thread: [src/trunk]: src/sys/arch/x86/x86 Add RDSEED and RDRAND backends for cpu_rng ...
Indexes:
Home | Main Index | Thread Index | Old Index