FreeBSD git weekly: 2025-10-20 to 2025-10-26

The size of an embedded struct has changed and might possibly be a
problem.  Allow this change to be detected by bumping __FreeBSD_version.

MFC after:      3 days

With this patch UDP-Lite endpoints are also show per default.

Reviewed by:            Peter Lei, Nick Banks
MFC after:              3 days
Relnotes:               yes
Differential Revision:  https://reviews.freebsd.org/D53230

flua is a standalone third-party component that deserves its own
package.  In particular, this means things can use flua without
having to depend on FreeBSD-utilities, which will be useful as
more base utilities use flua.

This saves ~500kB in FreeBSD-utilities for systems which don't
need flua.

MFC after:      3 days
Reviewed by:    kevans
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53161

Summary: UBSAN complains about p[signed - unsigned] wrapping around.

Reviewed by:    kevans
Differential Revision: https://reviews.freebsd.org/D53226

MFC after:    3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52586

Sponsored by: The FreeBSD Foundation
MFC after:      4 days
Reviewed by:    ziaee
Differential Revision:  https://reviews.freebsd.org/D53257

The direction of the data transfer in uio(9) can be confusing,
so state explicitly the difference between UIO_READ and UIO_WRITE.

Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D52996

Reviewed by:  ziaee
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D52992

fdisk: Bump removal to FreeBSD 16.0

Removal did not happen prior to 15.0.

Sponsored by:   The FreeBSD Foundation

fdisk: Bump deprecated version in warning message as well

Fixes: https://cgit.freebsd.org/src/commit/?id=f817f6e7f4a8 ("fdisk: Bump removal to FreeBSD 16.0")
Sponsored by:   The FreeBSD Foundation

Add 14.2, as this was cherry-picked prior to release.

Reported by:    Harald Eilertsen
Reviewed by:    kib
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53320

We live in the SPDX world now and our example manual pages should
reflect that.

Also, fix the order of the SPDX and copyright lines as per style(9).

Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53335

The ffs() function conforms to IEEE Std 1003.1-2008 ("POSIX.1").
The ffsl() and ffsll() functions conform to IEEE Std 1003.1-2024 ("POSIX.1").

Reviewed by:    ziaee
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53352

We use a pkg(8) trigger to run makewhatis for /usr/share/man when
manpages are updated, but this doesn't cover /usr/share/openssl/man.

Rewrite the trigger to process a list of directories instead of a
single directory, and include /usr/share/openssl/man in the list.

MFC after:      3 days
Reviewed by:    emaste
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53064

mac_text(3) as-written would seem to indicate that a `mac_t` should be
freed with free(3), but this isn't the case.  One can derive from
context from when the change was introduced and COMPATIBILITY that this
was intended to talk about *text in `mac_to_text`, so move the comment
there.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=179832
Co-authored-by: Priit Järv <priit cc ttu ee>
MFC after:      3 days

MFC after:    3 days

Also provide the pointer to the latest POSIX standard that justifies the
requirement.

Reviewed by:    emaste
Discussed with: rmacklem
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D53361

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

Reviewed by:  markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

When interrupt remapping (IR) is enabled, the device table entry
(DTE) for a given device will likely be initialized by
amdiommu_ir_find() during MSI configuration.  This function directly
calls amdiommu_get_ctx_for_dev() with id_mapped=false, which means that
any attempt to disable DMA remapping for the device (e.g. by setting
hw.busdma.pciD.B.S.F='bounce' in the loader tunables) will effectively
be ignored as the paging mode field in the DTE will not be set to
0 as required for identity mapping.  This will ultimately produce
an unusable device, because busdma will later observe the bounce
configuration through iommu_instantiate_ctx() and will employ the
non-translated 'bounce' busdma methods for the device, while the DTE
remains configured to enable translation.

Fix this by tweaking iommu_instantiate_ctx() to always return the
relevant per-device context object even if translation is disabled,
and adopt it in amdiommu_ir_find() instead of directly calling
amdiommu_get_ctx_for_dev().

Reviewed by:    kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D53209

These are known to work if loaded manually by loader(8) (for VF2 at
least). If nothing else, it is useful to provide a DTB closely tied to
the kernel version.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53117

These are known to work if loaded manually by loader(8) (for the Nezha
board at least). If nothing else, it is useful to provide a DTB closely
tied to the kernel version.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53118

modules: enable allwinner kmods on riscv

While here, standardize the place they are enabled in the Makefile. For
armv7 the module subdirectory was added explicitly in the config file,
but this is not idiomatic.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

modules/allwinner: add nvmem_if.h to SRCS

Ensure the header is generated; it is a dependency for these drivers.
This fixes standalone module builds and riscv LINT.

Reported by:    zlei
Sponsored by:   The FreeBSD Foundation
Fixes:  https://cgit.freebsd.org/src/commit/?id=5522519731b7 ("modules: enable allwinner kmods on riscv")

Add the subdirectory in the Makefile, not the config.

No functional change intended.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

Now under sys/contrib/device-tree.

vmm: Improve register get/set handling a bit

On non-amd64 platforms, check for negative register indices.  This isn't
required today since we match against individual register indices, but
we might as well check it.  On amd64, add a comment explaining why we
permit negative register indices.

Use mallocarray() for allocating register arrays in the ioctl layer.

No functional change intended.

Reviewed by:    corvink
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D53143

