FreeBSD/src 7858a57sys/dev/thunderbolt nhi.c

thunderbolt: Explicitly read NHI ISR0 register to clear it

This fixes and issue where Pink Sardine controllers were not receiving
interrupts for more than the first command sent on the ring.

Reviewed by:    emaste, imp
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D52862
DeltaFile
+16-0sys/dev/thunderbolt/nhi.c
+16-01 files

FreeBSD/src 2738049sys/netpfil/ipfilter/netinet fil.c

ipfilter(4): Fix a typo in a source code comment

- s/pointr/pointer/

Obtained from:  NetBSD

(cherry picked from commit f98d856f613b3d8ac564d03dbe0011bd9eaab757)
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/fil.c
+1-11 files

FreeBSD/src 6b25004sys/netpfil/ipfilter/netinet fil.c

ipfilter(4): Fix a typo in a source code comment

- s/pointr/pointer/

Obtained from:  NetBSD

(cherry picked from commit f98d856f613b3d8ac564d03dbe0011bd9eaab757)
DeltaFile
+1-1sys/netpfil/ipfilter/netinet/fil.c
+1-11 files

FreeBSD/src 7fd3c8dsys/dev/dpaa2 dpaa2_ni.c

dpaa2: Apply if_flags and MAC filters in dpaa2_ni_init()

make sure interface flags and filters are reprogrammed during init().

The config isn't pushed into the hardware when the interface is down but
the flags are still being set, so we need to do the initial programming
ourselves. This fixes bridge and multicast behavior.

PR:             292006
Reported by:    jhibbits

Approved by:    adrian
Reviewed by:    jhibbits
Differential Revision:  https://reviews.freebsd.org/D58330

(cherry picked from commit dc12e3e0e72a73f1ad1a14d8d0fa4e2147151720)
Signed-off-by: Nick Price <nprice at FreeBSD.org>
DeltaFile
+11-0sys/dev/dpaa2/dpaa2_ni.c
+11-01 files

FreeBSD/src 70f4810sys/vm vm_phys.c

vm/vm_phys.c: allow PHYS_TO_VM_PAGE(0) for registered fictitious page @0

PR:     296348

(cherry picked from commit 6a8558cf9f0190cb166042f97d2c883d822e66b2)
DeltaFile
+0-3sys/vm/vm_phys.c
+0-31 files

FreeBSD/src 42dbbafsys/kern vfs_mount.c

dounmount(9): temporarily enable recursion for the covered vnode lock

PR:     297174

(cherry picked from commit 9f5c4ef32812afb4573a278e6eafe5040f839d13)
DeltaFile
+26-3sys/kern/vfs_mount.c
+26-31 files

FreeBSD/src 2389370sys/kern kern_lock.c, sys/sys lockmgr.h vnode.h

lockmgr(9): add lockcanrecurse(9)

(cherry picked from commit 1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe)
DeltaFile
+7-0sys/kern/kern_lock.c
+2-0sys/sys/vnode.h
+1-0sys/sys/lockmgr.h
+10-03 files

FreeBSD/src 8bb4156tests/sys/kern Makefile ptrace_test.c

ptrace_test: require debug.ptrace_transparent_attach enabled for its test

(cherry picked from commit b0a85cb9df01b1b56bbd530b3c3ae85e6964a9c6)
DeltaFile
+4-0tests/sys/kern/ptrace_test.c
+1-0tests/sys/kern/Makefile
+5-02 files

FreeBSD/src a9a5c96crypto/openssl/exporters openssl.pc libssl.pc

crypto/openssl: correct version numbers for pkg-config files

The files were incorrectly reporting 3.5.1 instead of 3.0.21.

This is a direct commit to stable/14 as stable/15 and later are on
OpenSSL 3.5.

Approved by:    re (cperciva)
PR:     297144
Fixes:  d03be8cf ("crypto/openssl: make vendor imports easier/less error prone")
(cherry picked from commit 2e04d98688230fecce228b4d32e1bbf7da6ef508)
DeltaFile
+1-1crypto/openssl/exporters/openssl.pc
+1-1crypto/openssl/exporters/libssl.pc
+1-1crypto/openssl/exporters/libcrypto.pc
+3-33 files

FreeBSD/src fbe0d8asys/sys mbuf.h

mbuf: Parenthesize macro arguments

Approved by:    re (cperciva)
MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.

(cherry picked from commit 744cc514567d33d38986f0ff7de009f786acc180)
(cherry picked from commit 7d8fc2a82bfbfc3ad313ae72bfa72851c342eaf2)
DeltaFile
+1-1sys/sys/mbuf.h
+1-11 files

