FreeBSD/src b95e960contrib/libdiff/lib diff_output.c

libdiff: More type issues.

Sponsored by:   Klara, Inc.
Reviewed by:    allanjude
Differential Revision:  https://reviews.freebsd.org/D45080
DeltaFile
+12-12contrib/libdiff/lib/diff_output.c
+12-121 files

FreeBSD/src b985c9csys/contrib/openzfs/config ax_python_devel.m4, sys/contrib/openzfs/lib/libspl assert.c

zfs: merge openzfs/zfs at 8f1b7a6fa

Notable upstream pull request merges:
 #15839 c3f2f1aa2 vdev probe to slow disk can stall mmp write checker
 #15888 5044c4e3f Fast Dedup: ZAP Shrinking
 #15996 db499e68f Overflowing refreservation is bad
 #16118 67d13998b Make more taskq parameters writable
 #16128 21bc066ec Fix updating the zvol_htable when renaming a zvol
 #16130 645b83307 Improve write issue taskqs utilization
 #16131 8fd3a5d02 Slightly improve dnode hash
 #16134 a6edc0adb zio: try to execute TYPE_NULL ZIOs on the current task
 #16141 b28461b7c Fix arcstats for FreeBSD after zfetch support

Obtained from:  OpenZFS
OpenZFS commit: 8f1b7a6fa6762ea4c89198ceb11c521f80b92ddc
DeltaFile
+229-112sys/contrib/openzfs/config/ax_python_devel.m4
+328-8sys/contrib/openzfs/module/zfs/zap.c
+140-51sys/contrib/openzfs/module/zfs/spa.c
+97-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_write_slow_disk.ksh
+91-2sys/contrib/openzfs/lib/libspl/assert.c
+81-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/zap_shrink/zap_shrink_001_pos.ksh
+966-17343 files not shown
+1,332-27149 files

FreeBSD/src 04ea5e9sys/amd64/conf MINIMAL, sys/i386/conf MINIMAL

MINIMAL: Grow minimal to support ata, scsi and nvme

Until the boot loader automatically loads these things (including the
CAM dependency), we need to have them in the minimal kernel since they
are needed to boot. These aren't strictly required to be in the kernel,
since modules work, but are high enough demand items that until we sort
out boot loader automation, I'm adding them here. These devices are also
common in vm environments. The delta is relatively small in size. Once
the boot loader automation arrives, these and a lot of other things can
be trimmed. It's less than ideal, but is a good middle ground for the
moment.

Sponsored by:           Netflix
Reviewed by:            kevans, emaste
Differential Revision:  https://reviews.freebsd.org/D45012
DeltaFile
+12-0sys/amd64/conf/MINIMAL
+12-0sys/i386/conf/MINIMAL
+24-02 files

FreeBSD/src eea5f8dusr.bin/diff diffreg_new.c diff.c

diff: Sort headers.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D45078
DeltaFile
+9-5usr.bin/diff/diffreg_new.c
+2-2usr.bin/diff/diff.c
+1-1usr.bin/diff/diffdir.c
+12-83 files

FreeBSD/src 0549218contrib/libdiff/lib diff_main.c

libdiff: Fix type issues.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    allanjude, markj
Differential Revision:  https://reviews.freebsd.org/D45077
DeltaFile
+3-2contrib/libdiff/lib/diff_main.c
+3-21 files

FreeBSD/src ea2d874sys/geom/stripe g_stripe.c g_stripe.h

geom_stripe: Cascade cantrim just like we do for gmirror

If any of the disks can support trim, cascade that up the
stack. Otherwise, trims won't pass through striped raid setups.

PR: 277673
Reviewed by: imp (minor style tweaks from bug report)
DeltaFile
+20-1sys/geom/stripe/g_stripe.c
+3-0sys/geom/stripe/g_stripe.h
+23-12 files

FreeBSD/src 12117d0sys/cam/scsi scsi_da.c

da: Update trim stats for WRITE SAME and ATA TRIM

