FreeBSD/src 76af334sys/netpfil/ipfw ip_fw_bpf.c

ipfw: fix !VIMAGE build

NB: Rest of ipfw(4) sources get sx.h via vnet.h, which isn't perfect.
DeltaFile
+1-1sys/netpfil/ipfw/ip_fw_bpf.c
+1-11 files

FreeBSD/src fc614b0contrib/mtree mtree.8 create.c

Import latest mtree from NetBSD

Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'

This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all".  This was clarified in the man page.

Reported by:    glebius
PR:             219467
MFC after:      1 week

(cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0)
DeltaFile
+12-12contrib/mtree/mtree.8
+3-4contrib/mtree/create.c
+15-162 files

FreeBSD/src e2e7269contrib/mtree mtree.8 create.c

Import latest mtree from NetBSD

Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'

This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all".  This was clarified in the man page.

Reported by:    glebius
PR:             219467
MFC after:      1 week

(cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0)
DeltaFile
+12-12contrib/mtree/mtree.8
+3-4contrib/mtree/create.c
+15-162 files

FreeBSD/src f957857contrib/mtree mtree.8 create.c

Import latest mtree from NetBSD

Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d'

This commit partially reverts the previous vendor import, given that the
"type" keyword has been historically mandatory and should not be removed
by "-R all".  This was clarified in the man page.

Reported by:    glebius
PR:             219467
MFC after:      1 week

(cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0)
DeltaFile
+12-12contrib/mtree/mtree.8
+3-4contrib/mtree/create.c
+15-162 files

FreeBSD/src 8241dbcrelease/tools gce.conf

GCE: ARM64 Support: Add hw.pci.honor_msi_blacklist=0.

This is required for MSI support on GCE ARM64 instances which is
prerequisite to gve(4) not panicking at boot, and nvme(4) also has
a real sad time without interrupts. Tested on a variety of c4a VMs.

This is meant to be a temporary hack; long term fix would be to
check for the hypervisor and quirk gve(4) device with
PCI_QUIRK_ENABLE_MSI_VM.

PR:             kern/292081
(cherry picked from commit 9ae43352c89c776c8171f5881a984bc39acf5d6a)
DeltaFile
+3-0release/tools/gce.conf
+3-01 files

FreeBSD/src 2184a2drelease/tools gce.conf

GCE: ARM64 Support: Add hw.pci.honor_msi_blacklist=0.

This is required for MSI support on GCE ARM64 instances which is
prerequisite to gve(4) not panicking at boot, and nvme(4) also has
a real sad time without interrupts. Tested on a variety of c4a VMs.

This is meant to be a temporary hack; long term fix would be to
check for the hypervisor and quirk gve(4) device with
PCI_QUIRK_ENABLE_MSI_VM.

PR:             kern/292081
MFC after:      1 week

(cherry picked from commit 9ae43352c89c776c8171f5881a984bc39acf5d6a)
DeltaFile
+3-0release/tools/gce.conf
+3-01 files

FreeBSD/src 964d91etests/sys/netpfil/pf pflog.sh

pflog: tests: Fix rdr_action_head()

Fix a typo in the rdr_action_head() test.

Fixes:          685fb4253819 ("pf: Log the intended action when a NAT rule matches a packet")
MFC after:      1 week
DeltaFile
+1-1tests/sys/netpfil/pf/pflog.sh
+1-11 files

FreeBSD/src dce3d3astand/powerpc/ofw cas.c

powerpc/loader: Size the CAS PVR array correctly

Fixes:          895eeb492 ("powerpc/loader: Add CAS support for older CPUs")
MFC after:      1 week
DeltaFile
+1-1stand/powerpc/ofw/cas.c
+1-11 files

FreeBSD/src 5d8777fsys/dev/dwc if_dwc.c dwc1000_dma.c

dwc: add receive checksum offload for IPv6

This patch adds support for receive checksum offload for TCP/IPv6
and UDP/IPv6. Since receive checksum offload can't be configured
separately for IPv4 and IPv6, IFCAP_RXCSUM and IFCAP_RXCSUM_IPV6
can't be changed independently.

Reviewed by:            Timo Völker
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D54756
DeltaFile
+3-3sys/dev/dwc/if_dwc.c
+2-2sys/dev/dwc/dwc1000_dma.c
+1-1sys/dev/dwc/dwc1000_core.c
+6-63 files

FreeBSD/src aca67c3sys/dev/dwc if_dwc.c dwc1000_dma.c

