FreeBSD/src b39457bsys/dev/virtio/p9fs virtio_p9fs.c

virtio_p9fs: Disallow detach if a session is in progress

PR:             295453
Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D57500
DeltaFile
+4-0sys/dev/virtio/p9fs/virtio_p9fs.c
+4-01 files

FreeBSD/src c08a97fsys/netpfil/ipfilter/netinet ip_nat.c

ipfilter: Fix checksum update for NAT_DIVERTOUT

When taking a snapshot of the before ip_len (s1) for comparison with the
after-translated ip_len (s2), we must convert it from network to host
byte order before we can use it. Add the missing ntohs() call.

PR:             296944
MFC after:      3 days
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/ip_nat.c
+1-11 files

FreeBSD/src 7334d92share/man/man4 Makefile

share/man/man4: Move non-USB man pages out of MK_USB block

uart(4), unix(4) and the gzero(4) MLINK are not USB things, but they
were in the .if ${MK_USB} != "no" block.  So if we build with
WITHOUT_USB, these man pages are lost.  Move them out of the block.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 1100d9eca9cb2860c58633a9176dd11a30850da4)
DeltaFile
+3-3share/man/man4/Makefile
+3-31 files

FreeBSD/src fd8ca3dshare/man/man4 Makefile

share/man/man4: Move non-USB man pages out of MK_USB block

uart(4), unix(4), veriexec(4) and the gzero(4) MLINK are not USB
things, but they were in the .if ${MK_USB} != "no" block.  So if we
build with WITHOUT_USB, these man pages are lost.  Move them out of
the block.

Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 1100d9eca9cb2860c58633a9176dd11a30850da4)
DeltaFile
+4-4share/man/man4/Makefile
+4-41 files

FreeBSD/src 31f9f09lib/libc/tests/gen Makefile fts_capsicum_test.c

fts: add fts_capsicum_test.c

Add three test cases verifying fts(3) Capsicum capability mode:

- fts_dirfd_valid: verifies fts_dirfd is set for all non-root
  entries and openat(fts_dirfd, fts_name) identifies the same
  inode as fts_accpath
- fts_dirfd_capsicum: verifies complete fts traversal works in
  Capsicum capability mode using fts_openat() and fts_dirfd
- fts_dirfd_deep_tree: verifies fts_dirfd + fts_name is correct
  at all directory depths (7 non-root entries)

Sponsored by:   Google LLC (GSoC 2026)
Reviewed by:    asomers
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2332
DeltaFile
+210-0lib/libc/tests/gen/fts_capsicum_test.c
+1-0lib/libc/tests/gen/Makefile
+211-02 files

FreeBSD/src 44cddaasys/dev/netmap if_ptnet.c, sys/dev/virtio/network if_vtnet.c virtio_net.h

vtnet: move offload functions to virtio_net.h to share them

Move the functions vtnet_rxq_csum() and vtnet_txq_offload() and the
subfunctions they call from if_vtnet.c to virtio_net.h. This allows
us to call these functions from if_tuntap.c and if_ptnet.c.
virtio_net.h already contained a copy of these functions, but a copy
of an outdated version. The functions evolved in if_vtnet.c.
In if_vtnet.c, the copy has never been used because it increments
counters in their own functions.
This patch removes the outdated copy from virtio_net.h and moves the
new version of the functions from if_vtnet.c to virtio_net.h.
if_tuntap.c, if_ptnet.c, and if_vtnet.c just call these functions,
and if_vtnet.c increments its counters depending on the return value.

Reviewed by:            tuexen
MFC after:              1 month
MFC to:                 stable/15
Differential Revision:  https://reviews.freebsd.org/D57299
DeltaFile
+196-169sys/dev/virtio/network/virtio_net.h
+49-296sys/dev/virtio/network/if_vtnet.c
+19-3sys/dev/netmap/if_ptnet.c
+17-2sys/net/if_tuntap.c
+281-4704 files

FreeBSD/src 3f3f452usr.sbin/pmcstat pmcstat.8

pmcstat.8: Add a missing ERRORS section header

MFC after:      3 days
Sponsored by:   fme AG

(cherry picked from commit 5729a0b45cd1a24c8b82d161de4711b4e004498d)
DeltaFile
+2-2usr.sbin/pmcstat/pmcstat.8
+2-21 files

FreeBSD/src 81cf13f. configure, admin ltmain.sh config.guess

vendor/atf: import atf-0.24-rc2