FreeBSD/src f77a60alib/libifconfig libifconfig.c, sys/net rtsock.c

sys/socket.h: Fix AF_MAX

AF_MAX was always intended to be one more than the greatest allocated
value.  Jeff broke this in 2013.  Unfortunately, a bunch of people then
decided to adapt to the mistake instead of correcting it.

Approved by:    re (cperciva)
Fixes:          863c7e45628d (" - Reserve a special AF for SDP.  The one we were incorrectly using before    was taken by another AF.")
MFC after:      3 days
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    kevans, glebius
Differential Revision:  https://reviews.freebsd.org/D58597

(cherry picked from commit ddd850aa7720f77b6605599655df898b16ed74cc)
(cherry picked from commit 2d252764711bebe09970507a30dff0f7641c6e0c)
DeltaFile
+3-3sys/netlink/route/rt.c
+2-2sys/net/rtsock.c
+2-2sys/net/route/route_helpers.c
+2-2lib/libifconfig/libifconfig.c
+3-1sys/sys/socket.h
+1-1sys/net/route/route_ddb.c
+13-113 files not shown
+16-149 files

FreeBSD/src ce139f7sys/geom/zero g_zero.c

geom_zero(4): reset the uio vector on each uiomove()

PR:     297062

Approved by:    re (cperciva)

(cherry picked from commit 34ca5a9e7362b0c820fe339daa2b8d06c58b6fea)
(cherry picked from commit 51f5623874c0c2b8e5adb2e02313ac6f41229d31)
DeltaFile
+6-5sys/geom/zero/g_zero.c
+6-51 files

FreeBSD/src efdb824sys/dev/thunderbolt router_var.h nhi.c

thunderbolt: Reset controllers

Reset routine for both v1.0 and v2.0 routes, chosen depending on version
reported in caps.

Reviewed by:    imp
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D49452
DeltaFile
+63-0sys/dev/thunderbolt/nhi.c
+4-0sys/dev/thunderbolt/router_var.h
+67-02 files

FreeBSD/src 529177bsys/dev/thunderbolt nhi_var.h nhi_reg.h

thunderbolt: Get NHI version number from caps

Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D49452
DeltaFile
+21-8sys/dev/thunderbolt/nhi.c
+9-1sys/dev/thunderbolt/nhi_reg.h
+5-0sys/dev/thunderbolt/nhi_var.h
+35-93 files

FreeBSD/src a58471asys/dev/igc if_igc.c

igc: defer sysctl-driven reinit to the admin task

igc_sysctl_eee() and igc_sysctl_dmac() called igc_if_init() directly.

Request the reset through iflib instead, and skipping while the interface
is down; the new value is picked up by the next init.

Unlike e1000, igc has no ASSERT_CTX_LOCK_HELD and no acquire_swflag
path, so the defect is silent here rather than an assertion failure.

While here also remove unnecessary igc_if_init uses:
iflib_if_init_locked() already runs after IFDI_RESUME and
IFDI_MEDIA_CHANGE, so the trailing *_if_init() only added an unstopped
IFDI_INIT that the following iflib_stop() undoes.

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

(cherry picked from commit 30ccf2f48c11e54fc0540510dcec7cd006a2c366)
DeltaFile
+12-6sys/dev/igc/if_igc.c
+12-61 files

FreeBSD/src 0fa6b2csys/dev/e1000 if_em.c

e1000: defer sysctl-driven reinit to the admin task

Request the reset through iflib and let the admin task perform the
stop/init under the context lock, matching what the VF and SR-IOV paths
already do.

The assertion is compiled out without INVARIANTS, where the same write
instead resets the MAC and takes the ICH software flag while the queues
stay live and an ioctl or the admin task may be running.

While here also remove unnecessary em_if_init uses:
iflib_if_init_locked() already runs after IFDI_RESUME and
IFDI_MEDIA_CHANGE, so the trailing *_if_init() only added an unstopped
IFDI_INIT that the following iflib_stop() undoes.

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

(cherry picked from commit abdde8b602813753e423610b39be6806da5647e2)
DeltaFile
+12-6sys/dev/e1000/if_em.c
+12-61 files

FreeBSD/src e22491csys/dev/igc if_igc.c

igc: defer sysctl-driven reinit to the admin task

igc_sysctl_eee() and igc_sysctl_dmac() called igc_if_init() directly.

Request the reset through iflib instead, and skipping while the interface
is down; the new value is picked up by the next init.

Unlike e1000, igc has no ASSERT_CTX_LOCK_HELD and no acquire_swflag
path, so the defect is silent here rather than an assertion failure.

