HardenedBSD/src 339ea07lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json, sys/dev/hwpmc hwpmc_ibs.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+3,100-039 files not shown
+4,600-12345 files

HardenedBSD/src 77d7b42lib/libiscsiutil Makefile, libexec/nuageinit nuageinit.7

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+19-29usr.bin/diff3/diff3.c
+2-3libexec/nuageinit/nuageinit.7
+1-1usr.sbin/iscsid/Makefile
+1-1lib/libiscsiutil/Makefile
+1-1usr.sbin/ctld/Makefile
+1-0share/mk/src.libnames.mk
+25-356 files

HardenedBSD/src 5e23acbsys/dev/sound/pcm channel.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+15-1sys/dev/sound/pcm/channel.c
+15-11 files

HardenedBSD/src 7456bdcrelease/tools vmimage.subr, usr.sbin/bsdinstall/scripts mirrorselect

HBSD: Resolve merge conflicts

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-49usr.sbin/bsdinstall/scripts/mirrorselect
+4-20release/tools/vmimage.subr
+4-692 files

HardenedBSD/src b9b7ad3lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json, sys/dev/hwpmc hwpmc_ibs.c

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        release/tools/vmimage.subr (unresolved)
        usr.sbin/bsdinstall/scripts/mirrorselect (unresolved)
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+3,100-034 files not shown
+4,631-7940 files

HardenedBSD/src c2dee77usr.bin/diff3 diff3.c

diff3: Code cleanup

* Order includes.

* Turn the diff type into an enum.

* Turn an unreachable error message into an assertion.

* Remove unused debugging code.

* Remove some dead assignments.

* Consistently use 1 instead of EXIT_FAILURE.

* Turn a return from main() into an exit().

MFC after:      1 week
Sponsored by:   Klara, Inc.
Reviewed by:    bapt
Differential Revision:  https://reviews.freebsd.org/D55517
DeltaFile
+19-29usr.bin/diff3/diff3.c
+19-291 files

HardenedBSD/src 05ca483lib/libiscsiutil Makefile, share/mk src.libnames.mk

libiscsiutil: Record dependency on libmd

MFC after:      3 days
Fixes:          6378393308bc ("Add an internal libiscsiutil library.")
Sponsored by:   Klara, Inc.
Sponsored by:   NetApp, Inc.
Reviewed by:    kevans
Differential Revision:  https://reviews.freebsd.org/D55596
DeltaFile
+1-1lib/libiscsiutil/Makefile
+1-1usr.sbin/ctld/Makefile
+1-1usr.sbin/iscsid/Makefile
+1-0share/mk/src.libnames.mk
+4-34 files

HardenedBSD/src df5014flibexec/nuageinit nuageinit.7

nuageinit.7: Fix a couple of minor errors

Use the correct key name in the chpasswd section.
Remove a stray line to fix the description of 'password'.

MFC after:      1 week
Sponsored by:   Chelsio Communications
Reviewed by:    maxim
Differential Revision:  https://reviews.freebsd.org/D55547
DeltaFile
+2-3libexec/nuageinit/nuageinit.7
+2-31 files

HardenedBSD/src a9f454asys/dev/sound/pcm channel.c

sound: Detect unsupported formats