vmm: Add PRIV_DRIVER checks for passthru ioctls

In preparation for allowing non-root users to create and access bhyve
VMs, add privilege checks for ioctls which operate on passthru devices.

Reviewed by:    corvink
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D53144

vmm: Move local variables into ioctl handlers

Make the ioctl handlers easy to read by moving local variables into
per-ioctl blocks.  No functional change intended.

Reviewed by:    corvink, emaste
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D53145

Sponsored by: The FreeBSD Foundation
MFC after:      4 days
Reviewed by:    emaste, ziaee
Differential Revision:  https://reviews.freebsd.org/D53237

It seems like _QUAD_LOWWORD was incorrectly expanded into 1,
which is correct for big endian but not little endian.  This
means we always grab the padding word for the syscall number,
which is usually 0, causing SIGSYS to be delivered to the caller.
Reintroduce _QUAD_LOWWORD to fix the syscall.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290411
MFC after:      1 week
Discussed with: jrtc27
Reviewed by:    cognet, emaste
Approved by:    markj (mentor)
Fixes:          https://cgit.freebsd.org/src/commit/?id=8c9c3144ccfa3061879b8cec015ee7d1010e4766
Differential Revision:  https://reviews.freebsd.org/D53250

We have provided implementations for hard float of these for
a while now.  Add them to the header to make things official.
This is required for a bunch of legacy programs in ports.

Approved by:    markj (mentor)
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D53156

Add support for the DIOCGIDENT ioctl to both nvme controller device
nodes and namespace device nodes.

This information was already available via the nda(4) device node.
However, mapping /dev/nvmeX to /dev/ndaY device nodes is not
straightforward, so it's better to get it directly from the /dev/nvme
device node.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290259
MFC after:      2 weeks
Sponsored by:   ConnectWise
Submitted by:   imp (mostly)
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1875

fvp-base-revc.dtb works with the kernel now interrupt-maps are
supported in more cases.

Reviewed by:    mhorne
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D51258

Reviewed by:  andrew
Sponsored by:   Arm Ltd

Reviewed by: cem
Fixes: https://cgit.freebsd.org/src/commit/?id=1492c8c0d qcom_rnd: add initial qualcomm prng driver.
Fixes: https://cgit.freebsd.org/src/commit/?id=9eecef052 Add an Armv8 rndr random number provider
Fixes: https://cgit.freebsd.org/src/commit/?id=b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver
Differential Revision:  https://reviews.freebsd.org/D53292

Reviewed by: khng
Differential Revision:  https://reviews.freebsd.org/D53309

Suggested by: arrowd
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days

This driver was in fact not removed prior to FreeBSD 15.0.

Sponsored by:   The FreeBSD Foundation

Submitted by: Austin Shafer <ashafer@nvidia.com>
Reviewed by:    imp, jhb
Fixes:  https://cgit.freebsd.org/src/commit/?id=5c039412a2823
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D53336

Virtual Functions have access to a limited number of registers,
and their bus space size is lower. Use KASSERT to detect out-of-bounds
access and eliminate them to avoid kernel panics in production
environment.

Signed-off-by: Krzysztof Galazka <krzysztof.galazka@intel.com>

Reviewed by:    jmg
Tested by:      mateusz.moga_intel.com
Approved by:    kbowling (mentor), erj (mentor)
Sponsored by:   Intel Corporation
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D52976

The computation of the length was not taking into account that IPv6
endpoints, which are not IPv6 only, have a suffix of 46.
For UDP and TCP this bug was not relevant, since tcp46 and udp46
has the same length as PROTO, but sctp46 is longer. Upcoming
udplite support will also be affected.

Reviewed by:            asomers
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53212

This is a small change as suggested by Gleb to move all __inline -> inline aka C99 style. This
covers both BBR and Rack and makes no real changes to the code functionality

Reviewed by:    tuexen
 Differential Revision: <https://reviews.freebsd.org/D53197>

Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use
this to determine the inpcbinfo. This allows the same function to be
used in an upcoming commit to provide the list of pcbs for UDP-Lite
just by providing IPPROTO_UDPLITE in the arg2 parameter.

Reviewed by:            rrs
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53218

Fix the htons byteorder of vxlan packets after
`vxlan_pick_source_port` picks a source port during encapsulation.

Reviewed by:    zlei, kp, adrian
Differential Revision:  https://reviews.freebsd.org/D53022

While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does
not.  As a result, a connected UDP socket can be placed in the lbgroup
hash and thus receive datagrams from sources other than the connected
host.

Reported by:    Amit Klein <amit.klein@mail.huji.ac.il>
Reported by:    Omer Ben Simhon <omer.bensimhon@mail.huji.ac.il>
Reviewed by:    glebius
Approved by:    so
Security:       FreeBSD-SA-25:09.netinet
Security:       CVE-2025-24934

krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux

This shows up in GitHub Actions as a warning, and some compilers can
default to it being an error.

krb5: Include <features.h> on Linux so __GLIBC__ can be checked

__GLIBC__ is not pre-defined by the toolchain, it comes from features.h,
so we need to make sure that's included by this point.

Fixes:  https://cgit.freebsd.org/src/commit/?id=4dd2b869cd07 ("krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux")

Export the list of pcbs for UDP-Lite to be consumed by sockstat and
netstat.

Reviewed by:            Peter Lei, Nick Banks
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53229

With this patch UDP-Lite endpoints are also show per default.

