MFC r251249, r251251, r251252, r2512, r251254 and r251515:
Correct XHCI DMA descriptor programming.
Correct maximum IRQ rate.
MFC NFS FHA changes 249592 and 249596:

  ------------------------------------------------------------------------
  r249592 | ken | 2013-04-17 15:00:22 -0600 (Wed, 17 Apr 2013) | 180 lines

  Revamp the old NFS server's File Handle Affinity (FHA) code so that
  it will work with either the old or new server.

  The FHA code keeps a cache of currently active file handles for
  NFSv2 and v3 requests, so that read and write requests for the same
  file are directed to the same group of threads (reads) or thread
  (writes).  It does not currently work for NFSv4 requests.  They are
  more complex, and will take more work to support.

  This improves read-ahead performance, especially with ZFS, if the
  FHA tuning parameters are configured appropriately.  Without the
  FHA code, concurrent reads that are part of a sequential read from
  a file will be directed to separate NFS threads.  This has the
  effect of confusing the ZFS zfetch (prefetch) code and makes
  sequential reads significantly slower with clients like Linux that
  do a lot of prefetching.

  The FHA code has also been updated to direct write requests to nearby
  file offsets to the same thread in the same way it batches reads,
  and the FHA code will now also send writes to multiple threads when
  needed.

  This improves sequential write performance in ZFS, because writes
  to a file are now more ordered.  Since NFS writes (generally
  less than 64K) are smaller than the typical ZFS record size
  (usually 128K), out of order NFS writes to the same block can
  trigger a read in ZFS.  Sending them down the same thread increases
  the odds of their being in order.

  In order for multiple write threads per file in the FHA code to be
  useful, writes in the NFS server have been changed to use a LK_SHARED
  vnode lock, and upgrade that to LK_EXCLUSIVE if the filesystem
  doesn't allow multiple writers to a file at once.  ZFS is currently
  the only filesystem that allows multiple writers to a file, because
  it has internal file range locking.  This change does not affect the
  NFSv4 code.

  This improves random write performance to a single file in ZFS, since
  we can now have multiple writers inside ZFS at one time.

  I have changed the default tuning parameters to a 22 bit (4MB)
  window size (from 256K) and unlimited commands per thread as a
  result of my benchmarking with ZFS.

  The FHA code has been updated to allow configuring the tuning
  parameters from loader tunable variables in addition to sysctl
  variables.  The read offset window calculation has been slightly
  modified as well.  Instead of having separate bins, each file
  handle has a rolling window of bin_shift size.  This minimizes
  glitches in throughput when shifting from one bin to another.

  sys/conf/files:
  	Add nfs_fha_new.c and nfs_fha_old.c.  Compile nfs_fha.c
  	when either the old or the new NFS server is built.

  sys/fs/nfs/nfsport.h,
  sys/fs/nfs/nfs_commonport.c:
  	Bring in changes from Rick Macklem to newnfs_realign that
  	allow it to operate in blocking (M_WAITOK) or non-blocking
  	(M_NOWAIT) mode.

  sys/fs/nfs/nfs_commonsubs.c,
  sys/fs/nfs/nfs_var.h:
  	Bring in a change from Rick Macklem to allow telling
  	nfsm_dissect() whether or not to wait for mallocs.

  sys/fs/nfs/nfsm_subs.h:
  	Bring in changes from Rick Macklem to create a new
  	nfsm_dissect_nonblock() inline function and
  	NFSM_DISSECT_NONBLOCK() macro.

  sys/fs/nfs/nfs_commonkrpc.c,
  sys/fs/nfsclient/nfs_clkrpc.c:
  	Add the malloc wait flag to a newnfs_realign() call.

  sys/fs/nfsserver/nfs_nfsdkrpc.c:
  	Setup the new NFS server's RPC thread pool so that it will
  	call the FHA code.

  	Add the malloc flag argument to newnfs_realign().

  	Unstaticize newnfs_nfsv3_procid[] so that we can use it in
  	the FHA code.

  sys/fs/nfsserver/nfs_nfsdsocket.c:
  	In nfsrvd_dorpc(), add NFSPROC_WRITE to the list of RPC types
  	that use the LK_SHARED lock type.

  sys/fs/nfsserver/nfs_nfsdport.c:
  	In nfsd_fhtovp(), if we're starting a write, check to see
  	whether the underlying filesystem supports shared writes.
  	If not, upgrade the lock type from LK_SHARED to LK_EXCLUSIVE.

  sys/nfsserver/nfs_fha.c:
  	Remove all code that is specific to the NFS server
  	implementation.  Anything that is server-specific is now
  	accessed through a callback supplied by that server's FHA
  	shim in the new softc.

  	There are now separate sysctls and tunables for the FHA
  	implementations for the old and new NFS servers.  The new
  	NFS server has its tunables under vfs.nfsd.fha, the old
  	NFS server's tunables are under vfs.nfsrv.fha as before.

  	In fha_extract_info(), use callouts for all server-specific
  	code.  Getting file handles and offsets is now done in the
  	individual server's shim module.

  	In fha_hash_entry_choose_thread(), change the way we decide
  	whether two reads are in proximity to each other.
  	Previously, the calculation was a simple shift operation to
  	see whether the offsets were in the same power of 2 bucket.
  	The issue was that there would be a bucket (and therefore
  	thread) transition, even if the reads were in close
  	proximity.  When there is a thread transition, reads wind
  	up going somewhat out of order, and ZFS gets confused.

  	The new calculation simply tries to see whether the offsets
  	are within 1 << bin_shift of each other.  If they are, the
  	reads will be sent to the same thread.

  	The effect of this change is that for sequential reads, if
  	the client doesn't exceed the max_reqs_per_nfsd parameter
  	and the bin_shift is set to a reasonable value (22, or
  	4MB works well in my tests), the reads in any sequential
  	stream will largely be confined to a single thread.

  	Change fha_assign() so that it takes a softc argument.  It
  	is now called from the individual server's shim code, which
  	will pass in the softc.

  	Change fhe_stats_sysctl() so that it takes a softc
  	parameter.  It is now called from the individual server's
  	shim code.  Add the current offset to the list of things
  	printed out about each active thread.

  	Change the num_reads and num_writes counters in the
  	fha_hash_entry structure to 32-bit values, and rename them
  	num_rw and num_exclusive, respectively, to reflect their
  	changed usage.

  	Add an enable sysctl and tunable that allows the user to
  	disable the FHA code (when vfs.XXX.fha.enable = 0).  This
  	is useful for before/after performance comparisons.

  nfs_fha.h:
  	Move most structure definitions out of nfs_fha.c and into
  	the header file, so that the individual server shims can
  	see them.

  	Change the default bin_shift to 22 (4MB) instead of 18
  	(256K).  Allow unlimited commands per thread.

  sys/nfsserver/nfs_fha_old.c,
  sys/nfsserver/nfs_fha_old.h,
  sys/fs/nfsserver/nfs_fha_new.c,
  sys/fs/nfsserver/nfs_fha_new.h:
  	Add shims for the old and new NFS servers to interface with
  	the FHA code, and callbacks for the

  	The shims contain all of the code and definitions that are
  	specific to the NFS servers.

  	They setup the server-specific callbacks and set the server
  	name for the sysctl and loader tunable variables.

  sys/nfsserver/nfs_srvkrpc.c:
  	Configure the RPC code to call fhaold_assign() instead of
  	fha_assign().

  sys/modules/nfsd/Makefile:
  	Add nfs_fha.c and nfs_fha_new.c.

  sys/modules/nfsserver/Makefile:
  	Add nfs_fha_old.c.

  Reviewed by:	rmacklem
  Sponsored by:	Spectra Logic

  ------------------------------------------------------------------------
  r249596 | ken | 2013-04-17 16:42:43 -0600 (Wed, 17 Apr 2013) | 7 lines

  Move the NFS FHA (File Handle Affinity) code from sys/nfsserver to
  sys/nfs, since it is now shared by the two NFS servers.

  Suggested by:	rmacklem
  Sponsored by:	Spectra Logic
  ------------------------------------------------------------------------