This version incorporates some of the local changes which had not yet
made it upstream into the RC1 code.

Obtained from:          https://github.com/freebsd/atf/releases/tag/atf-0.24-rc2
DeltaFile
+1,477-925admin/config.sub
+936-601admin/config.guess
+601-159m4/libtool.m4
+417-211configure
+245-80admin/ltmain.sh
+8-110atf-c/detail/fs.c
+3,684-2,0868 files not shown
+3,874-2,15514 files

FreeBSD/src 33e2eacsys/dev/ixgbe if_ix.c

ix(4): Sanitize negative error codes

Due to development history FreeBSD driver error codes are reported
the same way as in Linux (as negatives) which is inconsistent
with FreeBSD standard. It may cause unexpected behavior when driver
errors are interpreted by a kernel as syscall handler return values.
This patch converts error codes from negative to positive values for
NVM access functions.

Signed-off-by: Pawel Sobczyk <pawel.sobczyk at intel.com>

Reviewed by:    kbowling, erj, milosz.linkiewicz_intel.com
Tested by:      Mateusz Moga <mateusz.moga at intel.com>
MFC after:      1 week
Sponsored by:   Intel Corporation
Differential Revision:  https://reviews.freebsd.org/D57642
DeltaFile
+19-4sys/dev/ixgbe/if_ix.c
+19-41 files

FreeBSD/src 189ee41sys/arm64/arm64 vfp.c

arm64 vfp: eliminate nested critical sections

At two out of three call sites to vfp_restore_state_common(), the caller
must use critical_{enter,exit}() to prevent preemption between its call
to vfp_restore_state_common() and other actions, notably its call to
sve_enable().  So, it is arguably better to make
vfp_restore_state_common()'s caller responsible for performing
critical_{enter,exit}() and simply perform CRITICAL_ASSERT() inside
vfp_restore_state_common().

Reviewed by:    kib, markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D58859
DeltaFile
+3-4sys/arm64/arm64/vfp.c
+3-41 files

FreeBSD/src 68091ebsys/dev/ufshci ufshci_sim.c

ufshci: report the highest LUN number in the path inquiry

cpi->max_lun is an inclusive upper bound, but the driver reported the
LUN count (8 or 32), so CAM probed one nonexistent LUN past the end.

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58820
DeltaFile
+1-1sys/dev/ufshci/ufshci_sim.c
+1-11 files

FreeBSD/src 3451829sys/dev/ufshci ufshci_reg.h

ufshci: correct the crypto/config register offsets and HCMID fields

The reserved array after CCAP must be 508, but it was 511.
This pushed the config, MCQ config, and ESI registers from 0x300 and
0x380 up to 0x900. None of these registers are used yet, so nothing
broke.

Also fix the HCMID bank index field. The spec places it at bits
[23:16], but it was defined on top of the manufacturer code at [15:0].

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58819
DeltaFile
+20-3sys/dev/ufshci/ufshci_reg.h
+20-31 files

FreeBSD/src e1aa173sys/dev/ufshci ufshci_dev.c

ufshci: consolidate the device query submit/poll pattern

The six query helpers duplicated the same submit, error check, poll,
and status check sequence. Move it into ufshci_dev_send_query() so
future changes to the query flow are made in one place. This also
unifies the failure log message format.

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58818
DeltaFile
+28-70sys/dev/ufshci/ufshci_dev.c
+28-701 files

FreeBSD/src f3c3db3sys/dev/ufshci ufshci_sim.c

ufshci: validate the CDB before allocating a request

The CDB pointer and length checks depend only on the CCB, so perform
them before allocating and initializing the request. This avoids a
wasted allocation for invalid CCBs on the I/O path and removes one
request-free error path.

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58817
DeltaFile
+11-11sys/dev/ufshci/ufshci_sim.c
+11-111 files

FreeBSD/src dbcebc7sys/dev/ufshci ufshci_req_sdb.c

ufshci: pass the queue being destroyed to the cmd descriptor teardown

ufshci_req_sdb_destroy() hardcoded &ctrlr->transfer_req_queue when
destroying command descriptors instead of using its req_queue argument.

No functional change: the branch only runs for the transfer queue, so
the two pointers are always the same today. Using the argument keeps
the function queue-agnostic for when more transfer queues exist (MCQ).

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58816
DeltaFile
+1-2sys/dev/ufshci/ufshci_req_sdb.c
+1-21 files