Reviewed by:            Peter Lei, Nick Banks
MFC after:              3 days
Relnotes:               yes
Differential Revision:  https://reviews.freebsd.org/D53230

With this patch UDP-Lite endpoints are also shown per default.

Reviewed by:            Nick Banks
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D53252

When copying the data in the first mbuf to get rid of the UDP
header, use the correct length. It was copying too much (8 bytes,
the length of the UDP header).
This only applies to handling TCP over UDP packets. The support for
TCP over UDP is disabled by default.

Reported by:            jtl
Reviewed by:            Peter Lei
MFC after:              3 days
Sponsored by:           Netflix, Inc.

ipf_nat_getent() allocates a variable-sized nat_save_t buffer with
KMALLOCS() (which does not zero memory) and then copies only a subset
of fields into it before returning the object to userland using
ipf_outobjsz(). Because the structure is not fully initialized on all
paths, uninitialized kernel heap bytes can be copied back to user space,
resulting in an information leak.

We fix this by zeroing out the data structure immediately after
allocation.

Reported by:            Ilja Van Sprundel <ivansprundel@ioactive.com>
Reviewed by:            emaste
MFC after:              3 days
Differential revision:  https://reviews.freebsd.org/D53274

ipf_htable_stats_get() constructs an iphtstat_t on the stack and only
initializes select fields before copying the entire structure to
userland. The trailing padding array iphs_pad[16] is never initialized,
so ~128 bytes of uninitialized kernel stack memory can be leaked to user
space on each call. This is a classic information disclosure
vulnerability that can reveal pointers and other sensitive data.

We fix this by zeroing out the data structure prior to use.

Reported by:            Ilja Van Sprundel <ivansprundel@ioactive.com>
Reviewed by:            emaste
MFC after:              3 days
Differential revision:  https://reviews.freebsd.org/D53275

The TCP_SAD_DETECTION code was removed. Remove the remaining
sysctl-variables and counters.

Reviewed by:    tuexen
MFC after:      3 days
Sponsored by:   Netflix, Inc.

TCP stats are currently incremented for the persist and progress
timeout conditions, but only the persist cause was saved in the
connection end info status, which in turn is logged in the
blackbox "connection end" event.

Reviewed by:    tuexen
MFC after:      3 days
Sponsored by:   Netflix, Inc.

It has been reported as PR 290478.  In the meantime, just sweep under
the carpet.

It is worth noting that neither commit:
2347ca21d657 ("blocklist-helper: Silence a bogus pf warning")
nor this one will be upstreamed, as this is a FreeBSD-specific issue.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290478
MFC after:      2 days

Honor the IPPROTO_IPV6-level socket option IPV6_TCLASS when sending
an UDP/IPv4 packet on an AF_INET6 socket.

Reviewed by:            bz, glebius
MFC after:              3 days
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D53346

Honor the IPPROTO_IPV6-level cmsg of type IPV6_TCLASS when sending
an UDP/IPv4 packet on an AF_INET6 socket.

Reviewed by:            bz
MFC after:              3 days
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D53347

Also fix some typos and move a couple NULL checks earlier.

Reviewed by:    mckusick, Johan Söllvander, markj, kevans, adrian
Fixes:          https://cgit.freebsd.org/src/commit/?id=0d4642a67e59f8da5e00a05001c342bdad2a806f
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53180

Fixes:                https://cgit.freebsd.org/src/commit/?id=195b00ec45e5 ("quot: Clean up")
Reviewed by:    rlibby
Differential Revision:  https://reviews.freebsd.org/D53224

bfb202c4554a addresses the CTRL-EVENT-SCAN-FAILED. Upstream d807e289d
caused FreeBSD regression in driver_bsd.c, which this rc.d patch
worked around. As of bfb202c4554a this workaround is no longer needed.

052211e08c0e implemented this change for wpa_supplicant but not for
hostapd.

Reported by:    avg
MFC after:      3 days

Currently mod_play_vchans() and mod_rec_vchans() run unconditionally,
even if the direction (playback, recording) is not supported by the
device. This results in the "autoconv" (see mod_autoconv()) control
failing when run on simplex devices, because we'll be trying to modify
vchans on an unsupported direction.

Test whether the direction is supported and silently move on if it
isn't.

Sponsored by:   The FreeBSD Foundation
MFC after:      4 days
Differential Revision:  https://reviews.freebsd.org/D53233

The menu was incorrectly using the fourth column (distname) instead of
the first (dist) of the MANIFEST.

The actual file name is on the first column of the MANIFEST file.
Remove the .txz part of the name to build the menu options.

Reviewed by:    jamie
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53177

Dummynet v3 switched to IP_DUMMYNET3 but did not update these
warnings/errors.

Fixes: https://cgit.freebsd.org/src/commit/?id=cc4d3c30ea28 ("Bring in the most recent version of ipfw and dummynet, developed")
Sponsored by:   The FreeBSD Foundation
Differential Revision: sbin/ipfw/ipfw2.c

IP_DUMMYNET_GET is no longer used in ipfw(1).

Reviewed by:    markj
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53348

Update vendor/libarchive to 3.8.2

