[PC-BSD Commits] [pcbsd/freebsd] 159130: MFC r256291:

GitHub noreply at github.com
Mon Oct 14 11:02:41 PDT 2013


  Branch: refs/heads/stable/10
  Home:   https://github.com/pcbsd/freebsd
  Commit: 159130772737068f0dcc17082b231d061d43c9cb
      https://github.com/pcbsd/freebsd/commit/159130772737068f0dcc17082b231d061d43c9cb
  Author: dim <dim at FreeBSD.org>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M sys/arm/versatile/versatile_pci.c

  Log Message:
  -----------
  MFC r256291:

In sys/arm/versatile/versatile_pci.c, add a default handler, to fix a
gcc warning about uninitialized use of a variable.

Approved by:	re (gjb)


  Commit: f3b0adca4b75a1ffff979bc101b39c12ec9c8c36
      https://github.com/pcbsd/freebsd/commit/f3b0adca4b75a1ffff979bc101b39c12ec9c8c36
  Author: dim <dim at FreeBSD.org>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M lib/clang/clang.build.mk

  Log Message:
  -----------
  Disable assertions in llvm and clang for the 10.0 release cycle.

Approved by:	re (gjb)


  Commit: 59c3f5e5a132724c9403c9554f8f7511b19dda1d
      https://github.com/pcbsd/freebsd/commit/59c3f5e5a132724c9403c9554f8f7511b19dda1d
  Author: np <np at FreeBSD.org>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c

  Log Message:
  -----------
  MFC r256302:
Add dependency on ibcore now that it has been modularized.

Approved by:	re (gjb)


  Commit: f71dcbc1ce5f213a050bde6b1f041272c9a05596
      https://github.com/pcbsd/freebsd/commit/f71dcbc1ce5f213a050bde6b1f041272c9a05596
  Author: bryanv <bryanv at FreeBSD.org>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M sys/dev/vmware/vmxnet3/if_vmx.c
    M sys/dev/vmware/vmxnet3/if_vmxvar.h

  Log Message:
  -----------
  MFC r256308:

Do not provide a hint of the guest's OS version

The calculation can overflow if __FreeBSD_version is big
enough, and it does not appear to be required.

Approved by:	re (gjb)


  Commit: 58e4e84a2a946159977168cd852379d56fcb3c9b
      https://github.com/pcbsd/freebsd/commit/58e4e84a2a946159977168cd852379d56fcb3c9b
  Author: mav <mav at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sbin/camcontrol/modeedit.c

  Log Message:
  -----------
  MFC r256317:
Fix mode page length calculation to remove last garbage line from the
`camcontrol mode daX -l` output.

Approved by:	re (gjb)


  Commit: 6ae9d57c2da58235102397383124570438585e6f
      https://github.com/pcbsd/freebsd/commit/6ae9d57c2da58235102397383124570438585e6f
  Author: edavis <edavis at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/dev/bxe/bxe.c
    M sys/dev/bxe/bxe_stats.c
    M sys/dev/bxe/ecore_sp.h

  Log Message:
  -----------
  Merge r256299 from head.

Approved by:	re@ (gjb)
Approved by:	davidch (mentor)


  Commit: 696eae7a90c8515e50b2fdd792310b0b5776b986
      https://github.com/pcbsd/freebsd/commit/696eae7a90c8515e50b2fdd792310b0b5776b986
  Author: edavis <edavis at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M share/misc/committers-src.dot

  Log Message:
  -----------
  Merge r256280 from head.

Approved by:	re@ (gjb)
Approved by:	davidch (mentor)


  Commit: e63a0d23bfc4424df90eeb5ea7a1b3f7672d1cb6
      https://github.com/pcbsd/freebsd/commit/e63a0d23bfc4424df90eeb5ea7a1b3f7672d1cb6
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/dev/ata/ata-all.c
    M sys/dev/ata/ata-card.c
    M sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c

  Log Message:
  -----------
  MFC r256304

  Allow the legacy CDROM device to be accessed in a FreeBSD guest, while
  still using enlightened drivers for other block devices.

Approved by:    re@ (gjb)


  Commit: 3595c37915b5d237d693934d027629266b06d30a
      https://github.com/pcbsd/freebsd/commit/3595c37915b5d237d693934d027629266b06d30a
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/amd64/conf/GENERIC
    M sys/i386/conf/GENERIC

  Log Message:
  -----------
  MFC r256328:
 Document XENHVM and xenpci are mutually inclusive.

