FreeBSD/src 27e2926usr.sbin/gstat gstat.c

gstat: Sanitize code which gcc did not like.
DeltaFile
+8-6usr.sbin/gstat/gstat.c
+8-61 files

FreeBSD/src 72acd17sys/dev/sound sndstat.c

sound: Use sx_assert instead of KASSERT(sx_xlocked())

It's redundant.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+1-2sys/dev/sound/sndstat.c
+1-21 files

FreeBSD/src d05d60elibexec/rc/rc.d lockd statd

rc.d: fix lockd and statd flags processing after scvj

The documented flags are named differently than the script name, this
requires special handling of the flags.

The Service Jails feature requires the handling of the variable to be
differently than it was initially. The change back then did not work,
which resulted in the flags to be ignored.

This commit fixes the issue in head. This affects 15.0 and 15.1 too.

PR:             296233
Reported by:    Robert Blayzor <rblayzor at inoc.net>
Tested by:      Robert Blayzor <rblayzor at inoc.net>
Fixes:          f99f0ee14e3af81c2 - rc.d: add a service jails config to all base system services
MFC after:      1 month
MFC to: 15-stable
DeltaFile
+2-1libexec/rc/rc.d/lockd
+2-1libexec/rc/rc.d/statd
+4-22 files

FreeBSD/src 968e748sys/dev/sound dummy.c

snd_dummy: advance pointers for both channels

Previously only the play pointer advanced each tick; the record channel
refilled the whole buffer with silence and left the DMA pointer at 0.
Advance the record pointer by one block per tick and fill that block
with silence, so the DMA pointer changes and mmap kqueue consumers can
track progress.

MFC after:      1 week
Reviewed by:    christos
Differential Revision:  https://reviews.freebsd.org/D57834
DeltaFile
+3-4sys/dev/sound/dummy.c
+3-41 files

FreeBSD/src c263dd4usr.sbin/gstat gstat.c gstat.8

gstat:  Refactor and polish.  Added option for {kB/MB/GB} per second.
DeltaFile
+416-358usr.sbin/gstat/gstat.c
+23-1usr.sbin/gstat/gstat.8
+439-3592 files

FreeBSD/src 26ffa3dsbin/nvmecontrol nvmecontrol.8

nvmecontrol(8): Fix typos in the manual page

- s/givne/given/
- s/assocation/association/
- s/reporing/reporting/

MFC after:      3 days
DeltaFile
+4-4sbin/nvmecontrol/nvmecontrol.8
+4-41 files

FreeBSD/src e233937sbin/ggate/ggated ggated.8

ggated(8): Fix two typos in the manual page

- s/colunm/column/
- s/operaions/operations/

MFC after:      3 days
DeltaFile
+2-2sbin/ggate/ggated/ggated.8
+2-21 files

FreeBSD/src be8c82bsbin/natd natd.8

natd(8): Fix a typo in the manual page

- s/appplications/applications/

MFC after:      3 days
DeltaFile
+1-1sbin/natd/natd.8
+1-11 files

FreeBSD/src 050962asbin/devd devd.conf.5

devd.conf(5): Fix a typo in the manual page

- s/betwen/between/

MFC after:      3 days
DeltaFile
+1-1sbin/devd/devd.conf.5
+1-11 files

FreeBSD/src 1e36fffsbin/ipfw ipfw.8

ipfw(8): Fix a typo in the manual page

- s/exept/except/

MFC after:      3 days
DeltaFile
+3-3sbin/ipfw/ipfw.8
+3-31 files

FreeBSD/src 0223ae3sbin/ipf/ippool ippool.5 ippool.8

ipfilter(4): Fix a couple of typos in the manual pages

- s/heirarchical/hierarchical/
- s/itnerface/interface/
- s/conjuction/conjunction/

MFC after:      3 days
DeltaFile
+2-2sbin/ipf/ippool/ippool.5
+1-1sbin/ipf/ippool/ippool.8
+3-32 files

