FreeBSD/src 4690a36contrib/blocklist/bin blacklistd.c run.c, contrib/blocklist/port popenve.c

Adapt changes from blocklist 2026-02-07 (10a907f)

Also apply the fix from PR 258411.

This is a direct commit to stable/14, as blacklist has been renamed to
blocklist upstream.

Approved by:    re (cperciva)

(cherry picked from commit 30c04399f2e81b8e71045fc410837461abeb2d8b)
DeltaFile
+37-34contrib/blocklist/port/popenve.c
+15-14contrib/blocklist/bin/blacklistd.c
+7-6contrib/blocklist/bin/run.c
+2-2contrib/blocklist/bin/blacklistd.conf.5
+0-1contrib/blocklist/bin/support.c
+61-575 files

FreeBSD/src 3c10ed2usr.bin/diff diffreg.c

diff: Report I/O errors in Stone algorithm

In the legacy Stone algorithm, we do a first pass over the files to
check if they're identical before we start diffing them.  That code
would correctly set the exit status if an I/O error was encountered,
but would not emit an error message.  Do so.

Approved by:    re (cperciva)
PR:             292198
MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    thj
Differential Revision:  https://reviews.freebsd.org/D55125

(cherry picked from commit f8c12e6e3874cdd353fb16785da6f4e7eb134cd9)
(cherry picked from commit 37ceb8794c22d88a41e261d23d347bc7ac08b2c8)
DeltaFile
+7-3usr.bin/diff/diffreg.c
+7-31 files

FreeBSD/src 7cf7c71usr.bin/diff/tests diff_test.sh

diff: Correctly declare tests

Approved by:    re (cperciva)
Sponsored by:   Klara, Inc.
Fixes:          5fc739eb5949 ("diff: Fix integer overflows in Stone algorithm")
Fixes:          270492602b9b ("diff: Add test case for pagination resource leak")
Fixes:          590126789c84 ("diff: Don't compare a file or directory to itself")

(cherry picked from commit 157d6664aeb815db3b758bd3038fd1512a0f4e2c)
(cherry picked from commit b8bcf04d6dd37308834ee258230082ae6875b1f3)
DeltaFile
+4-1usr.bin/diff/tests/diff_test.sh
+4-11 files

FreeBSD/src b413914usr.bin/diff diffdir.c diffreg.c, usr.bin/diff/tests diff_test.sh

diff: Don't compare a file or directory to itself

While here, stop abusing struct dirent for something we don't even need
to store.

Approved by:    re (cperciva)
PR:             254455
MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    thj, kevans
Differential Revision:  https://reviews.freebsd.org/D55113

(cherry picked from commit 590126789c841d80655869bc075c8980c173dd1c)

diff: Fix build

rc must be defined first.

Fixes:          590126789c84

    [5 lines not shown]
DeltaFile
+19-0usr.bin/diff/tests/diff_test.sh
+8-8usr.bin/diff/diffdir.c
+3-0usr.bin/diff/diffreg.c
+30-83 files

FreeBSD/src 6761e55usr.bin/diff pr.c pr.h, usr.bin/diff/tests diff_test.sh

diff: Fix pagination leak

* Drop an unnecessary variable and rename pidfd to procd.

* Rewinding stdout serves no purpose, so stop doing it.

* Don't bother freeing memory or setting the global status right
  before erroring out.

* Error out if dup(2) or dup2(2) fail.

* In the unlikely case that our pipe is equal to stdout, we need to
  record that information so we don't close it when cleaning up.

* Don't bother closing a descriptor before dup2(2)ing to it.

* Don't forget to close the the process descriptor after reaping the
  child process.


    [9 lines not shown]
DeltaFile
+10-12usr.bin/diff/pr.c
+1-0usr.bin/diff/pr.h
+0-1usr.bin/diff/tests/diff_test.sh
+11-133 files

FreeBSD/src 2434f3busr.bin/diff/tests diff_test.sh

diff: Add test case for pagination resource leak

The pagination code leaks either processes or descriptors or both,
depending on the exact version of the code you have.  Add a test case
which exercises this leak to facilitate fixing it.

Approved by:    re (cperciva)
MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    thj, kevans
Differential Revision:  https://reviews.freebsd.org/D55111

(cherry picked from commit 270492602b9bd8b8fce4f021f055804978bf3f23)
(cherry picked from commit 51c2384ce049ec92e07901cf8a84c171e5d72104)
DeltaFile
+22-0usr.bin/diff/tests/diff_test.sh
+22-01 files

FreeBSD/src 238bf5eusr.bin/diff diffreg.c, usr.bin/diff/tests diff_test.sh

diff: Fix integer overflows in Stone algorithm

Fix integer overflows that may occur when the context window is very
large and add tests to exercise those conditions.

Approved by:    re (cperciva)
PR:             267032
MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    thj, kevans
Differential Revision:  https://reviews.freebsd.org/D55110