Approved by:    re (delphij)
Sponsored by:   The FreeBSD Foundation


  Commit: 7c51c89f48f9acf8f37a61f58786fcf2694593a0
      https://github.com/pcbsd/freebsd/commit/7c51c89f48f9acf8f37a61f58786fcf2694593a0
  Author: des <des at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M bin/freebsd-version/freebsd-version.sh.in

  Log Message:
  -----------
  MFH (r256332): remove extraneous \n

Approved by:	re (gjb)


  Commit: a3d9abb29440ef708372ef9d658edfd75f1b6243
      https://github.com/pcbsd/freebsd/commit/a3d9abb29440ef708372ef9d658edfd75f1b6243
  Author: des <des at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc

  Log Message:
  -----------
  MFH (r256334): remove extraneous but harmless /

Approved by:	re (gjb)


  Commit: a5887bef7be52a549e5ba37139605164cac63e08
      https://github.com/pcbsd/freebsd/commit/a5887bef7be52a549e5ba37139605164cac63e08
  Author: des <des at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Log Message:
  -----------
  Move mergeinfo to the right place.

Approved by:	re (gjb)


  Commit: 0a01cb310b8b31bbeba6c1846d20b7f8a46c810f
      https://github.com/pcbsd/freebsd/commit/0a01cb310b8b31bbeba6c1846d20b7f8a46c810f
  Author: des <des at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M usr.sbin/bsdinstall/bsdinstall.8
    M usr.sbin/bsdinstall/scripts/Makefile
    M usr.sbin/bsdinstall/scripts/auto
    A usr.sbin/bsdinstall/scripts/entropy
    M usr.sbin/bsdinstall/scripts/jail
    M usr.sbin/bsdinstall/scripts/script

  Log Message:
  -----------
  MFH (r256338): store some entropy after installation

Approved by:	re (gjb)


  Commit: c0fff0b71f3c6ec27c933546137391bfb374feeb
      https://github.com/pcbsd/freebsd/commit/c0fff0b71f3c6ec27c933546137391bfb374feeb
  Author: dim <dim at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/dev/bxe/bxe.c

  Log Message:
  -----------
  In sys/dev/bxe/bxe.c, print bus_addr_t values using %#jx, to fix several
gcc warnings for PAE kernels.

Approved by:	re (glebius)
Reviewed by:	davidch, edavis


  Commit: f6c283672e887f04524b02fb957fbfd53a349f6e
      https://github.com/pcbsd/freebsd/commit/f6c283672e887f04524b02fb957fbfd53a349f6e
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/dev/hyperv/include/hyperv.h
    M sys/dev/hyperv/vmbus/hv_channel.c

  Log Message:
  -----------
  MFC r256350

  Fix vmbus channel memory leak where incorrect length parameter was
  being passed to contigfree().

Approved by:	re@ (glebius)


  Commit: c8e8fef3a6ed1142b7f9f4081f1db75bca9b1770
      https://github.com/pcbsd/freebsd/commit/c8e8fef3a6ed1142b7f9f4081f1db75bca9b1770
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M usr.sbin/bsdconfig/include/messages.subr
    M usr.sbin/bsdconfig/share/Makefile
    M usr.sbin/bsdconfig/share/device.subr
    M usr.sbin/bsdconfig/share/dialog.subr
    A usr.sbin/bsdconfig/share/keymap.subr
    M usr.sbin/bsdconfig/share/strings.subr
    M usr.sbin/bsdconfig/share/variable.subr
    M usr.sbin/bsdinstall/bsdinstall
    M usr.sbin/bsdinstall/scripts/Makefile
    M usr.sbin/bsdinstall/scripts/auto
    M usr.sbin/bsdinstall/scripts/config
    M usr.sbin/bsdinstall/scripts/keymap
    M usr.sbin/bsdinstall/scripts/netconfig
    M usr.sbin/bsdinstall/scripts/services
    A usr.sbin/bsdinstall/scripts/zfsboot

  Log Message:
  -----------
  MFC revisions 256321-256323,256331,256333,256335,256343:
Bring in a new zfsboot auto script for performing automatic setup of a boot
pool (optionally encrypted) with many other options, validations, features.
Originally submitted by Allan Jude; modified in collaboration.

