HardenedBSD/src 9316bd0contrib/spleen spleen-32x64.bdf spleen-16x32.bdf, libexec/rtld-elf rtld.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+5,487-2,363contrib/spleen/spleen-32x64.bdf
+2,899-2,834libexec/rtld-elf/rtld.c
+3,009-1,293contrib/spleen/spleen-16x32.bdf
+2,930-0sys/dev/usb/net/if_umb.c
+1,754-742contrib/spleen/spleen-8x16.bdf
+2,362-6contrib/spleen/spleen-12x24.bdf
+18,441-7,23861 files not shown
+24,037-8,25167 files

HardenedBSD/src dbdc32fsbin/kldstat kldstat.8, sys/powerpc/powerpc cpu.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+66-57sys/vm/vm_phys.c
+50-47sys/vm/vm_page.c
+57-10sys/powerpc/powerpc/cpu.c
+12-31tests/sys/netinet/fibs_test.sh
+20-15sys/vm/vm_reserv.c
+11-9sbin/kldstat/kldstat.8
+216-1697 files not shown
+241-18813 files

HardenedBSD/src 6f0c293sys/powerpc/powerpc cpu.c

Fix latency spikes on return from stop on POWER9+

On POWER9 and higher platforms, cpu_idle_power9() directly control the external
interrupt enable lines when entering / exiting stop states.  This does not
provide needed information to the rest of the kernel regarding the core going
into a stop state, and results in random, significant latency spikes (>200ms)
due to the stopped core not receiving wakeup interrupts in a deterministic
manner.

Bring cpu_idle_power9() in line with cpu_idle_powerx() by using spinlock
entry / exit to control the interrupt state vs. direct MSR read / write.

Signed-off-by: Timothy Pearson <tpearson at raptorengineering.com>
DeltaFile
+19-10sys/powerpc/powerpc/cpu.c
+19-101 files

HardenedBSD/src 58f7730sys/powerpc/powerpc cpu.c

Add machdep.cpu_idle_max_stop_state tunable

Multiple idle and deep sleep states are supported on Power7+ platforms, with
each state having a characteristic latency and effect on system real-time
performance.

Add a tunable to allow a maximum sleep state (maximum theoretical sleep-related
latency) to be set, in order to better support specific latency-sensitive
applications / real time workloads.

Signed-off-by: Timothy Pearson <tpearson at raptorengineering.com>
DeltaFile
+39-1sys/powerpc/powerpc/cpu.c
+39-11 files

HardenedBSD/src 5d8d4dasys/kern subr_bus.c, sys/powerpc/powerpc cpu.c

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+218-218sys/powerpc/ps3/ps3-hvcall.S
+148-0sys/kern/subr_bus.c
+16-3sys/x86/iommu/intel_drv.c
+18-0sys/powerpc/powerpc/cpu.c
+12-6sys/powerpc/ps3/ps3-hv-asm.awk
+16-0sys/x86/x86/io_apic.c
+428-22711 files not shown
+485-23517 files

HardenedBSD/src f9f006dsys/powerpc/include spr.h cpu.h, sys/powerpc/powerpc cpu.c

powerpc: Add nominal support for POWER10 and POWER11

(cherry picked from commit 1e434da3b065ef96b389e5e0b604ae05a51e794e)
DeltaFile
+18-0sys/powerpc/powerpc/cpu.c
+2-0sys/powerpc/include/spr.h
+2-0sys/powerpc/include/cpu.h
+22-03 files

HardenedBSD/src eea3036share/man/man4 iwlwifi.4 ath10k.4, targets/pseudo/bootstrap-packages bootstrap-packages.sh Makefile

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+96-0targets/pseudo/bootstrap-packages/bootstrap-packages.sh
+34-31share/man/man4/iwlwifi.4
+15-38usr.sbin/acpi/acpidump/acpi.c
+17-14share/man/man4/ath10k.4
+14-11share/man/man4/rtw88.4
+23-0targets/pseudo/bootstrap-packages/Makefile
+199-9426 files not shown
+303-14432 files

