HardenedBSD/src d49d183sys/dev/nvme nvme_ctrlr.c, usr.sbin/vidcontrol vidcontrol.1

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+5-1sys/dev/nvme/nvme_ctrlr.c
+1-4usr.sbin/vidcontrol/vidcontrol.1
+6-52 files

HardenedBSD/src a8b0208sys/dev/nvme nvme_ctrlr.c

nvme: Fix devd logging of SMART_ERROR

Remove extra arg so that we have type=SMART_ERROR rather than an invalid
message. Also log all aens.

Sponsored by:           Netflix
DeltaFile
+5-1sys/dev/nvme/nvme_ctrlr.c
+5-11 files

HardenedBSD/src 9ec8196usr.sbin/vidcontrol vidcontrol.1

vidcontrol.1: Video buffer dump is syscons only

Fixes:          1f4442f71fa3 (be explicit that -p and -P are sc(4) only)
MFC after:      3 days
Reviewed by:    ziaee
Differential Revision:  https://reviews.freebsd.org/D53878
DeltaFile
+1-4usr.sbin/vidcontrol/vidcontrol.1
+1-41 files

HardenedBSD/src 43080e4sys/compat/linuxkpi/common/include/linux ieee80211.h, sys/compat/linuxkpi/common/include/linux/soc/mediatek mtk_wed.h

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+138-32sys/compat/linuxkpi/common/include/linux/ieee80211.h
+65-36sys/netinet/tcp_syncache.c
+35-30sys/net/bpf.c
+8-31sys/contrib/dev/mediatek/mt76/util.h
+1-32sys/netinet/tcp_input.c
+27-1sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
+274-16221 files not shown
+365-18827 files

HardenedBSD/src 72ca894sys/net bpf.c

bpf: global bpf list doesn't need CK

All accesses to this list are done with the global lock held.  The
CK connotation is just confusing the reader.

Fixes:                  699281b545a8a3fc5109b5f2db62d261b65b588b
Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D53869
DeltaFile
+14-14sys/net/bpf.c
+14-141 files

HardenedBSD/src 8458966sys/net bpf.c

bpf: calculate net.bpf.stats buffer size dynamically

This removed the global counter, that was updated in a racy manner.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D53868
DeltaFile
+17-11sys/net/bpf.c
+17-111 files

HardenedBSD/src 57673d1sys/net bpf.c bpf.h

bpf: retire struct bpf_if_ext

The struct was used for bpf_if to bif_dlist masking, that is used to
optimize bpf_peers_present() call.  The only functional change here is
that bif_dlist and bif_next swap their places in the structure.  Both
belong to the first cache line anyway.

Reviewed by:            markj
Differential Revision:  https://reviews.freebsd.org/D53867
DeltaFile
+6-7sys/net/bpf.c
+4-9sys/net/bpf.h
+10-162 files

HardenedBSD/src ee18f8bsys/netinet tcp_input.c

tcp: don't set flowid in tcp_input()

With dd0e6bb996dc setting it always on connect(2) and syncache always
picking up the flowid from the incoming packet, any ESTABLISHED connection
shall have the flowid already set.

Reviewed by:            tuexen, gallatin
Differential Revision:  https://reviews.freebsd.org/D53886
DeltaFile
+0-31sys/netinet/tcp_input.c
+0-311 files

HardenedBSD/src 73fe85esys/netinet tcp_syncache.c tcp_syncache.h

tcp: store flowid info in syncache

Now retransmissions by syncache would use correct flowid, same as
synchronous responds.

Reviewed by:            tuexen, gallatin
Differential Revision:  https://reviews.freebsd.org/D51792
DeltaFile
+65-36sys/netinet/tcp_syncache.c
+4-4sys/netinet/tcp_syncache.h
+1-1sys/netinet/tcp_input.c
+70-413 files

HardenedBSD/src 1ba6fd3sys/dev/ichsmb ichsmb.c ichsmb_pci.c

ichsmb: shutdown interrupts to prevent spurious interrupts after  kexec

Obtained from:  Hewlett Packard Enterprise
Rebiewed by:    jhb, jhibbits
DeltaFile
+11-0sys/dev/ichsmb/ichsmb.c
+1-0sys/dev/ichsmb/ichsmb_pci.c
+1-0sys/dev/ichsmb/ichsmb_var.h
+13-03 files

HardenedBSD/src 3d71ce9lib/libc/stdbit stdc_has_single_bit.c

libc/stdc_has_single_bit.c: fix gcc warning (-Wparentheses)

gcc14 is concerned that the operator precedence between - and & might
be confusing.  Throw in some redundant parentheses to make it shut up.
The LLVM build was fine before this change.

