d586165577
* GENERAL - Update copyright. - Make kernel options for RANDOM_YARROW and RANDOM_DUMMY. Set neither to ON, which means we want Fortuna - If there is no 'device random' in the kernel, there will be NO random(4) device in the kernel, and the KERN_ARND sysctl will return nothing. With RANDOM_DUMMY there will be a random(4) that always blocks. - Repair kern.arandom (KERN_ARND sysctl). The old version went through arc4random(9) and was a bit weird. - Adjust arc4random stirring a bit - the existing code looks a little suspect. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Redo read_random(9) so as to duplicate random(4)'s read internals. This makes it a first-class citizen rather than a hack. - Move stuff out of locked regions when it does not need to be there. - Trim RANDOM_DEBUG printfs. Some are excess to requirement, some behind boot verbose. - Use SYSINIT to sequence the startup. - Fix init/deinit sysctl stuff. - Make relevant sysctls also tunables. - Add different harvesting "styles" to allow for different requirements (direct, queue, fast). - Add harvesting of FFS atime events. This needs to be checked for weighing down the FS code. - Add harvesting of slab allocator events. This needs to be checked for weighing down the allocator code. - Fix the random(9) manpage. - Loadable modules are not present for now. These will be re-engineered when the dust settles. - Use macros for locks. - Fix comments. * src/share/man/... - Update the man pages. * src/etc/... - The startup/shutdown work is done in D2924. * src/UPDATING - Add UPDATING announcement. * src/sys/dev/random/build.sh - Add copyright. - Add libz for unit tests. * src/sys/dev/random/dummy.c - Remove; no longer needed. Functionality incorporated into randomdev.*. * live_entropy_sources.c live_entropy_sources.h - Remove; content moved. - move content to randomdev.[ch] and optimise. * src/sys/dev/random/random_adaptors.c src/sys/dev/random/random_adaptors.h - Remove; plugability is no longer used. Compile-time algorithm selection is the way to go. * src/sys/dev/random/random_harvestq.c src/sys/dev/random/random_harvestq.h - Add early (re)boot-time randomness caching. * src/sys/dev/random/randomdev_soft.c src/sys/dev/random/randomdev_soft.h - Remove; no longer needed. * src/sys/dev/random/uint128.h - Provide a fake uint128_t; if a real one ever arrived, we can use that instead. All that is needed here is N=0, N++, N==0, and some localised trickery is used to manufacture a 128-bit 0ULLL. * src/sys/dev/random/unit_test.c src/sys/dev/random/unit_test.h - Improve unit tests; previously the testing human needed clairvoyance; now the test will do a basic check of compressibility. Clairvoyant talent is still a good idea. - This is still a long way off a proper unit test. * src/sys/dev/random/fortuna.c src/sys/dev/random/fortuna.h - Improve messy union to just uint128_t. - Remove unneeded 'static struct fortuna_start_cache'. - Tighten up up arithmetic. - Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing. - Assert that locks are held correctly. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Turn into self-sufficient module (no longer requires randomdev_soft.[ch]) * src/sys/dev/random/yarrow.c src/sys/dev/random/yarrow.h - Improve messy union to just uint128_t. - Remove unneeded 'staic struct start_cache'. - Tighten up up arithmetic. - Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing. - Assert that locks are held correctly. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Turn into self-sufficient module (no longer requires randomdev_soft.[ch]) - Fix some magic numbers elsewhere used as FAST and SLOW. Differential Revision: https://reviews.freebsd.org/D2025 Reviewed by: vsevolod,delphij,rwatson,trasz,jmg Approved by: so (delphij)
134 lines
3.6 KiB
C
134 lines
3.6 KiB
C
/*-
|
|
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* 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 AUTHOR 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 AUTHOR 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/clock.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/module.h>
|
|
#include <sys/random.h>
|
|
|
|
#include <contrib/octeon-sdk/cvmx.h>
|
|
#include <contrib/octeon-sdk/cvmx-rng.h>
|
|
|
|
#define OCTEON_RND_WORDS 2
|
|
|
|
struct octeon_rnd_softc {
|
|
uint64_t sc_entropy[OCTEON_RND_WORDS];
|
|
struct callout sc_callout;
|
|
};
|
|
|
|
static void octeon_rnd_identify(driver_t *drv, device_t parent);
|
|
static int octeon_rnd_attach(device_t dev);
|
|
static int octeon_rnd_probe(device_t dev);
|
|
static int octeon_rnd_detach(device_t dev);
|
|
|
|
static void octeon_rnd_harvest(void *);
|
|
|
|
static device_method_t octeon_rnd_methods[] = {
|
|
/* Device interface */
|
|
DEVMETHOD(device_identify, octeon_rnd_identify),
|
|
DEVMETHOD(device_probe, octeon_rnd_probe),
|
|
DEVMETHOD(device_attach, octeon_rnd_attach),
|
|
DEVMETHOD(device_detach, octeon_rnd_detach),
|
|
|
|
{ 0, 0 }
|
|
};
|
|
|
|
static driver_t octeon_rnd_driver = {
|
|
"rnd",
|
|
octeon_rnd_methods,
|
|
sizeof (struct octeon_rnd_softc)
|
|
};
|
|
static devclass_t octeon_rnd_devclass;
|
|
DRIVER_MODULE(rnd, nexus, octeon_rnd_driver, octeon_rnd_devclass, 0, 0);
|
|
|
|
static void
|
|
octeon_rnd_identify(driver_t *drv, device_t parent)
|
|
{
|
|
BUS_ADD_CHILD(parent, 0, "rnd", 0);
|
|
}
|
|
|
|
static int
|
|
octeon_rnd_probe(device_t dev)
|
|
{
|
|
if (device_get_unit(dev) != 0)
|
|
return (ENXIO);
|
|
|
|
device_set_desc(dev, "Cavium Octeon Random Number Generator");
|
|
return (BUS_PROBE_NOWILDCARD);
|
|
}
|
|
|
|
static int
|
|
octeon_rnd_attach(device_t dev)
|
|
{
|
|
struct octeon_rnd_softc *sc;
|
|
|
|
sc = device_get_softc(dev);
|
|
callout_init(&sc->sc_callout, 1);
|
|
callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc);
|
|
|
|
cvmx_rng_enable();
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
octeon_rnd_detach(device_t dev)
|
|
{
|
|
struct octeon_rnd_softc *sc;
|
|
|
|
sc = device_get_softc(dev);
|
|
|
|
callout_stop(&sc->sc_callout);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static void
|
|
octeon_rnd_harvest(void *arg)
|
|
{
|
|
struct octeon_rnd_softc *sc;
|
|
unsigned i;
|
|
|
|
sc = arg;
|
|
|
|
for (i = 0; i < OCTEON_RND_WORDS; i++)
|
|
sc->sc_entropy[i] = cvmx_rng_get_random64();
|
|
/* MarkM: FIX!! Check that this does not swamp the harvester! */
|
|
random_harvest_queue(sc->sc_entropy, sizeof sc->sc_entropy,
|
|
(sizeof(sc->sc_entropy)*8)/2, RANDOM_PURE_OCTEON);
|
|
|
|
callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc);
|
|
}
|