FreeBSD/src 4c150f3sys/powerpc/conf GENERIC64LE GENERIC64

powerpc64: enable extended error strings in GENERIC64* configs

These kernconfs were missed in the previous commit.

PR:             289236
Reviewed by:    kib
Fixes:          f38cbefef8090f3363e5685c5a3b30ffbf1d3ad0
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit afa048d159f64e1c609475314e19fb030ffd595f)
DeltaFile
+1-0sys/powerpc/conf/GENERIC64LE
+1-0sys/powerpc/conf/GENERIC64
+2-02 files

FreeBSD/src e1e6a16tests/sys/netpfil/common utils.subr

tests/netpfil: start ipfilter for ipfnat firewall type

This requested fix[0] was not complete before the change
was committed.

Cleans up this error message when running tests[1]:
"Cannot 'start' ipfilter. Set ipfilter_enable to YES in
/etc/rc.conf or use 'onestart' instead of 'start'."

[0] https://reviews.freebsd.org/D21065?id=60288#inline-131488
[1] https://ci.freebsd.org/job/FreeBSD-main-amd64-test/28917/testReport/sys.netpfil.common/rdr/ipfnat_local_redirect/

Fixes:          f97a8a36153a9
MFC after:      3 days
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit afbb7dc0a51e4d4c227bdf00770d1ad821cf9889)
DeltaFile
+1-1tests/sys/netpfil/common/utils.subr
+1-11 files

FreeBSD/src a594783sys/compat/linuxkpi/common/src linux_firmware.c

linux_firmware: reformat error print-out

This makes it easier to grep for the error message to better understand
the call stack when loading firmware modules fails.

Fix a cosmetic-only style(9) bug while here in the same function related
to another logging message.

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D58380
DeltaFile
+4-3sys/compat/linuxkpi/common/src/linux_firmware.c
+4-31 files

FreeBSD/src 492cfbesys/vm uma_core.c

uma: Enqueue full buckets in FIFO order when KASAN is configured

We want to defer reuse of free objects, and this is a trivial way to
promote that.

Suggested by:   rlibby
Reviewed by:    rlibby, alc
MFC after:      1 month
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58312
DeltaFile
+9-1sys/vm/uma_core.c
+9-11 files

FreeBSD/src 666eab3sys/vm uma_core.c

uma: Avoid allocating from free buckets when KASAN is enabled

When uma_zalloc_arg() hits an empty alloc bucket in the per-CPU cache,
it tries swapping the alloc and free buckets in the hope that the free
bucket has some items available.  If not, it has to lock the zone.

Disable this behaviour when KASAN is configured in order to further
defer reuse of freed items.  This forces a free item to go to the
per-domain full bucket cache before it becomes accessible to the
allocator.

Reviewed by:    rlibby
MFC after:      1 month
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58270
DeltaFile
+11-6sys/vm/uma_core.c
+11-61 files

FreeBSD/src 990989csys/vm uma_core.c

uma: Make an effort to defer reuse of items when KASAN is enabled

When KASAN is configured, make uma_zfree_arg() free items to the per-CPU
free bucket, rather than to the alloc bucket.  This means that the item
won't be recycled immediately the next time a thread goes to allocate an
item from that zone on the same CPU.  In other words, the item will stay
in a quarantine state longer, which helps make KASAN's use-after-free
detection more reliable.

Reviewed by:    rlibby
MFC after:      1 month
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58269
DeltaFile
+23-9sys/vm/uma_core.c
+23-91 files

FreeBSD/src 6337ca1sys/vm uma_core.c

uma: Factor out the implementations of uma_zfree_{arg,smr}()

The two function both free an item to a UMA zone, but uma_zfree_arg()
does so in such as way as to ensure that the item will be the first one
returned by a subsequent allocation, while uma_zfree_smr() must defer
reuse of the item and therefore never frees to the per-CPU alloc bucket.

When KASAN is enabled, we actually want uma_zfree_arg() to behave like
uma_zfree_smr(): to improve the reliability of use-after-free detection,
reuse of the newly freed item should be deferred for some time.

Refactor a bit to make it easier to improve KASAN along these lines:
introduce two helper functions, cache_free_item() and cache_free_smr(),
which handle most of the work of interacting with the per-CPU caches.
A subsequent commit will let uma_zfree_arg() use cache_free_smr() when
KASAN is enabled.

No functional change intended.


    [4 lines not shown]
