fix merge botch.

(mrg)

GCC 12.3.0: merge our old changes into the renamed .cc files.

(mrg)

initial merge of GCC 12.3.0.

this doesn't include any of the changes to the .c -> .cc files renamed,
and reverts our local changes to the vax port and libsanitizer subdir.
vax GCC was rewritten and our local fixes no longer are relevant, and
the new libsanitizer is more updated than our old one, and merging via
gcc10->gcc12 is not really possible.

unfortunately, our local changes to libsanitizer that aren't related
to the general update of those sources (ie, the netbsd code) will need
to be re-checked and perhaps re-ported.

(mrg)

COMPANT_NETBSD32: Regen for syscalls.master,v 1.143

(rin)

COMPAT_NETBSD32: Add support for memfd_create(2).

(rin)

netbsd32_netbsd: Sort headers. No binary changes.

(rin)

sys_epoll: whitespace -> tab. no binary changes.

(rin)

New sentence, new line.

(wiz)

sys_memfd: Comply with our implicit naming convention;
do_memfd_truncate() --> memfd_truncate_locked(). NFC.

(rin)

sys_memfd: Fix logic errors for offset in the previous.

(rin)

drm/linux_ww_mutex: Fix ww acquire context ordering.

XXX pullup-8
XXX pullup-9
XXX pullup-10

(riastradh)

nvmm(4): Document that VMX Unrestricted Guest is required

(gdt)

drm/linux_ww_mutex: Fix wait loops.

If cv_wait_sig returns because a signal is delivered, we may
nonetheless have been granted the lock.  It is harmless for us to
ignore this fact in three of the four paths, but in
ww_mutex_state_wait_sig, we may now have ownership of the lock and
MUST NOT return failure because the caller MUST release the lock
before destroying the ww_acquire_ctx.

While here, restructure the other three loops for clarity, so they
match the structure of the fourth and so they have a little less
impenetrable negation.

PR kern/57537

XXX pullup-8
XXX pullup-9
XXX pullup-10

(riastradh)

Fix locking and offset issues pointed out by @riastradh (Theodore Preduta)

(christos)

ews4800mips/floppies: Fix ramdisk overflow by dropping IEEE 802.11
support from x_ifconfig

(rin)

CHANGES: remove entry that has been pulled up to netbsd-10

(gutteridge)

t_memfd_create: Fix printf-like format by using %zu for size_t, and
%jd for off_t with cast to intmax_t, respectively.

(rin)

No need to ask whether to use the TCP option on NFS mount.

TCP mount has been default since NetBSD 9.0.

(tsutsui)

rump: Regen again to fix missing __kevent100 symbol.

makerumpsyscalls.sh requires rebuilt rump libraries installed in
/usr/lib or directory specified by its first argument.

Now, new failures observed for ATF after __kevent100 addition are
fixed at least for aarch64.

(rin)

regen

(christos)

typo

(christos)

Add/fix statx, readahead, close_range. From GSoC 2023 by Theodore Preduta

(christos)

sys/memfd.h: Fix include guards after rename.

(riastradh)

Don't skip compat_netbsd32_90 in the dependency chain.

(pgoyette)

COMPAT_NETBSD32: Reorganize the previous; Make compat_netbsd32_50 recursively
depended on compat_netbsd32_100, rather than directly depended on it.

Thanks pgoyette@ again for useful comments!

(rin)

Now, netbsd32_compat_50 module requires netbsd32_compat_100.
Thanks pgoyette@ for hints.

(rin)

Add comment on packed attribution for struct linux_epoll_event on amd64.
NFC.

(rin)

COMPAT_NETBSD32: No need to have compat_100_netbsd32_kevent_fetch_timeout.
NFCI.

(rin)

COMPAT_NETBSD32: Regen for syscalls.master,v 1.142

(rin)

COMPAT_NETBSD32: Catch up with sys___kevent100() addition.

XXX
Add epoll_* and memfd_create.

(rin)

Add tests for t_memfd_create and fix bug found by tests

(christos)

Sprinkle __inline to compat_100___kevent50_{fetch_changes,put_events}

(rin)

Tickets #1853 - #1857

(martin)

Tickets #1669 - #1673

(martin)

Tickets #250 - #255

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #255):

usr.sbin/tprof/arch/tprof_x86.c: revision 1.18
usr.sbin/tprof/arch/tprof_x86.c: revision 1.19