MFC revisions 256325,256330,256345:
Rewrite the keymap selection menu to display keymaps and provide a test
mechanism. Test mechanism originally submitted by Warren Block; modified.

MFC r256347:
Prominently display "Wireless" for each wireless network interface. Part
of PR bin/161547; submitted by Warren Block; slightly modified.

MFC r256348:
Remove the dumpdev configuration dialog, merge it into the regular
services configuration and enable it by default. Originally submitted by
Allan Jude; slightly modified.

PR:		bin/161547
Submitted by:	Allan Jude, Warren Block <wblock at wonkity.com>
In collaboration with:	Allan Jude <freebsd at allanjude.com>
Approved by:	re (glebius)


  Commit: 89a272e3b91ed0a23f538c485c1021adbfc81731
      https://github.com/pcbsd/freebsd/commit/89a272e3b91ed0a23f538c485c1021adbfc81731
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M sys/dev/hyperv/netvsc/hv_net_vsc.h
    M sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c

  Log Message:
  -----------
  MFC r256362

  Fix a lock-order reversal in the net driver by dropping the lock
  and holding a reference prior to calling further into the hyperv
  stack.

  Added missing FreeBSD idents.

Approved by:	re@ (gjb)


  Commit: 33f3e6ab569eb1040266c8ee7bdd0cf74bd58751
      https://github.com/pcbsd/freebsd/commit/33f3e6ab569eb1040266c8ee7bdd0cf74bd58751
  Author: rpaulo <rpaulo at FreeBSD.org>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M etc/Makefile
    R etc/atf/FreeBSD.conf
    R etc/atf/Makefile
    R etc/atf/common.conf
    M etc/ftpusers
    M etc/group
    M etc/master.passwd
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.usr.dist
    M lib/libcrypt/tests/crypt_tests.c
    M share/Makefile
    R share/atf/Makefile
    M share/examples/Makefile
    R share/examples/atf/Makefile
    M share/man/man5/Makefile
    M share/man/man7/Makefile
    M share/mk/atf.test.mk
    R share/xml/Makefile
    R share/xml/Makefile.inc
    R share/xml/atf/Makefile
    R share/xsl/Makefile
    R share/xsl/Makefile.inc
    R share/xsl/atf/Makefile
    M tools/build/mk/OptionalObsoleteFiles.inc
    M usr.bin/atf/Makefile
    M usr.bin/atf/Makefile.inc
    R usr.bin/atf/atf-config/Makefile
    R usr.bin/atf/atf-report/Makefile
    R usr.bin/atf/atf-run/Makefile
    R usr.bin/atf/atf-version/Makefile

  Log Message:
  -----------
  MFC 256365
	 Remove most of the ATF tools and the _atf user.

Approved by:	re


  Commit: 9eb1fa58092715cacc4e316cf710ece399e05137
      https://github.com/pcbsd/freebsd/commit/9eb1fa58092715cacc4e316cf710ece399e05137
  Author: eadler <eadler at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M share/misc/bsd-family-tree

  Log Message:
  -----------
  MFC r256327:

	Fix NetBSD release number

Approved by:	re (glebius)


  Commit: 49710188fe817615ce222b1acc13a836887660c4
      https://github.com/pcbsd/freebsd/commit/49710188fe817615ce222b1acc13a836887660c4
  Author: eadler <eadler at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M share/syscons/keymaps/INDEX.keymaps

  Log Message:
  -----------
  MFC r256367:

	Fix the formatting for the danish keymap.

