FreeBSD/src 10edaa6sbin/sysctl sysctl.8, share/man/man4 dtrace_mib.4 ifmib.4

dtrace_mib.4: Document the DTrace MIB provider

Reviewed by:    kp
MFC after:      1 week
Obtained from:  60d8dbbef075 netinet: add a probe point for IP, IP6, ICMP, ICMP6, UDP and TCP stats counters
Differential Revision:  https://reviews.freebsd.org/D53709

(cherry picked from commit ef19cae25337e7449f338914650bbfab0fbea99f)
DeltaFile
+123-0share/man/man4/dtrace_mib.4
+4-1share/man/man7/stats.7
+2-1share/man/man4/ifmib.4
+2-1sbin/sysctl/sysctl.8
+2-1share/man/man4/dtrace_ip.4
+2-1share/man/man4/dtrace_tcp.4
+135-58 files not shown
+149-1114 files

FreeBSD/src 457fbd5share/man/man7 d.7

d.7: Document macro variables

MFC after:      1 week

(cherry picked from commit 2b9301a22bc677239d3c0dc783d970f17e7ca294)
DeltaFile
+44-2share/man/man7/d.7
+44-21 files

FreeBSD/src 3ae6829share/man/man9 uio.9 Makefile

uio.9: Document uiomove_fromphys()

Reviewed by:    kib
Discussed with: markj, royger
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54070

(cherry picked from commit 076e44839160f74f96fda83fa81c3acb41b9ebc8)
DeltaFile
+34-11share/man/man9/uio.9
+1-0share/man/man9/Makefile
+35-112 files

FreeBSD/src 544c3eecddl/contrib/opensolaris/cmd/dtrace dtrace.1, lib/libsys intro.2

dtrace: Document the syscall provider

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D56831

(cherry picked from commit 242050278a377f5ca6906545ddc924b60ad8aa58)
DeltaFile
+87-0share/man/man4/dtrace_syscall.4
+3-2lib/libsys/intro.2
+2-1share/man/man4/linux.4
+2-1cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+1-0share/man/man4/Makefile
+95-45 files

FreeBSD/src 9306d04usr.sbin/ctld ctld.cc

ctld: Simplify pidfile rename handling in conf::apply

Explicitly copy the pidfile path from the initial configuration file
to the kernel-derived configuration to avoid having to check if the
old path is empty as a special case in conf::apply().

Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56533
DeltaFile
+10-15usr.sbin/ctld/ctld.cc
+10-151 files

FreeBSD/src f1c5de5usr.sbin/ctld ctld.cc ctld.hh

ctld: Add a dedicated conf method for shutting down

Currently the main loop creates an empty config and applies it to
force a shutdown of all of the existing configuration.  While this is
functional and does avoid duplicating some code, it is also a bit
clunky and requires a special hack in the pidfile path handling
in the conf::apply method.

Instead, use a dedicated conf::shutdown method which tears down the
CTL ports and LUNs and closes the sockets.

Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56532
DeltaFile
+40-16usr.sbin/ctld/ctld.cc
+1-0usr.sbin/ctld/ctld.hh
+41-162 files

FreeBSD/src 63d7b7fusr.sbin/ctld ctld.hh

ctld: Mark a few more isns_* methods in the conf class private

These are only invoked from other methods in the conf class.

Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56531
DeltaFile
+3-3usr.sbin/ctld/ctld.hh
+3-31 files

FreeBSD/src 4f90de0usr.sbin/ctld ctld.cc

ctld: Remove redundant call to conf::isns_schedule_update

This is already called at the end of conf::apply.

Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56530
DeltaFile
+0-2usr.sbin/ctld/ctld.cc
+0-21 files

FreeBSD/src be4f245sys/dev/sound/pcm ac97.c, sys/dev/thunderbolt tb_pcib.c

sys: Use is_pci_device instead of checking device or devclass names

Reviewed by:    bz, imp
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56998
DeltaFile
+2-5sys/dev/thunderbolt/tb_pcib.c
+1-1sys/dev/sound/pcm/ac97.c
+3-62 files

FreeBSD/src 6dc8133sys/arm64/iommu smmu.c, sys/dev/bge if_bge.c

sys: Use is_pci_device instead of direct comparisons to devclasses

Reviewed by:    bz
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56997
DeltaFile
+8-24sys/dev/iommu/busdma_iommu.c
+3-10sys/x86/iommu/intel_drv.c
+3-10sys/dev/bge/if_bge.c
+2-8sys/dev/pci/pci.c
+2-7sys/dev/vnic/thunder_bgx_fdt.c
+2-4sys/arm64/iommu/smmu.c
+20-636 files not shown
+29-8312 files

FreeBSD/src ffcf5e3share/man/man9 pci.9 Makefile, sys/dev/pci pci.c pcivar.h

pci: Add is_pci_device helper function