Important bugfixes:
 #2477 tar writer: fix replacing a regular file with a dir for
       ARCHIVE_EXTRACT_SAFE_WRITES
 #2659 lib: improve filter process handling
 #2664 zip writer: fix a memory leak if write callback error early
 #2665 lib: archive_read_data: handle sparse holes at end of file correctly
 #2668 7zip: Fix out of boundary access
 #2670 zip writer: fix writing with ZSTD compression
 #2672 lib: fix error checking in writing files
 #2678 zstd write filter: enable Zstandard's checksum feature
 #2679 lib: handle possible errors from system calls
 #2707 lib: avoid leaking file descriptors into subprocesses
 #2713 RAR5 reader: fix multiple issues in extra field parsing function
 #2716 RAR5 reader: early fail when file declares data for a dir entry
 #2717 bsdtar: Allow filename to have CRLF endings
 #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724)
 #2737 tar reader: fix an infinite loop when parsing V headers
 #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big
       enough

Obtained from:  libarchive
Vendor commit:  7f53fce04e4e672230f4eb80b219af17975e4f83
Security:       CVE-2025-25724
PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290303 (exp-run)
MFC after:      1 week

The -libutil function getmntpoint(3) is documented as accepting a device
name “with or without /dev/ prepended to it” but did not attempt to
prepend /dev/. This patch corrects the problem by prepending /dev/ to
names that do not begin with a '/'.

Reported-by: Dag-Erling Smørgrav
Differential Revision: https://reviews.freebsd.org/D53185
MFC-after:    1 week
Sponsored-by: Netflix

Approved by:  markj (mentor)
MFC after:      1 week

Differential Revision:        https://reviews.freebsd.org/D45670
Reviewed by:    imp
Approved by:    markj (mentor)
MFC after:      1 month

Reviewed by:  andrew, imp
Approved by:    markj (mentor)
Differential Revision:  https://reviews.freebsd.org/D45670
MFC after:      1 month

The archive attribute (UF_ARCHIVE) is listed as deprecated
in RFC8881.  However, the Windows NFSv4.1 client folk disagree
with this and say they need support for it.

This patch adds support for it, in a manner similar to what
is done for UF_SYSTEM and UF_HIDDEN.

MFC after:      2 weeks

One some systems, under some conditions, pulling a USB stick would
read(2) returning EIO and not ENXIO, like it should and used to.

Recoverdisk(1), which does not give up on EIO, like most programs
would, spins furiously.

Arguably, deadfs was always wrong in returning EIO, because once you
get to deadfs no operation will ever work again, but we used to
take a different path through devfs_vnops.c which got us the ENXIO.

Something changed recently, and while testing this fix, I noticed
that drm-kmod-66/i915kms may be the condition which trigger
the different code-path.

MFC to: stable/15
Fixes: https://cgit.freebsd.org/src/commit/?id=289785
Thanks to: imp, kib

A FUSE daemon can send asynchronous notification to the kernel in order
to, for example, invalidate an inode's cache.  Fix a page fault that can
happen if the file system isn't yet mounted, or is already unmounted,
when that notification arrives.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519
MFC after:      1 week
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D53356

There're some other drivers want to register and unregister linux
ioctl handler. Move the macro LINUX_IOCTL_SET from tdfx_linux.h to
linux_ioctl.h so that they can also benefit it.

While here, rename the declaration of linux ioctl function to be
consistent with the name of the handler.

Meanwhile, drop a comment about the macro, since its function is
obvious.

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

When adding jail descriptors, I split sys_jail remove in two, and
didn't properly track jail held between them when a jail was dying.
This fixes that as well as cleaning up the logic behind it.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290217
Reported by:    David 'equinox' Lamparter <equinox at diac24.net>
Reviewed by:    markj
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53200

Just like arm64, our DTS comes from Linux and is correctly sorted into
subdirectories by vendor. Enable the logic to preserve these directories
in the installation, for example:

  /boot/dtb/sifive/hifive-unmatched-a00.dtb

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D53116

MFC after:    3 days

LinuxKPI: add __counted_by_le() and __counted_by_be()

The former is needed by a wireless driver at v6.17.

MFC after:      3 days
Reviewed by:    dumbbell, emaste
Differential Revision: https://reviews.freebsd.org/D53203

LinuxKPI: add three skeleton functions to etherdevice.h

We will see how much we will need them and how to fill them at that
point.  They are left with a pr_debug("TODO") for now.

MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D53204

LinuxKPI: platform_device return type change

The return type now is void;  I believe no one ever used this
so we can just chnage it.  The only active platform_driver_register()
calls seems to be in ath1[01]k and mt76 and there in unsupported code.

MFC after:      3 days
Reviewed by:    dumbbell, emaste
Differential Revision: https://reviews.freebsd.org/D53205

LinuxKPI: device_driver add (*coredump)()

Needed by multiple wireless driver for the v6.17 update (likely earlier
versions already).

MFC after:      3 days
Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D53206

LinuxKPI: add fips.h

We do not currently aim to support crypto FIPS compliance in LinuxKPI
so keep this turned off.

MFC after:      3 days
Reviewed by:    emaste, dumbbell
Differential Revision: https://reviews.freebsd.org/D53207

LinuxKPI: add skeleton pci_enable_wake()

Given we do not yet support "wake" bits in device there is little need
doing it in PCI if we cannot check if we are supposed to do the
operation in first place.  Once we would implement this, we would need
to also do the appropriate PCI (pme) checks before enabling (disabling)
it.

MFC after:      3 days
Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D53208

LinuxKPI: page_pool headers moved; add netmem.h