Approved by:	re (glebius)


  Commit: 70d85b1cf39bf4f4d66a66b27b197046221e67f9
      https://github.com/pcbsd/freebsd/commit/70d85b1cf39bf4f4d66a66b27b197046221e67f9
  Author: markm <markm at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M etc/defaults/rc.conf
    M etc/rc.d/initrandom
    M share/examples/kld/random_adaptor/random_adaptor_example.c
    M share/man/man4/random.4
    M sys/boot/forth/loader.conf
    M sys/conf/NOTES
    M sys/conf/files
    M sys/conf/files.amd64
    M sys/conf/files.i386
    M sys/conf/options
    M sys/dev/glxsb/glxsb.c
    M sys/dev/hifn/hifn7751.c
    A sys/dev/random/dummy_rng.c
    M sys/dev/random/harvest.c
    M sys/dev/random/hash.h
    M sys/dev/random/ivy.c
    A sys/dev/random/live_entropy_sources.c
    A sys/dev/random/live_entropy_sources.h
    M sys/dev/random/nehemiah.c
    R sys/dev/random/pseudo_rng.c
    M sys/dev/random/random_adaptors.c
    M sys/dev/random/random_adaptors.h
    M sys/dev/random/random_harvestq.c
    M sys/dev/random/random_harvestq.h
    M sys/dev/random/randomdev.c
    M sys/dev/random/randomdev.h
    M sys/dev/random/randomdev_soft.c
    M sys/dev/random/randomdev_soft.h
    A sys/dev/random/rwfile.c
    A sys/dev/random/rwfile.h
    M sys/dev/random/yarrow.c
    M sys/dev/random/yarrow.h
    M sys/dev/rndtest/rndtest.c
    M sys/dev/safe/safe.c
    M sys/dev/syscons/scmouse.c
    M sys/dev/syscons/syscons.c
    M sys/dev/ubsec/ubsec.c
    M sys/kern/kern_intr.c
    M sys/kern/subr_bus.c
    M sys/mips/cavium/octeon_rnd.c
    M sys/modules/random/Makefile
    M sys/net/if_ethersubr.c
    M sys/net/if_tun.c
    M sys/netgraph/ng_iface.c
    M sys/sys/random.h

  Log Message:
  -----------
  Merge from project branch via main. Uninteresting commits are trimmed.

Refactor of /dev/random device. Main points include:

* Userland seeding is no longer used. This auto-seeds at boot time
on PC/Desktop setups; this may need some tweeking and intelligence
from those folks setting up embedded boxes, but the work is believed
to be minimal.

* An entropy cache is written to /entropy (even during installation)
and the kernel uses this at next boot.

* An entropy file written to /boot/entropy can be loaded by loader(8)

* Hardware sources such as rdrand are fed into Yarrow, and are no
longer available raw.

------------------------------------------------------------------------
r256240 | des | 2013-10-09 21:14:16 +0100 (Wed, 09 Oct 2013) | 4 lines

Add a RANDOM_RWFILE option and hide the entropy cache code behind it.
Rename YARROW_RNG and FORTUNA_RNG to RANDOM_YARROW and RANDOM_FORTUNA.
Add the RANDOM_* options to LINT.

------------------------------------------------------------------------
r256239 | des | 2013-10-09 21:12:59 +0100 (Wed, 09 Oct 2013) | 2 lines

Define RANDOM_PURE_RNDTEST for rndtest(4).

------------------------------------------------------------------------
r256204 | des | 2013-10-09 18:51:38 +0100 (Wed, 09 Oct 2013) | 2 lines

staticize struct random_hardware_source

------------------------------------------------------------------------
r256203 | markm | 2013-10-09 18:50:36 +0100 (Wed, 09 Oct 2013) | 2 lines

Wrap some policy-rich code in 'if NOTYET' until we can thresh out
what it really needs to do.

------------------------------------------------------------------------
r256184 | des | 2013-10-09 10:13:12 +0100 (Wed, 09 Oct 2013) | 2 lines

Re-add /dev/urandom for compatibility purposes.

------------------------------------------------------------------------
r256182 | des | 2013-10-09 10:11:14 +0100 (Wed, 09 Oct 2013) | 3 lines

Add missing include guards and move the existing ones out of the
implementation namespace.

------------------------------------------------------------------------
r256168 | markm | 2013-10-08 23:14:07 +0100 (Tue, 08 Oct 2013) | 10 lines

Fix some just-noticed problems:

o Allow this to work with "nodevice random" by fixing where the
MALLOC pool is defined.

o Fix the explicit reseed code. This was correct as submitted, but
in the project branch doesn't need to set the "seeded" bit as this
is done correctly in the "unblock" function.

o Remove some debug ifdeffing.

o Adjust comments.

------------------------------------------------------------------------
r256159 | markm | 2013-10-08 19:48:11 +0100 (Tue, 08 Oct 2013) | 6 lines

Time to eat crow for me.

I replaced the sx_* locks that Arthur used with regular mutexes;
this turned out the be the wrong thing to do as the locks need to
be sleepable. Revert this folly.

# Submitted by:	Arthur Mesh <arthurmesh at gmail.com> (In original diff)

------------------------------------------------------------------------
r256138 | des | 2013-10-08 12:05:26 +0100 (Tue, 08 Oct 2013) | 10 lines