This returns true if a given device is a PCI device (child of a PCI
bus).

Reviewed by:    bz, kib
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D56996
DeltaFile
+10-1share/man/man9/pci.9
+11-0sys/dev/pci/pci.c
+2-1share/man/man9/Makefile
+1-0sys/dev/pci/pcivar.h
+24-24 files

FreeBSD/src 6a043d0sys/compat/linuxkpi/common/include/linux pci.h

LinuxKPI: Check the devclass of the parent device in dev_is_pci

Reviewed by:    bz
Fixes:          c41d83548b6c ("LinuxKPI: pci.h add more defines and functions")
Sponsored by:   Chelsio Communications
Differential Revision:  https://reviews.freebsd.org/D57066
DeltaFile
+2-2sys/compat/linuxkpi/common/include/linux/pci.h
+2-21 files

FreeBSD/src 701d7belibexec/rc safe_eval.sh, libexec/rc/tests safe_eval_test.sh Makefile

Add test cases for safe_eval.sh

safe_set is the routine that does all the work.

In safe_set; if we replace one=`cmd arg` or two=$(cmd arg) add quotes
around the result eg. one="_cmd arg_"
Also lines containing `` or $() are too likely to result in syntax
errors, so just delete them.

Differential Revision:  https://reviews.freebsd.org/D56795
DeltaFile
+65-0libexec/rc/tests/safe_eval_test.sh
+7-1libexec/rc/tests/Makefile
+6-1libexec/rc/safe_eval.sh
+78-23 files

FreeBSD/src 32f8546sys/dev/qcom_tlmm qcom_tlmm.c

qcom_tlmm: remove annoying debugging

Yes this printf is for local debugging and not required at all on anything.

Pointed out by: andrew@
DeltaFile
+0-1sys/dev/qcom_tlmm/qcom_tlmm.c
+0-11 files

FreeBSD/src c391efcsys/dev/usb usbdevs, sys/dev/usb/serial u3g.c

u3g: Add Telit LM960A18 LTE modem

The patch in the PR failed to apply, so I manually applied the same
changes.

PR:             295231
Submitted by:   Mike Tancsa <mike at sentex.net>
Reviewed by:    emaste

(cherry picked from commit eacf4f50bfb19aa0278db5e8982d73c6d77ca24c)
DeltaFile
+2-0sys/dev/usb/serial/u3g.c
+2-0sys/dev/usb/usbdevs
+4-02 files

FreeBSD/src 22c054csys/sys elf_common.h

elf_common.h: Add SHT_LLVM_ADDRSIG

Reported by:    bz
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/sys/elf_common.h
+1-01 files

FreeBSD/src af5cdcdsys/dev/asmc asmc.c

Revert "asmc: fix asmc_key_dump() page fault on T2 MMIO backend"

This reverts commit 3abc07947c14f5c30e5328d56a2da8dbf8412ebf.

I'm not sure how this built locally for me but obviously failed
in CI; I'll go figure that out with the submitter and come back.
DeltaFile
+5-31sys/dev/asmc/asmc.c
+5-311 files

FreeBSD/src 2509ddeusr.sbin/freebsd-update freebsd-update.sh

freebsd-update: Skip /etc/ssl/cert.pem

We already run `certctl rehash` at the end, there is no point in asking
users upgrading from 15.0 to 15.1 to manually merge the trust store.

MFC after:      3 days
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D57028
DeltaFile
+1-1usr.sbin/freebsd-update/freebsd-update.sh
+1-11 files

FreeBSD/src d705a51lib/libcasper/services/cap_net cap_net.c

cap_net: do not allow new limits to drop keys from the old ones

If the old limit had family/hosts/sockaddr set, the new limit must
have them too. Before, a missing key in the new limit was treated as
"allow any", which let a caller silently extend their limits.

Reported by:    Joshua Rogers of AISLE Research Team
Reviewed by:    markj
MFC after:      1 day
Differential Revision:  https://reviews.freebsd.org/D56991
DeltaFile
+31-0lib/libcasper/services/cap_net/cap_net.c
+31-01 files

FreeBSD/src 7807401sys/netinet tcp_timewait.c

tcp: Fix typo in RFC 6191 sysctl

Fixes:          2af70d7a3849 ("tcp: Make RFC 6191 support configurable")
MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   Modirum MDPay
DeltaFile
+1-1sys/netinet/tcp_timewait.c
+1-11 files

FreeBSD/src 876a173lib/libc/gen nlist.3

nlist.3: Replace a.out(5) Xref with elf(5)

ELF support was added to nlist() in 1997, and a.out support was removed
in 2020.  The man page was not updated for either of these changes.

Fixes: 77909f597881 ("Initial elf nlist support, ...")
Fixes: 86cfa7e70b2b ("nlist: retire long-obsolete aout support")
Sponsored by: The FreeBSD Foundation
DeltaFile
+2-2lib/libc/gen/nlist.3
+2-21 files