While here also remove unnecessary igc_if_init uses:
iflib_if_init_locked() already runs after IFDI_RESUME and
IFDI_MEDIA_CHANGE, so the trailing *_if_init() only added an unstopped
IFDI_INIT that the following iflib_stop() undoes.

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

(cherry picked from commit 30ccf2f48c11e54fc0540510dcec7cd006a2c366)
DeltaFile
+12-6sys/dev/igc/if_igc.c
+12-61 files

FreeBSD/src cbedee9sys/dev/e1000 if_em.c

e1000: defer sysctl-driven reinit to the admin task

Request the reset through iflib and let the admin task perform the
stop/init under the context lock, matching what the VF and SR-IOV paths
already do.

The assertion is compiled out without INVARIANTS, where the same write
instead resets the MAC and takes the ICH software flag while the queues
stay live and an ioctl or the admin task may be running.

While here also remove unnecessary em_if_init uses:
iflib_if_init_locked() already runs after IFDI_RESUME and
IFDI_MEDIA_CHANGE, so the trailing *_if_init() only added an unstopped
IFDI_INIT that the following iflib_stop() undoes.

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

(cherry picked from commit abdde8b602813753e423610b39be6806da5647e2)
DeltaFile
+12-6sys/dev/e1000/if_em.c
+12-61 files

FreeBSD/src 2519e19sys/net iflib.c ifdi_if.m

iflib: Allow conditional LED device support

A driver class may implement LED control even though the capability is
not available on every device or firmware version it supports.  Add an
optional capability method and consult it before creating the led(4)
device.  Default to supported so existing providers are unchanged.

This will be used by bnxt which blends PF and VF in the same driver.

MFC after:      2 weeks
DeltaFile
+10-0sys/net/ifdi_if.m
+1-1sys/net/iflib.c
+11-12 files

FreeBSD/src bbf9322sys/dev/igc igc_regs.h if_igc.h

igc: Recover from fatal internal memory errors

I225 and I226 report uncorrectable internal memory errors through
ICR.FER and identify the affected region in PEIND.  Depending on the
region, hardware stops transmit or all PCIe and DMA traffic until the
port is reset and reinitialized.

Enable the fatal error interrupt and capture its read clear status in
the interrupt filter.  Mask the cause while an iflib reset is pending,
report the affected memory regions, and expose per region indication
counters.

PCIe region parity failures require a different recovery order from a
normal reset: assert DEV_RST, wait at least 3 ms, disable PCIe master
requests, clear PCIEERRSTS, and then reinitialize the port.  Follow that
sequence before entering the normal reset path and clear the remaining
LAN status afterward.

The I225/I226 PBECCSTS layout is unrelated to the PCH layout previously

    [20 lines not shown]
DeltaFile
+221-5sys/dev/igc/if_igc.c
+20-5sys/dev/igc/igc_defines.h
+10-0sys/dev/igc/if_igc.h
+7-2sys/dev/igc/igc_regs.h
+258-124 files

FreeBSD/src 9f7633bsys/dev/igc if_igc.h if_igc.c

igc: Report corrected internal ECC errors

I225 and I226 do not interrupt for corrected internal ECC errors.
Instead, the DMA packet buffer and PCIe memories expose sticky status
bits in PBECCSTS and PCIEECCSTS.

Sample these bits with the regular hardware statistics update, preserve
the PBECCSTS ECC enable state while clearing its RW1C indication, and
expose separate counters for the DMA packet buffer, PCIe transmit-data
memory, and PCIe retry buffer.

These counters represent observed indications rather than an exact error
count because multiple corrections between samples collapse into one
sticky status bit.

Hardware validation used an I225-IT (rev 3) and a debug kernel that
wrote only the documented self-clearing injection bits.  Each test
armed the injector, exercised the owning RAM with traffic, and compared
the corresponding counter before and after.

    [14 lines not shown]
DeltaFile
+40-0sys/dev/igc/if_igc.c
+3-0sys/dev/igc/if_igc.h
+43-02 files

FreeBSD/src 887114ausr.bin/du du.c du.1

du: Print progress information to stderr

* On SIGINFO, print the current path to stderr rather than stdout.

* Do so immediately, instead of the next time we finish a directory.

* Document this behavior in the manual page.

PR:             296861
MFC after:      1 week
Fixes:          d1588599c024 ("Report the next directory being scanned ...")
Reviewed by:    wollman
Differential Revision:  https://reviews.freebsd.org/D58702

(cherry picked from commit fd79bf63442eefd2c3bfb695a377dbd705f5cc6d)
DeltaFile
+11-1usr.bin/du/du.1
+4-4usr.bin/du/du.c
+15-52 files

FreeBSD/src b0c2926usr.bin/du du.c du.1