Add YARROW_RNG and FORTUNA_RNG to sys/conf/options.

Add a SYSINIT that forces a reseed during proc0 setup, which happens
fairly late in the boot process.

Add a RANDOM_DEBUG option which enables some debugging printf()s.

Add a new RANDOM_ATTACH entropy source which harvests entropy from the
get_cyclecount() delta across each call to a device attach method.

------------------------------------------------------------------------
r256135 | markm | 2013-10-08 07:54:52 +0100 (Tue, 08 Oct 2013) | 8 lines

Debugging. My attempt at EVENTHANDLER(multiuser) was a failure; use
EVENTHANDLER(mountroot) instead.

This means we can't count on /var being present, so something will
need to be done about harvesting /var/db/entropy/... .

Some policy now needs to be sorted out, and a pre-sync cache needs
to be written, but apart from that we are now ready to go.

Over to review.

------------------------------------------------------------------------
r256094 | markm | 2013-10-06 23:45:02 +0100 (Sun, 06 Oct 2013) | 8 lines

Snapshot.

Looking pretty good; this mostly works now. New code includes:

* Read cached entropy at startup, both from files and from loader(8)
preloaded entropy. Failures are soft, but announced. Untested.

* Use EVENTHANDLER to do above just before we go multiuser. Untested.

------------------------------------------------------------------------
r256088 | markm | 2013-10-06 14:01:42 +0100 (Sun, 06 Oct 2013) | 2 lines

Fix up the man page for random(4). This mainly removes no-longer-relevant
details about HW RNGs, reseeding explicitly and user-supplied
entropy.

------------------------------------------------------------------------
r256087 | markm | 2013-10-06 13:43:42 +0100 (Sun, 06 Oct 2013) | 6 lines

As userland writing to /dev/random is no more, remove the "better
than nothing" bootstrap mode.

Add SWI harvesting to the mix.

My box seeds Yarrow by itself in a few seconds! YMMV; more to follow.

------------------------------------------------------------------------
r256086 | markm | 2013-10-06 13:40:32 +0100 (Sun, 06 Oct 2013) | 11 lines

Debug run. This now works, except that the "live" sources haven't
been tested. With all sources turned on, this unlocks itself in
a couple of seconds! That is no my box, and there is no guarantee
that this will be the case everywhere.

* Cut debug prints.

* Use the same locks/mutexes all the way through.

* Be a tad more conservative about entropy estimates.

------------------------------------------------------------------------
r256084 | markm | 2013-10-06 13:35:29 +0100 (Sun, 06 Oct 2013) | 5 lines

Don't use the "real" assembler mnemonics; older compilers may not
understand them (like when building CURRENT on 9.x).

# Submitted by:	Konstantin Belousov <kostikbel at gmail.com>

------------------------------------------------------------------------
r256081 | markm | 2013-10-06 10:55:28 +0100 (Sun, 06 Oct 2013) | 12 lines

SNAPSHOT.

Simplify the malloc pools; We only need one for this device.

Simplify the harvest queue.

Marginally improve the entropy pool hashing, making it a bit faster
in the process.

Connect up the hardware "live" source harvesting. This is simplistic
for now, and will need to be made rate-adaptive.

All of the above passes a compile test but needs to be debugged.

------------------------------------------------------------------------
r256042 | markm | 2013-10-04 07:55:06 +0100 (Fri, 04 Oct 2013) | 25 lines

Snapshot. This passes the build test, but has not yet been finished or debugged.

Contains:

* Refactor the hardware RNG CPU instruction sources to feed into
the software mixer. This is unfinished. The actual harvesting needs
to be sorted out. Modified by me (see below).

* Remove 'frac' parameter from random_harvest(). This was never
used and adds extra code for no good reason.

* Remove device write entropy harvesting. This provided a weak
attack vector, was not very good at bootstrapping the device. To
follow will be a replacement explicit reseed knob.

* Separate out all the RANDOM_PURE sources into separate harvest
entities. This adds some secuity in the case where more than one
is present.

* Review all the code and fix anything obviously messy or inconsistent.
Address som review concerns while I'm here, like rename the pseudo-rng
to 'dummy'.

# Submitted by:	Arthur Mesh <arthurmesh at gmail.com> (the first item)

------------------------------------------------------------------------
r255319 | markm | 2013-09-06 18:51:52 +0100 (Fri, 06 Sep 2013) | 4 lines