FreeBSD/src c943026sbin/bectl bectl.8

bectl(8): Fix a typo in the manual page

- s/envionments/environments/

MFC after:      3 days
DeltaFile
+1-1sbin/bectl/bectl.8
+1-11 files

FreeBSD/src dd2127bbin/ps ps.1

ps(1): Fix a few typos in the manual page

- s/occurence/occurrence/
- s/occurences/occurrences/
- s/ouput/output/

MFC after:      3 days
DeltaFile
+4-4bin/ps/ps.1
+4-41 files

FreeBSD/src 9707d9ftests/sys/sound mmap.c

sound tests: Add PROT_EXEC rejection test

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj, kib
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/30

(cherry picked from commit 730eaf466493315c1d1164eb6b59b14766f49322)
(cherry picked from commit f6b3bd1f3384d262b893af123f3fc2df21c5b9ee)
DeltaFile
+28-0tests/sys/sound/mmap.c
+28-01 files

FreeBSD/src 0f4aac7sys/dev/sound/pcm dsp.c

sound: Handle CHN_F_MMAP_INVALID after cdev_pager_allocate()

We drop the channel lock to execute cdev_pager_allocate(). By the time
we pick up the lock again, CHN_F_MMAP_INVALID might be set, so make sure
we fail and free the vm handle.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj, kib
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/30

(cherry picked from commit 47efa8128268c35ac8f0a552d7a7ce43cd1c5925)
DeltaFile
+17-3sys/dev/sound/pcm/dsp.c
+17-31 files

FreeBSD/src f3d461csys/dev/sound/pcm dsp.c

sound: Re-arrange a calculation in dsp_mmap_single()

This makes it easier to read. No functional change intended.

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj, kib
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/30

(cherry picked from commit 0c8147ae3bc1c7db95098fcc92fc2e86111f59d3)
DeltaFile
+1-1sys/dev/sound/pcm/dsp.c
+1-11 files

FreeBSD/src 2c21445sys/dev/sound/pcm dsp.c

sound: Use and lock only the appropriate channel in dsp_mmap_single()

dsp_mmap_single() mmaps one of the channels associated with a
dsp_cdevpriv, based on the nprot argument. PROT_WRITE and
PROT_READ|PROT_WRITE select the output channel for mmaping, and
PROT_READ the input one. Instead of locking and modifying the flags of
all dsp_cdevpriv channels, do it only for the one we actually use.

While here, retire the now unused dsp_lock_chans() and
dsp_unlock_chans().

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    markj, kib
Pull-Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/30

(cherry picked from commit bbb37ddf3669f77d78446b9f1e37f58c63dc0a1c)
DeltaFile
+17-40sys/dev/sound/pcm/dsp.c
+17-401 files

FreeBSD/src e9df33ashare/man/man4 pcm.4, sys/dev/sound/pcm feeder_chain.c sound.c

sound: Retire SD_F_VPC and related settings

VPC is enabled by default, and the only way to turn it off is through a
loader hint. That being said, there is no benefit to turning it off in
the first place, because VPC provides more fine-grained volume control,
as well as access to the SNDCTL_DSP_[SET|GET][REC|PLAY]VOL ioctls and
dsp_ioctl_channel().

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit f70a687bb071cdee60dc7420d75fa1dd122af51a)
DeltaFile
+1-21share/man/man4/pcm.4
+2-2sys/dev/sound/pcm/feeder_chain.c
+0-4sys/dev/sound/pcm/sound.c
+2-2sys/dev/sound/pcm/sound.h
+1-1sys/dev/sound/pcm/dsp.c
+6-305 files

FreeBSD/src d0b3ecdsys/contrib/openzfs/cmd/zstream zstream_dump.c zstream_recompress.c, sys/contrib/openzfs/tests/unit test_zap.c

zfs: merge openzfs/zfs at 37af89948

Notable upstream pull request merges:
 #18509 f16b3744d zstream: refactor common functions
 #18573 -multiple Persist z_seq across znode eviction
 s18611 eb0c674c2 zfs_ioctl: fix EBUSY race between quota queries and mount
 #18637 77e64d86e Fix self-deadlock when setting the "allocating"/"path"
                  vdev property
 #18645 e3082b923 freebsd: set mnt_time on the rootfs at mountroot time
 #18652 50d012b2a zbookmark_compare: handle "marker" bookmarks with negative
                  levels
 #18664 520eeeaa6 Improve performance of "zpool offline" for log devices
 #18668 6b8f79877 Avoid more abd_t allocations in RAIDZ/dRAID
 #18669 99ab859c3 Optimize metaslab_set_selected_txg()
 #18673 97b9ba7a9 delegate: add 'send:encrypted' permission
 #18687 2ea519c2a Avoid lookup overhead for nonexistent xattr directories
 #18688 87593ea2b Fix handling of _PC_HAS_HIDDENSYSTEM for FreeBSD
 #18693 0483a8e0c Clean up embedded slog metaslab across txgs
 #18695 41311c665 RAIDZ: Optimize single data column writes

    [4 lines not shown]
DeltaFile
+416-656sys/contrib/openzfs/cmd/zstream/zstream_dump.c
+503-9sys/contrib/openzfs/tests/unit/test_zap.c
+222-288sys/contrib/openzfs/cmd/zstream/zstream_recompress.c
+151-312sys/contrib/openzfs/cmd/zstream/zstream_redup.c
+462-0sys/contrib/openzfs/cmd/zstream/zstream_io.c
+127-265sys/contrib/openzfs/cmd/zstream/zstream_decompress.c
+1,881-1,530161 files not shown
+7,283-2,797167 files

FreeBSD/src 8e61d87cddl/contrib/opensolaris/lib/libdtrace/common dt_consume.c

libdtrace: Fix dt_print_sym() not printing symbols in non-oformat mode

dt_print_sym() fills the symbol string via snprintf() in non-oformat
mode but the guarding `dtp->dt_oformat != 0 &&` for the dt_printf()
call causes the symbol is computed but never emitted.

This fixes tests:

- common.profile-n.t_dtrace_contrib.tst_sym_ksh
- common.profile-n.t_dtrace_contrib.tst_func_ksh

Reviewed by:    markj
Fixes:          93f27766a7e1 ("dtrace: Add the 'oformat' libdtrace option")
MFC after:      3 days
Event:          Halifax Hackathon 202606
Location:       Room 208, Computer Science Building, Dalhousie University
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D57895
DeltaFile
+1-1cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+1-11 files

FreeBSD/src a380d07usr.sbin/virtual_oss/virtual_oss virtual_oss.8

virtual_oss.8: Document `/dev/bluetooth/` prefix magic

Without this one could be led to believe they should have an actual
`/dev/bluetooth/xxx` device in devfs from just reading the examples.

Event:          Halifax Hackathon 202606
Reviewed by:    christos
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D57818

(cherry picked from commit 7ecd9afd3b28b9e1a112b5925a8f5902e121b128)
DeltaFile
+22-1usr.sbin/virtual_oss/virtual_oss/virtual_oss.8
+22-11 files

FreeBSD/src a6d7347usr.sbin/virtual_oss/virtual_oss virtual_oss.8

virtual_oss.8: Use `.Pa` macro to refer to devices

Suggested by:   christos
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days

(cherry picked from commit 31461c8bc9c16004feae9cc17b89fd5213a09ae0)
DeltaFile
+16-7usr.sbin/virtual_oss/virtual_oss/virtual_oss.8
+16-71 files

FreeBSD/src 0d4b73alib/libc/gen ctermid.c

ctermid(3): Fix return

Reported by:    bnovkov
Fixes:  dc24f31b67f5 ("ctermid(3): Fix return values section")
Sponsored by:   Klara, Inc.

(cherry picked from commit d7c110658e0b11fbe7a1f5d9f2b340d1985b9742)
DeltaFile
+1-1lib/libc/gen/ctermid.c
+1-11 files

FreeBSD/src 3d6a475lib/libc/gen ctermid.3 ctermid.c

ctermid(3): Fix return values section

ctermid() doesn't, and has never, set errno.

While here, add ctermid_r to the name section and align the parameter
name in the source file.

Reviewed by:    bnovkov
Approved by:    bnovkov
MFC after:      3 days
Obtained from:  https://github.com/apple-oss-distributions/libc
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D57396

(cherry picked from commit dc24f31b67f5b0bac35cb93470f6f2d065d99f6f)
DeltaFile
+15-10lib/libc/gen/ctermid.3
+7-7lib/libc/gen/ctermid.c
+22-172 files

FreeBSD/src e1f80e4lib/libc/gen daemon.3

daemon(3): Note about environment after calling daemon()

While here, fix missing comma typo.

Reviewed by:    0mp, ziaee
Approved by:    0mp, ziaee
MFC after:      3 days
Obtained from:  https://github.com/apple-oss-distributions/libc (partially)
Sponsored by:   Klara, Inc.
Differential Revision:  https://reviews.freebsd.org/D57384

(cherry picked from commit bb14ba3777bb201abd6d4dfbf67d70b81f9c1e97)
DeltaFile
+24-2lib/libc/gen/daemon.3
+24-21 files

FreeBSD/src 2b51bd5share/man/man4 ntsync.4 Makefile

ntsync.4: add the man page

(cherry picked from commit f6b37f47c09903413bd980a5ebd4c7c3e19ba8a5)
DeltaFile
+308-0share/man/man4/ntsync.4
+1-0share/man/man4/Makefile
+309-02 files

FreeBSD/src 4d3cbebsys/netgraph ng_socket.c

ng_socket: plug node reference leak

There is no need to reference node in its constructor, the framework
already granted us a reference.  This extraneous reference was later given
back on socket detach.  However, if node is destroyed before the socket,
the node was leaked.  This leak was harmless until VIMAGE, where
vnet_netgraph_uninit() would cycle through all nodes and shut them down
expecting them to not exist after the shutdown.

Fixes: 19284374970533e1aa04020d4f840e8877ed6266
DeltaFile
+0-2sys/netgraph/ng_socket.c
+0-21 files

FreeBSD/src 41bc52csys/netgraph ng_socket.c

ng_socket: simplify protosw(9) methods

- so_pcb can't be non-NULL in pr_attach.
- so_pcb can't be NULL in all other methods.
- Short circuit data socket attach down to the common attach.
- Short circuit both detach methods down to common one.
- Inline control socket attach.
- Inline control pr_bind.
- Inline data pr_connect.
- Rely on pr_connect_notsupp() for control connect(2).
- Don't use cast on so_pcb, it is void *.

Should be no functional change.
DeltaFile
+25-107sys/netgraph/ng_socket.c
+25-1071 files

FreeBSD/src 830d739stand/efi/include ipxe_download.h

loader.efi: polish SPDX header

Fixes:          afee781523e45198c7be0a19281bcae2c4ab66db
DeltaFile
+1-1stand/efi/include/ipxe_download.h
+1-11 files

FreeBSD/src 1fc6923tools/boot universe.sh

loader: Test GCC cross builds as part of universe.sh

Sicne we have gcc15 in Jenkins, and since people are actually using it,
add cross building tests to universe.sh to avoid build breakage when
hacking on loader.efi (and others). UEFI makes it too easy to mix
pointers and integers since it deals in an odd mix of
EFI_PHYSICAL_ADDRESS and pointers...

Sponsored by:           Netflix
DeltaFile
+10-0tools/boot/universe.sh
+10-01 files