FreeBSD/src 8c941e3sys/x86/acpica acpi_apm.c

acpi_apm: Don't recurse on ACPI_LOCK in apmreadfilt

The lock is already held by the caller since it is used as the knlist
lock.

PR:             293901
Reported by:    Jiaming Zhang <r772577952 at gmail.com>
Fixes:          cc2715cf1f86 ("acpi_apm: Narrow scope of ACPI_LOCK")
DeltaFile
+0-2sys/x86/acpica/acpi_apm.c
+0-21 files

FreeBSD/src 998d501share/man/man7 freebsd-base.7

freebsd-base.7: Add an example for unregistering

MFC after:              3 days
Reviewed by:            ivy, emaste
Discussed with:         bapt, des, emaste, ivy, phk, pi
Differential Revision:  https://reviews.freebsd.org/D55458
DeltaFile
+35-1share/man/man7/freebsd-base.7
+35-11 files

FreeBSD/src 5f922bdshare/man/man7 freebsd-base.7

freebsd-base.7: Break examples into subsections

Break the examples into subsections, so that we can have multi-step
examples.

MFC after:              3 days (to 15 only)
Discussed with:         ivy
Differential Revision:  https://reviews.freebsd.org/D55526
DeltaFile
+6-5share/man/man7/freebsd-base.7
+6-51 files

FreeBSD/src dc140a9share/skel dot.profile, usr.bin/apply apply.1

Bourne shell -> POSIX shell

The FreeBSD shell is a POSIX compatible shell. It evolved over several
decades from the Almquist shell, which was preceeded a decade before
that by the Bourne shell. Most readers today have never seen a Bourne
shell. If someone wants to learn to use our shell, they need to look for
tutorials on the POSIX shell. Align descriptions through out the tree
with this reality, consistent with it's manual and common parlance.

We made a similar change to the doc tree in b4d6eb01540fe.

MFC after:              3 days
Reviewed by:            carlavilla
Differential Revision:  https://reviews.freebsd.org/D56382
DeltaFile
+2-2usr.bin/fortune/datfiles/freebsd-tips
+2-2usr.bin/script/script.1
+1-1usr.sbin/adduser/adduser.8
+1-1share/skel/dot.profile
+1-1usr.bin/apply/apply.1
+1-1usr.bin/chpass/chpass.1
+8-86 files

FreeBSD/src 934a35alib/libthr libthr.3

libthr.3: describe SIGTHR

Explain how SIGTHR is used and that it should be not touched by user
code.  Note about SIGLIBRT.

Reviewed by:    emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D56384
DeltaFile
+19-0lib/libthr/libthr.3
+19-01 files

FreeBSD/src fa912e3lib/libthr libthr.3

libthr.3: describe what we mean by C runtime environment.

Reviewed by:    emaste
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D56384
DeltaFile
+6-0lib/libthr/libthr.3
+6-01 files

FreeBSD/src 893b90cusr.bin/netstat netstat.1 main.c

netstat: Add -F support for -g

This change adds the ability to examine the contents of multicast
routing tables for other FIBs without the need for executing
`netstat` with `setfib(1)`.

MFC after:      3 days
Sponsored by:   Klara, Inc.
Sponsored by:   Stormshield
Differential Revision:  https://reviews.freebsd.org/D56205
Reviewed by:    glebius, markj, zlei

(cherry picked from commit cff675e83cdb6c9027e94df9d010439e42e27dee)
DeltaFile
+12-1usr.bin/netstat/netstat.1
+2-0usr.bin/netstat/main.c
+14-12 files

FreeBSD/src 3524d4eshare/examples Makefile, share/examples/sound mmap.c

sound examples: Add mmap example

This example opens separate OSS capture and playback channels in mmap
mode, places them into a sync group, and starts them together so both
ring buffers advance on the same device timeline. It then monitors the
capture mmap pointer with SNDCTL_DSP_GETIPTR, converts that pointer into
monotonic absolute progress using the reported block count, and copies
newly recorded audio from the input ring to the matching region of the
output ring.

The main loop is driven by an absolute monotonic frame clock rather than
a fixed relative usleep delay. Wakeups are scheduled from the sample
rate using a small frame step similar to the SOSSO timing model, while
the audio path itself stays intentionally simple: just copy input to
output, with no explicit xrun recovery or processing beyond ring
wraparound handling.

MFC after:      1 week
Reviewed by:    christos
Differential Revision:  https://reviews.freebsd.org/D53749
DeltaFile
+297-0share/examples/sound/mmap.c
+1-0share/examples/Makefile
+298-02 files