Sponsored by:	Spectra Logic
MFC r250626:

Add less to rescue build.
MFC r251431:

Pull in r183297 from upstream llvm trunk:

  PR15662: Optimized debug info produces out of order function
  parameters

  When a function is inlined we lazily construct the variables
  representing the function's parameters. After that, we add any
  remaining unused parameters.

  If the function doesn't use all the parameters, or uses them out of
  order, then the DWARF would produce them in that order, producing a
  parameter order that doesn't match the source.

  This fix causes us to always keep the arg variables at the start of
  the variable list & in the original order from the source.

Reported by:	avg
MFC r240403 (obrien):
  Not all Pmake derivatives silently handle empty shell output, so ensure
  there is something for make(1) to consume.  Bmake gives output such as:
  "warning: Couldn't read shell's output for "/bin/sh -c true"

Approved by:	kib (mentor)
MFC r250617

etc/rc.d/syslogd
	Add netif as a requirement of syslogd to get lo0 up.  Currently, this
	doesn't affect the rc order, because mountcritremote already depends on
	netif.

Reviewed by:	eadler
Approved by:	ken (mentor)
MFC: 236567

Integrate a fix for a very odd signal delivery problem found
by Bryan Cantril and others in the Solaris/Illumos version of DTrace.

Obtained from: https://www.illumos.org/issues/789
MFC r250662