(cherry picked from commit 5fc739eb5949620da911db2f87ca8faedc549d3a)
(cherry picked from commit 237fd8dd96979412dd65ce95032aa9957463d069)
DeltaFile
+21-11usr.bin/diff/diffreg.c
+29-0usr.bin/diff/tests/diff_test.sh
+50-112 files

FreeBSD/src c08ee1esys/dev/iwx if_iwx.c

iwx: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Locally tested:

 * STA mode - iwx0: <Wi-Fi 6 AX210> mem 0x84c00000-0x84c03fff at device 0.0 on pci4

Differential Revision:  https://reviews.freebsd.org/D54463
DeltaFile
+6-4sys/dev/iwx/if_iwx.c
+6-41 files

FreeBSD/src f064d44sys/dev/usb/wlan if_rum.c if_run.c

run: rum: migrate to new net80211 encryption key API

Migrate to the new encryption key API rather than poking at the
key struct directly.

Locally tested:

 * STA mode - run0: MAC/BBP RT2860 (rev 0x0101), RF RT2820 (MIMO 2T2R), address 00:0e:2e:e5:ae:3a

Differential Revision:  https://reviews.freebsd.org/D54462
DeltaFile
+16-10sys/dev/usb/wlan/if_rum.c
+10-5sys/dev/usb/wlan/if_run.c
+26-152 files

FreeBSD/src 7a5288asys/net80211 ieee80211_ht.c

net80211: clean up time comparison in HT code

There's at least one place where the time comparison is wrong, leading
to some bad beahaviour around deciding to try and establish/reestablish
AMPDU TX sessions.

Start addressing these!

Differential Revision:  https://reviews.freebsd.org/D54390
DeltaFile
+5-3sys/net80211/ieee80211_ht.c
+5-31 files

FreeBSD/src 164d8afsys/i386/i386 swtch.S

i386: Fix build and remove empty unused macro

(cherry picked from commit 9e0fe126714cc0b2045bec16fe8d06dbcd663144)
DeltaFile
+1-3sys/i386/i386/swtch.S
+1-31 files

FreeBSD/src 68feaa1sys/kern sched_4bsd.c kern_synch.c, sys/sys sched.h proc.h

SCHED_4BSD: maybe_resched() cannot schedule ast() for curthread

(cherry picked from commit b249cb2b18b3fddae186d45fe6d984fc7bde10c4)
DeltaFile
+19-2sys/kern/sched_4bsd.c
+1-1sys/kern/kern_synch.c
+2-0sys/sys/sched.h
+1-0sys/sys/proc.h
+23-34 files

FreeBSD/src 8cec474sys/kern sched_ule.c sched_shim.c, sys/sys smp.h

Re-introduce kern.sched.topology_spec

PR:     292574

(cherry picked from commit 120ca8d74b46caa260702485e30fe5f9f9984682)
DeltaFile
+0-92sys/kern/sched_ule.c
+91-0sys/kern/sched_shim.c
+47-34sys/kern/subr_smp.c
+6-3sys/sys/smp.h
+144-1294 files

FreeBSD/src a3b5dafsys/amd64/conf GENERIC, sys/conf NOTES

sys: enable both SCHED_ULE and SCHED_4BSD for some configs

(cherry picked from commit 1322760fd1274930cbb61048d9a6ba3bc1782b2a)
DeltaFile
+1-1sys/conf/NOTES
+1-0sys/amd64/conf/GENERIC
+2-12 files

FreeBSD/src bd74830sys/kern sched_4bsd.c sched_shim.c

sched_shim: restore kern.ccpu sysctl

(cherry picked from commit ff870b783f098cafd8b938379eada6b8cfe9a4fb)
DeltaFile
+6-4sys/kern/sched_4bsd.c
+4-0sys/kern/sched_shim.c
+10-42 files

FreeBSD/src 29512ebsys/amd64/amd64 cpu_switch.S, sys/arm/arm swtch-v6.S

cpu_switch(): unconditionally wait on the blocked mutex transient

(cherry picked from commit 377c053a43f347588ce6800627adb634f87f8cf9)
DeltaFile
+13-18sys/i386/i386/swtch.S
+1-6sys/arm/arm/swtch-v6.S
+0-5sys/amd64/amd64/cpu_switch.S
+1-2sys/riscv/riscv/swtch.S
+1-2sys/powerpc/powerpc/swtch32.S
+1-2sys/arm64/arm64/swtch.S
+17-351 files not shown
+18-377 files

FreeBSD/src ac5ea31sys/kern sched_4bsd.c sched_ule.c, sys/sys sched.h

x86/local_apic.c: remove direct SCHED_ULE use

(cherry picked from commit c384b35e42ee5712dda6360ffa287c0350055580)
DeltaFile
+22-0sys/kern/sched_4bsd.c
+1-14sys/x86/x86/local_apic.c
+7-0sys/kern/sched_ule.c
+3-0sys/sys/sched.h
+1-0sys/kern/sched_shim.c
+34-145 files

