PC-BSD/trueos e2d60a1sys/amd64/conf IXNAS

Don't need WITNESS_SUPPORT

PC-BSD/trueos 2420289sys/amd64/conf IXNAS

Merge pull request #302 from william-gr/patch-2

Add INVARIANTS & WITNESS for now

PC-BSD/trueos 350e363sys/amd64/conf IXNAS

Add INVARIANTS & WITNESS for now

PC-BSD/trueos eaf8957sys/amd64/conf IXNAS

Merge pull request #301 from william-gr/patch-1

Add xz device, GEOM_UZIP dependency

PC-BSD/trueos e7eef2csys/amd64/conf IXNAS

Add xz device, GEOM_UZIP dependency

PC-BSD/trueos 3444f3dsys/amd64/conf IXNAS

Merge pull request #300 from william-gr/patch-1

Remove zfs from kernel

PC-BSD/trueos 70eb085sys/amd64/conf IXNAS

Remove zfs from kernel

We are going to use ZoF only going forward.

PC-BSD/trueos 44349bfstand/efi/boot1 Makefile, stand/efi/libefi Makefile

Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable

PC-BSD/trueos 9b04137lib/libc/sys fhlink.2 getfh.2, sys/cddl/contrib/opensolaris/uts/intel/dtrace fasttrap_isa.c

Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable

PC-BSD/trueos 22a1fb5sys/cddl/boot/zfs zfsimpl.h

MFC r342747 - zfsboot: support newer ZFS versions

Sponsored by:   iX Systems

PC-BSD/trueos 5fa6889share/mk src.opts.mk, stand/efi/boot1 Makefile

MFC r342793 - selectively disable ZFS without disabling loader

Sponsored by:   iX Systems

PC-BSD/trueos fc12cc2sys/i386/i386 exception.s

MFC r345246:
i386: improve detection of the fast page fault assist.

PC-BSD/trueos d688c14usr.sbin/freebsd-update freebsd-update.sh

MFC r34505: freebsd-update: restore old exit code when no updates are available
locally

This unbreaks ezjail and iocell, which get into an endless loop trying to
figure out how many times "freebsd-update install" needs to be called.

PR:            229346
Submitted by:   Mike Cole <mcole36 at gmail.com>
Approved by:    bapt

PC-BSD/trueos 6a2e0dclib/libc/sys stat.2

MFC r345087: Use consistent struct stat arg name in stat man page

stat, lstat, and fstat use `*sb` as the stat struct pointer arg name,
while fstatat previously used `*buf`.

PC-BSD/trueos 9ecef43libexec/rc/rc.d Makefile, tools/build/mk OptionalObsoleteFiles.inc

MFC r345079:

Fix still installing ipfilter rc.d files even when WITHOUT_IPFILTER
is specified.

When WITHOUT_IPFILTER is specified, delete-old-files fails to delete
the optional rc.d files from above. Fix this.

WITHOUT_IPFILTER fails to delete the ipfilter.5 optional file during
delete-old-files. Fix this.

Reported by:    Dmitry Luhtionov <dmitryluhtionov at gmail.com>

PC-BSD/trueos 964f2f3sys/amd64/conf IXNAS

Remove zfs from FreeNAS kernel conf

This commit removes zfs from FreeNAS kernel conf.

PC-BSD/trueos da711dbsys/conf files, sys/contrib/xz-embedded/freebsd xz_malloc.c

MFC r344479 (by sobomax), r344605:
Modularize xz.

PC-BSD/trueos 4252e66sys/dev/hwpmc hwpmc_core.c

MFC r345078:
hwpmc/core: Adopt to upcoming Skylake TSX errata.

PC-BSD/trueos fcbc697tests/sys/net if_tun_test.sh Makefile

MFC r344797:

tun tests: Test renaming and destroying a tun interface in a vnet jail

There was a problem destroying renamed tun interfaces in vnet jails. This was
fixed in r344794. Test the previously failing scenario.

PR:            235704

PC-BSD/trueos 31ec790sys/net if_tun.c

MFC r344794:

tun: VIMAGE fix for if_tun cloner

The if_tun cloner is not virtualised, but if_clone_attach() does use a
virtualised list of cloners.
The result is that we can't find the if_tun cloner when we try to remove
a renamed tun interface. Virtualise the cloner, and move the final
cleanup into a sysuninit so that we're sure this happens after all of
the vnet_sysuninits

Note that we need unit numbers to be system-unique (rather than unique
per vnet, as is done by if_clone_simple()). The unit number is used to
create the corresponding /dev/tunX device node, and this node must match
with the interface.
Switch to if_clone_advanced() so that we have control over the unit
numbers.