sbin/camcontrol/camcontrol.c
	If an expander returns 0x00 (no device attached) in the ATTACHED DEVICE
	field of the SMP DISCOVER response, ignore the value of ATTACHED SAS
	ADDRESS, because it is invalid.  Some expanders zero out the address
	when the attached device is removed, but others do not.  Section
	9.4.3.10 of the SAS Protocol Layer 2 revision 04b does not require them
	to do so.

Approved by:	ken (mentor)
MFC r251396

sys/dev/mps/mps.c
sys/dev/mps/mps_user.c
        Fix uninitialized memory reference in mps_read_config_page.  It was
        referencing a field (params->hdr.Ext.ExtPageType) that would only be
        set when reading an Extended config page.  The symptom was that
        MPSIO_READ_CFG_PAGE ioctls would randomly fail with
        MPI2_IOCSTATUS_CONFIG_INVALID_PAGE errors.  The solution is to
        determine whether an extended or an ordinary config page is requested
        by looking at the PageType field, which should be available regardless.

        Similarly, mps_user_read_extcfg_header and mps_user_read_extcfg_page,
        which call mps_read_config_page, had to be fixed to always set the
        PageType field.  They were implicitly assuming that
        mps_read_config_page always operated on Extended pages.

Reviewed by:	ken
Approved by:	ken (mentor)
MFC: r251089
Add a patch analygous to r248567, r248581, r251079 to the
old NFS client to avoid the panic reported in the PR by
doing the vnode_pager_setsize() call after unlocking the mutex.
MFC r244224, r248753

  Minor refactoring prior to .symbols file changes

  - Combine .if x and .if !x using .else
  - Separate out beforelinking dependency
  - Add comments to clarify .if nesting

  Always define and use PROGNAME

  This avoids having separate cases in the install rule for PROGNAME set
  and not set.  This is a minor cleanup in advance of further support for
  standalone debug files.
Bump __FreeBSD_version to bound boostrapping of ctfmerge which was fixed
in r249243.
MFC r250407:

Remove duplicated copies of various NetBSD compatibility shims used by
makefs and use libnetbsd, contrib/mtree, and contrib/mknod instead.

Sponsored by:	DARPA, AFRL
MFC: 235380,235454,235455,235456,235457,235613,235614,235628,236567,
     238125,238535,238660,238979,239972

Bring all changes to the DTrace Toolkit into FreeBSD 9.
MFC 249263: Fix a potential socket leak in the NFS server.
MFC 249315:
Proxy allocation requests for the PCI ROM BAR from child devices similar
to how the VGA bus driver currently proxies allocation requests for other
PCI BARs.
MFC r251109:
	Add support for tethering on the iPhone 4S

PR:	usb/179078
MFC r250462:
	Add option to lockf to avoid creating a file if it does not exist.

PR:	bin/170775
MFC 249766: Use a higher TTL (128) for DHCP packets.
MFC r227183,r229905,r250432,r250451,r250882:

	- Add missing static keywords to split(1)

	- Fix warning when compiling with gcc46:
	 error: variable 'defname' set but not use

	- Implement 'split -d' which allows a numeric suffix instead of an
	alphabetic one.

	- Bump .Dd for recent content change.
	Avoid signed overflow in error handling code.

PR:		bin/116209