dwc: add transmit checksum offload for IPv6

This patch adds support for transmit checksum offload for TCP/IPv6
and UDP/IPv6.

Reviewed by:            Timo Völker
MFC after:              3 days
Differential Revision:  https://reviews.freebsd.org/D54754
DeltaFile
+8-2sys/dev/dwc/if_dwc.c
+1-1sys/dev/dwc/dwc1000_dma.c
+9-32 files

FreeBSD/src 895eeb4stand/powerpc/ofw cas.c

powerpc/loader: Add CAS support for older CPUs

QEMU creates a "ibm,arch-vec-5-platform-support" property for all
pseries emulations.  Add POWER7 and POWER6 to the CAS list, more can be
added later as needed/desired.

MFC after:      1 week
DeltaFile
+6-0stand/powerpc/ofw/cas.c
+6-01 files

FreeBSD/src 9be9ab2sys/netpfil/ipfw ip_fw_table_value.c

netpfil/ipfw: Fix a typo in a source code comment

- s/vaues/values/

MFC after:      5 days
DeltaFile
+1-1sys/netpfil/ipfw/ip_fw_table_value.c
+1-11 files

FreeBSD/src cabb5adsys/dev/clk/rockchip rk_clk_fract.c

rockship: Fix a typo in a source code comment

- s/vaues/values/

MFC after:      5 days
DeltaFile
+1-1sys/dev/clk/rockchip/rk_clk_fract.c
+1-11 files

FreeBSD/src 4cd4ccbtools/tools/nanobsd defaults.sh, tools/tools/nanobsd/dhcpd common

nanobsd: Fix typos

MFC after:      1 week
DeltaFile
+2-2tools/tools/nanobsd/embedded/common
+1-1tools/tools/nanobsd/dhcpd/common
+1-1tools/tools/nanobsd/defaults.sh
+4-43 files

FreeBSD/src ecc039btools/tools/nanobsd legacy.sh defaults.sh

nanobsd: Add a NO_ROOT build option

Add a -U option to build NanoBSD images without root privileges.  It
relies on makefs/mkimg and metalog (mtree) files, similar to what
release engineering uses to build images.

Keep the current way to build NanoBSD images untouched.  Once this
method gets battle tested, it may be used to build images as root as
well.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48793
DeltaFile
+100-0tools/tools/nanobsd/legacy.sh
+34-6tools/tools/nanobsd/defaults.sh
+17-3tools/tools/nanobsd/nanobsd.sh
+151-93 files

FreeBSD/src 8832f76tools/tools/nanobsd defaults.sh

nanobsd: Add a provisional populate /data function

Add a provisional _populate_data_part function.  It populates the
optional /data partition, but using makefs(8), which is more in-line
with what release engineering uses to create images.

Reviewed by:    emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48792
DeltaFile
+4-0tools/tools/nanobsd/defaults.sh
+4-01 files

FreeBSD/src 800d390tools/tools/nanobsd defaults.sh

nanobsd: Add a provisional populate /cfg function

Add a provisional _populate_cfg_part function.  It populates the /cfg
partition, but using makefs(8), which is more in-line with what release
engineering uses to create images.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48791
DeltaFile
+4-0tools/tools/nanobsd/defaults.sh
+4-01 files

FreeBSD/src 61ac730tools/tools/nanobsd defaults.sh

nanobsd: Add a provisional populate_part function

Add a _populate_part(ition) function that mimics the current
populate_slice.  Note however, that this function is not
backward-compatible with populate_slice, hence the different name.  A
"_" is prepended to signal that it still experimental.

It can be used to populate the /cfg and /data partition using makefs(8).

Initially not wired.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48790
DeltaFile
+44-0tools/tools/nanobsd/defaults.sh
+44-01 files

FreeBSD/src 5ba2a74tools/tools/nanobsd defaults.sh legacy.sh

nanobsd: Add a nano_makefs function

Add a NANO_MAKEFS global variable with options equivalent to NANO_NEWFS
to be used with a nano_makefs function for creating images.

Also add a function that adjusts the code size calculation, so makefs -s
won't error about the minimum rounded size.  Ideally this shim should be
removed, therefore the suspicious _xxx prefix.

Initially not wired.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48789
DeltaFile
+14-0tools/tools/nanobsd/defaults.sh
+11-0tools/tools/nanobsd/legacy.sh
+25-02 files

FreeBSD/src 4f141f5tools/tools/nanobsd defaults.sh

