HardenedBSD/src ce12f16lib/libpfctl libpfctl.c, sbin/pfctl pfctl.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+19-12sys/net/iflib.c
+11-11lib/libpfctl/libpfctl.c
+6-3sys/sys/ktls.h
+3-2sys/net/iflib.h
+3-0sys/kern/uipc_ktls.c
+1-1sbin/pfctl/pfctl.c
+43-292 files not shown
+45-308 files

HardenedBSD/src f436d6dlib/libpfctl libpfctl.c, sbin/pfctl pfctl.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+19-12sys/net/iflib.c
+11-11lib/libpfctl/libpfctl.c
+6-3sys/sys/ktls.h
+3-2sys/net/iflib.h
+3-0sys/kern/uipc_ktls.c
+1-1sbin/pfctl/pfctl.c
+43-292 files not shown
+45-308 files

HardenedBSD/src 823ebd7lib/libpfctl libpfctl.c libpfctl.h, sbin/pfctl pfctl.c

libpfctl: export a get states variant that takes a pfctl_handle

Sponsored by:   Rubicon Communications, LLC ("Netgate")
DeltaFile
+11-11lib/libpfctl/libpfctl.c
+1-1sbin/pfctl/pfctl.c
+1-0lib/libpfctl/libpfctl.h
+13-123 files

HardenedBSD/src 622d7fasys/netpfil/pf pf.h

pf: fix pcounters array size

It's a 2 * 2 * 2, not 2 * 2 * 3. We only use PF_DROP and PF_PASS, so two
rows suffices.

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

HardenedBSD/src 4d69206sys/kern uipc_ktls.c, sys/sys ktls.h

ktls: Capture initial tls seqno at time offload is initiated

Some drivers want the TLS seqno when offload starts. Capture this
for them by adding a union for initial_seqno, sharing space with
the TLS 1.0 next_seqno.

Reviewed by: jhb
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D54275
MFC After: 1 month
DeltaFile
+6-3sys/sys/ktls.h
+3-0sys/kern/uipc_ktls.c
+9-32 files

HardenedBSD/src 43d7ee5sys/net iflib.c iflib.h

iflib: support for transmit side nic KTLS offload

This change adds support to iflib for drivers that want to do
transmit-side NIC ktls offload. This change does 2 things:

1) Extends the pkt info to include an optional mbuf pointer.

This gives drivers the ability to find the start of a TLS record if
they need to re-DMA part of the record to re-construct TLS state on
the NIC. This mbuf pointer is only passed when CSUM_SND_TAG is
present on the pkthdr. Note that I don't bother to inspect the send
tag on purpose; this will only be present for TLS offloaded or paced
connections

2) Allows the driver to specify how much ring padding is needed
   before the ring is considered to be full using the new isc_tx_pad
   field in if_softc_ctx.

This re-uses a field that was marked spare in 2019 via d49e83eac3baf.

    [11 lines not shown]
DeltaFile
+19-12sys/net/iflib.c
+3-2sys/net/iflib.h
+22-142 files

HardenedBSD/src 5631c44share/man/man9 vmem.9

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+3-0share/man/man9/vmem.9
+3-01 files

HardenedBSD/src 84a265dshare/man/man9 vmem.9

vmem.9: provide a reference to libuvmem(3)

(cherry picked from commit 5c1d9df10b78f8d2e13e16f5db2e4542f582aebd)
DeltaFile
+3-0share/man/man9/vmem.9
+3-01 files

HardenedBSD/src 5897f3fsys/netinet6 in6_ifattach.c, sys/powerpc/powerpc intr_machdep.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-0sys/netinet6/in6_ifattach.c
+2-72 files

HardenedBSD/src 9f8ff72sys/netinet6 in6_ifattach.c, sys/powerpc/powerpc intr_machdep.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-0sys/netinet6/in6_ifattach.c
+2-72 files

HardenedBSD/src 117306dsys/netinet6 in6_ifattach.c

in6_ifattach: include sys/eventhandler.h to unbreak NOVIMAGE builds

