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]sys: Remove $FreeBSD$: one-line .c pattern
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
Similar commit in current:
(cherry picked from commit 685dc743dc3b)
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)
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]sys: Remove $FreeBSD$: one-line .c pattern
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
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)
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)
Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/man/man5/src.conf.5 (unresolved)
| Delta | File |
|---|
| +8,669 | -0 | sys/contrib/dev/athk/ath11k/mac.c |
| +8,286 | -0 | sys/contrib/dev/athk/ath11k/wmi.c |
| +5,662 | -0 | sys/contrib/dev/athk/ath11k/dp_rx.c |
| +5,585 | -0 | sys/contrib/dev/athk/ath11k/wmi.h |
| +4,704 | -0 | sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c |
| +3,063 | -0 | sys/contrib/dev/athk/ath11k/qmi.c |
| +35,969 | -0 | 6,232 files not shown |
| +89,418 | -15,489 | 6,238 files |
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)
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
Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master
Conflicts:
sys/riscv/riscv/elf_machdep.c (unresolved)
routing: add IPv6 fib validation procedure.
Allow consistency validation of the inet6 fib based on rib data.
Validation can be kicked off by loading test_lookup module and
running sysctl net.route.test.run_inet6_scan=1
(cherry picked from commit cbfba56c45ab77303a3e25a82cf750043849760b)
routing: Use process fib instead of fib 0 when conducting tests.
* Allow to do validation/performance tests by using process
fib instead of default fib 0.
* Print all validation errors instead of just the first one.
(cherry picked from commit 4a77a9b6491093b9a8bb786a861ed74ddf156e8e)
HardenedBSD/src 97f483f — contrib/one-true-awk/testdir bib funstack.in, share/colldef zh_CN.UTF-8.src ja_JP.UTF-8.src
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
Makefile.inc1 (unresolved)
libexec/rtld-elf/Makefile (unresolved)
share/man/man5/src.conf.5 (unresolved)
targets/pseudo/bootstrap-tools/Makefile (unresolved)
| Delta | File |
|---|
| +0 | -69,894 | share/colldef/zh_CN.UTF-8.src |
| +67,474 | -0 | share/colldef_unicode/zh_CN.UTF-8.src |
| +31,102 | -0 | contrib/one-true-awk/testdir/bib |
| +27,220 | -0 | contrib/one-true-awk/testdir/funstack.in |
| +22,150 | -0 | share/colldef_unicode/ja_JP.UTF-8.src |
| +0 | -22,135 | share/colldef/ja_JP.UTF-8.src |
| +147,946 | -92,029 | 3,519 files not shown |
| +532,005 | -310,507 | 3,525 files |
HardenedBSD/src 3a72406 — contrib/unbound config.guess Makefile.in, contrib/unbound/services authzone.c outside_network.c
Merge branch 'freebsd/current/main' into hardened/current/master
routing: add IPv6 fib validation procedure.
Allow consistency validation of the inet6 fib based on rib data.
Validation can be kicked off by loading test_lookup module and
running sysctl net.route.test.run_inet6_scan=1
MFC after: 1 week
Merge branch 'freebsd/current/main' into hardened/current/master
routing: Use process fib instead of fib 0 when conducting tests.
* Allow to do validation/performance tests by using process
fib instead of default fib 0.
* Print all validation errors instead of just the first one.
MFC after: 1 week
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
share/man/man5/src.conf.5 (unresolved)
| Delta | File |
|---|
| +0 | -32,465 | contrib/apr/configure |
| +31,999 | -0 | contrib/arm-optimized-routines/math/test/traces/sincosf.txt |
| +0 | -30,335 | contrib/subversion/configure |
| +0 | -25,340 | contrib/apr-util/configure |
| +0 | -16,709 | contrib/subversion/subversion/libsvn_wc/wc_db.c |
| +16,000 | -0 | contrib/arm-optimized-routines/math/test/traces/exp.txt |
| +47,999 | -104,849 | 10,834 files not shown |
| +702,320 | -1,092,882 | 10,840 files |
HardenedBSD/src f67a511 — sys/contrib/openzfs/module/os/linux/zfs zfs_znode.c, sys/contrib/openzfs/module/zfs arc.c
Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master
* freebsd/13-stable/main:
tests: Revise FIB lookups per second benchmarking routines
Revise FIB lookups per second benchmarking routines.
Add IPv4 fib lookup performance tests with uniform keys.
Avoid deadlock when removing L2ARC devices under I/O
systemd: import: expand $ZPOOL_IMPORT_OPTS correctly
vdev_draid_min_asize() ignores reserved space
Do not hash unlinked inodes
Added uncompress requirement
ZTS: Add zfs_clone_livelist_dedup.ksh to Makefile.am
tests: Revise FIB lookups per second benchmarking routines
Fix a bug in the LPM SEQ benchmark (missing break inside a switch block)
by restructuring the test loop, while introducing additional two
synthetic test options:
ANN: scan only the address space announced in current RIB
REP: repeat lookups over several keys in a sliding window scheme
The total of eight combinations of test options are now available
through dedicated sysctl hooks.
Differential Revision: <https://reviews.freebsd.org/D30311>
Reviewed by: melifaro
MFC after: 3 days
(cherry picked from commit b6f8436b094daf7b1c429ce74997a4daf6994fcb)
Revise FIB lookups per second benchmarking routines.
Add a LPS benchmark variant which introduces artificial dependencies
between successive lookups. While here, instead of writing the results
from the lookups to a huge array, add them to an accumulator, in a more
lightweight attempt at preventing the CPU's OOO machinery from
discarding the lookup results if they would be completely unused.
net.route.test.run_lps_rnd measures LPS throughput with independent
uniformly random keys
net.route.test.run_lps_seq measures LPS throughput with uniformly
random keys with artificial interdependencies
Reviewed by: melifaro
MFC after: 7 days
Differential Revision: https://reviews.freebsd.org/D30096
(cherry picked from commit a43104ebe7630111d7e7debc56aacf49787dcf43)
Add IPv4 fib lookup performance tests with uniform keys.
Submitted by: zec
MFC after: 1 week
(cherry picked from commit b8598e2ff65ab82da0cf6861ee12f078b40bc252)
Merge branch 'freebsd/current/main' into hardened/current/master
* freebsd/current/main:
bsnmp: Fix incorrect use of libpfctl
tests: Revise FIB lookups per second benchmarking routines
tests: Revise FIB lookups per second benchmarking routines
Fix a bug in the LPM SEQ benchmark (missing break inside a switch block)
by restructuring the test loop, while introducing additional two
synthetic test options:
ANN: scan only the address space announced in current RIB
REP: repeat lookups over several keys in a sliding window scheme
The total of eight combinations of test options are now available
through dedicated sysctl hooks.
Differential Revision: <https://reviews.freebsd.org/D30311>
Reviewed by: melifaro
MFC after: 3 days
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
Makefile.inc1 (unresolved)
share/man/man5/src.conf.5 (unresolved)
targets/pseudo/bootstrap-tools/Makefile (unresolved)
tools/build/options/WITH_OFED_EXTRA (deleted)
| Delta | File |
|---|
| +71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
| +52,834 | -0 | contrib/terminus/ter-u32n.bdf |
| +52,834 | -0 | contrib/terminus/ter-u32b.bdf |
| +0 | -49,485 | contrib/binutils/Makefile.in |
| +47,418 | -0 | contrib/terminus/ter-u28b.bdf |
| +47,418 | -0 | contrib/terminus/ter-u28n.bdf |
| +272,094 | -49,917 | 25,491 files not shown |
| +3,013,181 | -3,285,385 | 25,497 files |
Merge branch 'freebsd/current/main' into hardened/current/master
* freebsd/current/main:
virtio_blk: Fix issuing T_GET_ID before DRIVER_OK status
Restore Cirrus-CI boot smoke test
linux: remove redundant SDT tracepoints
Introduce DXR as an IPv4 longest prefix matching / FIB module
Revise FIB lookups per second benchmarking routines.
Revise FIB lookups per second benchmarking routines.
Add a LPS benchmark variant which introduces artificial dependencies
between successive lookups. While here, instead of writing the results
from the lookups to a huge array, add them to an accumulator, in a more
lightweight attempt at preventing the CPU's OOO machinery from
discarding the lookup results if they would be completely unused.
net.route.test.run_lps_rnd measures LPS throughput with independent
uniformly random keys
net.route.test.run_lps_seq measures LPS throughput with uniformly
random keys with artificial interdependencies
Reviewed by: melifaro
MFC after: 7 days
Differential Revision: https://reviews.freebsd.org/D30096
Merge branch 'freebsd/current/main' into hardened/current/master
* freebsd/current/main:
sh: improve emacs mode
Add IPv4 fib lookup performance tests with uniform keys.
powerpc64: support superpages on pmap_mincore
cam: make sure to clear CCBs allocated on the stack
fortune/freebsd-tips: Add a few fortunes
fortune/freebsd-tips: Remove errant spaces
fortune/freebsd-tips: Remove bogus fortune
Add IPv4 fib lookup performance tests with uniform keys.
Submitted by: zec
MFC after: 1 week