FreeBSD/src a508a9fsys/dev/ufshci ufshci_req_sdb.c

ufshci: return the real errno from SDB queue construction

ufshci_req_sdb_cmd_desc_construct() and ufshci_req_sdb_construct()
returned ENOMEM for every failure, so an EINVAL from bus_dma_tag_create()
was reported as a memory shortage. Capture and return the real errno,
and drop the cmd descriptor construct's now pointless out label.

No functional change: no caller inspects the value beyond propagating
it, so this only improves the diagnostics on an attach failure.

Reviewed by:            imp (mentor)
Sponsored by:           Samsung Electronics
Differential Revision:  https://reviews.freebsd.org/D58815
DeltaFile
+21-18sys/dev/ufshci/ufshci_req_sdb.c
+21-181 files

FreeBSD/src 86aea5bcontrib/less search.c command.c

MFV: less v704.

(cherry picked from commit fa0dc4f0f96a1b77d4be7bcdbf965897cda14521)
DeltaFile
+245-91contrib/less/decode.c
+213-114contrib/less/less.nro
+147-59contrib/less/regexp.c
+173-29contrib/less/optfunc.c
+132-54contrib/less/command.c
+83-55contrib/less/search.c
+993-40238 files not shown
+1,844-76344 files

FreeBSD/src 6330c2fcontrib/less option.c cmdbuf.c

MFV less v691

Relnotes:       yes

(cherry picked from commit dafba19e42e78cd3d7c9264ece49ddd3d7d70da5)

MFV: less v692.

(cherry picked from commit e2abec625bf07c054f7ac2df2402d6c454113df8)
DeltaFile
+1,017-476contrib/less/less.nro
+374-153contrib/less/screen.c
+245-144contrib/less/lesskey.nro
+107-51contrib/less/mark.c
+70-68contrib/less/option.c
+81-57contrib/less/cmdbuf.c
+1,894-94958 files not shown
+2,855-1,45464 files

FreeBSD/src c620652contrib/less search.c command.c

MFV: less v704.

(cherry picked from commit fa0dc4f0f96a1b77d4be7bcdbf965897cda14521)
DeltaFile
+245-91contrib/less/decode.c
+213-114contrib/less/less.nro
+147-59contrib/less/regexp.c
+173-29contrib/less/optfunc.c
+132-54contrib/less/command.c
+83-55contrib/less/search.c
+993-40238 files not shown
+1,844-76344 files

FreeBSD/src 7ee086bsys/dev/e1000 e1000_defines.h e1000_ich8lan.c

e1000: Disable autonomous PCH power gating after reset

Panther Point changed the reset value of CTRL_EXT.DPG_EN to enable
autonomous power gating. Clear it after hardware reset on Panther Point
and Nova Point controllers to prevent unexpected Tx/Rx hangs, packet
loss, or corruption.

(cherry picked from commit 0979b0430c2d728e595841ecba30b63972794fe9)
DeltaFile
+8-0sys/dev/e1000/e1000_ich8lan.c
+1-0sys/dev/e1000/e1000_defines.h
+9-02 files

FreeBSD/src dd51b85sys/dev/ice ice_drv_info.h

ice(4): Add support for E835 CNSA 2.0 adapters

Added support for E835 adapters with post-quantum cryptographic (PQC)
algorithms in firmware/software signage and in SPDM attestation.

Signed-off-by: Pawel Sobczyk <pawel.sobczyk at intel.com>

Reviewed by:    Miłosz Linkiewicz <milosz.linkiewicz at intel.com>
Differential Revision:  https://reviews.freebsd.org/D57868

(cherry picked from commit 8194c32827e9c3867d4b295edca9842b71608526)
DeltaFile
+30-0sys/dev/ice/ice_drv_info.h
+30-01 files

FreeBSD/src 6000eb7sys/dev/e1000 e1000_defines.h e1000_ich8lan.c

e1000: Disable autonomous PCH power gating after reset

Panther Point changed the reset value of CTRL_EXT.DPG_EN to enable
autonomous power gating. Clear it after hardware reset on Panther Point
and Nova Point controllers to prevent unexpected Tx/Rx hangs, packet
loss, or corruption.

(cherry picked from commit 0979b0430c2d728e595841ecba30b63972794fe9)
DeltaFile
+8-0sys/dev/e1000/e1000_ich8lan.c
+1-0sys/dev/e1000/e1000_defines.h
+9-02 files