LINT-NOVIMAGE fails to build due to a missing eventhandler.h include
which in hte VIMAGE case is likely leaked through some other header.
Add the #include to unbreak the build.

Fixes:  0d469d23715d6 (net: attach IPv4 and IPv6 stacks to an ...)
DeltaFile
+1-0sys/netinet6/in6_ifattach.c
+1-01 files

HardenedBSD/src 27cb261sys/powerpc/powerpc intr_machdep.c

powerpc/intr: Minor cleanup

Use MTX_SYSINIT() instead of rolling our own.
DeltaFile
+1-7sys/powerpc/powerpc/intr_machdep.c
+1-71 files

HardenedBSD/src d367b23usr.sbin/fwget/pci pci_video_amd

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src 73b0861usr.sbin/fwget/pci pci_video_amd

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src ec36760tests/ci Makefile, tests/ci/tools freebsdci

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+35-22tests/ci/tools/freebsdci
+42-1tests/ci/Makefile
+77-232 files

HardenedBSD/src dd5a48fusr.sbin/fwget/pci pci_video_amd

fwget: Add Navi 33 support

Tested on a RX7600

MFC After:      3 days
DeltaFile
+8-0usr.sbin/fwget/pci/pci_video_amd
+8-01 files

HardenedBSD/src f954e59tests/ci Makefile, tests/ci/tools freebsdci

tests/ci: Collect environment information

For reproducing errors or test results it is important to gather
environment information. These environments are divided into two parts.
One part is in which environment the artifacts were built into and the
second part is in which environment the tests were run.

This patch collects thesee information and saves into a .env file in
the metadir. After this patch lands we will also need to change our
jenkins job where we are uploading the artifact to a central location.
This environment file should also be stored along with the artifact.
For easier location the image basename and the environment basename are
kept same.

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

(cherry picked from commit 14d5c13a89269862b51ef2a7f190b0d28cfbf8a2)
DeltaFile
+35-22tests/ci/tools/freebsdci
+42-1tests/ci/Makefile
+77-232 files

HardenedBSD/src 97737f9contrib/mtree create.c mtree.8, contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+37-9contrib/mtree/spec.c
+25-16contrib/mtree/compare.c
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+10-10contrib/mtree/crc.c
+279-1515 files not shown
+312-17011 files

HardenedBSD/src 1e1ad0econtrib/mtree create.c mtree.8, contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+37-9contrib/mtree/spec.c
+25-16contrib/mtree/compare.c
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+10-10contrib/mtree/crc.c
+279-1515 files not shown
+312-17011 files

HardenedBSD/src 7cc0266contrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

mtree: tests: Import NetBSD's mtree test suite

Manually import latest mtree test suite from NetBSD.

MFC after:      1 week

(cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d)
DeltaFile
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+39-11 files

HardenedBSD/src 12aa5ffcontrib/mtree spec.c compare.c

mtree: Fix typos

Manually apply a typo fix.  This change has already been submitted
upstream as bin/59824.

MFC after:      1 week

(cherry picked from commit dab5daf54cc26aaf2679a2eda5f378461f279ec5)
DeltaFile
+1-1contrib/mtree/spec.c
+1-1contrib/mtree/compare.c
+2-22 files

HardenedBSD/src ecc2e2econtrib/mtree create.c mtree.8

Import latest mtree from NetBSD

Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c'

MFC after:      1 week
Discussed with: brooks

(cherry picked from commit 49b6dda4d71175ad615718401573be5fd024822b)
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+36-8contrib/mtree/spec.c
+24-15contrib/mtree/compare.c
+10-10contrib/mtree/crc.c
+12-5contrib/mtree/verify.c
+250-1534 files not shown
+271-16710 files

HardenedBSD/src 9bbfffecontrib/netbsd-tests/usr.sbin/mtree t_mtree.sh

mtree: tests: Import NetBSD's mtree test suite

Manually import latest mtree test suite from NetBSD.

MFC after:      1 week

(cherry picked from commit 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d)
DeltaFile
+39-1contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
+39-11 files

HardenedBSD/src 97984decontrib/mtree compare.c spec.c

