FreeBSD/src 8b360b4 — release/scripts make-oci-image.sh, release/tools oci-image-runtime.conf

release: Avoid generating .pkgsave files in OCI images

This also installs the pkg key from the current source tree instead of
using the one currently installed on the host.

Reviewed by:            dch
MFC after:              1 day
Differential Revision:  https://reviews.freebsd.org/D52615

(cherry picked from commit e21e6e96b662dcbb2f0e37ab356c9dded62a586e)
DeltaFile
+9-1release/scripts/make-oci-image.sh
+4-0release/tools/oci-image-runtime.conf
+13-12 files

FreeBSD/src 7656159 — sys/dev/virtio/console virtio_console.h virtio_console.c

virtio_console: Handle VIRTIO_CONSOLE_RESIZE

Multiport devices report console size per port by control event,
which was ignored and hence their ttys could never have a window
size.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60094
DeltaFile
+38-0sys/dev/virtio/console/virtio_console.c
+5-0sys/dev/virtio/console/virtio_console.h
+43-02 files

FreeBSD/src 15198bf — sys/dev/virtio/console virtio_console.c, sys/dev/virtio/network if_vtnet.c

virtio: Validate host-supplied used lengths

virtio_console used the host-supplied used lengths without
validation, so a host could report a length larger than
the buffer, causing the receive and control paths to read
past the end of it.  Clamp to the buffer size.

vtnet already rejected used lengths larger than the buffer,
but performed the check after converting the length to an
int, so a length larger than INT_MAX would become negative
and bypass the check.  Reject such frames early before the
conversion, and count them in ierrors and rx_frame_too_large.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60092
DeltaFile
+4-1sys/dev/virtio/network/if_vtnet.c
+2-0sys/dev/virtio/console/virtio_console.c
+6-12 files

FreeBSD/src 9c8dcc2 — sys/dev/virtio/console virtio_console.c

virtio_console: Negotiate VIRTIO_CONSOLE_F_SIZE

The driver reads cols/rows and sets the tty window size but
never offered the feature, so that code has been dead since
the very beginning; also read size under the configuration
generation count.

Reviewed by:    markj
Approved by:    fuz (mentor)
Differential Revision:  https://reviews.freebsd.org/D60089
DeltaFile
+12-5sys/dev/virtio/console/virtio_console.c
+12-51 files

FreeBSD/src fe9c713 — contrib/llvm-project/clang/lib/Sema SemaTemplateInstantiateDecl.cpp