FreeBSD/src 508a232sys/dev/ice ice_drv_info.h

ice(4): Add support for E835 CNSA 2.0 adapters

Added support for E835 adapters with post-quantum cryptographic (PQC)
algorithms in firmware/software signage and in SPDM attestation.

Signed-off-by: Pawel Sobczyk <pawel.sobczyk at intel.com>

Reviewed by:    Miłosz Linkiewicz <milosz.linkiewicz at intel.com>
Differential Revision:  https://reviews.freebsd.org/D57868

(cherry picked from commit 8194c32827e9c3867d4b295edca9842b71608526)
DeltaFile
+30-0sys/dev/ice/ice_drv_info.h
+30-01 files

FreeBSD/src 31c2290sys/dev/vmware/vmxnet3 if_vmx.c

if_vmx: fix panic during kldload

Just like vmxnet3_intr_disable_all, iflib may invoke this routine
before vmxnet3_attach_post() has run, which is before the top-level
shared data area is initialized and the device made aware of it.

Approved by:    re (cperciva)
PR:             294312
Sponsored by:   Dell Inc.

(cherry picked from commit 01b0690c495e1043a72cae9ee945f9f2c2adc216)
(cherry picked from commit 065396e09e41d6932ef726053bed97aed6e022e1)
DeltaFile
+6-1sys/dev/vmware/vmxnet3/if_vmx.c
+6-11 files

FreeBSD/src 2f580ccsys/netipsec xform_ipcomp.c

netipsec/xform_ipcomp.c: fix sockaddr type set in ipcomp6_nonexp_encapcheck()

Approved by:    re (cperciva)

(cherry picked from commit 01d4e3c1d3ffa14041d8faa3a7a6e6509e73af84)
(cherry picked from commit 3626363aaed8fa8becbb3c89ba0bbeeea6ae1139)
DeltaFile
+1-1sys/netipsec/xform_ipcomp.c
+1-11 files

FreeBSD/src feecef8sys/netipsec key.c

PF_KEY socket: limit the length of copied socket address

Approved by:    re (cperciva)
PR:     297264

(cherry picked from commit cba481a7bff2fcf31420ee8b2714660e2666452b)
(cherry picked from commit 022f935a1fbc75d39a055eee0a327cb2062a4596)
DeltaFile
+69-59sys/netipsec/key.c
+69-591 files

FreeBSD/src 8ca6be0sys/netipsec key.c

netipsec/key.c::key_checksockaddrs(): constify src/dst address buffer pointers

Approved by:    re (cperciva)

(cherry picked from commit fbe9aa7ebfcd6d89b298cc7a23de02d119367221)
(cherry picked from commit af11a69e53070b6002e9246d24696cd03ea9d40a)
DeltaFile
+4-1sys/netipsec/key.c
+4-11 files

FreeBSD/src af06940share/man/man4 bnxt.4

bnxt(4): Cross-reference led(4)

Point the identification LED documentation to led(4), which describes
how to control /dev/led device nodes.

MFC after:      2 weeks
Sponsored by:   BBOX.io
DeltaFile
+4-1share/man/man4/bnxt.4
+4-11 files

FreeBSD/src a781965share/man/man4 ice.4, sys/dev/ice ice_iflib.h if_ice_iflib.c

ice: Add led(4) identification support

Expose the firmware-controlled physical port identification LED
through /dev/led/ice*.  Use the AdminQ port-identification command to
select blinking mode and restore the netlist-selected original mode
before the interface is stopped.

MFC after:      2 weeks
Sponsored by:   BBOX.io
DeltaFile
+44-0sys/dev/ice/if_ice_iflib.c
+8-1share/man/man4/ice.4
+1-0sys/dev/ice/ice_iflib.h
+53-13 files

FreeBSD/src a43b61ausr.sbin/makefs/tests makefs_zfs_tests.sh, usr.sbin/makefs/zfs dsl.c

makefs: Allow "legacy" as a valid ZFS mountpoint

Allow "legacy" alongside "none" as a valid value for the ZFS mountpoint
property, matching zfsprops(7).

Reviewed by:    imp, markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D58781

(cherry picked from commit 59d6422d6f21fd5cf4709ce9fcada54d3925a4f6)
DeltaFile
+39-0usr.sbin/makefs/tests/makefs_zfs_tests.sh
+3-2usr.sbin/makefs/zfs/dsl.c
+42-22 files