page_pool headers were not used yet;  they were created for mt76 but
are without functionality.  Upstream has migrated them for v6.17 and
split them up into multiple files.  Also add netmem.h which the little
needed is directly related to page pools.

MFC after:      3 days

LinuxKPI: soc/mediatek add pr_debug calls

We do not support Wireless Ethernet Dispatch (wed) on the mt76 (yet).
Add pr_debug calls with TODO in case we run into the calls anyway so
we could deal with them.

MFC after:      3 days

LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now

This likely belongs in socket code which we do not have in LinuxKPI.
Needed by a wirless driver at v6.17.

MFC after:      3 days

LinuxKPI: netdevice add attach/detach skeleton functions

For the moment add skeleton functions for netif_device_attach/detach()
needed by rtw8[89] v6.17.

MFC after;      3 days

LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers

This includes some type cleanups as well as some shuffling of structs
and functions to sort dependencies out.  Few new functions and defines
as well as new struct members.  Minor fixes to style and debug logging.

This is the majority of changes.  None of these should conflict with
current in-tree drivers.  The final bit of changes will come along with
the driver updates adding an extra argument to function pointers.

MFC after:      3 days

The size of an embedded struct has changed and might possibly be a
problem.  Allow this change to be detected by bumping __FreeBSD_version.

MFC after:      3 days

Add notes for other bits that we don't use in the code for error
status. We report these when there's an error, and this allows people
decoding it to not have to chase down these bits from the standard.

Sponsored by:           Netflix

random: add RDSEED as a provably unique entropy source

NIST SP800-90B allows for only a single entropy source to be claimed
in a FIPS-140-3 certificate.  In addition, only hardware sources that
have a NIST Entropy Source Validation (ESV) certificate, backed by
a SP800-90B Entropy Assessment Report, are usable.  Intel has obtained
ESV certificates for several of their processors, so RDSEED is a
FIPS-140-3 suitable entropy source.

However, even though RDRAND is seeded by RDSEED internally, RDRAND
would need a RBG certificate and CAVP testing run on the DRBG in order
to use it for FIPS-140-3 (SP800-90B) purposes.  So we need to know
down in the CSPRNG-subsystem which source the entropy came from.

In light of the potential issues surrounding AMD Zen 5 CPU's RDSEED
implementation[*], allow RDSEED to be disabled in loader.conf.
[*] https://www.phoronix.com/news/AMD-EPYC-Turin-RDSEED-Bug

Reviewed by:    cem
MFC after:      3 days
Sponsored by:   Juniper Networks
Differential Revision:  https://reviews.freebsd.org/D53150

random: fenestrasX: add RDSEED support

Reviewed by: cem
Fixes: https://cgit.freebsd.org/src/commit/?id=3a1298 random: add RDSEED as a provably unique entropy source
Differential Revision:  https://reviews.freebsd.org/D53291

Don't use __LP64__ to decide the value, as it gives the wrong result on
CHERI platforms.  Just define it in terms of __SIZEOF_LONG__.  Make a
similar adjustment for BITS_PER_LONG_LONG while here.

Reviewed by:    bz, dumbbell, emaste
MFC after:      1 week
Sponsored by:   CHERI Research Centre (EPSRC grant UKRI3001)
Differential Revision:  https://reviews.freebsd.org/D53135

The code that makes this VOP_BMAP call tries to perform a read-ahead I/O
operation. Failing to do that for any reason isn't fatal for `cluster_read()`,
because we still can return some data to the caller. This change is consistent
with other places within `cluster_read()`, where error returned by VOP_BMAP is
not returned to the caller - see the `if (nblks > 1)` block above the changed
lines and `if (reqbp)` at the end of the function.

PR:     https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264196
Approved by:    markj, kib
Differential Revision: https://reviews.freebsd.org/D51254

It was used for Octeon MIPS and all producers have been removed
from the source tree.

Reviewed by: emaste
Differential Revision:  https://reviews.freebsd.org/D53146

This includes the conflicting changes from previous driver versions
(v6.11/v6.14), mostly being function pointer or function arguments.

MFC after:      3 days

Both files are used by kernel and userspace.
Move them to sys/crypto where they belong.

No functional changes intended.

In preparation of D45670.

Reviewed by:    markj
Approved by:    markj (mentor)
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D52909

The reimplementation is a bit cleaner than the original code,
although it is also slightly slower. This shouldn't matter too
much as we will have asm code for the major platforms.

The code is unrolled when built in the kernel or user space, but
not when in libsa, as to reduce the code size.

Differential Revision:  https://reviews.freebsd.org/D45670
Reviewed by:    jrtc27, imp
Approved by:    markj (mentor)
MFC after:      1 month

There is no reason to not allow kern.geom.zero.byte and
kern.geom.zero.clear to be settable as a tunable.

Reviewed by:    imp, markj
Approved by:    markj (mentor)
MFC after:      1 week
Event:          EuroBSDCon 2025
Differential Revision:  https://reviews.freebsd.org/D52763

Ensure that all destructors for cdevpriv finished running before
destroy_dev() returns to the caller.  Otherwise, since
devfs_destroy_cdevpriv() removes the cdevpriv data from the list, drops
the cdevpriv_mtx, and then starts the destructor, it is possible for
destroy_dev() to return before destructor finished in other thread.

This should allow drivers to safely remove cdev instance data that might
be referenced by cdevpriv data.