The scsi UNMAP path updated trim stats in the da sysctl, but the ATA
TRIM passthru and WRITE SAME paths did not. Add code so they do.

PR: 277637
Reviewed by: imp (tweaked WS path to update ranges)
DeltaFile
+6-0sys/cam/scsi/scsi_da.c
+6-01 files

FreeBSD/src 0c0146ctests/sys/kern sendfile_helper.c sendfile_test.sh

tests/sendfile: test operation on unix/stream socket

Although there are already multiple tests in the tests collection
that utilize sendfile(2) support over unix/stream socket, they all
don't exercise the asynchronous part of the operation.  This test
framework, however, uses a trick to toggle true async operation and
guarantee that pr_ready method of unix/stream is also tested.

Reviewed by:            chs
Differential Revision:  https://reviews.freebsd.org/D45055
DeltaFile
+30-9tests/sys/kern/sendfile_helper.c
+24-0tests/sys/kern/sendfile_test.sh
+54-92 files

FreeBSD/src c368d3ftests/sys/kern sendfile_helper.c

tests/sendfile: factor out tcp_socketpair()

It creates a pair of connected TCP sockets for later testing.  No
functional change.

Reviewed by:            chs
Differential Revision:  https://reviews.freebsd.org/D45054
DeltaFile
+65-54tests/sys/kern/sendfile_helper.c
+65-541 files

FreeBSD/src a25e0balib/libarchive Makefile.inc

libarchive: fix thread autodetermination for zstd compression format

The libarchive code uses sysconf(3) to determine the number of threads
when 0 has been given as the number of thread to use

MFC after:      3 days
DeltaFile
+2-1lib/libarchive/Makefile.inc
+2-11 files

FreeBSD/src 7206f7csys/compat/linuxkpi/common/include/asm set_memory.h

linuxkpi: Fix set_memory_*

set_memory_* is currently implemented using PHYS_TO_DMAP but not all
architectures have a DMAP.  Looking at how this function is used the
given address isn't physical but virtual so the PHYS_TO_DMAP call can
simply be removed.

Also cast numpages before shifting it to avoid overflow.

Reviewed by:    kib, markj
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D45057
DeltaFile
+6-15sys/compat/linuxkpi/common/include/asm/set_memory.h
+6-151 files

FreeBSD/src 95032b5usr.bin/split split.c

Tighten boundary check in split(1) to prevent a potential buffer overflow.

Before increasing sufflen, make sure the current name plus two (including
the terminating NUL character and the to-be-added character) does not
exceed the fixed buffer length, and stop immediately if this would occur.

In worst case scenario the code would write an nul character beyond the
boundary, however it would be caught by open(2) and based on the memory
layout, we do not believe this would constitute a security vulnerability.

MFC after:      3 days
DeltaFile
+4-0usr.bin/split/split.c
+4-01 files

FreeBSD/src bf89881tests/sys/netpfil/pf nat66.py

pf tests: fix REQUIRED_MODULES typo

This ensures we don't try to run the nat66 tests if pf is not loaded.

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+1-1tests/sys/netpfil/pf/nat66.py
+1-11 files

FreeBSD/src aa48259usr.sbin/periodic periodic.conf, usr.sbin/periodic/etc/security 200.chkmounts 800.loginfail

periodic.conf: remove long deprecated security_daily_compat_var()

This function is documented to be gone in after 11. Time to remove this
compat shim.

PR:             275296
Reviewed by:    jrm (mentor)
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D44796
DeltaFile
+0-22usr.sbin/periodic/periodic.conf
+0-4usr.sbin/periodic/etc/security/200.chkmounts
+0-3usr.sbin/periodic/etc/security/800.loginfail
+0-3usr.sbin/periodic/etc/security/900.tcpwrap
+0-3usr.sbin/periodic/etc/security/security.functions
+0-2usr.sbin/periodic/etc/security/500.ipfwdenied
+0-3710 files not shown
+0-5716 files

FreeBSD/src 7b082bdsys/conf newvers.sh, sys/sys param.h

Post-14.1-branch updates

Rename stable/14 to -STABLE

Bump __FreeBSD_version

Approved by:    re (implicit)
Sponsored by:   https://www.patreon.com/cperciva
DeltaFile
+1-1sys/conf/newvers.sh
+1-1sys/sys/param.h
+2-22 files

FreeBSD/src 3f5f387release/pkg_repos release-dvd.conf, sys/conf newvers.sh

14.1: create releng/14.1 branch

Update from PRERELEASE to BETA1
Switch pkg(8) configuration to use the quarterly repository
Bump __FreeBSD_version

Approved by:    re (implicit)
Sponsored by:   https://www.patreon.com/cperciva
DeltaFile
+1-1release/pkg_repos/release-dvd.conf
+1-1sys/conf/newvers.sh
+1-1sys/sys/param.h
+3-33 files

FreeBSD/src c4d0e1fcontrib/libarchive/libarchive archive_string.c archive_match.c, contrib/libarchive/unzip/test test_I.c

libarchive: merge bugfixes from vendor branch

 #2147 archive_string: clean up strncat_from_utf8_to_utf8 (36047967a)
 #2153 archive_match: check archive_read_support_format_raw()
       return value (0ce1b4c38)
 #2154 archive_match: turn counter into flag (287e05d53)
 #2155 lha: Do not allow negative file sizes (93b11caed)
 #2156 tests: setenv LANG to en_US.UTF-8 in bsdunzip test_I.c (83e8b0ea8)

(cherry picked from commit c0b58e65deca1e5e2c434ede7e64f03af6044be8)
DeltaFile
+42-54contrib/libarchive/libarchive/archive_string.c
+9-9contrib/libarchive/libarchive/archive_match.c
+8-0contrib/libarchive/unzip/test/test_I.c
+2-0contrib/libarchive/libarchive/archive_read_support_format_lha.c
+61-634 files

FreeBSD/src cf2750bsys/kern sys_generic.c

kcmp_pget(): do not accept TIDs

(cherry picked from commit 5b3e5c6ce3e552dae3e84d6bc781bc9f53c22d71)
DeltaFile
+2-1sys/kern/sys_generic.c
+2-11 files

FreeBSD/src d9ec850libexec/rtld-elf rtld_printf.c

rtld snprintf: do not erronously skip a char at the buffer boundary

(cherry picked from commit 56ee5fc43c40479e2651b21862e299bcf73017ae)
DeltaFile
+3-4libexec/rtld-elf/rtld_printf.c
+3-41 files

FreeBSD/src 6b667b4sys/kern sys_generic.c

kcmp_pget(): add an assert that we did not hold the current process

(cherry picked from commit 1e01650a787028fd558e8cb709c232e335fc2cd9)
DeltaFile
+5-1sys/kern/sys_generic.c
+5-11 files

FreeBSD/src 44debeelibexec/rtld-elf rtld_printf.c

rtld snprintf: do not erronously skip a char at the buffer boundary

(cherry picked from commit 56ee5fc43c40479e2651b21862e299bcf73017ae)
DeltaFile
+3-4libexec/rtld-elf/rtld_printf.c
+3-41 files

FreeBSD/src 33cac29sys/kern sys_generic.c

kcmp_pget(): do not accept TIDs

(cherry picked from commit 5b3e5c6ce3e552dae3e84d6bc781bc9f53c22d71)
DeltaFile
+2-1sys/kern/sys_generic.c
+2-11 files

FreeBSD/src 66e0bf7sys/kern sys_generic.c

kcmp_pget(): add an assert that we did not hold the current process

(cherry picked from commit 1e01650a787028fd558e8cb709c232e335fc2cd9)
DeltaFile
+5-1sys/kern/sys_generic.c
+5-11 files

FreeBSD/src a8089eausr.sbin/nvmfd io.c devices.c

nvmfd: A simple userspace daemon for the NVMe over Fabrics controller