Reproduction scenario:
        jail -c -n foo persist vnet
        jexec test ifconfig tun create
        jexec test ifconfig tun0 name wg0
        jexec test ifconfig wg0 destroy

PR:            235704

    [2 lines not shown]
DeltaFile
+80-25sys/net/if_tun.c
+80-251 files

PC-BSD/trueos da7e159usr.sbin/pc-installdialog pc-installdialog.sh, usr.sbin/pc-sysinstall/backend functions-extractimage.sh functions-unmount.sh

Backport fixes to pc-installdialog and pc-sysinstall from trueos-master

PC-BSD/trueos 6b0855esys/fs/ext2fs ext2_vfsops.c

MFC: r344757:
Fix double free in case of mount error.

Reported by:    Christopher Krah, Thomas Barabosch, and Jan-Niclas Hilgert of Fraunhofer 
FKIE
Reported as:    FS-9-EXT3-2: Denial Of Service in nmount-5 (vm_fault_hold)
Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19385

PC-BSD/trueos 647a592sys/fs/ext2fs ext2_inode_cnv.c ext2_vfsops.c

MFC: r344752:
Add additional on-disk inode checks.

Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19323

PC-BSD/trueos d58ea76sys/fs/ext2fs ext2_alloc.c

MFC: r344754:
Do not panic if inode bitmap is corrupted.

admbug:         804
Reported by:    Ilja Van Sprundel
Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19325

PC-BSD/trueos 682e1b9sys/fs/ext2fs ext2_alloc.c

MFC: r344756, r345179:
Do not read the on-disk inode in case of vnode allocation.

Reported by:    Christopher Krah, Thomas Barabosch, and Jan-Niclas Hilgert of Fraunhofer 
FKIE
Reported as:    FS-6-EXT2-4: Denial Of Service in mkdir-0 (ext2_mkdir/vn_rdwr)
Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19327

PC-BSD/trueos 66bedc8sys/fs/ext2fs ext2_vfsops.c

MFC: r344755:
Fix integer overflow possibility.

Reported by:    Christopher Krah, Thomas Barabosch, and Jan-Niclas Hilgert of Fraunhofer 
FKIE
Reported as:    FS-2-EXT2-1: Out-of-Bounds Write in nmount (ext2_vget)
Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19326

PC-BSD/trueos 28329d4sys/fs/ext2fs ext2_alloc.c

MFC: r344753:
Validate block bitmaps.

Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19324

PC-BSD/trueos ec03032sys/fs/ext2fs ext2_vfsops.c ext2_alloc.c

MFC r344751:
Make superblock reading logic more strict.

Add more on-disk superblock consistency checks to ext2_compute_sb_data() function.
It should decrease the probability of mounting filesystems with corrupted superblock data.

Reviewed by:    pfg

Differential Revision:    https://reviews.freebsd.org/D19322

PC-BSD/trueos f1f7617sys/x86/include specialreg.h

MFC r345189:
Add symbolic name for TSC_AUX MSR address.

PC-BSD/trueos ae28eccsys/netpfil/ipfw ip_fw_pfil.c ip_fw_private.h

MFC r345004 (with modification):
  Add IP_FW_NAT64 to codes that ipfw_chk() can return.

  It will be used by upcoming NAT64 changes. We use separate code
  to avoid propagating EACCES error code to user level applications
  when NAT64 consumes a packet.

  Obtained from:        Yandex LLC
  Sponsored by: Yandex LLC

PC-BSD/trueos 3236608sys/netpfil/ipfw/nat64 nat64_translate.c

MFC r345003:
  Add NULL pointer check to nat64_output().

  It is possible that a processed packet was originated by local host,
  in this case m->m_pkthdr.rcvif is NULL. Check and set it to V_loif to
  avoid NULL pointer dereference in IP input code, since it is expected
  that packet has valid receiving interface when netisr processes it.

  Obtained from:        Yandex LLC
  Sponsored by: Yandex LLC

PC-BSD/trueos 823f52esys/dev/rtwn/rtl8192c r92c_tx.c r92c_reg.h, sys/dev/rtwn/rtl8192c/usb r92cu_init.c

MFC r344745:
rtwn_usb(4): fix Tx instability with RTL8192CU chipsets

PR:            233949

PC-BSD/trueos 26e02f6sys/cddl/contrib/opensolaris/uts/common/dtrace fasttrap.c, sys/cddl/contrib/opensolaris/uts/intel/dtrace fasttrap_isa.c

MFC r344599:
Fix fasttrap_sig{trap,segv}().

PC-BSD/trueos c488985sys/cddl/contrib/opensolaris/uts/intel/dtrace fasttrap_isa.c