Diagnosed by:   kevans
Reviewed by:    kevans, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D53303

Noted by:     arrowd
Reviewed by:    markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D53315

It did not happen prior to FreeBSD 15.0.

Reported by:    zlei
Sponsored by:   The FreeBSD Foundation

We are shipping at least one 32-bit kernel in FreeBSD 15.0 (i.e.,
armv7).

Sponsored by:   The FreeBSD Foundation

Some FreeBSD file systems (msdosfs and optionally ZFS)
handle case insensitive file name lookup.
NFS (v3 and 4) provide an attribute to indicate this
capability, but without this patch, the NFS server does
not know if the file system does support this.

This patch adds the pathconf name_PC_CASE_INSENSITIVE
that can be used by the NFS server or user programs to
check for this feature.

Reviewed by:    kib
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53349

This may include atkbdc, which is not being removed in 15.0.

Sponsored by:   The FreeBSD Foundation

The descriptions for these unmapped_io and rotating sysctls indicated
that they're deprecated and being removed for FreeBSD 15.0.  That did
not happen, so update to FreeBSD 16 instead.

Sponsored by:   The FreeBSD Foundation

Sometimes one or the other but not both tools are present; this ensures
that all cases are correctly handled.

Reported by:    cperciva
Approved by:    cperciva (re)
Sponsored by:   SkunkWerks, GmbH

Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53186

MFC after:      2 days

PR:           https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290238
Reviewed by:    ivy
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53214

We're correctly recording all of the packages in the dvd METALOG file,
but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then
users won't be able to install them very easily.

Reviewed by:    markj
Reported by:    Lars Tunkrans
MFC after:      3 days
Sponsored by:   https://www.patreon.com/cperciva
Differential Revision:  https://reviews.freebsd.org/D53199

The change which enabled the sdhci_fdt module build on riscv
inadvertently enabled the neta module as well. This driver is not needed
on this platform.

Move each entry to a respective identical conditional blocks.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Fixes:  https://cgit.freebsd.org/src/commit/?id=e9dd9f95f82f ("riscv: Add the sdhci_fdt driver to the build")

They are shared by arm, arm64, and now riscv. Note that they are
always installed by default, where MAN_ARCH=all.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52585

Updates: 84e717c4c & 9a593520

It was previously disabled when we built for older 32-bit arm targets
which lack 64-bit atomics.  As we now support armv7 at a minimum there
is no need to disable LLDB.

Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52668

There may be other issues here but this change certainly seems to
be necessary.

PR:     https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290394
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D53263

Reported by:  Sarah Walker <Sarah.Walker2@arm.com>
Reviewed by:    emaste
Fixes:  https://cgit.freebsd.org/src/commit/?id=1c52229528e7 ("lib: Move libopencsd to /usr/lib and make private")
Sponsored by:   Arm Ltd
Differential Revision:  https://reviews.freebsd.org/D53217

This defaults to plain "pkg", but being able to override it is useful
when testing pkg itself.

Reviewed by:    cperciva
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D53307

Reviewed by:  kib
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53334

Currently, files in /boot (other than /boot/kernel) are assigned to the
bootloader package using a filename match in mtree-to-plist.awk.  This
causes some problems, most notably that debug info for userboot ends up
in the utilities-dbg package instead of bootloader-dbg.

Remove the path handling from mtree-to-plist and instead set PACKAGE
in the appropriate Makefiles to put these in the correct package.

While here, move userboot*.so from bootloader-dev to bootloader.

MFC after:      3 days
Reviewed by:    cperciva
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53179

flua is a standalone third-party component that deserves its own
package.  In particular, this means things can use flua without
having to depend on FreeBSD-utilities, which will be useful as
more base utilities use flua.

This saves ~500kB in FreeBSD-utilities for systems which don't
need flua.

MFC after:      3 days
Reviewed by:    kevans
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53161

This is somewhat widely used in VNET jails, it's fairly small (150kB on
amd64) and it's enough of a core system component that it's reasonable
to include, even if many jails don't require it.

MFC after:      3 days
Reviewed by:    dch
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53154

Simplify the Makefile logic by using MANGROUPS.yes for optional
packages.  Also, move bluetooth manpages to the correct package,
add the correct conditional for OpenSSH (MK_OPENSSH), and properly
alphabetise the file.

MFC after:      3 days
Reviewed by:    emaste
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53127

Both of these packages use resolvconf for various things.  Add a
dependency to make this work.

MFC after:      3 days
Reviewed by:    des
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D53115

Add a new per-group SUBPACKAGE option to bsd.man.mk.  When MANSPLITPKG
is enabled, this is forced to "-man", otherwise it defaults to empty
but can be overridden by the caller.

Use this in bsd.lib.mk to install library manpages in the -dev package
instead of the base package.  This is nearly always preferable, since
library manpages are usually in section 2 or 3 and are only relevant
to people with development packages installed.

For manpages which should be installed in the base package even for
libraries, add a new MANNODEV group in bsd.lib.mk.  Update existing
Makefiles to use this where appropriate.

MFC after:      3 days
Discussed with: olce
Reviewed by:    olce
Sponsored by:   https://www.patreon.com/bsdivy
Differential Revision:  https://reviews.freebsd.org/D52832

Reported by:  wosch
Sponsored by:   The FreeBSD Foundation

With big thanks to Mark Johnston for mentoring me!

Approved by:    markj (mentor)
Differential Revision:  https://reviews.freebsd.org/D53258