FreeBSD/src 916cc38sys/kern sched_shim.c sched_4bsd.c, sys/sys sched.h

kern/sched: move duplicate preemption stat vars into sched_shim.c

(cherry picked from commit a84a39dfe5d1fd98afdf29a74017fce29441b730)
DeltaFile
+5-0sys/kern/sched_shim.c
+0-4sys/kern/sched_4bsd.c
+0-4sys/kern/sched_ule.c
+3-0sys/sys/sched.h
+8-84 files

FreeBSD/src f491e0dsys/x86/x86 cpu_machdep.c

x86/cpu_machdep.c: unconditionally fence

(cherry picked from commit 1c4e16f6db81254376f4919aede03267fe572aea)
DeltaFile
+0-3sys/x86/x86/cpu_machdep.c
+0-31 files

FreeBSD/src 4e5c15fshare/man/man7 tuning.7

tuning.7: document schedulers knobs

(cherry picked from commit 0730a05cd383276ca8eedf295509e869ac9b88a0)
DeltaFile
+26-0share/man/man7/tuning.7
+26-01 files

FreeBSD/src 20f2249sys/kern sched_ule.c sched_4bsd.c, sys/sys sched.h

kern/sched: deduplicate dtrace hook vars

(cherry picked from commit 783b8a0fd880255a8315db7f59d0450bd7276f4d)
DeltaFile
+0-6sys/kern/sched_ule.c
+0-6sys/kern/sched_4bsd.c
+6-0sys/kern/sched_shim.c
+6-0sys/sys/sched.h
+12-124 files

FreeBSD/src a3fb3d0sys/kern sched_4bsd.c sched_shim.c, sys/sys sched.h

kern/sched: deduplicate sdt probes

(cherry picked from commit 9409e86980302cd495376861de3475b78734bc37)
DeltaFile
+0-18sys/kern/sched_4bsd.c
+18-0sys/kern/sched_shim.c
+0-18sys/kern/sched_ule.c
+11-0sys/sys/sched.h
+29-364 files

FreeBSD/src e642bf4sys/kern sched_ule.c sched_4bsd.c, sys/net iflib.c

net/iflib.c: move out scheduler-depended code into the hook

(cherry picked from commit b602ba1b5fd92bb226e32f5720885f856a5cb0bb)
DeltaFile
+3-79sys/net/iflib.c
+68-0sys/kern/sched_ule.c
+8-0sys/sys/sched.h
+7-0sys/kern/sched_4bsd.c
+1-0sys/kern/sched_shim.c
+87-795 files

FreeBSD/src 1d4bc18sys/kern sched_ule.c

sysctl kern.sched.ule.topology_spec: allow to run if ULE is not initialized

(cherry picked from commit 5a6e0e31bc2e8ed8f655be63fa5b8c41f3d60753)
DeltaFile
+2-1sys/kern/sched_ule.c
+2-11 files

FreeBSD/src 684091fsys/kern sched_shim.c

kern/sched_shim.c: Add sysctl kern.sched.available

(cherry picked from commit ba8f429f42ecae1881d0face52df87ad1489af15)
DeltaFile
+31-0sys/kern/sched_shim.c
+31-01 files

FreeBSD/src 6300032sys/kern sched_4bsd.c

sys: Move 4BSD sysctls under kern.sched.4bsd

(cherry picked from commit 8aa8289d991bc369b6739ce4c4bcd7d5234f48a2)
DeltaFile
+17-13sys/kern/sched_4bsd.c
+17-131 files

FreeBSD/src 89388d5sys/kern sched_shim.c, sys/sys sched.h

kern/sched_shim.c: provide required SYSINIT hooks

(cherry picked from commit 7efbfd6ff6490fa6b7144cc341eaf282a21fab32)
DeltaFile
+25-0sys/kern/sched_shim.c
+3-0sys/sys/sched.h
+28-02 files

FreeBSD/src 9c5067asys/conf files, sys/kern sched_shim.c

Add kern/sched_shim.c

(cherry picked from commit ce38acee8d0bb35223b227479b9998c77b47f41b)
DeltaFile
+94-0sys/kern/sched_shim.c
+48-0sys/sys/sched.h
+1-0sys/conf/files
+143-03 files

FreeBSD/src d19ddc3sys/kern sched_ule.c

sys: Move ULE sysctls under kern.sched.ule

(cherry picked from commit eb454937a3c04e5d1bde4f58d0ebb2dc48472ced)
DeltaFile
+32-28sys/kern/sched_ule.c
+32-281 files

FreeBSD/src 22515fbsys/kern sched_4bsd.c

sys: Make sched_4bsd a sched instance

(cherry picked from commit b125c4d13095b3f26d105a985099dfe1cc3ac0b3)
DeltaFile
+144-101sys/kern/sched_4bsd.c
+144-1011 files