HardenedBSD/src ad71433share/man/man4 iwlwifi.4 ath10k.4, targets/pseudo/bootstrap-packages bootstrap-packages.sh Makefile

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+96-0targets/pseudo/bootstrap-packages/bootstrap-packages.sh
+34-31share/man/man4/iwlwifi.4
+15-38usr.sbin/acpi/acpidump/acpi.c
+17-14share/man/man4/ath10k.4
+14-11share/man/man4/rtw88.4
+23-0targets/pseudo/bootstrap-packages/Makefile
+199-9423 files not shown
+293-13829 files

HardenedBSD/src 1e434dasys/powerpc/include cpu.h spr.h, sys/powerpc/powerpc cpu.c

powerpc: Add nominal support for POWER10 and POWER11
DeltaFile
+18-0sys/powerpc/powerpc/cpu.c
+2-0sys/powerpc/include/cpu.h
+2-0sys/powerpc/include/spr.h
+22-03 files

HardenedBSD/src cd5652dcontrib/traceroute traceroute.c, sys/cam/scsi scsi_target.c

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

Conflicts:
        share/examples/bhyve/vmrun.sh (unresolved)
        sys/kern/kern_mib.c (unresolved)
DeltaFile
+105-29usr.bin/dtc/fdt.cc
+28-27contrib/traceroute/traceroute.c
+27-18sys/netinet/udp_usrreq.c
+26-12sys/cam/scsi/scsi_target.c
+18-19usr.sbin/traceroute6/traceroute6.c
+20-14sys/dev/cxgbe/t4_main.c
+224-11950 files not shown
+426-25056 files

HardenedBSD/src 1d71b75lib/libc/sys setfib.2, sys/arm/arm identcpu-v6.c

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        sys/kern/kern_mib.c (unresolved)
DeltaFile
+11-7sys/kern/kern_mib.c
+1-10sys/compat/linprocfs/linprocfs.c
+4-4lib/libc/sys/setfib.2
+3-3sys/x86/x86/identcpu.c
+2-0sys/netinet/ip6.h
+1-1sys/arm/arm/identcpu-v6.c
+22-253 files not shown
+25-279 files

HardenedBSD/src 337b2a0sys/arm/arm identcpu-v6.c, sys/arm64/arm64 identcpu.c

identcpu: Let the hw.model be readable in capability mode

On some platforms this static information can be derived directly from
the CPU, and there doesn't seem much use in restricting it.

Reviewed by:    emaste, imp, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D43281

(cherry picked from commit 0aba5dd2af57ea3ae90eb49d7745c4c5b6f0ab6b)
DeltaFile
+1-1sys/arm/arm/identcpu-v6.c
+1-1sys/arm64/arm64/identcpu.c
+1-1sys/powerpc/powerpc/cpu.c
+1-1sys/x86/x86/identcpu.c
+4-44 files

HardenedBSD/src e244060sys/arm/arm identcpu-v6.c, sys/arm64/arm64 identcpu.c

identcpu: Let the hw.model be readable in capability mode

On some platforms this static information can be derived directly from
the CPU, and there doesn't seem much use in restricting it.

Reviewed by:    emaste, imp, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D43281

(cherry picked from commit 0aba5dd2af57ea3ae90eb49d7745c4c5b6f0ab6b)
DeltaFile
+1-1sys/arm64/arm64/identcpu.c
+1-1sys/arm/arm/identcpu-v6.c
+1-1sys/powerpc/powerpc/cpu.c
+1-1sys/x86/x86/identcpu.c
+4-44 files

HardenedBSD/src c9db220lib/libpfctl libpfctl.c, sys/dev/bnxt if_bnxt.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+44-68sys/dev/bnxt/if_bnxt.c
+68-19lib/libpfctl/libpfctl.c
+85-0tests/sys/netpfil/pf/pflog.sh
+19-19sys/sys/systm.h
+15-11sys/netpfil/pf/pf.c
+14-4sys/kern/subr_stats.c
+245-12162 files not shown
+389-24568 files

HardenedBSD/src 011a364crypto/heimdal/doc/doxyout/hx509/man/man3 hx509_env.3, sys/compat/linprocfs linprocfs.c

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

Conflicts:
        sys/kern/kern_mib.c (unresolved)
DeltaFile
+44-68sys/dev/bnxt/if_bnxt.c
+19-19sys/sys/systm.h
+11-7sys/kern/kern_mib.c
+9-9crypto/heimdal/doc/doxyout/hx509/man/man3/hx509_env.3
+14-4sys/kern/subr_stats.c
+1-10sys/compat/linprocfs/linprocfs.c
+98-11732 files not shown
+155-17338 files