FreeBSD/src add68b4sys/net if_bridge.c

bridge(4): Remove epoch_enter during destruction

bridge doesn't require to enter epoch during destruction.

Reviewed by: zlei, glebius
Differential Revision: https://reviews.freebsd.org/D55935

(cherry picked from commit 17920f8335106487968d7928d01b34300756ea00)
DeltaFile
+0-5sys/net/if_bridge.c
+0-51 files

FreeBSD/src 6af0ee7sys/net if_bridge.c

if_bridge(4): don't sleep under epoch(9) in destruction

bridge tries to run callout_drain(9) twice under epoch
during destruction.
once for bridge_timer, which is not required to be under epoch.
second time for the BSTP callout, which is already disabled
earlier inside bridge_delete_member.

Reviewed by: glebius, zlei
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D55876

(cherry picked from commit a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd)
DeltaFile
+2-2sys/net/if_bridge.c
+2-21 files

FreeBSD/src 7d38eb7sys/net/route nhop_ctl.c

routing: Fix use-after-free in finalize_nhop

FIB_NH_LOG calls the `nhop_get_upper_family(nh)` to read
`nh->nh_priv->nh_upper_family` for failure logging.
Call FIB_NH_LOG before freeing nh so failures are logged
without causing a panic.

MFC after: 3 days
DeltaFile
+2-2sys/net/route/nhop_ctl.c
+2-21 files

FreeBSD/src 6e5c351sys/dev/sound/pcm channel.c

sound: Simplify parts of chn_notify()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56240

(cherry picked from commit 8b18fc456bb136112e166508a9182718cdd44be2)
DeltaFile
+20-27sys/dev/sound/pcm/channel.c
+20-271 files

FreeBSD/src 7bccc0dsys/dev/sound/pcm channel.c

sound: De-macro array definitions in chn_calclatency()

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56263

(cherry picked from commit 66a82f5fa471b8eda018b7566c3725a6742dfc0c)
DeltaFile
+16-21sys/dev/sound/pcm/channel.c
+16-211 files

FreeBSD/src f56d086sys/dev/sound/pcm channel.c

sound: Make chn_reset() control flow clearer

I think this is cleaner than playing around with return values.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56264

(cherry picked from commit 8007a78bfe1f41b7055f8677f8ac9ae4cc2fbc7c)
DeltaFile
+18-15sys/dev/sound/pcm/channel.c
+18-151 files

FreeBSD/src 573fd42sys/dev/sound/pcm channel.c channel.h

sound: Retire unused CHN_N_* defines

These still haven't been implemented by the original author, and there
doesn't seem to be much use for them anyway.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56239

(cherry picked from commit 2d84c8a3d3d673081c803f8aadc4eae8f6a221d8)
DeltaFile
+1-25sys/dev/sound/pcm/channel.c
+2-5sys/dev/sound/pcm/channel.h
+3-302 files

FreeBSD/src 8b87f38sys/dev/sound/pcm feeder.c feeder.h

sound: Mark some snd_fmt* functions as static

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj
Differential Revision:  https://reviews.freebsd.org/D56238

(cherry picked from commit f369d4148b93410fe7f8ea989f66790403d23ce8)
DeltaFile
+3-3sys/dev/sound/pcm/feeder.c
+0-3sys/dev/sound/pcm/feeder.h
+3-62 files

FreeBSD/src 3bc0114sys/sys abi_types.h

sys/abi_types.h: time32_t is 64-bit on non-x86 architectures

As long as 'sys/compat/freebsd32/freebsd32.h' is used unconditionally on
all platforms (in 'kern_umtx.c' at least), the rule of thumb is to
ensure that 'struct foo32' on a 32-bit arch is type-compatible with
'struct foo' on the same arch.  In practice, this is very simple to
achieve: All 'foo32' types should be compatible with 'foo' on 32-bit
architectures, which is what we are supposed to do already for compat'
structures by design.  The recently introduced 'freebsd32_uint64_t' type
typically supports that.

This change fixes commit 87632ddf67b0 ("openzfs sys/types32.h: use
abi_compat.h for time32_t") which was defining 'time32_t' to 'in32_t'
for all 32-bit architectures, which is wrong but on i386.  By luck, this
did not change the size of whole 'struct ffclock_estimate32' (whose size
is compile-time asserted) because 'struct bintime32''s one would stay
the same, as even if its field 'sec' was incorrectly sized after that
commit, the 'frac' one is 64-bit and 64-bit aligned on all non-x86
architectures so its offset in 'struct bintime32' would stay the same.

    [7 lines not shown]
DeltaFile
+1-5sys/sys/abi_types.h
+1-51 files

FreeBSD/src 4391323sys/net iflib.c

iflib: drain admin task and fix teardown order on register failure

When IFDI_ATTACH_POST() fails (or netmap attach fails), iflib tears down with
ether_ifdetach(), taskqueue_free(ifc_tq), and IFDI_DETACH(). CTX_LOCK is still
held after ether_ifattach. ether_ifdetach() and taskqueue_drain(admin) must not
run under CTX_LOCK.

Teardown ordering (match iflib_device_deregister):

- Free the per-interface admin taskqueue after IFDI_DETACH / IFDI_QUEUES_FREE, not before.
- Drop IFNET_WLOCK() across IFDI_DETACH / IFDI_QUEUES_FREE so driver detach can sleep in
LinuxKPI workqueue drain, then retake IFNET_WLOCK() before iflib_free_intr_mem and fail_unlock.

MFC after:      2 weeks
Reviewed by:    gallatin, kgalazka, #iflib
Differential Revision: https://reviews.freebsd.org/D56316
DeltaFile
+18-1sys/net/iflib.c
+18-11 files

FreeBSD/src d2b96f6sys/net iflib.c

iflib: Fix panic observed while doing sysctl -a with if_bnxt unload

Observed below kernel panic calltrace while performing sysctl -a
operation while unloading the if_bnxt driver,

Fatal trap 9: general protection fault while in kernel mode

KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe02a7569940
vpanic() at vpanic+0x136/frame 0xfffffe02a7569a70
panic() at panic+0x43/frame 0xfffffe02a7569ad0
trap_fatal() at trap_fatal+0x68/frame 0xfffffe02a7569af0
calltrap() at calltrap+0x8/frame 0xfffffe02a7569af0

trap 0x9, rip = 0xffffffff80c0b411, rsp = 0xfffffe02a7569bc0, rbp = 0xfffffe02a7569be0 ---
sysctl_handle_counter_u64() at sysctl_handle_counter_u64+0x61/frame 0xfffffe02a7569be0
sysctl_root_handler_locked() at sysctl_root_handler_locked+0x9c/frame 0xfffffe02a7569c30
sysctl_root() at sysctl_root+0x22f/frame 0xfffffe02a7569cb0
userland_sysctl() at userland_sysctl+0x196/frame 0xfffffe02a7569d50

    [22 lines not shown]
DeltaFile
+24-21sys/net/iflib.c
+24-211 files

FreeBSD/src 54f5d20share/man/man4 ciss.4

ciss.4: List all devices supported by ciss(4)

PR:             285744
Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56285
DeltaFile
+45-1share/man/man4/ciss.4
+45-11 files

FreeBSD/src c2a9617stand/efi/loader main.c, stand/man loader.efi.8

loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS'

Both (U)EFI and BIOS are completely different things, be precise and don't use
them together.

Reviewed by:    imp
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56329

(cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223)
DeltaFile
+6-6stand/man/loader.efi.8
+3-3usr.sbin/efibootmgr/efibootmgr.8
+2-2stand/efi/loader/main.c
+11-113 files

FreeBSD/src 5524317stand/efi/loader main.c, stand/man loader.efi.8

loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS'

Both (U)EFI and BIOS are completely different things, be precise and don't use
them together.

Reviewed by:    imp
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56329

(cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223)
DeltaFile
+6-6stand/man/loader.efi.8
+3-3usr.sbin/efibootmgr/efibootmgr.8
+2-2stand/efi/loader/main.c
+11-113 files

FreeBSD/src 80a97bcstand/efi/loader main.c, stand/man loader.efi.8

loader.efi.8/efibootmgr.8: Don't use contradicting term 'EFI BIOS'

Both (U)EFI and BIOS are completely different things, be precise and don't use
them together.

Reviewed by:    imp
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D56329

(cherry picked from commit 4f684e929de1275b1099b17b2a2cff0d3f4af223)
DeltaFile
+6-6stand/man/loader.efi.8
+4-4stand/efi/loader/main.c
+2-2usr.sbin/efibootmgr/efibootmgr.8
+12-123 files

FreeBSD/src 43d6327sys/x86/include cputypes.h

x86: Mark LOCORE to prevent build failure on i386 platform

PR:     294468
Reported by:    dan.kotowski at a9development.com
Tested by:      dan.kotowski at a9development.com
Discussed with: kib
Fixes:  9289df1949cd ("x86: Add zen identifier helper function")
MFC after:      2 weeks
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D56377
DeltaFile
+2-0sys/x86/include/cputypes.h
+2-01 files

FreeBSD/src 692a289sys/fs/nfs nfs_commonsubs.c nfsid.h, sys/nfs nfs_diskless.c

nfs_diskless: Fix handling of nfsuserd case for NFSv4

Commit 8b9775912cbc added support for an NFSv4 mounted
root file system, but only if the NFSv4 configuration
used id numbers in the strings.

This patch adds support for the case where the NFSv4
configuration uses name<-->id mappings via nfsuserd(8)
by priming the mapping cache with just enough entries
so that it works until the nfsuserd(8) is running.
They are listed in nfs_prime_userd[] in
sys/fs/nfs/nfs_commonsubs.c.

The entries in nfs_prime_userd[] are also wired into
the kernel's cache for name<-->id mappings when nfsuserd(8)
starts up.  This is necessary, since an upcall to the
nfsuserd(8) daemon for a mapping when looking up the
path to the passwd/group database files (/etc) will
hang the system, due to a vnode lock being held on

    [13 lines not shown]
DeltaFile
+66-10sys/fs/nfs/nfs_commonsubs.c
+44-0sys/nfs/nfs_diskless.c
+13-0sys/fs/nfs/nfsid.h
+1-0sys/fs/nfs/nfsrvstate.h
+124-104 files

FreeBSD/src 8de7c76contrib/ncurses configure aclocal.m4, contrib/ncurses/doc/html ncurses-intro.html

ncurses: merge update to ncurses 6.6

6.6 is ABI compatible with 6.5 (tested with abidiff)
Remove html documentation to ease updates

MFC After:      1 month

(cherry picked from commit 68ad2b0d7af2a3571c4abac9afa712f9b09b721c)
DeltaFile
+15,906-15,332contrib/ncurses/configure
+2,456-1,968contrib/ncurses/misc/terminfo.src
+0-3,390contrib/ncurses/doc/html/ncurses-intro.html
+0-2,282contrib/ncurses/ncurses/win32con/win_driver.c
+853-527contrib/ncurses/aclocal.m4
+639-518contrib/ncurses/announce.html.in
+19,854-24,017411 files not shown
+40,960-36,365417 files

FreeBSD/src 2b95477sys/dev/nvme nvme_ctrlr.c

nvme: Use passed in max_pages.

Noticed by: jhb
Sponsored by: Netflix
DeltaFile
+1-1sys/dev/nvme/nvme_ctrlr.c
+1-11 files

FreeBSD/src 81b2055bin/sh histedit.c

sh: Increase default history size to POSIX mandated minimum of 128

The default history size in bin/sh is currently 100 however POSIX.1-2024
mandates that a default greater than or equal to 128 shall be used,
therefore this increases the default history size in /bin/sh to 128.

POSIX standards reference:
https://pubs.opengroup.org/onlinepubs/9799919799/utilities/sh.html#tag_20_110_08

MFC after:      3 days
Reviewed by:    emaste, jilles, jlduran, ziaee
Signed-off-by:  Kristofer Peterson <kris at tranception.com>
Closes:         https://github.com/freebsd/freebsd-src/pull/2093
DeltaFile
+1-1bin/sh/histedit.c
+1-11 files

FreeBSD/src a3c4573sys/compat/linux linux_stats.c

linux: add sysfs filetype support for Linux statfs()

Added MAGIC number below and map to linsysfs in bsd_to_linux_ftype()

This maps:
  - `linsysfs` -> `LINUX_SYSFS_MAGIC` (`0x62656572`)

Signed-off-by: YAO, Xin <mr.yaoxin at outlook.com>

Reviewed by:    emaste
Pull request:   https://github.com/freebsd/freebsd-src/pull/2119
DeltaFile
+16-14sys/compat/linux/linux_stats.c
+16-141 files

FreeBSD/src 777767f. fw.c reg.h

rtw89: update Realtek's rtw89 driver

This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
028ef9c96e96197026887c0f092424679298aae8 ( tag: v7.0 ).

Sponsored by:   The FreeBSD Foundation
DeltaFile
+1,097-90fw.c
+924-10reg.h
+650-46mac_be.c
+543-20phy_be.c
+446-73fw.h
+384-56phy.c
+4,044-29538 files not shown
+5,680-54044 files