Merge commit c4ce37507537 from llvm-project (by ShengYi Hung):

  [Clang][Sema] Create LocalScope for Variable Template (#228280)

  A variable template should create its own LocalScope, as it should be
  opaque to other instantiations. This can occur when there are multiple
  instantiations in the same lexical scope. The correct behavior is that
  these instantiations should not be chained together.

  Assisted-by: Claude # Test ReleaseNote
  Fixes: #134148

This fixes an assertion while building the devel/glaze port.

PR:             276265
MFC after:      3 days
DeltaFile
+4-0contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+4-01 files

FreeBSD/src 2300c23 — sys/dev/vt/hw/fb vt_fb.c

vt_fb: Do not perform VT switch in vd_init hook

After 40c20fc29cad it is done by vt_core as soon as vt lock is dropped
after vd_init() has been executed to avoid sleeping with non-sleepable
lock held.

Reviewed by:    quentin.thebault_defenso.fr, vexeduxr
Differential Revision:  https://reviews.freebsd.org/D59632
DeltaFile
+0-3sys/dev/vt/hw/fb/vt_fb.c
+0-31 files

FreeBSD/src 4c46d1a — usr.sbin/bhyveload bhyveload.c

bhyveload: do not hang on EOF from console input

Currently, when bhyveload(8) fails to boot the guest,
it drops into the loader prompt waiting for user input.

This behaviour is inconvenient when using bhyveload(8) from
scripts.

Make it exit when it receives EOF from console input.

PR:             286289
Reviewed by:    markj
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59226

(cherry picked from commit 8c20260bc55d7b4be0cbcf0a940505ae15ab41a9)
DeltaFile
+5-1usr.sbin/bhyveload/bhyveload.c
+5-11 files

FreeBSD/src 49276e4 — usr.sbin/bhyveload bhyveload.c

bhyveload: do not hang on EOF from console input

Currently, when bhyveload(8) fails to boot the guest,
it drops into the loader prompt waiting for user input.

This behaviour is inconvenient when using bhyveload(8) from
scripts.

Make it exit when it receives EOF from console input.

PR:             286289
Reviewed by:    markj
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59226

(cherry picked from commit 8c20260bc55d7b4be0cbcf0a940505ae15ab41a9)
DeltaFile
+5-1usr.sbin/bhyveload/bhyveload.c
+5-11 files

FreeBSD/src ff2efe6 — usr.sbin/bhyve bhyve.8

bhyve.8: add details on using TPM with UEFI

Add a note that UEFI VMs using TPM devices should be configured
to use a varfile. Some UEFI boot loaders, such as shim, update
persistent boot variables and then reset the system when a TPM is
present. Without a writable varfile, the VM may be reset repeatedly.

Add a TPM device example to the examples list.

While here, add a missing "\" to the "uefivm" example, and add ".Pp"
before the vCPU pinning examples for consistency with other examples.

PR:             287326
Reviewed by:    michaelo, ziaee
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D60181
DeltaFile
+30-2usr.sbin/bhyve/bhyve.8
+30-21 files

FreeBSD/src 7b8c805 — contrib/tzdata zone1970.tab zone.tab

contrib/tzdata: import tzdata 2026e

Changes: https://github.com/eggert/tz/blob/2026e/NEWS

Briefly:
    Manitoba moves to permanent -05 on 2026-10-31.

(cherry picked from commit f11af6535044c8266d52806d72b07e939f94049c)
DeltaFile
+98-20contrib/tzdata/northamerica
+38-0contrib/tzdata/NEWS
+26-4contrib/tzdata/europe
+4-1contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone1970.tab
+1-1contrib/tzdata/zone.tab
+168-273 files not shown
+171-309 files

FreeBSD/src 961a842 — contrib/tzdata zone1970.tab zone.tab

contrib/tzdata: import tzdata 2026e

Changes: https://github.com/eggert/tz/blob/2026e/NEWS

Briefly:
    Manitoba moves to permanent -05 on 2026-10-31.

(cherry picked from commit f11af6535044c8266d52806d72b07e939f94049c)
DeltaFile
+98-20contrib/tzdata/northamerica
+38-0contrib/tzdata/NEWS
+26-4contrib/tzdata/europe
+4-1contrib/tzdata/zonenow.tab
+1-1contrib/tzdata/zone1970.tab
+1-1contrib/tzdata/zone.tab
+168-273 files not shown
+171-309 files

FreeBSD/src d9e2cac — sys/kern subr_witness.c

jail: note existing process/prison lock order in witness.
DeltaFile
+7-0sys/kern/subr_witness.c
+7-01 files

FreeBSD/src 9d5a33d — contrib/netbsd-tests/lib/libc/gen t_assert.c

[tests] lib/libc/gen:assert_test: undefine `NDEBUG`

In the event `NDEBUG` was defined, `assert` would become a no-op,
breaking some of the expectations in `assert_test` around `assert(..)`
failing generating a coredump.

This is a better approach than the previous one committed in 6f3445006a
as it continues to test the `assert(..)` function instead of just
skipping it if `NDEBUG` was defined.

Suggested by:   kevans
MFC after:      4 days
MFC with:       6f3445006a
Fixes:          6f3445006a
Differential Revision: https://reviews.freebsd.org/D60253
DeltaFile
+6-20contrib/netbsd-tests/lib/libc/gen/t_assert.c
+6-201 files

FreeBSD/src dec68ae — lib/libc/stdlib getenv.c

libc/stdlib/getenv.c:  always allocate new environment

in particular, if the old environment is NULL.

Among making it less surprising for userspace to observe NULL environ,
the change also prevents NULL deref in __rebuild_environ() when
terminating the empty as NULL environment with the NULL pointer.

Reported by:     Leo Bicknell <bicknell at ufp.org>
PR:     298747
Reviewed by:    emaste, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D59996
DeltaFile
+1-1lib/libc/stdlib/getenv.c
+1-11 files

FreeBSD/src 891bda1 — sys/net/route nhop.h nhgrp_ctl.c

route/fib_algo: Fix nexthop index collision across families

fib_algo indexes its idx->nhop array by the nexthop index with
assumption of its uniqueness. Which is true except for IPv4 over
IPv6 nexthops.
Give each index space its own segment within the same array and
offset the index by the segment base. Segments are created on demand
and sized independently, so the rib's own family keeps base 0 and
tables without cross-family nexthops index exactly as before.

Reviewed by:    melifaro
Discussed with: markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D59552

(cherry picked from commit 63343822430453f4add20bcbfa134c99132361df)
DeltaFile
+128-22sys/net/route/fib_algo.c
+19-0sys/net/route/nhgrp_ctl.c
+1-0sys/net/route/nhop.h
+148-223 files

FreeBSD/src 782c6ea — sys/netpfil/pf pf_nl.c

pf: do not leak a source hash row lock in the netlink dump

pf_handle_get_srcnodes() returns with the lock of a source hash row
held when it cannot start the message for a source node.  Unlock the
row there, as the other error exit of the loop does.

Reviewed by:            kp
Approved by:            kp (mentor)
Fixes:                  9c125336727b ("pf: convert DIOCGETSRCNODES to netlink")
MFC after:              1 week
Sponsored by:           Rubicon Communications, LLC ("Netgate")
Differential Revision:  https://reviews.freebsd.org/D60251
DeltaFile
+1-0sys/netpfil/pf/pf_nl.c
+1-01 files

FreeBSD/src abed4cb — sys/kern sched_4bsd.c sched_ule.c

sched: factor out hogticks calculation into sched_update_hogticks()

Suggested by:   olce
Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59471

(cherry picked from commit 5a879394ba2eac14f65b466a46dae39326df00db)
DeltaFile
+11-6sys/kern/sched_ule.c
+10-6sys/kern/sched_4bsd.c
+21-122 files

FreeBSD/src a7cedda — sys/kern sched_ule.c

sched_ule: fix invalid tdq_slice() and sched_slice_min

sched_slice_min should always to be greater than zero. When modifying
sched_slice through sysctl, if the new value is less than
SCHED_SLICE_MIN_DIVISOR, sched_slice_min is computed to zero. Add
imax(1, ...) to prevent this.

tdq_slice() should not return a value less than sched_slice_min since
that will cause integer underflow of ts2->ts_slice in
sched_ule_fork_thread. SCHED_SLICE_MIN_DIVISOR is currently set to 6 so
when load is 5 and sched_slice is 4, the two if conditions in
tdq_slice() will pass and the function will return zero. Thus use imax()
so tdq_slice returns sched_slice_min at minimum.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59408

    [2 lines not shown]
DeltaFile
+2-4sys/kern/sched_ule.c
+2-41 files

FreeBSD/src 0facbd5 — sys/kern sched_ule.c

sched_ule: fix typo in comment

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59409

(cherry picked from commit 5803063625371dfbaf68e55b0d9e15021f103e28)
DeltaFile
+1-1sys/kern/sched_ule.c
+1-11 files

FreeBSD/src 8ef613e — sys/kern sched_ule.c

sched_ule: fix comment on ts_slice

In ULE ts_slice stores the number of ticks of slice passed not
remaining.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59407

(cherry picked from commit 872074c50e99ab8858c2defe255d716f8f75f15b)
DeltaFile
+1-1sys/kern/sched_ule.c
+1-11 files

FreeBSD/src f11c5eb — sys/kern sched_4bsd.c

sched_4bsd: remove obsolete comment

'awake' checks if a thread, not a process, is awake.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59404

(cherry picked from commit 6c0c77e190b27d768595ef5b38d798430fb03a8b)
DeltaFile
+1-5sys/kern/sched_4bsd.c
+1-51 files

FreeBSD/src 8ad706e — sys/kern sched_4bsd.c

sched_4bsd: fix vague comment

The comment "was incremented in schedcpu()" doesn't give enough
background for decrementing ts_slptime by 1 (thus ignoring decay_cpu()
for 1 ts_slptime). More accurately, ts_slptime is decremented by 1
because decay_cpu() has already executed once in schedcpu() when
ts_slptime was 1.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59406

(cherry picked from commit cd33abbce5a5c3b454f00ca3d0ecd71c2234106c)
DeltaFile
+2-1sys/kern/sched_4bsd.c
+2-11 files

FreeBSD/src a4f40ac — sys/kern sched_4bsd.c

sched_4bsd: move comment to correct location

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59403

(cherry picked from commit 039498c2735ee0697da24b9c60c9e67680f91f31)
DeltaFile
+6-5sys/kern/sched_4bsd.c
+6-51 files

FreeBSD/src efd9712 — sys/kern sched_4bsd.c

sched_4bsd: fix comment in maybe_preempt()

The comment says the new thread's priority is not a realtime priority
while the code states pri > PRI_MAX_ITHD which is interrupt priorities
not realtime.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59402

(cherry picked from commit 351f6733180cebdc83585f9a00677f4998f6c6f1)
DeltaFile
+1-1sys/kern/sched_4bsd.c
+1-11 files

FreeBSD/src c087ee0 — sys/kern sched_4bsd.c sched_ule.c

sched: fix kern.sched.{4bsd,ule}.slice

Fix three problems with kern.sched.{4bsd,ule}.slice:

 * Guarantee minimum slice is 1.
 * Recalculate hogticks on sysctl write.
 * For ULE, recalculate sched_slice_min on sysctl write.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59401

(cherry picked from commit 179f5b2bfedccc762352f06057f4e389bfabb2ea)
DeltaFile
+21-1sys/kern/sched_ule.c
+20-1sys/kern/sched_4bsd.c
+41-22 files

FreeBSD/src 069c6f6 — sys/kern sched_ule.c

sched_ule: fix typo goup to group

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59400

(cherry picked from commit f609ca733fee72894634f751d1fbc3db53d603dc)
DeltaFile
+10-10sys/kern/sched_ule.c
+10-101 files

FreeBSD/src be9536d — sys/kern sched_4bsd.c

sched_4bsd: remove obsolete comment

In old Unix, the whole process address space including scheduler-related
data was paged out to disk. We now allocate thread-related data with UMA
on wired memory which never page out. Thus this comment is now obsolete.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59398

(cherry picked from commit 46416a57eb7b6d74fda13cc6e40a43bdfa6b7da9)
DeltaFile
+0-5sys/kern/sched_4bsd.c
+0-51 files

FreeBSD/src 188234a — sys/kern sched_ule.c

sched_ule: remove unused KTR_ULE

Commit 62fa74d95a16 ("Add support for the new cpu...") removed all uses
of KTR_ULE, leaving the macro unused.

Reviewed by:    olce
Approved by:    olce (mentor)
Fixes:          62fa74d95a16 ("Add support for the new cpu...")
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59399

(cherry picked from commit 7997d2a18150a449b563c87490e8d440bb1023f3)
DeltaFile
+0-2sys/kern/sched_ule.c
+0-21 files

FreeBSD/src f6bbf7b — sys/kern sched_4bsd.c

sched_4bsd: remove dumping from maybe_preempt()

'dumping' is true only when kernel is dumping after crash (see
minidumpsys()) so KERNEL_PANICKED() will catch this.

Reviewed by:    olce
Approved by:    olce (mentor)
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59395

(cherry picked from commit 1dfefffcbdc652ee88a3baa284182f96e20faf17)
DeltaFile
+1-2sys/kern/sched_4bsd.c
+1-21 files

FreeBSD/src e3c9438 — sys/kern sched_4bsd.c

sched_4bsd: update function name in comment

In b43179fbe815 ("Create a new scheduler api..."), schedclock() was
renamed to sched_clock() but the function name in the comment remained
still. Update the comment to reflect up-to-date name for schedclock().

Reviewed by:    olce
Approved by:    olce (mentor)
Fixes: b43179fbe815 ("Create a new scheduler api...")
MFC after:      2 weeks
Sponsored by:   FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D59397

(cherry picked from commit 5d67118d2c7388bdc065e640719553ff4d9eea89)
DeltaFile
+1-1sys/kern/sched_4bsd.c
+1-11 files