Sponsored by:           Samsung Electronics
Reviewed By:            imp (mentor)
Differential Revision:  https://reviews.freebsd.org/D53253

GCC warns about the sign mismatch in comparisons:

lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet4::body() const':
lib/libc/tests/net/inet_net_test.cc:86:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare]
   86 |                 ATF_REQUIRE_EQ(bits, addr.bits);
      |                 ^~~~~~~~~~~~~~
lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet6::body() const':
lib/libc/tests/net/inet_net_test.cc:205:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare]
  205 |                 ATF_REQUIRE_EQ(bits, addr.bits);
      |                 ^~~~~~~~~~~~~~

Fixes:          https://cgit.freebsd.org/src/commit/?id=8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}")

GCC does not like passing NULL (__null) to std::ostringstream::operator<<
inside of ATF_REQUIRE_EQ:

lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_ntop_invalid::body() const':
lib/libc/tests/net/inet_net_test.cc:306:9: error: passing NULL to non-pointer argument 1 of 'std::__1::basic_ostream<_CharT, _Traits>& std::__1::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT = char; _Traits = std::__1::char_traits<char>]' [-Werror=conversion-null]
  306 |         ATF_REQUIRE_EQ(ret, NULL);
      |         ^~~~~~~~~~~~~~
In file included from /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/sstream:317,
                 from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++/macros.hpp:29,
                 from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++.hpp:29,
                 from lib/libc/tests/net/inet_net_test.cc:33:
/usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:338:81: note:   declared here
  338 | basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) {
      |                                                                            ~~~~~^~~
...

Fixes:          https://cgit.freebsd.org/src/commit/?id=8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}")

This greatly speeds up skipping a test that can't be run.

MFC after:      2 weeks
Sponsored by:   ConnectWise
Reviewed by:    kp
Differential Revision: https://reviews.freebsd.org/D53215

Approved by:  so

VOP_BMAP is purely advisory.  If VOP_BMAP returns an error during
readahead, cluster_read should still succeed, because the actual data
was still read just fine.

Add a regression test for PR 264196, wherein cluster_read would fail if
VOP_BMAP did.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264196
MFC with:       62aef3f73f38db9fb68bffc12cc8900fecd58f0e
Reported by:    danfe
Reviewed by:    arrowd
Differential Revision: https://reviews.freebsd.org/D51316

The first test is supposed to close the new fd, but was instead not
closing anything.

Reviewed by:    ngie, markj
Fixes:          https://cgit.freebsd.org/src/commit/?id=3cedbec3ee08 ("Integrate tools/regression/fifo into ...")
Differential Revision:  https://reviews.freebsd.org/D52799

Reviewed by:  tuexen
MFC after:      3 days
Sponsored by:   Netflix, Inc.

- s/th/the/

MFC after:      3 days

- s/th/the/

MFC after:      3 days

Sponsored by: The FreeBSD Foundation
MFC after:      4 days

ATM support for netgraph was removed in af0cc0b22362 ("NgATM: Remove
netgraph ATM support")

Remove the directory from the mtree specification.

Reviewed by:    emaste
Fixes:  https://cgit.freebsd.org/src/commit/?id=21735dfaebdf ("include: Remove no longer existing netgraph/atm")
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53260

Reviewed by:  imp, emaste
Fixes:  https://cgit.freebsd.org/src/commit/?id=a21def4d568f ("pccard: Remove wi(4) driver")
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53264

Reviewed by:  imp
Fixes:  https://cgit.freebsd.org/src/commit/?id=663b174b5b53 ("an: Remove driver")
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D53265

When producing formatted output, trim leading whitespace and trailing
commas from the human-readable time and uptime before emitting them.
The text output remains unchanged.

PR:             https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290089
Fixes:          https://cgit.freebsd.org/src/commit/?id=6e6febb54da9 ("w: Fix idle time in json output, add login/idle times to json output")
Reviewed by:    marius.h_lden.org
Differential Revision:  https://reviews.freebsd.org/D53167

While here, fix the ordering of the elements in the copyright header per
style(9) and remove the text of the license as we already have the SPDX
tag here.

MFC after:      3 days

- s/overriden/overridden/

MFC after:      5 days

- s/Sychronous/Synchronous/

MFC after:      5 days

- s/noticable/noticeable/
- s/compatability/compatibility/

MFC after:      5 days

- s/derrived/derived/

MFC after:      5 days

- s/opion/option/

MFC after:      5 days

- s/overriden/overridden/
- s/explicitely/explicitly/

MFC after:      5 days

- s/dereferencable/dereferenceable/

MFC after:      5 days

- s/envirnoment/environment/

While here fix a .Xr macro.

MFC after:      5 days

- s/rechargable/rechargeable/

MFC after:      5 days

- s/configued/configured/

MFC after:      5 days

- s/activitiy/activity/

MFC after:      5 days

- s/incosistent/inconsistent/

MFC after:      5 days

- s/occurences/occurrences/

MFC after:      5 days

- s/recommented/recommended/

MFC after:      5 days

- s/speciifed/specified/

MFC after:      1 week

- s/addresess/addresses/

MFC after:      1 week

- s/Parseing/Parsing/

MFC after:      1 week

- s/MISCELANEOUS/MISCELLANEOUS/

MFC after:      1 week

- s/evalation/evaluation/

MFC after:      1 week

- s/verndor/vendor/

MFC after:      1 week

Notable upstream pull request merges:
 #17750 6e5b836e9 FreeBSD: Correct _PC_MIN_HOLE_SIZE
 #17803 1861a329f zvol: verify IO type is supported
 #17826 51de2d76f Explicit set ashift for non-leaf vdevs
 #17830 f4276479c Suppress some ashift warnings
 #17843 6ae99d269 mmap_seek: print error code and text on failure

Obtained from:  OpenZFS
OpenZFS commit: 6ae99d26924decb5f618b596ec7663e6a26d2e5f

Initially, `zfs_getpages()` is provided with an array of busy pages by
the vnode pager. It then tries to acquire the range lock, but if there
is a concurrent `zfs_write()` running and fails to acquire that range
lock, it "unbusies" the pages to avoid a deadlock with `zfs_write()`.
After that, it grabs the pages again and retries to acquire the range
lock, and so on.

Once it got the range lock, it filters out valid pages, then copy DMU
data to the remaining invalid pages.

The problem is that freshly allocated zero'd pages it grabbed itself are
marked as valid. Therefore they are skipped by the second part of the
function and DMU data is never copied to these pages. This causes mapped
pages to contain zeros instead of the expected file content.

This was discovered while working on RabbitMQ on FreeBSD. I could
reproduce the problem easily with the following commands:

    git clone https://github.com/rabbitmq/rabbitmq-server.git
    cd rabbitmq-server/deps/rabbit

    gmake distclean-ct RABBITMQ_METADATA_STORE=mnesia \
      ct-amqp_client t=cluster_size_3:leader_transfer_stream_send

The testsuite fails because there is a sendfile(2) that can happen
concurrently to a write(2) on the same file. This leads to sendfile(2)
or read(2) (after the sendfile) sending/returning data with zeros, which
causes a function to crash.

The patch consists of not setting the `VM_ALLOC_ZERO` flag when
`zfs_getpages()` grabs pages again. Then, the last page is zero'd if it
is invalid, in case it would be partially filled with the end of the
file content. Other pages are either valid (and will be skipped) or they
will be entirely overwritten by the file content.

This patch was submitted to OpenZFS as openzfs/zfs#17851 which was
approved.

Reviewed by:    avg, mav
Obtained from:  OpenZFS
OpenZFS commit: 8a3533a366e6df2ea770ad7d80b7b68a94a81023
MFC after:      3 days
Differential revision: https://reviews.freebsd.org/D53219

Release notes at
        https://nlnetlabs.nl/news/2025/Oct/22/unbound-1.24.1-released/

Security:       CVE-2025-11411
MFC after:      3 days

Merge commit '73dd92916f532cb3fe353220103babe576d30a15'

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

Some of the changes we reported upstream got incorporated in this
(or the v6.16) release.

This also includes a change from iwlwifi-next.git::next for missing symbols

iwl_mvm_v3_rate_from_fw() and iwl_mvm_v3_rate_to_fw() were originally
comitted to mvm/rs.[ch] which we do not have.  That left us with
unresolved symbols.  For the never comitted v6.16 driver update I had
started to piece these together but they have been migrated out to
utils.c so take them from there until the next release hopefully ships
this change.

Obtained from:  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git
        branch next, 1b49af228594452206d5c50a33b6a341428edb63

MFC after:      3 days

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

MFC after:      3 days

Notable upstream pull request merges:
 #17836 adacf020c Fix return value for setting zvol threading
 #17839 44704616b zpool: fix conflict with -v and -o options
 #17851 3a55e76b8 FreeBSD: zfs_getpages: Don't zero freshly allocated pages
 #17863 0455150f1 FreeBSD zio_crypt.c: initialize uio variables before
                  access

Obtained from:  OpenZFS
OpenZFS commit: 0455150f1160dd7089ab31fefcfc58bfa548ab81

Merge commit '1ae0b2f3a242a48af2deef1e88649bf4a3a74e2f'

Changes:

https://github.com/zoulasc/blocklist/compare/8aa81bf...156df4f

MFC after:      2 days

Upstream introduced an extra column in blocklistctl(8) to display the
name of the rule associated in the database entry.

It is intended to avoid confusion when seemingly duplicate locations
appear in the output of the blocklistctl dump command.  Especially when
users are transitioning from the old nomenclature to the new one.

The latest patches will not be fully backported to blacklistctl(8), to
avoid breaking current scripts that may be parsing its output.  Also we
are slowly preparing to feature-freeze everything related to blacklist.

MFC:    2 days

This migrates a bunch of format strings to compile on both 32 and
64 bit platforms.

This should be a no-op, and it isn't yet used by a 64 bit kernel build
as the 64 bit changes to vchiq are not yet in the tree.

Differential Revision:  https://reviews.freebsd.org/D36431
Submitted by: Marco Devesas Campos <devesas.campos@gmail.com>

UDP: let udp_pcblist() support UDP and UDP-Lite

Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use
this to determine the inpcbinfo. This allows the same function to be
used in an upcoming commit to provide the list of pcbs for UDP-Lite
just by providing IPPROTO_UDPLITE in the arg2 parameter.

Reviewed by:            rrs
MFC after:              3 days
Pull Request:           https://reviews.freebsd.org/D53218

Revert "UDP: let udp_pcblist() support UDP and UDP-Lite"

This reverts commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3.
Missing link to review.