HardenedBSD/src 0aba5ddsys/arm/arm identcpu-v6.c, sys/arm64/arm64 identcpu.c

identcpu: Let the hw.model be readable in capability mode

On some platforms this static information can be derived directly from
the CPU, and there doesn't seem much use in restricting it.

Reviewed by:    emaste, imp, kib
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D43281
DeltaFile
+1-1sys/arm/arm/identcpu-v6.c
+1-1sys/arm64/arm64/identcpu.c
+1-1sys/powerpc/powerpc/cpu.c
+1-1sys/x86/x86/identcpu.c
+4-44 files

HardenedBSD/src cb0c532contrib/less screen.c, sys/kern vfs_subr.c

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]
DeltaFile
+175-44sys/vm/vm_map.c
+97-38sys/kern/vfs_subr.c
+64-0tests/sys/vm/stack/stack_dlopen_exec_test.c
+57-0tests/sys/vm/stack/stack_mprotect_exec_test.c
+42-11contrib/less/screen.c
+51-0tests/sys/vm/mmap_map_32bit_helper.c
+486-9331,889 files not shown
+1,170-49,85331,895 files

HardenedBSD/src 4b40a16sys/dev/pms/RefTisa/tisa/sassata/common tdproto.h tdsatypes.h, sys/dev/pms/RefTisa/tisa/sassata/sas/common tdtypes.h

sys: Remove $FreeBSD$: one-line .h pattern

Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/

Similar commit in current:
(cherry picked from commit 2ff63af9b88c)
DeltaFile
+0-1sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h
+0-1sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h
+0-1sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h
+0-1sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h
+0-1sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h
+0-1sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h
+0-6903 files not shown
+0-909909 files

HardenedBSD/src acf3d6esys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,042 files not shown
+2,188-48,40531,048 files

HardenedBSD/src 2226d61sys/arm64/arm64 pl031_rtc.c, sys/compat/linux linux_socket.c

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

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]
DeltaFile
+697-0sys/dev/virtio/gpu/virtio_gpu.c
+454-0sys/dev/virtio/gpu/virtio_gpu.h
+153-0sys/arm64/arm64/pl031_rtc.c
+80-52sys/compat/linux/linux_socket.c
+107-0tools/build/freebsd-yeet.pl
+87-11sys/dev/ixl/ixl_pf_main.c
+1,578-6331,044 files not shown
+2,304-48,37531,050 files

HardenedBSD/src 2ff63afsys/cam/ctl ctl.h ctl_backend.h

sys: Remove $FreeBSD$: one-line .h pattern

Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/
DeltaFile
+0-1sys/cam/ctl/ctl.h
+0-1sys/cam/ctl/ctl_backend.h
+0-1sys/cam/ctl/ctl_cmd_table.c
+0-1sys/cam/ctl/ctl_debug.h
+0-1sys/cam/ctl/ctl_error.h
+0-1sys/cam/ctl/ctl_frontend.h
+0-6739 files not shown
+0-745745 files

HardenedBSD/src 65b43f4bin/cp/tests cp_test.sh, bin/pkill pkill.c

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

Conflicts:
        sys/i386/linux/imgact_linux.c (deleted)
        sys/kern/imgact_aout.c (deleted)
DeltaFile
+1-3sys/xen/xenbus/xenbusb.h
+1-3sys/dev/qlxge/qls_isr.c
+1-1sys/sys/_bus_dma.h
+1-1bin/cp/tests/cp_test.sh
+1-1bin/pkill/pkill.c
+1-1bin/timeout/timeout.1
+6-105,655 files not shown
+5,661-5,6655,661 files

HardenedBSD/src caa41f6sys/dev/qlxge qls_isr.c, sys/netgraph/bluetooth/l2cap ng_l2cap_ulpi.c

spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD

The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.

Discussed with:         pfg
MFC After:              3 days
Sponsored by:           Netflix

(cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b)
DeltaFile
+2-2sys/xen/xenbus/xenbusb.h
+2-2sys/dev/qlxge/qls_isr.c
+1-1sys/powerpc/include/openpicvar.h
+1-1sys/powerpc/include/pcpu.h
+1-1sys/powerpc/include/pcpu_aux.h
+1-1sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+8-85,432 files not shown
+5,440-5,4405,438 files