du: Print progress information to stderr

* On SIGINFO, print the current path to stderr rather than stdout.

* Do so immediately, instead of the next time we finish a directory.

* Document this behavior in the manual page.

PR:             296861
MFC after:      1 week
Fixes:          d1588599c024 ("Report the next directory being scanned ...")
Reviewed by:    wollman
Differential Revision:  https://reviews.freebsd.org/D58702

(cherry picked from commit fd79bf63442eefd2c3bfb695a377dbd705f5cc6d)
DeltaFile
+11-1usr.bin/du/du.1
+4-4usr.bin/du/du.c
+15-52 files

FreeBSD/src ceb764fcontrib/unbound config.h.in configure, contrib/unbound/doc Changelog

unbound: Update to 1.26.0

Release notes at
        https://community.nlnetlabs.nl/t/unbound-1-26-0-released

Merge commit '84ffc29dc8ddb0c946db5cb3b3c1310bec6a9e6c'

(cherry picked from commit 7a789145f88a6aceacc59029a0cafe7de7aeefea)
DeltaFile
+3,512-3,494contrib/unbound/util/configlexer.c
+2,874-1,942contrib/unbound/configure
+2,148-2,099contrib/unbound/util/configparser.c
+577-0contrib/unbound/doc/Changelog
+223-181lib/libunbound/config.h
+220-178contrib/unbound/config.h.in
+9,554-7,894108 files not shown
+12,570-8,977114 files

FreeBSD/src ea65604sys/fs/pseudofs pseudofs.c

pseudofs: Don't purge the cache on shutdown

This is a waste of time and results in a use-after-free if linsysfs is
loaded and a USB network interface is in use, since USB devices are
disconnected at shutdown, which triggers a call into linsysfs, which
then tries to destroy a pseudofs node which has already been purged.

MFC after:      1 week
Reviewed by:    glebius
Differential Revision:  https://reviews.freebsd.org/D58359

(cherry picked from commit 4ebcdb8dd9a7bdddbc97ff6ee47e0a7556c76b5a)
DeltaFile
+0-1sys/fs/pseudofs/pseudofs.c
+0-11 files

FreeBSD/src fe264ccsys/fs/tarfs tarfs.h

tarfs: remove unused 'ino' in mount structure.

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

(cherry picked from commit 54e6dec44b6dd264b19e50439a58b33cab4c10c3)
DeltaFile
+0-1sys/fs/tarfs/tarfs.h
+0-11 files

FreeBSD/src 79cf64acontrib/unbound config.h.in configure, contrib/unbound/doc Changelog

unbound: Update to 1.26.0

Release notes at
        https://community.nlnetlabs.nl/t/unbound-1-26-0-released

Merge commit '84ffc29dc8ddb0c946db5cb3b3c1310bec6a9e6c'

(cherry picked from commit 7a789145f88a6aceacc59029a0cafe7de7aeefea)
DeltaFile
+3,512-3,494contrib/unbound/util/configlexer.c
+2,874-1,942contrib/unbound/configure
+2,148-2,099contrib/unbound/util/configparser.c
+577-0contrib/unbound/doc/Changelog
+223-181lib/libunbound/config.h
+220-178contrib/unbound/config.h.in
+9,554-7,894108 files not shown
+12,570-8,977114 files

FreeBSD/src 0477871sys/fs/tarfs tarfs.h

tarfs: remove unused 'ino' in mount structure.

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

(cherry picked from commit 54e6dec44b6dd264b19e50439a58b33cab4c10c3)
DeltaFile
+0-1sys/fs/tarfs/tarfs.h
+0-11 files

FreeBSD/src df9c672sys/fs/pseudofs pseudofs.c

pseudofs: Don't purge the cache on shutdown

This is a waste of time and results in a use-after-free if linsysfs is
loaded and a USB network interface is in use, since USB devices are
disconnected at shutdown, which triggers a call into linsysfs, which
then tries to destroy a pseudofs node which has already been purged.

MFC after:      1 week
Reviewed by:    glebius
Differential Revision:  https://reviews.freebsd.org/D58359

(cherry picked from commit 4ebcdb8dd9a7bdddbc97ff6ee47e0a7556c76b5a)
DeltaFile
+0-1sys/fs/pseudofs/pseudofs.c
+0-11 files

FreeBSD/src e15d226tools/tools/git mfc-candidates.lua

mfc-candidates: Fix remote repo detection

In my repos the remote "freebsd" is git at gitrepo.freebsd.org:src.git.
In particular, the last component is delimited by a colon, not a slash.

Sponsored by:   Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D48951
DeltaFile
+1-1tools/tools/git/mfc-candidates.lua
+1-11 files