Yarrow wants entropy estimations to be conservative; the usual idea
is that if you are certain you have N bits of entropy, you declare
N/2.

------------------------------------------------------------------------
r255075 | markm | 2013-08-30 18:47:53 +0100 (Fri, 30 Aug 2013) | 4 lines

Remove short-lived idea; thread to harvest (eg) RDRAND enropy into the
usual harvest queues. It was a nifty idea, but too heavyweight.

# Submitted by:	Arthur Mesh <arthurmesh at gmail.com>

------------------------------------------------------------------------
r255071 | markm | 2013-08-30 12:42:57 +0100 (Fri, 30 Aug 2013) | 4 lines

Separate out the Software RNG entropy harvesting queue and thread
into its own files.

# Submitted by:	 Arthur Mesh <arthurmesh at gmail.com>

------------------------------------------------------------------------
r254934 | markm | 2013-08-26 20:07:03 +0100 (Mon, 26 Aug 2013) | 2 lines

Remove the short-lived namei experiment.

------------------------------------------------------------------------
r254928 | markm | 2013-08-26 19:35:21 +0100 (Mon, 26 Aug 2013) | 2 lines

Snapshot; Do some running repairs on entropy harvesting. More needs
to follow.

------------------------------------------------------------------------
r254927 | markm | 2013-08-26 19:29:51 +0100 (Mon, 26 Aug 2013) | 15 lines

Snapshot of current work;

1) Clean up namespace; only use "Yarrow" where it is Yarrow-specific
or close enough to the Yarrow algorithm. For the rest use a neutral
name.

2) Tidy up headers; put private stuff in private places. More could
be done here.

3) Streamline the hashing/encryption; no need for a 256-bit counter;
128 bits will last for long enough.

There are bits of debug code lying around; these will be removed
at a later stage.

------------------------------------------------------------------------
r254784 | markm | 2013-08-24 14:54:56 +0100 (Sat, 24 Aug 2013) | 39 lines

1) example (partially humorous random_adaptor, that I call "EXAMPLE")
 * It's not meant to be used in a real system, it's there to show how
   the basics of how to create interfaces for random_adaptors. Perhaps
   it should belong in a manual page

2) Move probe.c's functionality in to random_adaptors.c
 * rename random_ident_hardware() to random_adaptor_choose()

3) Introduce a new way to choose (or select) random_adaptors via tunable
"rngs_want" It's a list of comma separated names of adaptors, ordered
by preferences. I.e.:
rngs_want="yarrow,rdrand"

Such setting would cause yarrow to be preferred to rdrand. If neither of
them are available (or registered), then system will default to
something reasonable (currently yarrow). If yarrow is not present, then
we fall back to the adaptor that's first on the list of registered
adaptors.

4) Introduce a way where RNGs can play a role of entropy source. This is
mostly useful for HW rngs.

The way I envision this is that every HW RNG will use this
functionality by default. Functionality to disable this is also present.
I have an example of how to use this in random_adaptor_example.c (see
modload event, and init function)

5) fix kern.random.adaptors from
kern.random.adaptors: yarrowpanicblock
to
kern.random.adaptors: yarrow,panic,block

6) add kern.random.active_adaptor to indicate currently selected
adaptor:
root at freebsd04:~ # sysctl kern.random.active_adaptor
kern.random.active_adaptor: yarrow

# Submitted by:	Arthur Mesh <arthurmesh at gmail.com>

Submitted by:	Dag-Erling Smørgrav <des at FreeBSD.org>, Arthur Mesh <arthurmesh at gmail.com>
Reviewed by:	des at FreeBSD.org
Approved by:	re (delphij)
Approved by:	secteam (des,delphij)


  Commit: 2a6361507410ac1bd935b61f13d48c2512bb6cc3
      https://github.com/pcbsd/freebsd/commit/2a6361507410ac1bd935b61f13d48c2512bb6cc3
  Author: hrs <hrs at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M etc/rc.d/jail
    M share/man/man5/rc.conf.5
    M usr.sbin/jail/command.c
    M usr.sbin/jail/config.c
    M usr.sbin/jail/jail.8
    M usr.sbin/jail/jail.c
    M usr.sbin/jail/jailp.h

  Log Message:
  -----------
  MFC 256385:

- Add mount.fdescfs parameter to jail(8). This is similar to
  mount.devfs but mounts fdescfs.  The mount happens just after
  mount.devfs.