mtree: Fix typos

Manually apply a typo fix.  This change has already been submitted
upstream as bin/59824.

MFC after:      1 week

(cherry picked from commit dab5daf54cc26aaf2679a2eda5f378461f279ec5)
DeltaFile
+1-1contrib/mtree/compare.c
+1-1contrib/mtree/spec.c
+2-22 files

HardenedBSD/src f6fb1f8contrib/mtree create.c mtree.8

Import latest mtree from NetBSD

Merge commit 'f600477feb4ae61a75f61949eb600caff4aeea8c'

MFC after:      1 week
Discussed with: brooks

(cherry picked from commit 49b6dda4d71175ad615718401573be5fd024822b)
DeltaFile
+60-84contrib/mtree/create.c
+108-31contrib/mtree/mtree.8
+36-8contrib/mtree/spec.c
+24-15contrib/mtree/compare.c
+10-10contrib/mtree/crc.c
+12-5contrib/mtree/verify.c
+250-1534 files not shown
+271-16710 files

HardenedBSD/src c4d5a99sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/zfs zfs_ctldir.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+103-66sys/contrib/openzfs/module/zfs/ddt.c
+104-38sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c
+71-42sys/contrib/openzfs/module/zfs/dsl_scan.c
+53-40sys/contrib/openzfs/module/zfs/arc.c
+86-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh
+781-48565 files not shown
+1,420-76971 files

HardenedBSD/src 1f7bbf9sys/contrib/openzfs/contrib/initramfs/scripts zfs, sys/contrib/openzfs/module/os/linux/zfs zfs_ctldir.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+364-299sys/contrib/openzfs/contrib/initramfs/scripts/zfs
+103-66sys/contrib/openzfs/module/zfs/ddt.c
+104-38sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c
+71-42sys/contrib/openzfs/module/zfs/dsl_scan.c
+53-40sys/contrib/openzfs/module/zfs/arc.c
+86-0sys/contrib/openzfs/tests/zfs-tests/tests/functional/dedup/dedup_prune_leak.ksh
+781-48565 files not shown
+1,420-76971 files

HardenedBSD/src 7f39d05sbin/reboot reboot.c

reboot: Fix halt -p behavior

The RB_HALT bit is always set when invoked as `halt`, so to maintain a
distinction between `halt` and `halt -p`, we must check the RB_POWEROFF
bit first.

PR:             291814
Fixes:          4453ec5b8716 ("reboot: Default to a clean shutdown")
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D54320
DeltaFile
+2-2sbin/reboot/reboot.c
+2-21 files

HardenedBSD/src a8c594dsys/conf files.amd64

files.amd64: remove some lines duplicated from files.x86

These were added to files.x86 because they were duplicated in both
files.i386 and files.amd64, but they did not end up removed in the
latter.  Garbage collect them now.

Reviewed by:    jhibbits
Fixes:  b9c6fa339d9c7 ("files.x86: Pull in some more duplicate [...]")
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Differential Revision:  https://reviews.freebsd.org/D54295
DeltaFile
+0-2sys/conf/files.amd64
+0-21 files

HardenedBSD/src 34892a8sys/compat/linuxkpi/common/include/linux bitops.h, sys/modules Makefile

LinuxKPI: bitcount fix builds with gcc and older llvm

LLVM before 19 and gcc before 14 do not support __builtin_popcountg().
Use __const_bitcount<n> from sys/bitcount.h as a replacement in these
cases.  This should still allow drm-kmod to build where the size needs
to be known at compile-time.

Remove the conditional for gcc around the iwlwifi modules build,
which was collateral damage in all this.

Sponsored by:   The FreeBSD Foundation
Fixes:          7cbc4d875971, 5e0a4859f28a
MFC after:      3 days
Reviewed by:    brooks, emaste (without the sys/modules/Makefile change)
Differential Revision: https://reviews.freebsd.org/D54297
DeltaFile
+8-0sys/compat/linuxkpi/common/include/linux/bitops.h
+0-3sys/modules/Makefile
+8-32 files