FreeBSD/src 2af70d7share/man/man4 tcp.4, sys/netinet tcp_timewait.c tcp_var.h

tcp: Make RFC 6191 support configurable

Add a default-on per-VIMAGE sysctl for RFC 6191 connection recycling.
This makes it possible to merge the change to older branches where it
can be switched off by default to minimize risk.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   Modirum MDPay
Reviewed by:    pouria, marius.h_lden.org, tuexen
Differential Revision:  https://reviews.freebsd.org/D57045
DeltaFile
+37-21sys/netinet/tcp_timewait.c
+10-1share/man/man4/tcp.4
+2-0sys/netinet/tcp_var.h
+49-223 files

FreeBSD/src 3abc079sys/dev/asmc asmc.c

asmc: fix asmc_key_dump() page fault on T2 MMIO backend

asmc_key_dump() used I/O port macros (ASMC_DATAPORT_WRITE/READ,
asmc_command()) unconditionally. On T2 Macs, sc_ioport is NULL
(MMIO backend is used instead), causing a page fault when
ASMC_DEBUG triggers asmc_dumpall() during attach.

Add an MMIO guard at the top of asmc_key_dump(): delegate to
asmc_key_dump_by_index() + asmc_key_read() for MMIO devices,
consistent with the rest of the T2 code paths.

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D56748
DeltaFile
+31-5sys/dev/asmc/asmc.c
+31-51 files

FreeBSD/src f599387crypto/openssh config.h

openssh: Regen config.h to fix i386 SIZEOF_TIME_T

Fixes: 2574974648c6 ("OpenSSH: Update to 10.3p1")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+4-0crypto/openssh/config.h
+4-01 files

FreeBSD/src 0b0e5dacrypto/openssh freebsd-configure.sh

openssh: Fix SIZEOF_TIME_T in freebsd-configure.sh

Sponsored by:   The FreeBSD Foundation
Reviewed by:    jlduran
Differential Revision: https://reviews.freebsd.org/D57053
DeltaFile
+7-0crypto/openssh/freebsd-configure.sh
+7-01 files

FreeBSD/src 1987f9cusr.sbin/bhyve bhyve.8

bhyve.8: Fix formatting of -G's "w" prefix

"w" is a command modifier, not an argument. Use Cm.

Fixes:  2cdff9918e79 byhve: add option to specify IP address for gdb
MFC after:      3 days

(cherry picked from commit 7abddbb3cdeeff0d4d991aee52e92382e847e8a2)
DeltaFile
+4-4usr.sbin/bhyve/bhyve.8
+4-41 files

FreeBSD/src eb4d186usr.sbin/bhyve bhyve.8

bhyve.8: Fix formatting of -G's "w" prefix

"w" is a command modifier, not an argument. Use Cm.

Fixes:  2cdff9918e79 byhve: add option to specify IP address for gdb
MFC after:      3 days

(cherry picked from commit 7abddbb3cdeeff0d4d991aee52e92382e847e8a2)
DeltaFile
+4-4usr.sbin/bhyve/bhyve.8
+4-41 files

FreeBSD/src b5cd337sbin/mount mount.8, share/man/man4 p9fs.4

p9fs.4: Cross-reference mount(8)

MFC after:      3 days

(cherry picked from commit ae0fd05a333b0ab9e6f020b07a0e483e6f85538a)
DeltaFile
+3-2share/man/man4/p9fs.4
+2-1sbin/mount/mount.8
+5-32 files

FreeBSD/src 30f500eshare/man/man4 p9fs.4 Makefile

p9fs.4: MLINK to virtio_p9fs.4

Technically, virtio_p9fs is an emulated device that masquerades
as a p9fs mount, but it does not make sense to have two separate manual
pages.

Reviewed by:    bnovkov, dfr
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D57013
DeltaFile
+3-2share/man/man4/p9fs.4
+1-0share/man/man4/Makefile
+4-22 files

FreeBSD/src 4f6c60csys/contrib/dev/iwlwifi zzz_fw_ports_fwget.sh

iwlwifi: firmware: reduce script to extract fwget information

Due to driver changes it is no longer feasible to extract the full
PCI ID / firmware / card type information in one go as we used to
be able to.
We have already changed the way we extract firmware information for
ports and marked the iwlwififw.4 man page as obsolete.

Reduce the script to simply extarct the fwget(8) information and,
compared to the old times, sort each section so diffs will be easier
to see in the future.  This was particular helpful this time to make
sure we do not lose entries with the change of technique.

We also keep the script in the best perl spirit to do the job but
not to win a price, especially given it seems we have to change
matters every (other) year.

Given we can no longer extract firmware information for the PCI IDs,
we need to "manually" check against the ports that names match.

    [6 lines not shown]
DeltaFile
+82-356sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh
+82-3561 files