Reported by:    Martin Filla <freebsd at sysctl.cz>
Approved by:    markj (mentor)
MFC after:      1 month
Fixes:          6296500a85c8474e3ff3fe2f8e4a9d56dd0acd64
Differential Revision:  https://reviews.freebsd.org/D54057
DeltaFile
+5-5lib/libc/stdbit/stdc_has_single_bit.c
+5-51 files

HardenedBSD/src 853e044sys/contrib/dev/mediatek/mt76/mt7915 coredump.c eeprom.c, sys/contrib/dev/mediatek/mt76/mt7921 mcu.c

mt76: add LINUXKPI_PARAM_PREFIX for module_param*

In order to not overwrite sysctl/tunables under compat.linuxkpi
we need to prefix the module_param* names with a per-driver/file
designator to make them (more) uniq.  Add the FreeBSD specific
LINUXKPI_PARAM_PREFIX defines for that where missing in mt76.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+4-0sys/contrib/dev/mediatek/mt76/mt7915/coredump.c
+4-0sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c
+4-0sys/contrib/dev/mediatek/mt76/mt7915/mcu.c
+4-0sys/contrib/dev/mediatek/mt76/mt7915/mmio.c
+4-0sys/contrib/dev/mediatek/mt76/mt7921/mcu.c
+4-0sys/contrib/dev/mediatek/mt76/mt7925/mcu.c
+24-05 files not shown
+44-011 files

HardenedBSD/src 9492230sys/contrib/dev/mediatek/mt76 util.h

mt76: util.h: extend worker name

In mt76_worker_setup() add the "name" argument to the description
for the worker thread.  That way we have a chance to keep them apart.

While here, rename a variable and shorten the the (c)/SPDX section
according to new style.

MFC after:      3 days
DeltaFile
+8-31sys/contrib/dev/mediatek/mt76/util.h
+8-311 files

HardenedBSD/src c67fd35sys/contrib/dev/mediatek/mt76 mac80211.c

mt76: ieee80211_is_first_frag() operates on the seq_ctrl field not on fc.

Pass the correct field to ieee80211_is_first_frag(); otherwise the results
may vary.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
X-To-Upstream:  yes
DeltaFile
+1-1sys/contrib/dev/mediatek/mt76/mac80211.c
+1-11 files

HardenedBSD/src 87aa494sys/modules/mt76 Makefile.inc

mt76: set appropriate CONFIG options for the module build

Always set CONFIG_ARCH_DMA_ADDR_T_64BIT as it is true for all
architectures we support.  Add an option for CONFIG_NET_MEDIATEK_SOC_WED,
which we currently do not yet support.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+9-0sys/modules/mt76/Makefile.inc
+9-01 files

HardenedBSD/src 51c73fcsys/compat/linuxkpi/common/include/linux/soc/mediatek mtk_wed.h

LinuxKPI: mt76: depend on CONFIG_NET_MEDIATEK_SOC_WED

If CONFIG_NET_MEDIATEK_SOC_WED is not set then be silent;  if
CONFIG_NET_MEDIATEK_SOC_WED is set we will enable logic or rather te
pr_debug("TODO") calls for now.

Spsonsored by:  The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+27-1sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
+27-11 files

HardenedBSD/src b10ff7esys/compat/linuxkpi/common/include/net mac80211.h

LinuxKPI: 802.11: move ieee80211_offload_flags

Move the enum and leave a comment on the struct member for the vif
about the type.

No functional changes.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+7-7sys/compat/linuxkpi/common/include/net/mac80211.h
+7-71 files

HardenedBSD/src af22833sys/compat/linuxkpi/common/include/linux ieee80211.h, sys/compat/linuxkpi/common/include/net cfg80211.h

LinuxKPI: 802.11: fill in more skeleton functions

Some of these are used by mt76 and while I was here and it only was
a handfull I figured I should just clean this all up.

There is one problem in that between 802.11az and 802.11-2024 action
frame formats have changed;  I got compile errors from iwlwifi(4) given
I updated them to -2024 so we remain on older versions for the moment.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+138-32sys/compat/linuxkpi/common/include/linux/ieee80211.h
+4-0sys/compat/linuxkpi/common/include/net/cfg80211.h
+142-322 files

HardenedBSD/src 5ceb2a0sys/netinet ip_reass.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-5sys/netinet/ip_reass.c
+0-51 files

HardenedBSD/src 9b1c8a3contrib/bmake/mk options.mk, sys/arm64/arm64 gicv3_its.c

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        sys/netinet/ip_reass.c (unresolved)
DeltaFile
+133-23sys/arm64/arm64/gicv3_its.c
+102-46contrib/bmake/mk/options.mk
+120-3sys/dev/ufshci/ufshci_dev.c
+79-3sys/dev/ufshci/ufshci_uic_cmd.c
+71-1sys/dev/ufshci/ufshci_ctrlr.c
+64-1sys/dev/ufshci/ufshci_private.h
+569-77195 files not shown
+1,321-834201 files