- rc.d/jail now displays whole error message from jail(8) when a jail
  fails to start.

Approved by:	re (gjb)


  Commit: c1abbfde2d2ed6e8b37eddbb9bf305f79d3ce103
      https://github.com/pcbsd/freebsd/commit/c1abbfde2d2ed6e8b37eddbb9bf305f79d3ce103
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M usr.sbin/bhyve/pci_virtio_block.c

  Log Message:
  -----------
  MFC r256389

  Implement the virtio block 'get-ident' operation. This eliminates the
  annoying verbose boot error of the form

     g_handleattr: vtbd0 bio_length 24 len 28 -> EFAULT

  The ident returned by bhyve is a text string 'BHYVE-XXXX-XXXX', where
  the X's are the first bytes of the md5 hash of the backing filename.

Approved by:	re (gjb)


  Commit: d58485abbdccf27ecf761ed841b039cfc481aec7
      https://github.com/pcbsd/freebsd/commit/d58485abbdccf27ecf761ed841b039cfc481aec7
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M usr.sbin/bsdconfig/share/strings.subr

  Log Message:
  -----------
  MFC r256391:
Fix signed integer overflow detection in f_expand_number() of strings.subr.

Approved by:	re (glebius)


  Commit: 406e69db40b575febd27bb50fca2fbd53a0577c2
      https://github.com/pcbsd/freebsd/commit/406e69db40b575febd27bb50fca2fbd53a0577c2
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update stable/10 to -BETA1 as part of the 10.0-RELEASE cycle.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


  Commit: 7c32cd66f0f7521fd56226973d83f12f2af038d3
      https://github.com/pcbsd/freebsd/commit/7c32cd66f0f7521fd56226973d83f12f2af038d3
  Author: markm <markm at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M sys/dev/random/dummy_rng.c
    M sys/dev/random/random_adaptors.c
    M sys/dev/random/randomdev.h
    M sys/dev/random/randomdev_soft.c

  Log Message:
  -----------
  MFC:

There is an issue (not seen in our testing) where "yarrow" and
"dummy" switch priorities, and the users are left with no usable
/dev/random. The fix assigns priories to these and gives the users
what they want. The override tuneable has a stupid name (blame me!)
and this fixes it to be something that 'sysctl kern.random' emits
and is the right thing to set.

Approved by:	re (gjb)
Approved by:	secteam (cperciva)


  Commit: 2f58c55ded3493e5a70649285980b1c76297e6f0
      https://github.com/pcbsd/freebsd/commit/2f58c55ded3493e5a70649285980b1c76297e6f0
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Log Message:
  -----------
  Forced commit to mark the real -BETA1 point.