DeltaFile
+92-69sys/vm/uma_core.c
+92-691 files

FreeBSD/src b86e364tools/tools/git git-mfc

git-mfc: Improve handling of remotes

If we can't figure out which remote to use, print a useful error instead
of assuming that "freebsd" is the right remote to use.
DeltaFile
+5-5tools/tools/git/git-mfc
+5-51 files

FreeBSD/src 7392dc9tools/tools/git git-mfc

git-mfc: Let the upstream for PRERELEASE branches be main

Such branches are in code slush but are the same as stable branches for
the purpose of MFCs.
DeltaFile
+1-1tools/tools/git/git-mfc
+1-11 files

FreeBSD/src 4c1c2b9tools/tools/git git-mfc

git-mfc: Slightly relax the regex used to search for reverts

Prompted by commit 9dfaf1cb37f8ac89cf in FreeBSD src.

Reported by:    des
DeltaFile
+1-1tools/tools/git/git-mfc
+1-11 files

FreeBSD/src bb933b1sys/kern kern_event.c

kqueue: Allocate marker knotes on the stack

The scan marker was originally stack-allocated.  In commit
1c0f9af5b5224, it became heap-allocated since the marker is visible to
other threads and a scanning thread's stack may be swapped out.  Now
that kernel stacks can no longer be swapped out, we can avoid these heap
allocations.

Reviewed by:    kib
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58402
DeltaFile
+13-16sys/kern/kern_event.c
+13-161 files

FreeBSD/src 9a7bd33sys/kern sys_procdesc.c kern_exit.c, sys/sys procdesc.h

procdesc: Remove dead code

As far as I can see, it is impossible for procdesc_exit() to observe
pd->pd_fpcount == 0: if procdesc_close() decrements that counter to
zero, then it will clean up the procdesc structure too, and this is
atomic with respect to the proctree lock.

No functional change intended.

Reviewed by:    kib
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58396
DeltaFile
+4-18sys/kern/sys_procdesc.c
+2-1sys/kern/kern_exit.c
+1-1sys/sys/procdesc.h
+7-203 files

FreeBSD/src 586e2b3sys/kern uipc_usrreq.c, tests/sys/kern unix_passfd_test.c

unix: Preserve FD_RESOLVE_BENEATH when passing an fd

The FD_RESOLVE_BENEATH flag is supposed to be sticky.  It's set when you
receive an fd from a different jail and preserved by openat(<dfd>) etc..
However, if you send the fd to yourself, the flag is stripped since
SCM_RIGHTS message don't preserve file descriptor flags.

Fix this by preserving those flags and checking for UF_RESOLVE_BENEATH
in restrict_rights().

Fixes:          350ba9672a7f ("unix: Set O_RESOLVE_BENEATH on fds transferred between jails")
Reviewed by:    kib
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58317
DeltaFile
+31-0tests/sys/kern/unix_passfd_test.c
+19-8sys/kern/uipc_usrreq.c
+50-82 files

FreeBSD/src 91e11c8lib/libsys pdfork.2, sys/kern sys_procdesc.c

procdesc: Disallow pddupfd() of non-passable files

Reported by:    Maik Muench of Secfault Security
Reviewed by:    kib
Fixes:          1ad21a652182 ("kern: add pddupfd(2)")
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58403
DeltaFile
+7-3sys/kern/sys_procdesc.c
+6-0lib/libsys/pdfork.2
+13-32 files

FreeBSD/src 76ca489sys/netinet6 nd6_rtr.c

netinet6/nd6: Sprinkle missing prefix refcounting

When we drop the prefix lock to call nd6_prefix_offlink() or
nd6_prefix_onlink(), make sure to keep the correpsonding prefix
structure alive.  It is possible for a concurrent nd6_timer() to expire
the prefix while the lock is dropped.

Reported by:    Maik Muench of Secfault Security
Reviewed by:    pouria, zlei
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58423
DeltaFile
+4-0sys/netinet6/nd6_rtr.c
+4-01 files

FreeBSD/src c7917e7sys/kern kern_kthread.c

kthread: Fix a thread leak

Fixes:          963629923308 ("kthread_add(): do not allow to attach the thread to a dead or dying process")
Reviewed by:    kib
MFC after:      1 week
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D58433
DeltaFile
+1-0sys/kern/kern_kthread.c
+1-01 files

FreeBSD/src e591a76sys/compat/linuxkpi/common/include/net/page_pool helpers.h types.h, sys/compat/linuxkpi/common/src linuxkpi_page_pool.c

