Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pcbsd/freebsd
base: d7e1bd6e0195
head fork: pcbsd/freebsd
compare: b72a651a1d4d
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Sep 21, 2013
@dag-erling dag-erling Set props and correct RCS ID tag.
Approved by:	re (blanket)
@dag-erling dag-erling Remove autoprops.
Approved by:	re (blanket)
Commits on Sep 22, 2013
gibbs Fix compilation of the i386 PAE kernel config.
	Provide vtomach() when PAE is defined.

Approved by:	re (blanket Xen)
gibbs Fix ia64 and mips kernel builds due to XENHVM=>GENERIC integration in
revision 255744.

	IPI_SUSPEND is only available on amd64 and i386.  Protect
	new uses of this constant with #ifdefs to avoid impacting
	other platforms.

Approved by:	re (blanket Xen)
andrew Remove the armv6eb architecture as it is unused, and almost certainly
broken. None of our kernels can boot armv6eb. The little-endian kernels do
not have the required code to be able to switch endian when running a
big-endian executable.

Approved by:	re (gjb)
@glebius glebius - Create kern.ipc.sendfile namespace, and put the new "readhead" OID
  there as "kern.ipc.sendfile.readahead".
- Push all nsfbuf related tunables into MD code. Don't move them
  to new namespace in favor of POLA.

Reviewed by:	scottl
Approved by:	re (gjb)
@dcci dcci Consistently use the same value to indicate exclusively-held and
shared-held locks for all the primitives in lc_lock/lc_unlock routines.
This fixes the problems introduced in r255747, which indeed introduced an
inversion in the logic.