Approved by:	re (implicit)


  Commit: 877edc98d7d93d33f7fb1050a18381199dad81f8
      https://github.com/pcbsd/freebsd/commit/877edc98d7d93d33f7fb1050a18381199dad81f8
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M bin/freebsd-version/freebsd-version.sh.in
    M etc/Makefile
    R etc/atf/FreeBSD.conf
    R etc/atf/Makefile
    R etc/atf/common.conf
    M etc/defaults/rc.conf
    M etc/ftpusers
    M etc/group
    M etc/master.passwd
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.usr.dist
    M etc/rc.d/initrandom
    M etc/rc.d/jail
    M lib/clang/clang.build.mk
    M lib/libcrypt/tests/crypt_tests.c
    M sbin/camcontrol/modeedit.c
    M share/Makefile
    R share/atf/Makefile
    M share/examples/Makefile
    R share/examples/atf/Makefile
    M share/examples/kld/random_adaptor/random_adaptor_example.c
    M share/man/man4/random.4
    M share/man/man5/Makefile
    M share/man/man5/rc.conf.5
    M share/man/man7/Makefile
    M share/misc/bsd-family-tree
    M share/mk/atf.test.mk
    M share/syscons/keymaps/INDEX.keymaps
    R share/xml/Makefile
    R share/xml/Makefile.inc
    R share/xml/atf/Makefile
    R share/xsl/Makefile
    R share/xsl/Makefile.inc
    R share/xsl/atf/Makefile
    M sys/amd64/conf/GENERIC
    M sys/arm/versatile/versatile_pci.c
    M sys/boot/forth/loader.conf
    M sys/conf/NOTES
    M sys/conf/files
    M sys/conf/files.amd64
    M sys/conf/files.i386
    M sys/conf/newvers.sh
    M sys/conf/options
    M sys/dev/ata/ata-all.c
    M sys/dev/ata/ata-card.c
    M sys/dev/bxe/bxe.c
    M sys/dev/bxe/bxe_stats.c
    M sys/dev/bxe/ecore_sp.h
    M sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
    M sys/dev/glxsb/glxsb.c
    M sys/dev/hifn/hifn7751.c
    M sys/dev/hyperv/include/hyperv.h
    M sys/dev/hyperv/netvsc/hv_net_vsc.h
    M sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
    M sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
    M sys/dev/hyperv/vmbus/hv_channel.c
    A sys/dev/random/dummy_rng.c
    M sys/dev/random/harvest.c
    M sys/dev/random/hash.h
    M sys/dev/random/ivy.c
    A sys/dev/random/live_entropy_sources.c
    A sys/dev/random/live_entropy_sources.h
    M sys/dev/random/nehemiah.c
    R sys/dev/random/pseudo_rng.c
    M sys/dev/random/random_adaptors.c
    M sys/dev/random/random_adaptors.h
    M sys/dev/random/random_harvestq.c
    M sys/dev/random/random_harvestq.h
    M sys/dev/random/randomdev.c
    M sys/dev/random/randomdev.h
    M sys/dev/random/randomdev_soft.c
    M sys/dev/random/randomdev_soft.h
    A sys/dev/random/rwfile.c
    A sys/dev/random/rwfile.h
    M sys/dev/random/yarrow.c
    M sys/dev/random/yarrow.h
    M sys/dev/rndtest/rndtest.c
    M sys/dev/safe/safe.c
    M sys/dev/syscons/scmouse.c
    M sys/dev/syscons/syscons.c
    M sys/dev/ubsec/ubsec.c
    M sys/dev/vmware/vmxnet3/if_vmx.c
    M sys/dev/vmware/vmxnet3/if_vmxvar.h
    M sys/i386/conf/GENERIC
    M sys/kern/kern_intr.c
    M sys/kern/subr_bus.c
    M sys/mips/cavium/octeon_rnd.c
    M sys/modules/random/Makefile
    M sys/net/if_ethersubr.c
    M sys/net/if_tun.c
    M sys/netgraph/ng_iface.c
    M sys/sys/random.h
    M tools/build/mk/OptionalObsoleteFiles.inc
    M usr.bin/atf/Makefile
    M usr.bin/atf/Makefile.inc
    R usr.bin/atf/atf-config/Makefile
    R usr.bin/atf/atf-report/Makefile
    R usr.bin/atf/atf-run/Makefile
    R usr.bin/atf/atf-version/Makefile
    M usr.sbin/bhyve/pci_virtio_block.c
    M usr.sbin/bsdconfig/include/messages.subr
    M usr.sbin/bsdconfig/share/Makefile
    M usr.sbin/bsdconfig/share/device.subr
    M usr.sbin/bsdconfig/share/dialog.subr
    A usr.sbin/bsdconfig/share/keymap.subr
    M usr.sbin/bsdconfig/share/strings.subr
    M usr.sbin/bsdconfig/share/variable.subr
    M usr.sbin/bsdinstall/bsdinstall
    M usr.sbin/bsdinstall/bsdinstall.8
    M usr.sbin/bsdinstall/scripts/Makefile
    M usr.sbin/bsdinstall/scripts/auto
    M usr.sbin/bsdinstall/scripts/config
    A usr.sbin/bsdinstall/scripts/entropy
    M usr.sbin/bsdinstall/scripts/jail
    M usr.sbin/bsdinstall/scripts/keymap
    M usr.sbin/bsdinstall/scripts/netconfig
    M usr.sbin/bsdinstall/scripts/script
    M usr.sbin/bsdinstall/scripts/services
    A usr.sbin/bsdinstall/scripts/zfsboot
    M usr.sbin/jail/command.c
    M usr.sbin/jail/config.c
    M usr.sbin/jail/jail.8
    M usr.sbin/jail/jail.c
    M usr.sbin/jail/jailp.h

  Log Message:
  -----------
  Merge branch 'stable/10' of https://github.com/freebsd/freebsd into stable/10

Conflicts:
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/d99a538bd828...877edc98d7d9


More information about the Commits mailing list