HardenedBSD/src c60f642contrib/bmake configure var.c, contrib/bmake/mk options.mk ChangeLog

Update to bmake-20251111

Merge commit '638c66de4a0faa4c2e815e81cd4021c2387c7e0f'
DeltaFile
+102-46contrib/bmake/mk/options.mk
+44-9contrib/bmake/configure
+49-0contrib/bmake/mk/ChangeLog
+43-3contrib/bmake/var.c
+37-0contrib/bmake/ChangeLog
+20-16contrib/bmake/mk/install-new.mk
+295-7487 files not shown
+690-69893 files

HardenedBSD/src 638c66d. configure var.c, mk options.mk ChangeLog

Import bmake-20251111

Intersting/relevant changes since bmake-20250804

ChangeLog since bmake-20250804

2025-11-15  Simon J Gerraty  <sjg at beast.crufty.net>

        * boot-strap: unset more things from env and save a copy
        to env.out for debugging.

2025-11-12  Simon J Gerraty  <sjg at beast.crufty.net>

        * VERSION (_MAKE_VERSION): 20251111
        Merge with NetBSD make, pick up
        o var.c: add :sh1 which only evaluates command on first reference.

2025-11-11  Simon J Gerraty  <sjg at beast.crufty.net>


    [74 lines not shown]
DeltaFile
+102-46mk/options.mk
+44-9configure
+49-0mk/ChangeLog
+43-3var.c
+37-0ChangeLog
+26-10mk/sys.vars.mk
+301-6883 files not shown
+657-68589 files

HardenedBSD/src e19230d. Makefile.inc1

Makefile.inc1: Fix the libbnxtre dependency target

Reported by:    Jenkins
Fixes:          73e8fe62466a ("libpcap: Fix dependency definitions for libpcap")
DeltaFile
+1-1Makefile.inc1
+1-11 files

HardenedBSD/src 812bcb7. .mailmap

mailmap: add my Raptor Engineering address

Approved by: jhibbits(mentor)
DeltaFile
+1-0.mailmap
+1-01 files

HardenedBSD/src 84fd37fshare/misc committers-src.dot

committers-src: add myself (tpearson@)

Add myself (tpearson@) as a new src committer with jhibbits@ as my mentor.

Approved by: jhibbits(mentor)
DeltaFile
+2-0share/misc/committers-src.dot
+2-01 files

HardenedBSD/src 73e8fe6. Makefile.inc1, lib/libpcap Makefile

libpcap: Fix dependency definitions for libpcap

Commit 35dd53a9e132 ("librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping")
causes a build failure, since src.libnames.mk declares a depencency on
libbnxtre.so, but the libpcap Makefile and prebuild lib dependencies
were not updated accordingly.  Fix the declarations.

Fixes:  35dd53a9e132 ("librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping")
Reviewed by:    ssaxena
Differential Revision:  https://reviews.freebsd.org/D54048
DeltaFile
+2-0Makefile.inc1
+1-0lib/libpcap/Makefile
+3-02 files

HardenedBSD/src 962ad7clib/ofed Makefile

ofed: Define SUBDIR_DEPEND_libbnxtre

Fixes:  b42fda6be3fd ("share/mk: Include libbnxtre entry in bsd.libnames.mk")
DeltaFile
+1-0lib/ofed/Makefile
+1-01 files

HardenedBSD/src 74f7e91sys/netinet ip_divert.c

divert: Use CK_SLISTs for the divcb hash table

The hash table is accessed in ip_divert_packet(), and there the accesses
are synchronized only by the net epoch, so plain SLIST is not safe.

Reviewed by:    ae
MFC after:      1 week
Sponsored by:   OPNsense
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D54011
DeltaFile
+9-8sys/netinet/ip_divert.c
+9-81 files

HardenedBSD/src 20a0a2fsys/riscv/riscv pmap.c

riscv/pmap: Handle superpages in pmap_extract_and_hold()

Without this change, vm_fault_quick_hold_pages() falls back to the slow
fault handler when it encounters a superpage mapping.

Reviewed by:    alc, kib
Reported and tested by: br
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54022
DeltaFile
+16-6sys/riscv/riscv/pmap.c
+16-61 files

HardenedBSD/src 35dd53ashare/mk src.libnames.mk, usr.bin/ofed/libibverbs Makefile.inc

librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping

By default ibv_devices and rping are not statically bound to
libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list
'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1
library to rping & ibv_devices utils.

MFC-After:      3 days
Reviewed-by:    sumit.saxena at broadcom.com
Differential-Revision: https://reviews.freebsd.org/D49604
DeltaFile
+5-2share/mk/src.libnames.mk
+1-1usr.bin/ofed/libibverbs/Makefile.inc
+1-1usr.bin/ofed/librdmacm/Makefile.inc
+7-43 files