Reported by:	many
Tested by:	bdrewery, pho, lme, Adam McDougall, O. Hartmann
Approved by:	re (glebius)
bz Update comment from draft to RFC number.
Submitted by:	Loganaden Velvindron (logan
Approved by:	re (gjb)
MFC after:	6 days
alc Both the vm_map and vmspace zones are defined as "no free". So, there…
… is no

point in defining a fini function for these zones.

Reviewed by:	kib
Approved by:	re (glebius)
Sponsored by:	EMC / Isilon Storage Division
@dag-erling dag-erling Fix indentation.
Approved by:	re (blanket)
@dag-erling dag-erling Due to a missing command-line argument, yacc regenerated the parser but
not its header file, resulting in a mismatch between the lexer and parser
and strange errors when reading the configuration file.

Approved by:	re (blanket)
ian Launch the shell, passing it the path to the mk-osreldate script, rather
than launching the script directly and relying on #! to launch the shell.
This avoids problems when the source is mounted with the noexec flag.

MFC this together with r255775.

Approved by:	re (kib)
MFC after:	2 weeks
@kostikbel kostikbel Increase the chance of the buffer write from the bufdaemon helper
context to succeed.  If the locked vnode which owns the buffer to be
written is shared locked, try the non-blocking upgrade of the lock to

PR:	kern/178997
Reported and tested by:	Klaus Weber <>
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Approved by:	re (marius)
@kostikbel kostikbel Pre-acquire the filedesc sx when a possibility exists that the later
code could need to remove a kqueue from the filedesc list.  Global
lock is already locked, which causes sleepable after non-sleepable
lock acquisition.

Reported and tested by:	pho
Reviewed by:	jmg
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Approved by:	re (gjb)
@kostikbel kostikbel Revert r255797. The LK_UPGRADE | LK_NOWAIT drops the lock.
Approved by:	re (marius, implicit)
@dag-erling dag-erling Build and install drill(1).
Approved by:	re (blanket)
@dag-erling dag-erling Remove drill(1) if MK_LDNS_UTILS is false.
Remove host(1) if both MK_BIND and MK_LDNS_UTILS are false.

Approved by:	re (blanket)
@DimitryAndric DimitryAndric Pull in r191165 from upstream llvm trunk:
  ISelDAG: spot chain cycles involving MachineNodes

  Previously, the DAGISel function WalkChainUsers was spotting that it
  had entered already-selected territory by whether a node was a
  MachineNode (amongst other things). Since it's fairly common practice
  to insert MachineNodes during ISelLowering, this was not the correct

  Looking around, it seems that other nodes get their NodeId set to -1
  upon selection, so this makes sure the same thing happens to all
  MachineNodes and uses that characteristic to determine whether we
  should stop looking for a loop during selection.

  This should fix PR15840.

Specifically, this fixes the long-standing assertion failure when
compiling the multimedia/gstreamer port on i386.  Thanks to Tijl
Coosemans for his help in getting upstream to fix it.

Approved by:	re (marius)
@dag-erling dag-erling Always request zeroed memory, in case we're dumb enough to leak it la…

Approved by:	re (gjb)
@seanbruno seanbruno Export two new DCMD enums. These allow set/get of the mfi_ctrl_proper…

structure in the driver.

Having these in 10.0 means that mfiutil can be modified to take adavantage
of new updates without a kernel recompile.

Approved by:	re (gjb)
MFC after:	2 weeks
Commits on Sep 23, 2013
ian Launch the bourne shell using "sh" rather than "${SHELL}", as the latter
may come in from the environment and reflect the user's interactive shell.
Using bare "sh" is the dominant pattern in existing makefiles.

MFC this together with r255775.

Approved by:	re ()
MFC after:	2 weeks
@dag-erling dag-erling Add a setup script for unbound(8) called local-unbound-setup. It
generates a configuration suitable for running unbound as a caching
forwarding resolver, and configures resolvconf(8) to update unbound's
list of forwarders in addition to /etc/resolv.conf.  The initial list
is taken from the existing resolv.conf, which is rewritten to point to
localhost.  Alternatively, a list of forwarders can be provided on the
command line.

To assist this script, add an rc.subr command called "enabled" which
does nothing except return 0 if the service is enabled and 1 if it is
not, without going through the usual checks.  We should consider doing
the same for "status", which is currently pointless.

Add an rc script for unbound, called local_unbound.  If there is no
configuration file, the rc script runs local-unbound-setup to generate

Note that these scripts place the unbound configuration files in
/var/unbound rather than /etc/unbound.  This is necessary so that
unbound can reload its configuration while chrooted.  We should
probably provide symlinks in /etc.

Approved by:	re (blanket)
@trasz trasz Prevent "lock (iscsi) sx does not match earlier (sleep mutex) lock" p…

triggered by "kldload iscsi_initiator; kldunload iscsi_initiator; kldload

Approved by:	re (marius)
theraven Import a new libcxxrt. This fixes some potential crashing in the dema…

Approved by:	re (gjb)
MFC after:	1 week
loos Fix DELAY() on RPi, the wrong math was making it take twice it should.
Reported by:	Alexander <>
Approved by:	adrian (mentor)
Approved by:	re (gjb)
nwhitehorn Add installer support for CHRP/PAPR PowerPC systems that use MBR+BSD
formatting, like x86, but with an additional MBR slice containing a raw
boot partition.

Approved by:	re (gjb)
@devinteske devinteske Fix a bug in HTTP checking/fetching.
Fix a bug in HTTP checking/fetching. Add Main Site to HTTP menu. Add new
example script and move existing example script ->

Reviewed by:	gjb, brd
Approved by:	re (gjb), clusteradm (brd)
MFC after:	3 days
@dag-erling dag-erling Ensure that resolvconf(8) preserves the edns0 setting.
Approved by:	re (blanket)
@glebius glebius Fix coredump on 'arp -d'.
Submitted by:	az
Approved by:	re (kib)
@trasz trasz Don't use M_WAITOK when running from context where sleeping is prohib…

such as callout or a geom thread.

Approved by:	re (marius)
Sponsored by:	FreeBSD Foundation
@dag-erling dag-erling Move local_unbound up in the rc order.
Approved by:	re (blanket)
@dag-erling dag-erling Prevent resolvconf from updating /etc/resolv.conf. As Jakob Schlyter
pointed out, having additional nameservers listed in /etc/resolv.conf
can break DNSSEC verification by providing a false positive if unbound
returns SERVFAIL due to an invalid signature.  The downside is that
the domain / search path won't get updated either, but we can live
with that.

Approved by:	re (blanket)
@kostikbel kostikbel Free both KVA and backing pages when freeing TSS memory.
Reported and tested by:	pho
Sponsored by:	The FreeBSD Foundation
Approved by:	re (marius)
@hirenp hirenp Correcting EXAMPLES section.
Approved by:	re (gjb)
@dag-erling dag-erling Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a
repeat performance by introducing a script that runs configure with and
without Kerberos, diffs the result and generates krb5_config.h, which
contains the preprocessor macros that need to be defined in the Kerberos
case and undefined otherwise.

Approved by:	re (marius)
Commits on Sep 24, 2013
danilo - Add myself as port commiter and my mentors relationship.
- Add myself to calendar.freebsd.

Approved by:	re (gjb), wg (mentor)
@amotin amotin Make load average sampling asynchronous to hardclock ticks. This impr…

measurement of load caused by time-related events still using hardclock.
For example, without this change dummynet, scheduling events each hardclock
tick, was always miscounted as load of 1.

There is still aliasing with events delayed by the new precision mechanism,
but it probably can't be avoided without moving this sampling from using
callout to some lower-level code or handling it in some other special way.

Reviewed by:	davide
Approved by:	re (marius)
@trasz trasz Fix a few instances of M_WAITOK in threads marked as prohibited from …

missed in r255824.

Approved by:	re (kib)
Sponsored by:	FreeBSD Foundation
@dag-erling dag-erling Don't include the build date or command-line arguments in the binary.
Approved by:	re (blanket)
@dag-erling dag-erling Regenerate the configure script before running it.
Set the default config file to /var/unbound/unbound.conf.

Approved by:	re (blanket)
@dag-erling dag-erling Regenerate
Approved by:	re (blanket)
@dag-erling dag-erling Replace the unused /etc/unbound directory with a symlink to /var/unbo…

Approved by:	re (blanket)
@dag-erling dag-erling Forgotten in r255825: NETWORKING requires local_unbound.
Approved by:	re (blanket)
@kostikbel kostikbel Ensure that the ERESTART return from the syscall reloads the
registers, to make the restarted syscall instruction pass the correct

PR:	kern/182161
Reported by:	Russ Cox <>
Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Approved by:	re (marius)
@kostikbel kostikbel Use the pv lists generation count to read-lock the pvh_global_lock in

Noted and reviewed by:	alc
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
Approved by:	re (marius)
@trasz trasz Properly ignore PDUs with CmdSN outside of allowed range.
Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation
@kostikbel kostikbel In pmap_clear_modify(), initialize pvh even for fictitious managed
page, otherwise the small mappings loop would use uninitialized value.
Note that currently pmap_clear_modify() is not called for fictitious

Sponsored by:	The FreeBSD Foundation
Approved by:	re (glebius)
@dag-erling dag-erling Flip the switch: disable BIND and enable LDNS_UTILS.
Approved by:	re (blanket)
@dag-erling dag-erling Regenerate.
Approved by:	re (blanket)
@devinteske devinteske Update dialog to 1.2-20130923.
Approved by:	re (marius)
scottl Update the CAM API for FreeBSD 10:
- Remove the timeout_ch field.  It's been deprecated since FreeBSD 7.0;
  MPSAFE drivers should be managing their own timeout storage.  The
  remaining non-MPSAFE drivers have been modified to also manage their own
  storage, and should be considered for updating to MPSAFE (or removal)
  during the FreeBSD 10.x lifecycle.

- Add fields related to soft timeouts and quality of service, to be used
  in upcoming work.

- Add room for more flags in the CCB header and path_inq structures.

- Begin support for extended 64-bit LUNs.

- Bump the CAM version number to 0x18, but add compat shims.  Tested with
  camcontrol and smartctl.

Reviewed by:    nathanw, ken, kib
Approved by:    re
Obtained from:  Netflix
gjb Update head/ to -ALPHA3.
This commit marks the point the final KBI change was made as part of the
10.0-RELEASE cycle.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
@trasz trasz Improve error handling in the old initiator, preventing panic on attempt
to load iscsi_initiator.ko when iscsi.ko is already loaded.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation
@trasz trasz As it turns out, when MOD_LOAD handler returns error, kernel calls MO…

handler.  Make the new iSCSI initiator not panic when this happens.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation
@bsdjhb bsdjhb Don't parse NO_ROOT metadata for extra kernels if NO_ROOT isn't defined.
Approved by:	re (gjb)
MFC after:	1 week
@dag-erling dag-erling Introduce a kern.geom.notaste sysctl that can be used to temporarily
disable GEOM tasting to avoid the "bouncing GEOM" problem where, when
you shut down the consumer of a provider which can be viewed in multiple
ways (typically a mirror whose members are labeled partitions), GEOM
will immediately taste that provider's alter ego and reattach the

Approved by:	re (glebius)
joel Minor mdoc fixes.
Approved by:	re (blanket)
Commits on Sep 25, 2013
gjb Revert r255853 pending fixes to build errors in usr.bin/kdump
Approved by:	re (implicit)
jmg fix a bug where we access a bread buffer after we have brelse'd it...
The kernel normally didn't unmap/context switch away before we accessed
the buffer most of the time, but under heavy I/O pressure and lots of
mount/unmounting this would cause a fault on nofault panic...

Reviewed by:	dteske
Approved by:	re (kib)
Sponsored by:	Vicor
MFC after:	3 days
jmg NULL stale pointers (should be a no-op as they should no longer be

Reviewed by:	dteske
Approved by:	re (kib)
Sponsored by:	Vicor
MFC after:	3 days
attilio Avoid memory accesses reordering which can result in fget_unlocked()
seeing a stale fd_ofiles table once fd_nfiles is already updated,
resulting in OOB accesses.

Approved by:	re (kib)
Sponsored by:	EMC / Isilon storage division
Reported and tested by:	pho
Reviewed by:	benno
ambrisko Add PCI device ID for MegaRAID Invader cards. This was the only
change needed to make it work on my card.

Approved by:	re (glebius)
scottl Re-do r255853. Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there.  There are no user-servicable parts in there, so
no need for those tools to be groping around in there.

Approved by:	re
scottl Re-do r255853. Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there.  There are no user-servicable parts in there, so
no need for those tools to be groping around in there.

Approved by:    re
@dag-erling dag-erling Additional BIND files.
Submitted by:	bdrewery
Approved by:	re (blanket)
@delphij delphij Correct a NULL pointer deference in nslookup and nsupdate that would
cause the utility to crash in interactive mode when the user gives
an EOF on standard input.

MFC after:	3 days
Approved by:	re (gjb)
Commits on Sep 26, 2013
andrew Add an elf note on ARM to store the MACHINE_ARCH an executable was built
for. This is useful for software needing to know which architecture a
binary is built for as arm and armv6 have slight differences meaning only
some binaries build for one will work as expected on the other. It is
expected pkgng will be able to make use of this to simplify the logic to
determine which package ABI to use.

Approved by:	re (kib)
@kmoore134 kmoore134 Merge branch 'master' of