nanobsd: Switch the / partition in fstab

Introduce a function tgt_switch_root_fstab() that switches the root
partition in the target file system tab file.  Initially not wired.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48788
DeltaFile
+16-0tools/tools/nanobsd/defaults.sh
+16-01 files

FreeBSD/src 605fb07tools/tools/nanobsd defaults.sh

nanobsd: Add a NANO_TIMESTAMP variable

Initially not wired, this variable will hold the time stamp for all the
files of the final image.
By default uses the last commit time stamp, if empty, it will use the
start time of the NanoBSD build.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48787
DeltaFile
+5-0tools/tools/nanobsd/defaults.sh
+5-01 files

FreeBSD/src 7c4d6fbtools/tools/nanobsd defaults.sh

nanobsd: Add a function to create directories

Add tgt_dir(), that creates and adds directory entries to the metalog
specification file.  Initially not wired.

Reviewed by:    imp
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48786
DeltaFile
+19-0tools/tools/nanobsd/defaults.sh
+19-01 files

FreeBSD/src 64e16fatools/tools/nanobsd defaults.sh

nanobsd: Prefer tgt_touch() instead of touch

Prefer tgt_touch() as it adds an entry to the metalog file.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48785
DeltaFile
+1-1tools/tools/nanobsd/defaults.sh
+1-11 files

FreeBSD/src b8b046atools/tools/nanobsd defaults.sh

nanobsd: Set the proper mode for /tmp

The correct mode for /tmp is 1777, keep the same mode when symlinking it
to /var/tmp.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48784
DeltaFile
+1-1tools/tools/nanobsd/defaults.sh
+1-11 files

FreeBSD/src 5345567tools/tools/nanobsd defaults.sh

nanobsd: Prefer tgt_dir2symlink() to create symlinks

Prefer tgt_dir2symlink() to create symlinks, as it has the benefit of
appending the entry to the metalog file.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48783
DeltaFile
+1-1tools/tools/nanobsd/defaults.sh
+1-11 files

FreeBSD/src 6eccd84tools/tools/nanobsd defaults.sh

nanobsd: Make tgt_dir2symlink() take a mode

Make tgt_dir2symlink() take an optional third argument that sets the
mode.  By default, assume an absolute mode of 0777, to maintain
backward compatibility.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48782
DeltaFile
+6-5tools/tools/nanobsd/defaults.sh
+6-51 files

FreeBSD/src eb544c6tools/tools/nanobsd defaults.sh

nanobsd: Add uname/gname to the spec

Also include the default NanoBSD uname/gname in the specification file.

By default, NANO_DEF_UNAME and NANO_DEF_GNAME map to root and wheel
respectively.

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48781
DeltaFile
+8-2tools/tools/nanobsd/defaults.sh
+8-21 files

FreeBSD/src 7106db6tools/tools/nanobsd defaults.sh legacy.sh

nanobsd: Prefer nano_umount to umount

nano_umount[^1] is a convenience routine used to override issues with
umount(8) without changing the nanobsd.sh source code.  There were a few
places where it was not being used.

[^1]: Introduced in 6d12b61a88a6 ("Add a routine for easy workaround any
umount issues w/o hacking nanobsd.sh.")

Reviewed by:    imp, emaste
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D48780
DeltaFile
+3-3tools/tools/nanobsd/defaults.sh
+1-1tools/tools/nanobsd/legacy.sh
+4-42 files

FreeBSD/src a4f0a60tests/sys/fs/tarfs tarfs_test.sh

tarfs: tests: Increase timeout (again 2)

Bump the timeout value (for the third time), to avoid cutoff on emulated
architectures on ci.freebsd.org.  One of the runners will take
considerably more time to complete this test.

Reported by:    Jenkins
Fixes:          a551b0524953 ("tarfs: tests: Increase timeout (again)")
MFC after:      3 days
DeltaFile
+1-1tests/sys/fs/tarfs/tarfs_test.sh
+1-11 files

FreeBSD/src dd1d6a0sys/net80211 ieee80211_proto.c

net80211: fix arguments to IEEE80211_NOTE in ieee80211_fix_rate

Fix the arguments to the debug statement.

(slightly adjusted from the original submission by bz)

PR:             286448

(cherry picked from commit 75556c7e999e9095ce71558ae61f49c1ba61a192)
(cherry picked from commit 2e93d2f39d72e5542781165c368343d7d73643e9)
DeltaFile
+2-2sys/net80211/ieee80211_proto.c
+2-21 files