FreeBSD/src aa15df4sys/sys queue.h

queue.h: Reorder STAILQ_INSERT_TAIL

The current implementation briefly violates the tail invariant.  This
is not usually an issue, but if an insert is in flight when a panic
occurs, we may then trip the invariant while dumping core.

MFC after:      1 week
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    obiwac, olce, jhb
Differential Revision:  https://reviews.freebsd.org/D55819
DeltaFile
+2-1sys/sys/queue.h
+2-11 files

FreeBSD/src 889d10dsys/dev/nvme nvme_private.h nvme_qpair.c

nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4

The goal this change is to remove the use of the tag and handle
needed by bus_space_[read|write]_4.

Fixes:                  b3d9e5013f3e5 (Don't active memory space)
Requested by:           jhb
Reviewed by:            gallatin, imp, jhb, jrtc27
Differential Revision:  https://reviews.freebsd.org/D55818
DeltaFile
+6-11sys/dev/nvme/nvme_private.h
+3-4sys/dev/nvme/nvme_qpair.c
+0-3sys/dev/nvme/nvme_pci.c
+0-2sys/dev/nvme/nvme_ahci.c
+9-204 files

FreeBSD/src 4e3beefsys/dev/nvme nvme_private.h nvme_ahci.c

nvme: Removed unused 'regs' variable

The private struct has a 'regs' member that's only written to
and otherwise unused. This change removes it.

Fixes:                  b3d9e5013f3e5 (Don't active memory space)
Requested by:           jhb
Reviewed by:            imp, jhb, jrtc27
Differential Revision:  https://reviews.freebsd.org/D55817
DeltaFile
+0-2sys/dev/nvme/nvme_private.h
+0-1sys/dev/nvme/nvme_ahci.c
+0-1sys/dev/nvme/nvme_pci.c
+0-43 files

FreeBSD/src e073105sys/net if.c

ifnet: Remove unreachable code

The ioctls SIOCSIFVNET and SIOCSIFRVNET are for userland only. For
SIOCSIFVNET, if_vmove_loan(), the interface is obtained from current
VNET. For SIOCSIFRVNET, if_vmove_reclaim(), a valid child prison is
held before getting the interface. In both cases the VNET of the
obtained interfaces is stable, so there's no need to check it.

No functional change intended.

Reviewed by:    glebius, jamie (for #jails)
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D55828
DeltaFile
+0-18sys/net/if.c
+0-181 files

FreeBSD/src 8065ff6sys/net if.c

ifnet: Fix decreasing the vnet interface count

It should be decreased only when the interface has been successfully
removed from the "active" list.

This prevents vnet_if_return() from potential OOB writes to the
allocated memory "pending".

Reviewed by:    kp, pouria
Fixes:          a779388f8bb3 if: Protect V_ifnet in vnet_if_return()
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55873
DeltaFile
+3-3sys/net/if.c
+3-31 files

FreeBSD/src 33e0568sys/dev/usb/net if_ure.c

ure(4): Fix spurious link flaps from MII

A race condition in the MII layer causes spurious link down events.
In `statchg`, on link down, check if the PHY reports the link as
actually down using the BMSR register, if not, force the status of the
link to back up and restart TX. Do the same in a MII `linkchg` handler.
On actual link up, restart TX in case it went idle and down.

PR:             252165
Signed-off-by:  Rafael Kitover <rkitover at gmail.com>
Reviewed by:    pouria
Differential Revision: https://reviews.freebsd.org/D55682
DeltaFile
+66-3sys/dev/usb/net/if_ure.c
+66-31 files

FreeBSD/src fed9017share/man/man9 crypto_request.9

crypto_request.9: Fix typo on crypto_initreq arguments

The function signature of `crypto_initreq()` was
incorrectly documented.

Signed-off-by:  Zixu Wu <zx at bv3.dev>
Reviewed by:    ziaee, pouria
Pull Request:   https://github.com/freebsd/freebsd-src/pull/2077
DeltaFile
+1-1share/man/man9/crypto_request.9
+1-11 files

FreeBSD/src 283ef95sys/net rss_config.c

rss_config: Add option to enable rss udp hashing

Added optional system tunable parameter to enable
4-tuple rss udp hashing.

Signed-off-by: bigJ <bigj at solanavibestation.com>
Reviewed by: adrian, pouria
Pull Request: https://github.com/freebsd/freebsd-src/pull/2057
DeltaFile
+22-12sys/net/rss_config.c
+22-121 files

FreeBSD/src e608379contrib/tcpdump tcpdump.c print-icmp6.c, contrib/tcpdump/missing snprintf.c

tcpdump: Update to 4.99.6

Changes:        https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES
Obtained from:  https://www.tcpdump.org/release/tcpdump-4.99.6.tar.xz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55578
Differential Revision:  https://reviews.freebsd.org/D55871
DeltaFile
+0-508contrib/tcpdump/missing/snprintf.c
+311-47contrib/tcpdump/tcpdump.c
+84-103contrib/tcpdump/print-icmp6.c
+79-105contrib/tcpdump/print-egp.c
+110-56contrib/tcpdump/CMakeLists.txt
+54-84contrib/tcpdump/print-mobility.c
+638-90363 files not shown
+1,581-1,65869 files

FreeBSD/src 5f659f2sys/modules/zfs Makefile

zfs: Fix build after merge of openzfs/zfs at f8e5af53e

The change causing it is the introduction of the test over __BMI2__ in
'module/zstd/lib/common/bitstream.h'.

This is a stop-gap commit whose content needs to be upstreamed (after
possibly having been improved).

Fixes:          8a62a2a5659d ("zfs: merge openzfs/zfs at f8e5af53e")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+22-21sys/modules/zfs/Makefile
+22-211 files

FreeBSD/src 9976cffsys/dev/rge if_rge.c if_rgevar.h

rge: use C style comments instead of C++

FreeBSD style(9) mandates C style comments. The initial import from
OpenBSD left several C++ style // comments in if_rge.c and if_rgevar.h.
Replace them with proper /* */ comments.

Also fix a malformed comment that mixed // with a closing */.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55743
DeltaFile
+2-2sys/dev/rge/if_rge.c
+0-4sys/dev/rge/if_rgevar.h
+2-62 files

FreeBSD/src 73f37a6share/mk bsd.own.mk

Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk"

This reverts commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf.

It might be that all that's needed to fix this is to add
".include <bsd.compiler.mk>" to some Makefiles. I'll look into it soon
but for now let's unbreak HEAD.

Approved by:            bnovkov (mentor)
Differential Revision:  https://reviews.freebsd.org/D55869
DeltaFile
+6-0share/mk/bsd.own.mk
+6-01 files

FreeBSD/src 424d3causr.bin/backlight backlight.8

backlight.8: Fix typo in man

Increment and decrement where swapped.

Signed-off-by: Salman Sarray <salman at sarray.de>
Reviewed by: ziaee, Christos Longros <chris.longros at gmail.com>
Pull Request: https://github.com/freebsd/freebsd-src/pull/2072
DeltaFile
+2-2usr.bin/backlight/backlight.8
+2-21 files

FreeBSD/src 2e93669sys/netgraph/bluetooth/drivers/ubt ng_ubt_rtl.c, usr.sbin/bluetooth/rtlbtfw rtlbtfw.conf main.c

rtlbtfw(8): Add support for Realtek 8852CE

Add the USB Vendor/Product ID (0x13d3:0x3612) for
the new Realtek 8852CE drive to make sure it works.

Signed-off-by: Ying Xu <fakeshadow1337 at gmail.com>
Reviewed by: pouria, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/2071
DeltaFile
+1-1usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
+1-0sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
+1-0usr.sbin/bluetooth/rtlbtfw/main.c
+3-13 files

FreeBSD/src 0bebad8share/mk bsd.own.mk

bsd.own.mk: Deorbit compat include of bsd.compiler.mk

Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]")
mentions that bsd.own.mk included bsd.compiler.mk as a temporary
workaround and was destined to be removed in FreeBSD 12. Do that now.

PR:             203540
Reviewed by:    bnovkov, imp
Approved by:    bnovkov (mentor)
Differential Revision:  https://reviews.freebsd.org/D55867
DeltaFile
+0-6share/mk/bsd.own.mk
+0-61 files

FreeBSD/src 356415asys/conf files

Unbreak LINT after ZFS import

Fixes:          8a62a2a5659d ("zfs: merge openzfs/zfs at f8e5af53e")
DeltaFile
+3-0sys/conf/files
+3-01 files

FreeBSD/src 462a1f6share/man/man5 resolver.5

resolver.5: document six previously undocumented options

Document the edns0, inet6, insecure1, insecure2, no-check-names,
and rotate options which are parsed by res_init(3) but were not
described in the resolver(5) man page.

MFC after:      1 week
Signed-off-by:  Christos Longros <chris.longros at gmail.com>
Reviewed by:    des
Differential Revision:  https://reviews.freebsd.org/D55864
DeltaFile
+39-1share/man/man5/resolver.5
+39-11 files

FreeBSD/src 8365f87sys/amd64/amd64 trap.c

amd64: do reset %rip after page fault if pcb_onfault is set

for any kernel page fault, and not only for EFIRT case.

Reported and tested by: pho
Fixes:  914a53570750ce5a104a5870403d7669656fddc3
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+20-13sys/amd64/amd64/trap.c
+20-131 files

FreeBSD/src a0b3ef1usr.sbin/ipfwpcap ipfwpcap.c

ipfwpcap: Fix build after libpcap 1.10.6 update

pcap-int.h now references SIZEOF_TIME_T from libpcap's config.h, which
is not available to consumers of the internal header outside of the
libpcap build.  Switch to the public <pcap.h> header and replace the
direct FILE* casts and ferror()/fflush() calls with pcap_dump_flush(3),
which is the correct public API for flushing a pcap dump file.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+2-7usr.sbin/ipfwpcap/ipfwpcap.c
+2-71 files

FreeBSD/src 16cef5fcontrib/libpcap configure pcap-linux.c, lib/libpcap config.h

libpcap: Update to 1.10.6

Changes:        https://raw.githubusercontent.com/the-tcpdump-group/libpcap/89e982c37c36ad0bf9f10b7ded421cb42422effa/CHANGES
Reviewed by:    bms, emaste
Obtained from:  https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D55545
Differential Revision:  https://reviews.freebsd.org/D55858
DeltaFile
+361-360contrib/libpcap/configure
+566-102contrib/libpcap/pcap-linux.c
+404-50contrib/libpcap/nametoaddr.c
+225-123contrib/libpcap/pcap-dlpi.c
+245-101contrib/libpcap/gencode.c
+209-54lib/libpcap/config.h
+2,010-79067 files not shown
+3,574-1,50173 files

FreeBSD/src e6f4e4ashare/man/man4 re.4 rge.4

re(4), rge(4): improve Realtek driver man pages

Add D-Link DGE-530(T) and Killer E2600 to the re(4) HARDWARE list.
Both are supported by the driver but were missing from the man page.

Also add cross-references between re(4) and rge(4) in SEE ALSO,
as both are Realtek NIC drivers.

Signed-off-by: Christos Longros <chris.longros at gmail.com>

Reviewed by:    adrian
Differential Revision:  https://reviews.freebsd.org/D55745
DeltaFile
+5-0share/man/man4/re.4
+1-0share/man/man4/rge.4
+6-02 files

FreeBSD/src 251907crelease/tools ec2.conf

EC2: Fix comment re avoiding unicode

We're avoiding *unicode*, not avoiding *ascii*.

Reported by:    marck
Fixes:  277830b4d3ae ("EC2: Don't use unicode in boot loader")
MFC after:      3 days
DeltaFile
+2-1release/tools/ec2.conf
+2-11 files

FreeBSD/src 922d735sys/fs/tarfs tarfs_io.c

tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset()

ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0

This change is needed to MFV zstd 1.5.7.

Approved by:    emaste (mentor)
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D55835
DeltaFile
+2-2sys/fs/tarfs/tarfs_io.c
+2-21 files

FreeBSD/src 736d885tests/sys/fs/fusefs read.cc

tests/fusefs: fix sign-compare warning on armv7

Fixes:          7e68af7ce2c1b892954df415774fe59fd2f1b62f
Reviewed by:    asomers
Approved by:    emaste (mentor)
Differential Revision:  https://reviews.freebsd.org/D55846
DeltaFile
+5-5tests/sys/fs/fusefs/read.cc
+5-51 files

FreeBSD/src 4efe7fashare/misc committers-ports.dot

committers-ports.dot: Add new committer (laurent)

Update Mentor (thierry) and Mentee (laurent) Information.

Reviewed by:    thierry (mentor)
Approved by:    thierry (mentor)
Differential Revision:  https://reviews.freebsd.org/D55856
DeltaFile
+3-1share/misc/committers-ports.dot
+3-11 files

FreeBSD/src c4e303fusr.sbin/virtual_oss/virtual_oss virtual_oss.c

virtual_oss: Use virtual_oss_delay_ns() to avoid duplication

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit 3a410851bf02c247e71bcd06fdeec2706c6b6070)
DeltaFile
+1-4usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+1-41 files

FreeBSD/src 9c49c39usr.sbin/virtual_oss/virtual_oss virtual_oss.c

virtual_oss: Use virtual_oss_timestamp() to avoid duplication

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week

(cherry picked from commit e75c8faf277dded0a80d469cb8182583716a2211)
DeltaFile
+13-16usr.sbin/virtual_oss/virtual_oss/virtual_oss.c
+13-161 files

FreeBSD/src 8a62a2asys/contrib/openzfs/module/unicode u8_textprep.c, sys/contrib/openzfs/module/zfs u8_textprep.c

zfs: merge openzfs/zfs at f8e5af53e

Notable upstream pull request merges:
 #17358 4975430cf Add vdev property to disable vdev scheduler
 #18031 c77f17b75 Add snapshots_changed_nsecs dataset property
 #18080 dbb3f247e cmd/zfs: clone: accept `-u` to not mount newly created
                  datasets
 #18089 -multiple Zstd: Update bundled library to version 1.5.7
 #18091 2301755df Fix zfs_open() to skip zil_async_to_sync() for the
                  snapshot
 #18093 -multiple L2ARC: Rework write throttling with DWPD rate limiting
                  and parallel writes
 #18095 2dbd6af5e Rename several printf attributes declarations to
                  __printf__
 #18096 8605bdfdd FreeBSD: unbreak compilation on i386
 #18105 794f1587d When receiving a stream with the large block flag,
                  activate feature
 #18115 765929cb4 DDT: Add locking for table ZAP destruction
 #18118 09e4e01e9 Fix history logging for `zpool create -t`

    [45 lines not shown]
DeltaFile
+7,037-228sys/contrib/openzfs/module/zstd/lib/common/xxhash.h
+4,698-1,133sys/contrib/openzfs/module/zstd/lib/compress/zstd_compress.c
+2,171-0sys/contrib/openzfs/module/zfs/u8_textprep.c
+0-2,171sys/contrib/openzfs/module/unicode/u8_textprep.c
+1,288-592sys/contrib/openzfs/module/zstd/lib/decompress/huf_decompress.c
+1,478-370sys/contrib/openzfs/module/zstd/lib/zstd.h
+16,672-4,494517 files not shown
+38,434-15,260523 files

FreeBSD/src 7566892lib/libsys sigreturn.2

sigreturn.2: refresh the man page

(cherry picked from commit 9da4a804f0916b24519b8baa7ed460a7ba23d8c8)
DeltaFile
+16-8lib/libsys/sigreturn.2
+16-81 files

FreeBSD/src f914641sys/dev/acpi_support acpi_system76.c

acpi_system76: Improve sysctl names

* Improve sysctl descriptions.
* Rename battery charging-threshold sysctl for clarity.
* Fix mis-spelled words.
* Style: sort headers.

Reported by: olce, jhb
Reviewed by: olce
Differential Revision: https://reviews.freebsd.org/D55848
DeltaFile
+11-10sys/dev/acpi_support/acpi_system76.c
+11-101 files