MFC r344588:
Remove illumos-specific code from the x86 fasttrap_isa.c.

PC-BSD/trueos aaa017bsys/kern uipc_shm.c

MFC r344670:
Allow FIONBIO and FIOASYNC ioctls on POSIX shm descriptors.
DeltaFile
+21-1sys/kern/uipc_shm.c
+21-11 files

PC-BSD/trueos 867d12esys/cddl/contrib/opensolaris/uts/common/dtrace fasttrap.c, sys/cddl/contrib/opensolaris/uts/intel/dtrace fasttrap_isa.c

MFC r344450, r344452, r344453:
Fix a tracepoint lookup race in fasttrap_pid_probe().

PC-BSD/trueos b906b70sys/mips/mips vm_machdep.c

MFC r345141:
mips: remove dead comment and definitions.

PC-BSD/trueos a32149bsys/ufs/ffs ffs_vnops.c

MFC r344562:

FFS: allow sendfile(2) to work with block sizes greater than the page size

Implement ffs_getpages_async(), which when possible calls the asynchronous
flavor of the generic pager's getpages function. When the underlying
block size is larger than the system page size, however, it will invoke
the (synchronous) buffer cache pager, followed by a call to the client
completion routine. This retains true asynchronous completion in the most
common (block size <= page size) case, which is important for the performance
of the new sendfile(2). The behavior in the larger block size case mirrors
the default implementation of VOP_GETPAGES_ASYNC, which most other
filesystems use anyway as they do not override the getpages_async method.

PR:            235708

PC-BSD/trueos 33fbd24usr.bin/proccontrol proccontrol.1

MFC r345089:
Some fixes for proccontrol(1) man page.

PC-BSD/trueos a5f6b04sys/x86/include specialreg.h, sys/x86/x86 identcpu.c

MFC r345075:
Add register number, CPUID bits, and print identification for TSX
force abort errata.

PC-BSD/trueos 179be94sys/dev/hwpmc hwpmc_core.c

MFC r345074:
Remove useless version check.

PC-BSD/trueos cb192b5lib/libc/sys fhlink.2 getfh.2, sys/compat/freebsd32 freebsd32_systrace_args.c

MFC r341689, r341711, r341712, r341809:
Add getfhat(2), fhlink(2), fhlinkat(2), fhreadlink(2) file handle system calls.

To easier potential MFC of the AT_BENEATH feature, some vestiges of it were
left in the merged product but commented out.

Due to a lot of conflicts, it was impossible to split the merge and
regeneration of the syscall tables, because I needed to test the result.
It is fine for stable branch to commit the whole change with the
generated diff.

PC-BSD/trueos d40ed1esbin/ifconfig Makefile, sys/dev/iwm if_iwm_config.h if_iwm.c

Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable

PC-BSD/trueos 5ee3a83sys/netpfil/pf pf_ioctl.c

MFC r344921:

pf: Fix DIOCGETSRCNODES

r343295 broke DIOCGETSRCNODES by failing to reset 'nr' after counting the
number of source tracking nodes.
This meant that we never copied the information to userspace, leading to '? ->
?' output from pfctl.

PR:            236368

PC-BSD/trueos 66ab243sbin/ifconfig Makefile

MFC r344748:
Allow to build ifconfig(8) without wireless support

The change removes SIOC[GS]IEEE80211 handling from ifconfig(8)
if WITHOUT_WIRELESS_SUPPORT=yes is set in src.conf(5).

Reviewed by:    bz
Differential Revision:  https://reviews.freebsd.org/D19289

PC-BSD/trueos 4a9665asys/dev/iwm if_iwm_config.h if_iwm.c

MFC r345002:
iwm(4): use correct channel list source for Intel 3168

Intel 3168 uses another EEPROM section to store channel flags;
port missing bits from iwlwifi to make it work.

PR:            230750, 236235
Tested by:      Bert JW Regeer <xistence at 0x58.com>

PC-BSD/trueos eef73ffsys/sys param.h

bump version to reflect MFC of CCM for the benefit of the ZoF port

Sponsored by:   iX Systems
DeltaFile
+1-1sys/sys/param.h
+1-11 files

PC-BSD/trueos 4d59076sys/amd64/conf IXNAS

Bring "iflib" into IXNAS kernel config for 12-stable, looks like if_em
requires it now

PC-BSD/trueos 2c90bd5stand/defaults loader.conf

Update default RC to rc.d on FreeNAS branch

PC-BSD/trueos 4b2475econtrib/llvm/lib/Demangle ItaniumDemangle.cpp, contrib/llvm/lib/Target/X86 X86ISelLowering.cpp X86InstrAVX512.td

Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable