FreeBSD/src 5bf7849 — sys/kern uipc_socket.c

socket: Remove the divert(4) socket compat shim again

Python in the ports tree now handles PF_DIVERT sockets properly; see
ports commit 4d84480d7a68.  I no longer have any specific reason to keep
the shim and Gleb wants to remove it, so, let's remove it.

This reverts commit cb7009867ae6b33aa39cb6cb1453b69073144b44.

Requested by:   glebius
Reviewed by:    glebius
Differential Revision:  https://reviews.freebsd.org/D60390
DeltaFile
+0-7sys/kern/uipc_socket.c
+0-71 files

FreeBSD/src 6b1d5fe — sys/netipsec key.c

netipsec: Fix V_spd_size updates

key_unregister_ifnet() was erroneously decrementing the size of the
global security policy database, V_sptree, but it doesn't modify that
database.  V_sptree_ifnet is for policies attached to if_ipsec
interfaces.  Note also that key_register_ifnet() was not incrementing
the counter.

Move the definition of V_spd_size up to the rest of the SPD definitions.
Its inclusion among the SPD cache definitions was confusing to me.

Reviewed by:    ae
Reported by:    Stephan de Wit and Cedrik Pischem from OPNsense
Sponsored by:   OPNsense
Sponsored by:   Klara, Inc.
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D60418
DeltaFile
+4-3sys/netipsec/key.c
+4-31 files

FreeBSD/src 9543276 — sys/dev/usb usbdevs

usbdevs: Add ublox LARA-L6

The device has multiple PIDs as it supports different USB profiles.

Approved by:            adrian
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D60482
DeltaFile
+6-0sys/dev/usb/usbdevs
+6-01 files

FreeBSD/src 398b29f — usr.sbin/sysconf sysconf.c sysconf.8, usr.sbin/sysconf/tests sysconf_test.sh

sysconf: add a poudriere target

poudriere.conf is handed to sysrc(8), including the jail, tree, and
set overlays poudriere(8) consults.  make, src, and src-env are
sub-targets over the matching make(1) files under poudriere.d.  -l
and -L list one path per line; -L includes overlays that do not exist
yet.  A bare -- ends the sub-target so the next word is a variable.
Bump sysconf(8) to 2.2.

Reviewed by:    fuz, kfv, bcr
Differential Revision:  https://reviews.freebsd.org/D59943
DeltaFile
+677-0usr.sbin/sysconf/sysconf_poudriere.c
+364-0usr.sbin/sysconf/sysconf-poudriere.8
+201-0usr.sbin/sysconf/tests/sysconf_test.sh
+51-19usr.sbin/sysconf/sysconf-targets.c
+56-1usr.sbin/sysconf/sysconf.8
+13-5usr.sbin/sysconf/sysconf.c
+1,362-253 files not shown
+1,378-289 files

FreeBSD/src 439eb9c — usr.sbin/sysconf Makefile sysconf_priv.h, usr.sbin/sysconf/tests sysconf_test.sh

sysconf: accept a unique prefix of a target keyword

Exact match still wins.  An ambiguous prefix is rejected with the
list of matches.  Move keyword selection and the rc pass-through
into sysconf-targets.c.  Bump sysconf(8) to 2.1.

Reviewed by:    kfv
Differential Revision:  https://reviews.freebsd.org/D59924
DeltaFile
+179-0usr.sbin/sysconf/sysconf-targets.c
+7-84usr.sbin/sysconf/sysconf.c
+49-0usr.sbin/sysconf/tests/sysconf_test.sh
+20-2usr.sbin/sysconf/sysconf.8
+6-1usr.sbin/sysconf/sysconf_priv.h
+1-0usr.sbin/sysconf/Makefile
+262-876 files

FreeBSD/src 9c8be65 — usr.sbin/ctld nvmf.cc

ctld: Fix namespace IDs for exported NVMe namespaces

NVMe namespace IDs are 1-based, but CTL LUN IDs are 0-based.  The
in-kernel NVMe ctl(4) target accounts for this by adding one to the
LUN ID to compute a namespace ID.  ctld was attempting to handle this
by translating namespace IDs from config files to internal LUN IDs,
but it did this incorrectly resulting in the namespace configured for
as namespace N actually showing up as namespace N + 1.

Fixes:          66b5296f1b29 ("ctld: Add support for NVMe over Fabrics")
Sponsored by:   Chelsio Communications
DeltaFile
+2-2usr.sbin/ctld/nvmf.cc
+2-21 files

FreeBSD/src 3b0eaca — sys/dev/nvmf/host nvmf_ns.c

nvmf: Limit namespace character device I/O size

Set si_iosize_max for namespace character devices matching the fix
from commit 125ec0e30785bb0cbca7aa6c0b1a34b75e53078d.

Sponsored by:   Chelsio Communications
DeltaFile
+1-0sys/dev/nvmf/host/nvmf_ns.c
+1-01 files

FreeBSD/src 62f54be — tests/sys/kern timerfd.c, tests/sys/kqueue kqueue_fork.c

tests/sys/kern: Skip some timer tests if ncpu == 1

PR:             299223
MFC after:      1 week
DeltaFile
+3-0tests/sys/kqueue/kqueue_fork.c
+3-0tests/sys/kern/timerfd.c
+6-02 files

FreeBSD/src 23be969 — lib/libsysdecode syscallnames.c linux.c

libsysdecode: Fix some cpp conditionals

While testing the bare values happens to work, the intent is to test
for their definition.

Reviewed by:    emaste
Fixes:          9a16bd169e8c ("libsysdecode: support errno and syscalls for arm64 Linux")
Fixes:          b69ae1a34c6f ("libsysdecode: Add preliminary support for decoding Linux syscalls")
Differential Revision:  https://reviews.freebsd.org/D60415
DeltaFile
+2-2lib/libsysdecode/linux.c
+1-1lib/libsysdecode/syscallnames.c
+3-32 files

FreeBSD/src b40ba68 — usr.sbin/bhyve pci_passthru.c

bhyve: Remove unneeded include of <machine/iodev.h>

This is a kernel-only header for /dev/io.  The user-facing header
defining the ioctl commands is <dev/io/iodev.h>.

Reviewed by:    bnovkov, imp
Differential Revision:  https://reviews.freebsd.org/D60399
DeltaFile
+0-1usr.sbin/bhyve/pci_passthru.c
+0-11 files

FreeBSD/src 228dd4e — sys/modules Makefile

sys: Enable pcfclock.ko on all architectures

This driver has been in sys/conf/NOTES (and thus enabled in LINT
builds on all architectures) since the file was renamed from the i386
LINT and there is no i386-specific code in the driver.

Reviewed by:    imp, markj
Differential Revision:  https://reviews.freebsd.org/D60177
DeltaFile
+1-2sys/modules/Makefile
+1-21 files

FreeBSD/src cb55ad8 — sys/kern kern_sendfile.c

sendfile: Include opt_inet*.h

Pointy hat to:  jhb
Reported by:    markj
Fixes:          1d8c5f8e0255 ("sendfile: Fix build for kernels without INET or INET6")
DeltaFile
+2-0sys/kern/kern_sendfile.c
+2-01 files

FreeBSD/src 911fceb — sys/dev/hwpmc hwpmc_mod.c

hwpmc: return errors from PMC_OP_PMCGETMSR

pcd_get_msr() returns a positive errno, but only a negative value was
treated as a failure, so errors were reported as success.

Signed-off-by:  Osvaldo Janeri Filho <ojanerif at amd.com>
Reviewed by:    mhorne
MFC after:      3 days
Sponsored by:   AMD
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2461
DeltaFile
+1-1sys/dev/hwpmc/hwpmc_mod.c
+1-11 files

FreeBSD/src ca9c571 — lib/libpmc libpmc_pmu_util.c

libpmc: fix the family check for the AMD DF event encoding

The check compares cpu_family with decimal 19 instead of 0x19, so
Families 17h and 19h get the Family 1Ah DF encoding.

Signed-off-by:  Osvaldo Janeri Filho <ojanerif at amd.com>
Reviewed by:    mhorne
Fixes:          00c0a1f0bf6c ("hwpmc: Fix PMC flags for AMD Zen cores")
MFC after:      3 days
Sponsored by:   AMD
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2461
DeltaFile
+1-1lib/libpmc/libpmc_pmu_util.c
+1-11 files

FreeBSD/src 12e2507 — sys/net/route fib_algo.c

route/fib_algo: Fix FIB_ALGO without ROUTE_MPATH option

The ROUTE_MPATH compile option has been removed from CURRENT
branch. Therefore, use the ROUTE_MPATH macro for nhgrp headers.

PR:     299210
Fixes:  891bda143f6b ("route/fib_algo: Fix nexthop index ...")
Differential Revision:  https://reviews.freebsd.org/D59552

(cherry picked from commit 63343822430453f4add20bcbfa134c99132361df)
DeltaFile
+2-1sys/net/route/fib_algo.c
+2-11 files

FreeBSD/src 20381bc — sys/dev/sound/pcm sound.h

sound: Remove obsolete comment from sound.h

MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
DeltaFile
+0-6sys/dev/sound/pcm/sound.h
+0-61 files

FreeBSD/src d39b12e — sys/kern kern_sysctl.c

sysctl: don't loop when EAGAIN is returned

When userland_sysctl() experiences EAGAIN, don't loop internally but
leave retrying to the caller.
Looping was a problem in case of using tcpsso(8) to switch a TCP stack
where the acceptance check of the new TCP stack results in EAGAIN.

Reviewed by:            kib, glebius
MFC after:              1 week
MFC to:                 stable/15
Sponsored by:           Netflix, Inc.
Differential Revision:  https://reviews.freebsd.org/D60444
DeltaFile
+3-8sys/kern/kern_sysctl.c
+3-81 files

FreeBSD/src f3b4732 — sys/dev/acpica/Osd OsdSchedule.c

acpi: Tasks: Document why 'acpi_task_count' is accessed unsynchronized

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit e89c3ac5df58a9eae9d01f325ffc9b34258c4b29)
DeltaFile
+1-0sys/dev/acpica/Osd/OsdSchedule.c
+1-01 files

FreeBSD/src 17498d6 — sys/dev/acpica/Osd OsdSchedule.c

acpi: Tasks: Make OsdSchedule.c whitespace clean

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit f0825f75bab8ae7cb8e0ba717f76110b6f1862f3)
DeltaFile
+1-1sys/dev/acpica/Osd/OsdSchedule.c
+1-11 files

FreeBSD/src 61685a3 — sys/dev/acpica/Osd OsdSchedule.c

acpi: Tasks: Remove unnecessary includes

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 2165accd3748c0acb6e82756d71a46509b220fd8)
DeltaFile
+0-2sys/dev/acpica/Osd/OsdSchedule.c
+0-21 files

FreeBSD/src 35801aa — sys/amd64/amd64 fpu.c pmap.c, sys/amd64/vmm vmm.c

ifuncs: Include <machine/ifunc.h> instead of <x86/ifunc.h>

All architectures have been providing an 'ifunc.h' header with
DEFINE_IFUNC() et alter working both in kernel and userland since commit
cf41d1113377 ("riscv: implement kernel ifunc resolution"), and separate
<i386/ifunc.h> and <amd64/ifunc.h> headers were introduced in commit
2b1db07bec92 ("x86: add machine/ifunc.h"), so stop including
<x86/ifunc.h> directly and use the common <machine/ifunc.h> idiom.

While here, re-order includes in the blocks featuring <x86/ifunc.h>,
which requires fixing <x86/apicvar.h> so that it can be included before
<machine/intr_machdep.h>.

Reviewed by:    kib
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60194

(cherry picked from commit a2fbd988638e94b61cc78449e893f2c02d43dec0)
DeltaFile
+6-6sys/amd64/vmm/vmm.c
+5-5sys/amd64/amd64/machdep.c
+4-4sys/amd64/amd64/pmap.c
+2-2sys/x86/x86/cpu_machdep.c
+2-2sys/i386/i386/npx.c
+2-2sys/amd64/amd64/fpu.c
+21-218 files not shown
+31-2814 files

FreeBSD/src cc2e969 — sys/dev/random rdseed.c ivy.c

random: Remove unused include of ifuncs

No functional change (intended).

Reviewed by:    markj, emaste
Fixes:          3a12982962ce ("random: add RDSEED as a provably unique entropy source")
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60193

(cherry picked from commit 18ce3f50f630f64d5e9e898a3c06e9ed6e5a63a5)
DeltaFile
+0-1sys/dev/random/rdseed.c
+0-1sys/dev/random/ivy.c
+0-22 files

FreeBSD/src b9a11a3 — sys/conf NOTES

NOTES: Multiple schedulers can be compiled in at once

Mention that ULE is the default scheduler when multiple ones are
compiled in and how the tunable 'kern.sched.name' can be used to select
another one.

While here, regroup SCHED_ULE and SCHED_4BSD, as they control if the
respective scheduler instances are compiled in, putting SCHED_STATS
aside.

Reviewed by:    mchoo
Fixes:          75a66a92c92f ("- Add an option to compile in SCHED_STATS. ...")
Fixes:          1322760fd127 ("sys: enable both SCHED_ULE and SCHED_4BSD for some configs")
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60014

(cherry picked from commit 754d2c69f3589cdd0bc4649d9e85ecd59935d9d3)
DeltaFile
+10-7sys/conf/NOTES
+10-71 files

FreeBSD/src 14be203 — sys/arm/include ifunc.h, sys/arm64/include ifunc.h

ifuncs: Have DEFINE_*IFUNC() macros expand the passed name

While here, make each <machine/ifunc.h> header include <sys/types.h> so
that it can be included standalone.

Reviewed by:    kib
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60167

(cherry picked from commit ab9fcc5a553a25804b9535190e914e3ba0e746cf)
DeltaFile
+12-7sys/riscv/include/ifunc.h
+11-7sys/x86/include/ifunc.h
+11-7sys/arm/include/ifunc.h
+10-6sys/arm64/include/ifunc.h
+8-6sys/powerpc/include/ifunc.h
+52-335 files

FreeBSD/src 892cd94 — sys/conf NOTES

NOTES: SMP: Move PREEMPTION out of the debugging options section

It has been activated by default for more than 20 years.

Reviewed by:    mchoo, srcmgr (imp)
Fixes:          444ba945136b ("Switch the default scheduler to 4BSD...")
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60012

(cherry picked from commit 61ce73643f22f6f8273701eb978faa246bbca27d)
DeltaFile
+5-4sys/conf/NOTES
+5-41 files

FreeBSD/src 65cd5ed — sys/conf NOTES, sys/x86/conf NOTES

NOTES: IPI_PREEMPTION: Fix documentation, applies to all architectures

Move its description into 'sys/conf/NOTES' and update it to match reality.

Reviewed by:    scheduler (mchoo)
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60013

(cherry picked from commit d972d832f580c307cdfd87d563a382f40877dd10)
DeltaFile
+0-7sys/x86/conf/NOTES
+6-0sys/conf/NOTES
+6-72 files

FreeBSD/src 91a3b75 — sys/i386/conf NOTES

i386 NOTES: Remove IPI_PREEMPTION remnant after move to x86 NOTES

Fixes:          1f38677ba40b ("x86 NOTES: Move shared options from amd/i386 NOTES to x86 NOTES")
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60011

(cherry picked from commit 7ce0ede913801c0e74f6d90beee2fc4eb5c6ef2f)
DeltaFile
+0-3sys/i386/conf/NOTES
+0-31 files

FreeBSD/src 5ebf596 — sys/conf options

sys/conf/options: remove improper full stops

Only keep them when used in a sentence.

Reviewed by: vexeduxr
Signed-off-by: Quentin Thébault <quentin.thebault at defenso.fr>
Sponsored by: Defenso
Closes: https://github.com/freebsd/freebsd-src/pull/2004
(cherry picked from commit 87b2c0168d9deb79aacf3f13dbd3201054371b2b)
DeltaFile
+17-17sys/conf/options
+17-171 files

FreeBSD/src 9b74c57 — sys/conf options

sched: options: Regroup scheduler-related kernel options

This makes it easier to have a full list of them at a glance, and makes
for a natural place to add new ones.

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60010

(cherry picked from commit 406d6658ff821fc43eb0b2b10df4ab09eb2e2e16)
DeltaFile
+8-6sys/conf/options
+8-61 files

FreeBSD/src fbf789a — sys/dev/usb/net usb_ethernet.c, sys/net80211 ieee80211_freebsd.c

SYSCTL(9): Retire SYSCTL_NODE_CHILDREN()

It does not provide value over the pre-existing SYSCTL_STATIC_CHILDREN()
macro, which is widely used in the tree, whereas SYSCTL_NODE_CHILDREN()
is not.

Reviewed by:    markj
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D60009

(cherry picked from commit 4672ad1f16092c146261b4de485ec5eb5e8d127b)
DeltaFile
+0-3sys/sys/sysctl.h
+1-1sys/net80211/ieee80211_freebsd.c
+1-1sys/dev/usb/net/usb_ethernet.c
+2-53 files