HardenedBSD/src 161fa17sys/contrib/dev/athk/ath11k mac.c wmi.c

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+8,669-0sys/contrib/dev/athk/ath11k/mac.c
+8,286-0sys/contrib/dev/athk/ath11k/wmi.c
+5,662-0sys/contrib/dev/athk/ath11k/dp_rx.c
+5,585-0sys/contrib/dev/athk/ath11k/wmi.h
+4,704-0sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c
+3,063-0sys/contrib/dev/athk/ath11k/qmi.c
+35,969-06,232 files not shown
+89,418-15,4896,238 files

HardenedBSD/src 8b901f3contrib/xz ChangeLog, contrib/xz/src/liblzma/common memcmplen.h

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

Conflicts:
        lib/csu/common/csu_common.h (deleted)
        share/man/man5/src.conf.5 (unresolved)
        sys/i386/linux/imgact_linux.c (deleted)
        sys/kern/imgact_aout.c (deleted)
DeltaFile
+267-0contrib/xz/ChangeLog
+66-0share/mk/local.sys.dirdeps.env.mk
+0-66share/mk/local.meta.sys.env.mk
+17-0stand/efi/libefi/devpath.c
+14-0tools/build/options/WITH_META_ERROR_TARGET
+12-1contrib/xz/src/liblzma/common/memcmplen.h
+376-675,795 files not shown
+6,208-5,8965,801 files

HardenedBSD/src 4d846d2sys/dev/adb adb_kbd.c adbvar.h, sys/dev/ae if_ae.c if_aereg.h

spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD

The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.

Discussed with:         pfg
MFC After:              3 days
Sponsored by:           Netflix
DeltaFile
+2-2sys/xen/xenbus/xenbusb.h
+2-2sys/dev/qlxge/qls_isr.c
+1-1sys/dev/adb/adb_kbd.c
+1-1sys/dev/adb/adbvar.h
+1-1sys/dev/ae/if_ae.c
+1-1sys/dev/ae/if_aereg.h
+8-85,571 files not shown
+5,579-5,5795,577 files

HardenedBSD/src 0f2dea6contrib/byacc configure CHANGES, sbin/ping/tests test_ping.py

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+2,201-1,469contrib/byacc/configure
+2,779-171contrib/byacc/CHANGES
+1,356-1,365sys/netinet/ip_mroute.c
+652-551contrib/byacc/config.guess
+940-0sbin/ping/tests/test_ping.py
+485-238contrib/byacc/install-sh
+8,413-3,794684 files not shown
+18,096-9,222690 files

HardenedBSD/src 2b629f4contrib/bc/src program.c vm.c, contrib/bc/tests other.sh

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

Conflicts:
        sys/conf/options (unresolved)
DeltaFile
+75-45contrib/bc/tests/other.sh
+61-11sbin/route/route.8
+36-32sys/conf/NOTES
+30-19contrib/bc/src/program.c
+2-45sys/netinet/in_pcb.c
+17-17contrib/bc/src/vm.c
+221-169178 files not shown
+963-681184 files

HardenedBSD/src 429ba16sys/powerpc/aim mp_cpudep.c, sys/powerpc/ofw ofw_machdep.c

powerpc: fix warning: a function declaration without a prototype is deprecated in all versions of C

Reviewers: #powerpc
Approved by: alfredo

Subscribers: imp, jhibbits

Differential Revision: https://reviews.freebsd.org/D38787
DeltaFile
+5-5sys/powerpc/powerpc/platform.c
+2-2sys/powerpc/ofw/ofw_machdep.c
+1-1sys/powerpc/powerpc/cpu.c
+1-1sys/powerpc/powerpc/fpu.c
+1-1sys/powerpc/aim/mp_cpudep.c
+1-1sys/powerpc/powerpc/pmap_dispatch.c
+11-112 files not shown
+13-138 files

HardenedBSD/src 5aeb963contrib/sqlite3 sqlite3.c, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+5,556-3,450contrib/sqlite3/sqlite3.c
+8,287-0sys/contrib/openzfs/cmd/ztest.c
+0-8,221sys/contrib/openzfs/cmd/ztest/ztest.c
+4,219-3,950sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+24,751-23,6119,387 files not shown
+738,363-247,4629,393 files