LinuxKPI: page pool updates and add to the build

Split implementation out from the header files.

This "page pool" is the very minimalistic version we need in order to
support packets on mt76.
We allocate the page pool in order to have the meta data available of
which we only make limited use.
This implementation does no pooling, it does no page fragments for now,
it always hands out a full page and frees it upon return.

It is written in a way that it can be in the tree before the 'struct page'
work it depends on has landed in order to reduce friction for people who
want to try mt7921 (or others later) upfront.  We use the same #ifdef
as in the struct page work for that reason so one knob will turn everything
on or off.

Once the struct page work has landed and settled we can start filling this
with more complexity.

    [8 lines not shown]
DeltaFile
+156-0sys/compat/linuxkpi/common/src/linuxkpi_page_pool.c
+30-28sys/compat/linuxkpi/common/include/net/page_pool/helpers.h
+18-1sys/compat/linuxkpi/common/include/net/page_pool/types.h
+2-0sys/conf/files
+1-0sys/modules/linuxkpi/Makefile
+207-295 files

FreeBSD/src 0b8d220sys/compat/linuxkpi/common/include/linux page.h

LinuxKPI: page.h: resort lines

Two of the "page macros" can be abstracted elsewhere in the upcoming
struct page work, so sort them away from the four which are here to
stay.

No functional change.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D58299
DeltaFile
+3-2sys/compat/linuxkpi/common/include/linux/page.h
+3-21 files

FreeBSD/src f45506csys/compat/linuxkpi/common/include/linux page.h

LinuxKPI: page.h: use atop() and ptoa() instead of PAGE_SHIFT

With upcoming changes to 'struct page' this will make the lines
easier to read by using the predefined macros from param.h.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    markj, kib
Differential Revision: https://reviews.freebsd.org/D58298
DeltaFile
+2-2sys/compat/linuxkpi/common/include/linux/page.h
+2-21 files

FreeBSD/src fe17840sys/compat/linuxkpi/common/include/linux scatterlist.h

LinuxKPI: sg_page() remove superfluous ()

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D58295
DeltaFile
+1-1sys/compat/linuxkpi/common/include/linux/scatterlist.h
+1-11 files

FreeBSD/src ac4b43bsys/compat/linuxkpi/common/src linux_page.c

LinuxKPI: prefer struct page [*] over struct vm_page[_t]

LinuxKPI is based on Linux 'struct page' which is currently aliased
to struct vm_page.  Upcoming changes may change that so start using
'struct page *' instead vm_page_t to make future changes transparent.

This is a continuation of 9e9c682ff3a1 and should be a NOP.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste (no objections)
Differential Revision: https://reviews.freebsd.org/D58297
DeltaFile
+2-2sys/compat/linuxkpi/common/src/linux_page.c
+2-21 files

FreeBSD/src 0845efesys/compat/linuxkpi/common/include/linux page.h

LinuxKPI: move clear_page() within the linux/page.h file

clear_page() would normally live in asm/page.h but adding the file
and fixing the dependencies would be too much for a single line.

Move the function to the end of the file with a clear separator
and make it clear that it does not operate on a 'struct page'
but on a page address by changing the argument name and leaving
a comment.

The function is currently used by at least mthca(4) as the only
in-tree consumer, and drm-kmod ttm_pool.c.

No functional changes.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Reviewed by:    emaste
Differential Revision: https://reviews.freebsd.org/D58296
DeltaFile
+7-1sys/compat/linuxkpi/common/include/linux/page.h
+7-11 files

FreeBSD/src 2099bf2sys/compat/linuxkpi/common/src linux_pci.c

LinuxKPI: pci: fix dma handle type in match function

dma_addr_t is a vm_paddr_t which is a uint of some width.  Rather than
passing pointers of it around pass the value.

Comparing the addresses of different storage for the same dma handle
(the actual bug here) will not work when passed to the devres match
function.

Sponsored by:   The FreeBSD Foundation
Fixes:          0a575891211ef ("implement dmam_free_coherent()")
MFC after:      3 days
Differential Revision: https://reviews.freebsd.org/D58285
DeltaFile
+4-4sys/compat/linuxkpi/common/src/linux_pci.c
+4-41 files

FreeBSD/src 8a7ab3esys/dev/usb/video uvideo.c

uvideo: Return actual mtx_sleep error in dqbuf