This daemon can operate as a purely userspace controller exporting one
or more simulated RAM disks or local block devices as NVMe namespaces
to a remote host.  In this case the daemon provides a discovery
controller with a single entry for an I/O controller.

nvmfd can also offload I/O controller queue pairs to the nvmft.ko
in-kernel Fabrics controller when -K is passed.  In this mode, nvmfd
still accepts connections and performs initial transport-specific
negotitation in userland.  The daemon still provides a userspace-only
discovery controller with a single entry for an I/O controller.
However, queue pairs for the I/O controller are handed off to the CTL
NVMF frontend.

Eventually ctld(8) should be refactored to to provide an abstraction
for the frontend protocol and the discovery and the kernel mode of
this daemon should be merged into ctld(8).  At that point this daemon
can be moved to tools/tools/nvmf as a debugging tool (mostly as sample

    [5 lines not shown]
DeltaFile
+677-0usr.sbin/nvmfd/io.c
+386-0usr.sbin/nvmfd/devices.c
+343-0usr.sbin/nvmfd/discovery.c
+260-0usr.sbin/nvmfd/nvmfd.c
+244-0usr.sbin/nvmfd/controller.c
+139-0usr.sbin/nvmfd/ctl.c
+2,049-04 files not shown
+2,255-010 files

FreeBSD/src 4f9fa31usr.sbin/ctladm ctladm.c ctladm.8

ctladm: Add nvlist command to list active NVMeoF associations

Reviewed by:    imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44728
DeltaFile
+253-1usr.sbin/ctladm/ctladm.c
+16-1usr.sbin/ctladm/ctladm.8
+269-22 files

FreeBSD/src 09a9315tools/tools/nvmf/nvmfdd nvmfdd.c Makefile

nvmfdd: A simple userspace NVMe over Fabrics host

This program uses libnvmf to connect to a remote Fabrics controller
and perform a single read or write operation.  The write command reads
data from stdin to construct one or more NVM Write commands sent to
the remote namespace.  The read command uses one or more NVM Read
commands to read blocks from a remote namespace writing the data to
stdout.

Reviewed by:    chuck, imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44730
DeltaFile
+493-0tools/tools/nvmf/nvmfdd/nvmfdd.c
+9-0tools/tools/nvmf/nvmfdd/Makefile
+502-02 files

FreeBSD/src 17c907dusr.sbin/ctladm ctladm.c ctladm.8

ctladm: Add nvterminate command to drop active NVMeoF associations

Reviewed by:    imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44729
DeltaFile
+72-2usr.sbin/ctladm/ctladm.c
+13-0usr.sbin/ctladm/ctladm.8
+85-22 files

FreeBSD/src 25bad5asys/cam/ctl ctl_ioctl.h ctl.c

ctl: Add NVMF port type and ioctls

- Add CTL_PORT_NVMF as a new port type.

- Define a new CTL_NVMF ioctl for NVMF-specific operations similar to
  CTL_ISCSI.  This ioctl supports a command to handoff a single
  queue pair, a command to enumerate active associations, and a
  command to disconnect one or more active associations.

Reviewed by:    imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44724
DeltaFile
+62-0sys/cam/ctl/ctl_ioctl.h
+17-0sys/cam/ctl/ctl.c
+1-0sys/cam/ctl/ctl.h
+80-03 files

FreeBSD/src 5fd6897usr.sbin/ctladm ctladm.c

ctladm: Permit creating nvmf ports

Reviewed by:    imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44727
DeltaFile
+1-0usr.sbin/ctladm/ctladm.c
+1-01 files

FreeBSD/src 51346bdsys/kern kern_mbuf.c, sys/sys mbuf.h

mbuf: Add EXT_CTL for mbufs backed by a CTL backend buffer

This is somewhat similar to EXT_NET_DRV, but CTL isn't a network
driver.

Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D44725
DeltaFile
+1-0sys/kern/kern_mbuf.c
+1-0sys/sys/mbuf.h
+2-02 files