This way we can avoid edge-cases like
8af6aee96ed609456900c6dd92dafabac5e89c0a ("virtual_oss(8): Remove
floating point formats from preference list").

Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Reviewed by:    emaste
Differential Revision:  https://reviews.freebsd.org/D55403

(cherry picked from commit 3deae7b786743193531f4e69527e789de52644c5)
DeltaFile
+15-1sys/dev/sound/pcm/channel.c
+15-11 files

HardenedBSD/src 32beb3asys/net vnet.c

vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned

Some 32-bit architectures, e.g., armv7, require strict 8-byte
alignment while doing atomic 64-bit access. Hence aligning to the
pointer type (4-byte alignment) does not meet the requirement on
those architectures.

Make the space allocated by vnet_data_alloc() sufficent aligned to
avoid unaligned access.

PR:             265639
Diagnosed by:   markj
Reviewed by:    jhb, markj
Co-authored-by: jhb
MFC after:      5 days
Differential Revision:  https://reviews.freebsd.org/D55560
DeltaFile
+11-3sys/net/vnet.c
+11-31 files

HardenedBSD/src d44d79eusr.sbin/bsdinstall/scripts mirrorselect

bsdinstall: remove ftp.at.freebsd.org

After ~13 years of running the ftp.at.freebsd.org community mirror is
shutting down at the end of March.  Remove it from the mirrorselect
script.

Reported by:    Klaus P. Ohrhallinger <k at 7he.at>
DeltaFile
+0-1usr.sbin/bsdinstall/scripts/mirrorselect
+0-11 files

HardenedBSD/src 5a59ef8sys/dev/iommu iommu_gas.c, sys/kern kern_procctl.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+64-85sys/kern/kern_procctl.c
+1-1sys/dev/iommu/iommu_gas.c
+65-862 files

HardenedBSD/src fe90ad2sys/kern kern_procctl.c

procctl(PROC_REAP_KILL): align error reporting with pgkill(2)

(cherry picked from commit 5c8af592f69a31da94c45722dcd74afcf0ab375e)
DeltaFile
+5-1sys/kern/kern_procctl.c
+5-11 files

HardenedBSD/src cf64824sys/kern kern_procctl.c

reap_kill_subtree_once(): reap_kill_proc_work() might drop proctree_lock

(cherry picked from commit 0e67c3f675eab3a9c00b76e3886ace7700ef1bd4)
DeltaFile
+8-3sys/kern/kern_procctl.c
+8-31 files

HardenedBSD/src 08f95c4sys/kern kern_procctl.c

procctl(PROC_REAP_KILL): use pgrp pg_killsx sx to sync with fork

PR:     290844

(cherry picked from commit be140717a0a4bbfa7176d334c36364d34a0b1bc5)
DeltaFile
+54-84sys/kern/kern_procctl.c
+54-841 files

HardenedBSD/src e0dbeabsys/dev/iommu iommu_gas.c

iommu_gas: Fix assertion.

(cherry picked from commit 7e8284c6ad95bb7a0fc84d4d945ee98737efdd36)
DeltaFile
+1-1sys/dev/iommu/iommu_gas.c
+1-11 files

HardenedBSD/src 565a233sys/dev/e1000 if_em.c, usr.sbin/freebsd-update freebsd-update.sh

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+2-2sys/dev/e1000/if_em.c
+4-0usr.sbin/freebsd-update/freebsd-update.sh
+6-22 files

HardenedBSD/src b24dc84sys/dev/e1000 if_em.c

e1000: Increase FC pause/refresh time on PCH2 and newer

This corresponds to Linux f74dc880098b4a29f76d756b888fb31d81ad9a0c

That commit does not provide any public background detail, but it's been
in use for over 5 years and corresponds to previous chip bugs w.r.t.
automatic generation of PAUSE frames.

Reviewed by:    kgalazka
Differential Revision:  https://reviews.freebsd.org/D54555

(cherry picked from commit 2bdec2ee73be7dbafce9982b0dc5c273918a5443)
DeltaFile
+2-2sys/dev/e1000/if_em.c
+2-21 files

HardenedBSD/src 178d0b5lib/libpmc/pmu-events/arch/x86/amdzen6 floating-point.json load-store.json

libpmc: Import AMD Zen 6 PMU events.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2049
DeltaFile
+1,106-0lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json
+523-0lib/libpmc/pmu-events/arch/x86/amdzen6/load-store.json
+339-0lib/libpmc/pmu-events/arch/x86/amdzen6/recommended.json
+326-0lib/libpmc/pmu-events/arch/x86/amdzen6/l2-cache.json
+192-0lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json
+177-0lib/libpmc/pmu-events/arch/x86/amdzen6/l3-cache.json
+2,663-06 files not shown
+3,217-112 files

HardenedBSD/src 3ce3e89lib/libpmc/pmu-events/arch/x86/amdzen1 recommended.json, lib/libpmc/pmu-events/arch/x86/amdzen2 recommended.json

libpmc: Update event definitions for AMD Zen

The pmu event definitions for AMD Zen 5 was updated since it was
imported into the tree.  As a bonus I also updated the recommended json
counters for Zen 1-3 even though we do not use that file yet.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2048
DeltaFile
+3-3lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json
+2-1lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json
+9-64 files

HardenedBSD/src e51ef8alib/libpmc libpmc.c, sys/dev/hwpmc hwpmc_ibs.c hwpmc_ibs.h

hwpmc: Initial support for AMD IBS

This patch adds support for AMD IBS.  It adds a new class of performance
counter that cotains two events: ibs-fetch and ibs-op events. Unlike
most existing sampled events, IBS events provide a number of values
containing extra information regarding the sample.  To support this we
use the existing callchain event, and introduce a new flag for multipart
payloads.  The first 8 bytes of the pc_sample contains a header that
defines up to four payloads.

Sponsored by: Netflix

Reviewed by: imp,mhorne
Pull Request: https://github.com/freebsd/freebsd-src/pull/2022
DeltaFile
+614-0sys/dev/hwpmc/hwpmc_ibs.c
+176-0sys/dev/hwpmc/hwpmc_ibs.h
+98-1usr.sbin/pmcstat/pmcstat_log.c
+84-12sys/dev/hwpmc/hwpmc_mod.c
+57-7lib/libpmc/libpmc.c
+23-4sys/x86/x86/local_apic.c
+1,052-248 files not shown
+1,130-3214 files

HardenedBSD/src 00c0a1flib/libpmc libpmc_pmu_util.c, lib/libpmc/pmu-events jevents.c json.c

hwpmc: Fix PMC flags for AMD Zen cores

The PMC flags available for DF and L3 counters were not all implemented.
More importantly, the field encodings for the L3 counters changed in an
incompatible way between Family 17h and Family 19h.  Similarly, the
field encodings for the DF coutners changed between Family 19h and 1Ah.
I also added the precise retire flag for the 3rd core counter.

Lastly, I added a warning in the jevent parser because ignoring the
unknown fields results in counters incorrectly programmed.  We should
not just ignore that.

Sponsored by: Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/2040
DeltaFile
+67-26sys/dev/hwpmc/hwpmc_amd.h
+66-5lib/libpmc/libpmc_pmu_util.c
+39-1lib/libpmc/pmu-events/jevents.c
+17-2sys/dev/hwpmc/hwpmc_amd.c
+14-0lib/libpmc/pmu-events/json.c
+1-0lib/libpmc/pmu-events/json.h
+204-346 files

HardenedBSD/src 82069fasys/netlink netlink_snl_route_parsers.h

snl: Remove duplicate rta_expires member in route parser

There is no user for `rta_expires` member and it's
duplicate of `rta_expire`.

Reviewed By: melifaro
Differential Revision: https://reviews.freebsd.org/D55445
DeltaFile
+0-1sys/netlink/netlink_snl_route_parsers.h
+0-11 files

HardenedBSD/src d37214dusr.sbin/freebsd-update freebsd-update.sh

freebsd-update: Error for -b basedir without UNAME_r set

freebsd-update sets the currently running release from UNAME -r, which
can be overridden via the --currently-running commandline option (or by
setting UNAME_r in the environment).  This may be invalid if -b is used
to specify a basedir other than /, so error out if -b is specified
without setting the currently running version.

PR:             283229
Reviewed by:    cperciva
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48016

(cherry picked from commit 097458ac665db732cc91a22279da4cc14f694da2)
DeltaFile
+4-0usr.sbin/freebsd-update/freebsd-update.sh
+4-01 files

HardenedBSD/src 1f2f5ebsys/x86/conf NOTES

asmc(4): pull 32-bit support for the driver

The asmc(4) driver should work for 32-bit Intel-based Macs, in theory, if
the model details were added to the detection list. That being said,
32-bit Intel Macs were only released and available to the general public
for 8 months [1], so the value in maintaining i386 support in the driver is
reduced due to limited hardware access.

Remove 32-bit support for the driver officially to make it clear its use is
not supported.

This should fix building `NOTES.i386` by proxy as well.

Relnotes:       yes
MFC after:      2 weeks
Fixes:          f224591746b ("Add ASMC_DEBUG make option")
Fixes:          8342d9f7b5f ("asmc(4): Stop building it on i386, as...")
Differential Revision:  https://reviews.freebsd.org/D55544
DeltaFile
+0-2sys/x86/conf/NOTES
+0-21 files

HardenedBSD/src 960409drelease/tools vmimage.subr

vmimage.subr: skip -dbg sets for WITHOUT_DEBUG_FILES/WITHOUT_KERNEL_SYMBOLS

This matches non-pkgbase behavior as installworld/installkernel skip the
debug bits if these knobs are set.

MFC after:      1 week
Sponsored by:   Chelsio Communications
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D55572
DeltaFile
+5-5release/tools/vmimage.subr
+5-51 files

HardenedBSD/src 9d769e9sys/net if_gre.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/src c3e0ed8sys/net if_gre.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/src afbfc2asys/net if_gre.c

gre: unbreak LINT-NOINET

- Move some of the braces under their respective conditionals to make the
statements more self-encapsulated and only define the `aliasreq` union
in the event either INET or INET6 is defined.

- Fix a copy-paste error: `in_gre_ioctl` should be `in6_gre_ioctl` in the
  INET6 case.

Reported by:    tinderbox
Fixes:          e1e18cc12e68 ("if_gre: Add netlink support with tests")
Differential Revision: https://reviews.freebsd.org/D55546
DeltaFile
+12-4sys/net/if_gre.c
+12-41 files

HardenedBSD/src 44e3c0esys/conf files, sys/dev/acpica acpivar.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+75-0sys/dev/xen/acpi/xen-acpi.c
+20-1sys/netinet/sctp_syscalls.c
+13-0sys/dev/acpica/Osd/OsdHardware.c
+13-0sys/dev/acpica/acpivar.h
+2-1sys/dev/dpaa2/dpaa2_buf.c
+1-0sys/conf/files
+124-26 files