Modify comment. No functional change.

tprof(8): Add support for Skylake-X and Cascade Lake.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #1857):

sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch)

coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
  the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
  the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
  as it is.
- KNF.

(martin)

lint: eliminate redundant code

No functional change.

(rillig)

Pull up following revision(s) (requested by msaitoh in ticket #254):

sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch)

coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
  the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
  the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
  as it is.
- KNF.

(martin)

Pull up following revision(s) (requested by msaitoh in ticket #254):

sys/arch/x86/x86/coretemp.c: revision 1.39

coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
  the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
  the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
  as it is.

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #1856:

sys/dev/pci/ichsmb.c 1.83-1.84

- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
  ichsmb_i2c_exec().

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #1672:

sys/dev/pci/ichsmb.c 1.83-1.84

- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
  ichsmb_i2c_exec().

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #253:

sys/dev/pci/ichsmb.c 1.83-1.84

- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
  ichsmb_i2c_exec().

(martin)

lint1: remove option -m

The list of lint messages is only needed for generating the manual page
lint.7.  Since 2022-07-06, that list is extracted from the source code
instead of compiling and then running lint1.

(rillig)

regen (ticket #1855)

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #1855:

sys/dev/pci/pcidevs                            1.1481-1.1482

Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices.

(martin)

lint: only generate err-msgs.h in debug mode

(rillig)

regen (ticket #1671)

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #1671:

sys/dev/pci/pcidevs                            1.1481-1.1482

Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices.

(martin)

regen (ticket #252)

(martin)

Pull up the following revisions, via patch, requested by msaitoh
in ticket #252:

sys/dev/pci/pcidevs                            1.1481-1.1482

Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices.

(martin)

Pull up the following revisions, via patch, requested by msaitoh
in ticket #1854:

usr.sbin/cpuctl/arch/i386.c                    1.137-1.139

- CPU model 0x5a is not Atom E3500 but Atom Z3500.
- Add Alder Lake-N.

(martin)

lint: fix use-after-free in memory debug mode

A node may be allocated before its type.  Since the objects are freed in
reverse allocation order, the type cannot be accessed anymore when the
node is freed.

(rillig)

Pull up the following revisions, via patch, requested by msaitoh
in ticket #1670:

usr.sbin/cpuctl/arch/i386.c                    1.137-1.139

- CPU model 0x5a is not Atom E3500 but Atom Z3500.
- Add Alder Lake-N.

(martin)

Pull up the following revisions, via patch, requested by msaitoh in
ticket #251:

usr.sbin/cpuctl/arch/i386.c                    1.137-1.139

- CPU model 0x5a is not Atom E3500 but Atom Z3500.
- Add Alder Lake-N.

(martin)

libc: Warn of __kevent50 when itself (not kevent) is referenced

(rin)

Pull up the following revisions, all via patch, requested by msaitoh
in ticket #1853:

sys/arch/x86/include/specialreg.h 1.204-1.206, 1.208

- Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT.
- Add AMD CPUID 0x80000008 %ebx bit 30 IBPB_RET and CPUID 0x8000000a
  %edx bit 29 BusLockThreshold.
- Fix typo in comment.

(martin)

Pull up the following revisions, all via patch, requested by msaitoh
in ticket #1669:

sys/arch/x86/include/specialreg.h              1.204-1.206, 1.208

- Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT.
- Add AMD CPUID 0x80000008 %ebx bit 30 IBPB_RET and CPUID 0x8000000a
  %edx bit 29 BusLockThreshold.
- Fix typo in comment.

(martin)

Pull up the following revisions, all via patch, requested by msaitoh
in ticket #250:

sys/arch/x86/include/specialreg.h              1.204-1.206, 1.208

- Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT.
- Add AMD CPUID 0x80000008 %ebx bit 30 IBPB_RET and CPUID 0x8000000a
  %edx bit 29 BusLockThreshold.
- Fix typo in comment.

(martin)

sys/memfd.h: Tidy.

- Sort includes.
- #include <sys/types.h> for size_t.

(riastradh)

sys: Rename sys/miscfd.h -> sys/memfd.h.

Let's not create new dumping grounds for miscellaneous stuff; one
header file for one purpose.

(riastradh)

memfd(2): Convert KASSERT to CTASSERT.

Move it closer to where it's relevant too.

(riastradh)

lint: condense code for ending a function

No functional change.

(rillig)

lint: constify

(rillig)

lint: remove forward declarations for functions

No functional change.

(rillig)

compat/linux: aarch64 does not have epoll_create(2) nor epoll_wait(2)

Note that for Linux, new architectures like arm64 use MI system call
table in include/uapi/asm-generic/unistd.h, instead of MD syscall.tbl.

XXX
Too many ifdef's like this. We should be smarter...

(rin)

Slight reformatting. NFCI.

(skrll)

linux/aarch64: Regen for syscalls.master,v 1.8

(rin)

linux/aarch64/syscalls.master: Dedup and sort headers. NFC.

(rin)

linux/aarch64/syscalls.master: Include linux_misc.h.

(rin)

lint: use standard function attribute for noreturn functions

(rillig)

remove extra `_' to fix debug build

(pgoyette)

Fix some macro( usage)s

(wiz)

Remove Pp that have no effect.

(wiz)

tests/lint: test declarations in C11 and C23

(rillig)

lint: extract 'vararg' and 'prototype' flags from global 'dcs'

These flags are only relevant for parameter lists, so add a separate
type for it.

No functional change.

(rillig)

regen

(christos)

add epoll syscalls

(christos)

regen

(christos)

regen

(christos)

Add epoll(2) from Theodore Preduta as part of GSoC 2023

(christos)

Gcc complains about overflow writing 53 bytes into a region of size 35,
and it is correct for the alphabet copying line, which correctly comments
about the overflow too.

(christos)

ostat: use standard option order (AaBb...)

Fix macro usage while here

(wiz)

vax/csu: __start: Use 0x0000 as entry mask instead of 0x0101 (two NOPs)

This was a quite common trick to able to load executables with a.out
headers stripped. Now, the system boots successfully into multi-user
mode without this trick.

Thanks ragge@ for kind explanation:
https://mail-index.netbsd.org/port-vax/2023/07/28/msg004397.html

(rin)

xen_clock(4): New hardclock dtrace probes.

sdt:xen:hardclock:tick(last, now)
  fires on every hardclock tick

sdt:xen:hardclock:jump(last, now, nticks)
  fires on every hardclock tick when (now - last) >= 2*NS_PER_TICK,
  i.e., this call to the timer interrupt handler requires multiple
  hardclock ticks

(riastradh)

xen_clock(4): Compute NS_PER_TICK only once per call.

This involves a division by an unknown number, so let's cache it.

XXX Could do better by precomputing it in xen_resumeclocks, with some
effort to ensure concurrent calls don't stomp on each other.

(riastradh)

xen_clock(4): Fix whitespace and sprinkle comments.

No functional change intended.

(riastradh)

timecounter(9): Link to phk's timecounter paper for reference.

No functional change intended.

(riastradh)

openssh: Apply __dead to print_config() to fix build with clang

(rin)

add iostat -X option, limited alternative statistics.

this is like the "-D" option, except it skips the xfers/s, and
reports MB/s instead of KB/s.  allows for far more devices to
be displayed per line by default (about 50% more.)

(mrg)

gcc 10 is now in gcc.old, make mknative-gcc.old gcc-10 happy.

(mrg)

vax/csu: Use register name provided by asm.h. No binary changes.

(rin)

vax/csu: __do_global_ctors_aux: Save actually-used r8, instead of r11

Thanks Kalvis Duckmanton for report and patch on tech-toolchain:
https://mail-index.netbsd.org/tech-toolchain/2023/07/28/msg004321.html

(rin)

arm/bus_dma: Fix misleading comment:

- * For a virtually-indexed write-back cache, we need
- * to do the following things:
+ * For a write-back cache, we need to do the following things:

This comment was written long ago when we supported only virtually-
indexed caches for arm. But subsequent comments are valid also for
physically-indexed cache.

(rin)

openssh: Fix commented out lines for manpages to reduce diff from upstream

(rin)

openssh: KNF for our local changes.

(rin)

x86: make the CPUID list for errata be far less confusing

the 0x80000001 CPUID result needs some parsing to match against
actual family/model/stepping values.  4-bit 'family' values of
15 or 6 change how to parse the 4-bit extended model and 8-bit
extended family value - for family 6 or 15, the extended model
bits (4) are concatenated with the base 4-bits to create an
8-bit value, and for family 15, the family value is addition
of the family value and the 8-bit extended-family value, giving
a range of 0 to 15 + 0xff aka 270.

use a CPUREV(family, model, stepping) macro that builds the
relevant bit-representation of a CPUID, making it far easier
to understand what each entry means, and to add new ones too.

i have confirmed that the emitted cpurevs[] array has the same
values before/after this change, ie, NFCI or observed.

(mrg)

ssh_config.5: Change in comment from upstream.

(rin)

openssh: whitespace

(rin)

ssh-keygen.1: Catch up upstream change in comment.

(rin)

oepnssh: trailing tab

(rin)

sftp.1: Fix old (and non-critical) merge botch.

(rin)

openssh: Adjust blank line to reduce diff from upstream.

(rin)

openssh: whitespace fix

(rin)

openssh: whitespace -> tab

(rin)

openssh: Reduce diff from upstream; remove never-enabled #if 0'ed block

(rin)

openssh: Remove upstream-removed files from OPENSSH branch.
These files have already been removed from HEAD.

(rin)

Simplify fix for PR toolchain/57146

Introduce ARCH_STRIP_SYMBOLS variable to centralize logic for debug
symbols from MD Makefile's to Makefile.kern.inc.

(rin)

Add Zen4 Phoenix support.

(msaitoh)

Regen.

(msaitoh)

Add AMD 19h/7xh Root Complex.

(msaitoh)

Add Zen2 Mendocino APU support.

(msaitoh)

Add Zen4 Ryzen "Phoenix" support.

(msaitoh)

add m5407

(christos)

CHANGES: fix a typo

(gutteridge)

disable lint for arm

(christos)

Ticket #1852

(martin)

Tickets #1667 and #1668

(martin)

Tickets #247 - #249

(martin)

Pull up following revision(s) (requested by gutteridge in ticket #249):

distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.16
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.17
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.18
distrib/evbmips/instkernel/ramdisk/list: revision 1.19

Add bpf to the device nodes provided in the evbmips ramdisk

Intended to address an issue noted by Denis Ovsienko on port-mips,
where dhcpcd doesn't work with the netbsd-INSTALL_OCTEON kernel. (I am
not able to test this directly, but verified by mounting the ramdisk
images generated before and after this change.)

Remove redundant variable assignment
It got clobbered by another assignment later, and this has been the
case since r. 1.1 of the file.

Add dk[0-3] to the device nodes provided in the evbmips ramdisk
The installer provided by octeon.img creates wedges, which may later
need to be recovered via the standard sysinst installer provided by
netbsd-INSTALL_OCTEON.

Add dkctl(8) and gpt(8) to the evbmips ramdisk

The installer provided by octeon.img creates GPT wedges, which may
later need to be recovered via the standard sysinst installer provided
by netbsd-INSTALL_OCTEON.

(martin)

Pull up following revision(s) (requested by bouyer in ticket #248):

sys/arch/xen/xen/xbd_xenbus.c: revision 1.132 (patch)
sys/arch/xen/xen/xbd_xenbus.c: revision 1.133 (patch)
sys/arch/xen/xen/xbd_xenbus.c: revision 1.134 (patch)

The disk size reported in the xenstore is always in XEN_BSIZE units,
not sector-size. Should fix the issue reported by Christian Kujau
on netbsd-users and port-xen.

Also use XEN_BSIZE when computing the number of bytes for format_bytes().
While there note in a comment that sc_sectors is in XEN_BSIZE units

Propoerly handle 4k sector size backends:
- report the backend's sector size to upper layers, not DEV_BSIZE.
  Adjust the number of sectors accordingly.
- Use sc_secsize instead of XEN_BSIZE where appropriate. The sectors numbers
  in I/O requests are still in XEN_BSIZE units, but must be a multiple
  of sc_secsize/XEN_BSIZE.
- As a consequence of previous, the buffer has to be aligned to sc_secsize,
  aligned to XEN_BSIZE may not be enough. This means that we may have to
  xbd_map_align() more buffer, including some without B_PHYS set.
- Add some more DPRINTF lines, related to I/O requests

Tested with a linux dom0.

thanks to Christian Kujau for providing access to his hardware for testing
and debugging.

(martin)

doc: clarify changes entry

(nia)

doc: Changes for July

(nia)

Pull up following revision(s) (requested by bouyer in ticket #1668):

sys/arch/xen/xen/xen_clock.c: revision 1.10
sys/arch/xen/xen/xen_clock.c: revision 1.12
(applied to sys/arch/xen/xen/clock.c)

Unmask event after VCPUOP_stop_periodic_timer and
initializing ci->ci_xen_hardclock_systime_ns, to avoid a possible race with
xen_timer_handler()

Unmask event after arming the one-shot timer in clock initialisation,
to avoid a possible race with xen_timer_handler() updating
ci_xen_hardclock_systime_ns while we're reading it.

Pointed out by Taylor R Campbell

(martin)

Pull up following revision(s) (requested by mrg in ticket #1852):

sys/arch/x86/x86/errata.c: revision 1.32

fix the cpuids for the zen2 client CPUs.

i'm not exactly how i came up with the values i had, though one
of them was still valid and matched my test systems.

(martin)

Pull up following revision(s) (requested by mrg in ticket #1667):

sys/arch/x86/x86/errata.c: revision 1.32

fix the cpuids for the zen2 client CPUs.

i'm not exactly how i came up with the values i had, though one
of them was still valid and matched my test systems.

(martin)

Pull up following revision(s) (requested by mrg in ticket #247):

sys/arch/x86/x86/errata.c: revision 1.32

fix the cpuids for the zen2 client CPUs.

i'm not exactly how i came up with the values i had, though one
of them was still valid and matched my test systems.

(martin)

dhcpd: move isc_event_free() before isc_timer_destroy() in timer cb

isc_timerevent_destroy() called by isc_event_free() expects to be able to
hold the timer lock, so must run before the timer is destroyed.
PR misc/57491.

(tnn)

include glyph name in -d output

(macallan)

document command line option

(macallan)

kern: Restore non-atomic time_second symbol.

This is used by savecore(8), vmstat(8), and possibly other things.

XXX Should really teach dump and savecore(8) to use an intentionally
designed header, rather than relying on kvm(3) -- and make it work
for saving cores from other kernels so you don't have to boot the
same buggy kernel to get a core dump.

(riastradh)

Add AMD IBPB_RET and BusLockThreshold.

(msaitoh)

x86/pmap: Print quantities in failed assertions in pmap_load.

(riastradh)

new OpenSSH

(christos)

bump libssh

(christos)

Merge changes between OpenSSH-9.1 and OpenSSH-9.3

(christos)

wsemul_vt100_subr: complete the refactoring from 2010

In 1.20 refactoring, functions in this file were changed to accept a
pointer to the new base class instead of the full emuldata:

  -wsemul_vt100_foo(struct wsemul_vt100_emuldata *edp, ...)
  +wsemul_vt100_foo(struct vt100base_data *edp, ...)

but the argument name was not changed.  While this saved on the diff
churn back then, it created a rather unfortunate situation where the
same emulation state variables are referred to differently in this
file and other vt100 emulation files.  Complete that old change by
renaming the base class arguments to match the variable name used for
it in other files.

Same object code is generated.

(uwe)

Fix formatting corruption for manpages from tzcode.

Comment out .TH macros, that cause mandoc(1) to run into man(7) mode.

(rin)

blank line audit

(skrll)

G/C pmap_md_kernel_*

(skrll)

Reduce #ifdefs

(skrll)

Wrap long lines in a comment block.

(skrll)

spaces to tabs.

(skrll)

Remove debug printfs

(skrll)

Trailing whitespace

(skrll)

Attach the clock event counter for each cpu^Whart.

(skrll)

Use OBJCOPY_STRIPFLAGS instead of STRIPFLAGS.

(rin)

Fix kernel size inflation for arm and aarch64 (PR toolchain/57146)

For some conditions, SYSTEM_LD_TAIL is set for arm and aarch64.
Then, ctfmerge(1) in default SYSTEM_LD_TAIL is unintentionally
skipped, which results in the catastrophic kernel size inflation,
as reported in the PR.

Also, introduce and use OBJCOPY_STRIPFLAGS variable instead of
STRIPFLAGS, as strip(1) is replaced by objcopy(1) during MI
kernel build procedure.

XXX
For Makefile.{arm,aarch64}, weird logic is used to determine how
to handle debug symbols; MKDEBUG{,KERNEL} are taken into account
later in sys/conf/Makefile.kern.inc.

(rin)

Always use arm-elf2aout; no a.out support both for binutils{,.old}

(rin)