Don't coerce errors to EINVAL, which isn't correct for mtx_sleep's
failure cases.

Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-1sys/dev/usb/video/uvideo.c
+1-11 files

FreeBSD/src b22b159sys/dev/aq aq_hw.h aq_fw1x.c

aq(4): Use standard ETHER_ADDR_LEN definition

No need for a bespoke #define.

(cherry picked from commit 8c64625d90792462289686e0209a9f3fff67fc9b)
DeltaFile
+2-1sys/dev/aq/aq_hw.h
+1-1sys/dev/aq/aq_fw1x.c
+0-2sys/dev/aq/aq_common.h
+1-1sys/dev/aq/aq_fw2x.c
+4-54 files

FreeBSD/src daf364fsys/dev/aq aq_hw_llh.c aq_ring.c

aq(4): style(9) cleanup

(cherry picked from commit 668423f75b4d9006f16847b415c861defb8267d7)
DeltaFile
+62-34sys/dev/aq/aq_hw_llh.c
+11-7sys/dev/aq/aq_ring.c
+10-6sys/dev/aq/aq_fw.c
+10-5sys/dev/aq/aq_hw.c
+4-2sys/dev/aq/aq_dbg.c
+2-3sys/dev/aq/aq_fw1x.c
+99-575 files not shown
+106-6711 files

FreeBSD/src 06a2734sys/dev/aq aq_hw_llh.c aq_hw.c

aq(4): Style, whitespace and misc cleanup

The compiled objects do not change other than a few diagnostic messages
that include __LINE__.

Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D54304

(cherry picked from commit 96156003ec0c70de88a448d48d8e9bd37913589f)
DeltaFile
+1,100-1,024sys/dev/aq/aq_hw_llh.c
+516-503sys/dev/aq/aq_hw.c
+453-420sys/dev/aq/aq_hw_llh.h
+299-271sys/dev/aq/aq_fw2x.c
+260-204sys/dev/aq/aq_main.c
+219-209sys/dev/aq/aq_fw.c
+2,847-2,63112 files not shown
+3,598-3,34118 files

FreeBSD/src df0b781sys/dev/aq aq_common.h aq_dbg.h

aq(4): Use sys, not userland, headers

And remove some unused definitions.

Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D54152

(cherry picked from commit d2850435f18c81479f79bd23ea8d4b997dbc0521)
DeltaFile
+1-7sys/dev/aq/aq_common.h
+1-1sys/dev/aq/aq_dbg.h
+1-1sys/dev/aq/aq_fw.c
+1-1sys/dev/aq/aq_fw1x.c
+1-1sys/dev/aq/aq_fw2x.c
+0-1sys/dev/aq/aq_hw.h
+5-126 files

FreeBSD/src 56e056asys/dev/aq aq_hw_llh_internal.h aq_hw_llh.c

sys: Import snapshot of Aquantia ACQ107 vendor driver

Obtained from https://github.com/Aquantia/aqtion-freebsd commit
c61d27b1d94af72c642deefa0595884481ea7377.

This is not using a vendor branch.  The formerly-upstream repo is
abandoned and I do not believe it will receive updates.  This initial
import serves as a snapshot of the vendor code, but from here we will
iterate on it in the tree as our own code.

Bug fixes, code cleanup, and build infrastructure will follow.

NetBSD and OpenBSD have derivatives of this driver (with additional
hardware support).  We can look to changes in those drivers, and the
Linux driver, to add support here.

Reviewed by:    adrian
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53813

    [2 lines not shown]
DeltaFile
+3,335-0sys/dev/aq/aq_hw_llh_internal.h
+1,986-0sys/dev/aq/aq_hw_llh.c
+1,329-0sys/dev/aq/aq_main.c
+1,176-0sys/dev/aq/aq_hw_llh.h
+907-0sys/dev/aq/aq_hw.c
+581-0sys/dev/aq/aq_ring.c
+9,314-012 files not shown
+12,109-018 files

FreeBSD/src c9ee056sys/dev/aq aq_main.c aq_media.c

aq(4): Port to IfAPI

Direct access to struct ifnet members is not possible in FreeBSD 15;
accessors must be used.  These exist in all supported FreeBSD versions,
so we do not need to make this conditional.

(cherry picked from commit 4756f5ff8f10cdda925cab60c0b66606698e49ee)
DeltaFile
+8-8sys/dev/aq/aq_main.c
+6-6sys/dev/aq/aq_media.c
+2-2sys/dev/aq/aq_ring.c
+16-163 files