CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sun Oct 13 05:57:14 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c
tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c
tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c
tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c
tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c
Log Message:
Use PRIxBUSADDR
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra124_car.c \
src/sys/arch/arm/nvidia/tegra_xusb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra124_xusbpad.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \
src/sys/arch/arm/nvidia/tegra_hdaudio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_apbdma.c \
src/sys/arch/arm/nvidia/tegra_rtc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_cec.c \
src/sys/arch/arm/nvidia/tegra_pinmux.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_fuse.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_gpio.c \
src/sys/arch/arm/nvidia/tegra_timer.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_mc.c \
src/sys/arch/arm/nvidia/tegra_usbphy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_pmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_sdhc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_soctherm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra124_car.c
diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.17 src/sys/arch/arm/nvidia/tegra124_car.c:1.18
--- src/sys/arch/arm/nvidia/tegra124_car.c:1.17 Sat Mar 9 19:41:26 2019
+++ src/sys/arch/arm/nvidia/tegra124_car.c Sun Oct 13 05:57:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra124_car.c,v 1.17 2019/03/09 19:41:26 jakllsch Exp $ */
+/* $NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.17 2019/03/09 19:41:26 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
#include
#include
@@ -758,7 +758,7 @@ tegra124_car_attach(device_t parent, dev
sc->sc_bst = faa->faa_bst;
error = bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
if (of_getprop_uint32(phandle, "#clock-cells", >sc_clock_cells))
Index: src/sys/arch/arm/nvidia/tegra_xusb.c
diff -u src/sys/arch/arm/nvidia/tegra_xusb.c:1.17 src/sys/arch/arm/nvidia/tegra_xusb.c:1.18
--- src/sys/arch/arm/nvidia/tegra_xusb.c:1.17 Tue Jan 8 18:04:00 2019
+++ src/sys/arch/arm/nvidia/tegra_xusb.c Sun Oct 13 05:57:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
#include "opt_tegra.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.18 2019/10/13 05:57:14 skrll Exp $");
#include
#include
@@ -223,11 +223,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, >sc_ioh);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "fpci", , ) != 0) {
aprint_error(": couldn't get registers\n");
@@ -235,11 +234,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, >sc_bsh_fpci);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIxBUSADDR "\n", addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "ipfs", , ) != 0) {
aprint_error(": couldn't get registers\n");
@@ -247,11 +245,10 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, >sc_bsh_ipfs);
if (error) {
- aprint_error(": couldn't map %#" PRIx64 ": %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %" PRIxBUSADDR ": %d", addr, error);
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sun Oct 13 05:57:14 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c tegra124_xusbpad.c tegra210_car.c tegra210_xusbpad.c tegra_apbdma.c tegra_cec.c tegra_com.c tegra_fuse.c tegra_gpio.c tegra_hdaudio.c tegra_mc.c tegra_pinmux.c tegra_pmc.c tegra_rtc.c tegra_sdhc.c tegra_soctherm.c tegra_timer.c tegra_usbphy.c tegra_xusb.c Log Message: Use PRIxBUSADDR To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra124_car.c \ src/sys/arch/arm/nvidia/tegra_xusb.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra124_xusbpad.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra210_car.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \ src/sys/arch/arm/nvidia/tegra_hdaudio.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_apbdma.c \ src/sys/arch/arm/nvidia/tegra_rtc.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_cec.c \ src/sys/arch/arm/nvidia/tegra_pinmux.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_com.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_fuse.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_gpio.c \ src/sys/arch/arm/nvidia/tegra_timer.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra_mc.c \ src/sys/arch/arm/nvidia/tegra_usbphy.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_pmc.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_sdhc.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_soctherm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: skrll Date: Sun Oct 13 05:56:52 UTC 2019 Modified Files: src/sys/arch/arm/nvidia: tegra_drm_mode.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_drm_mode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: skrll
Date: Sun Oct 13 05:56:52 UTC 2019
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm_mode.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_drm_mode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm_mode.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.18 src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.19
--- src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.18 Sun Jul 7 10:27:41 2019
+++ src/sys/arch/arm/nvidia/tegra_drm_mode.c Sun Oct 13 05:56:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.18 2019/07/07 10:27:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $");
#include
#include
@@ -699,7 +699,7 @@ tegra_crtc_mode_set_base(struct drm_crtc
struct drm_framebuffer *old_fb)
{
struct tegra_crtc *tegra_crtc = to_tegra_crtc(crtc);
-
+
tegra_crtc_do_set_base(crtc, old_fb, x, y, 0);
/* Commit settings */
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Sun Oct 13 04:05:39 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Enable TEST_LWP_ENABLED in t_ptrace_wait*
The LWP events (created, exited) are now reliable in my local tests.
PR kern/51420
PR kern/51995
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.135 src/tests/lib/libc/sys/t_ptrace_wait.c:1.136
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.135 Sun Oct 13 04:00:12 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sun Oct 13 04:05:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.135 2019/10/13 04:00:12 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.136 2019/10/13 04:05:39 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.135 2019/10/13 04:00:12 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.136 2019/10/13 04:05:39 kamil Exp $");
#include
#include
@@ -126,7 +126,7 @@ static int debug = 0;
#endif
#ifndef TEST_LWP_ENABLED
-#define TEST_LWP_ENABLED 0
+#define TEST_LWP_ENABLED 1
#endif
///
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Sun Oct 13 04:05:39 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Enable TEST_LWP_ENABLED in t_ptrace_wait* The LWP events (created, exited) are now reliable in my local tests. PR kern/51420 PR kern/51995 To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Sun Oct 13 04:00:12 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Bump the number of threads in LWP t_ptrace_wait*() tests from to 100 This is a torture, but on purpose to catch LWP_CREATED and LWP_EXITED bugs. The threads do nothing other than calling sched_yield() in a loop. MAXLWP is now defined to 2048 on all ports. This change effects the following tests: - trace_thread_nolwpevents - trace_thread_lwpexit - trace_thread_lwpcreate - trace_thread_lwpcreate_and_exit To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Sun Oct 13 04:00:12 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Bump the number of threads in LWP t_ptrace_wait*() tests from to 100
This is a torture, but on purpose to catch LWP_CREATED and LWP_EXITED bugs.
The threads do nothing other than calling sched_yield() in a loop.
MAXLWP is now defined to 2048 on all ports.
This change effects the following tests:
- trace_thread_nolwpevents
- trace_thread_lwpexit
- trace_thread_lwpcreate
- trace_thread_lwpcreate_and_exit
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.134 src/tests/lib/libc/sys/t_ptrace_wait.c:1.135
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.134 Wed Oct 2 23:15:09 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sun Oct 13 04:00:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.134 2019/10/02 23:15:09 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.135 2019/10/13 04:00:12 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.134 2019/10/02 23:15:09 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.135 2019/10/13 04:00:12 kamil Exp $");
#include
#include
@@ -5455,6 +5455,8 @@ TRACEME_EXEC(traceme_signalignored_exec,
///
+#define TRACE_THREADS_NUM 100
+
static volatile int done;
static void *
@@ -5463,8 +5465,8 @@ trace_threads_cb(void *arg __unused)
done++;
- while (done < 3)
- continue;
+ while (done < TRACE_THREADS_NUM)
+ sched_yield();
return NULL;
}
@@ -5483,7 +5485,7 @@ trace_threads(bool trace_create, bool tr
const int elen = sizeof(event);
struct ptrace_siginfo info;
- pthread_t t[3];
+ pthread_t t[TRACE_THREADS_NUM];
int rv;
size_t n;
lwpid_t lid;
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sun Oct 13 03:50:26 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
Avoid double lwp_exit() in eventswitch()
For the PTRACE_LWP_EXIT event, the eventswitch() call is triggered from
lwp_exit(). In the case of setting the program status to PS_WEXIT, do not
try to demise in place, by calling lwp_exit() as it causes panic.
In this scenario bail out from the function and resume the lwp_exit()
procedure.
To generate a diff of this commit:
cvs rdiff -u -r1.371 -r1.372 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.371 src/sys/kern/kern_sig.c:1.372
--- src/sys/kern/kern_sig.c:1.371 Sun Oct 13 03:19:57 2019
+++ src/sys/kern/kern_sig.c Sun Oct 13 03:50:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.371 2019/10/13 03:19:57 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.372 2019/10/13 03:50:26 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.371 2019/10/13 03:19:57 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.372 2019/10/13 03:50:26 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -1614,6 +1614,12 @@ repeat:
if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
mutex_exit(p->p_lock);
mutex_exit(proc_lock);
+
+ if (pe_report_event == PTRACE_LWP_EXIT) {
+ /* Avoid double lwp_exit() and panic. */
+ return;
+ }
+
lwp_exit(l);
panic("eventswitch");
/* NOTREACHED */
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sun Oct 13 03:50:26 UTC 2019 Modified Files: src/sys/kern: kern_sig.c Log Message: Avoid double lwp_exit() in eventswitch() For the PTRACE_LWP_EXIT event, the eventswitch() call is triggered from lwp_exit(). In the case of setting the program status to PS_WEXIT, do not try to demise in place, by calling lwp_exit() as it causes panic. In this scenario bail out from the function and resume the lwp_exit() procedure. To generate a diff of this commit: cvs rdiff -u -r1.371 -r1.372 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sun Oct 13 03:19:57 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
Fix one the the root causes of unreliability of the ptrace(2)ed threads
In case of sigswitchin away in issignal() and continuing the execution on
PT_CONTINUE (or equivalent call), there is a time window when another
thread could cause the process state to be changed to PS_STOPPING.
In the current logic, a thread would receive signal 0 (no-signal) and exit
from issignal(), returning to userland and never finishing the process of
stopping all LWPs. This causes hangs waitpid() waiting for SIGCHLD and
the callout polling for the state of the process in an infinite loop.
Instead of prompting for a returned signal from a debugger, repeat the
issignal() loop, this will cause checking the PS_STOPPING flag again and
sigswitching away in the scenario of stopping the process.
To generate a diff of this commit:
cvs rdiff -u -r1.370 -r1.371 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.370 src/sys/kern/kern_sig.c:1.371
--- src/sys/kern/kern_sig.c:1.370 Sun Oct 13 03:10:22 2019
+++ src/sys/kern/kern_sig.c Sun Oct 13 03:19:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.370 2019/10/13 03:10:22 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.371 2019/10/13 03:19:57 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.370 2019/10/13 03:10:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.371 2019/10/13 03:19:57 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -1865,7 +1865,7 @@ issignal(struct lwp *l)
if (p->p_stat == SSTOP || (p->p_sflag & PS_STOPPING) != 0) {
sigswitch_unlock_and_switch_away(l);
mutex_enter(p->p_lock);
- signo = sigchecktrace();
+ continue;
} else if (p->p_stat == SACTIVE)
signo = sigchecktrace();
else
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sun Oct 13 03:19:57 UTC 2019 Modified Files: src/sys/kern: kern_sig.c Log Message: Fix one the the root causes of unreliability of the ptrace(2)ed threads In case of sigswitchin away in issignal() and continuing the execution on PT_CONTINUE (or equivalent call), there is a time window when another thread could cause the process state to be changed to PS_STOPPING. In the current logic, a thread would receive signal 0 (no-signal) and exit from issignal(), returning to userland and never finishing the process of stopping all LWPs. This causes hangs waitpid() waiting for SIGCHLD and the callout polling for the state of the process in an infinite loop. Instead of prompting for a returned signal from a debugger, repeat the issignal() loop, this will cause checking the PS_STOPPING flag again and sigswitching away in the scenario of stopping the process. To generate a diff of this commit: cvs rdiff -u -r1.370 -r1.371 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sun Oct 13 03:10:22 UTC 2019 Modified Files: src/sys/kern: kern_sig.c Log Message: Add sigswitch_unlock_and_switch_away(), extracted from sigswitch() Use sigswitch_unlock_and_switch_away() whenever there is no need for sigswitch(). To generate a diff of this commit: cvs rdiff -u -r1.369 -r1.370 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sun Oct 13 03:10:22 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
Add sigswitch_unlock_and_switch_away(), extracted from sigswitch()
Use sigswitch_unlock_and_switch_away() whenever there is no need for
sigswitch().
To generate a diff of this commit:
cvs rdiff -u -r1.369 -r1.370 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.369 src/sys/kern/kern_sig.c:1.370
--- src/sys/kern/kern_sig.c:1.369 Sat Oct 12 19:57:09 2019
+++ src/sys/kern/kern_sig.c Sun Oct 13 03:10:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.369 2019/10/12 19:57:09 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.370 2019/10/13 03:10:22 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.369 2019/10/12 19:57:09 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.370 2019/10/13 03:10:22 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -126,6 +126,7 @@ static int sigpost(struct lwp *, sig_t,
static int sigput(sigpend_t *, struct proc *, ksiginfo_t *);
static int sigunwait(struct proc *, const ksiginfo_t *);
static void sigswitch(int, int, bool);
+static void sigswitch_unlock_and_switch_away(struct lwp *);
static void sigacts_poolpage_free(struct pool *, void *);
static void *sigacts_poolpage_alloc(struct pool *, int);
@@ -932,10 +933,11 @@ repeat:
* The process is already stopping.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, true);
+ mutex_exit(proc_lock);
+ sigswitch_unlock_and_switch_away(l);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
- goto repeat; /* XXX */
+ goto repeat;
}
mask = >l_sigmask;
@@ -1642,10 +1644,11 @@ repeat:
* The process is already stopping.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, true);
+ mutex_exit(proc_lock);
+ sigswitch_unlock_and_switch_away(l);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
- goto repeat; /* XXX */
+ goto repeat;
}
KSI_INIT_TRAP();
@@ -1692,7 +1695,6 @@ sigswitch(int ppmask, int signo, bool pr
{
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
- int biglocks;
KASSERT(mutex_owned(p->p_lock));
KASSERT(l->l_stat == LSONPROC);
@@ -1752,10 +1754,26 @@ sigswitch(int ppmask, int signo, bool pr
mutex_exit(proc_lock);
}
- /*
- * Unlock and switch away.
- */
+ sigswitch_unlock_and_switch_away(l);
+}
+
+/*
+ * Unlock and switch away.
+ */
+static void
+sigswitch_unlock_and_switch_away(struct lwp *l)
+{
+ struct proc *p;
+ int biglocks;
+
+ p = l->l_proc;
+
+ KASSERT(mutex_owned(p->p_lock));
KASSERT(!mutex_owned(proc_lock));
+
+ KASSERT(l->l_stat == LSONPROC);
+ KASSERT(p->p_nrlwps > 0);
+
KERNEL_UNLOCK_ALL(l, );
if (p->p_stat == SSTOP || (p->p_sflag & PS_STOPPING) != 0) {
p->p_nrlwps--;
@@ -1845,7 +1863,7 @@ issignal(struct lwp *l)
* we awaken, check for a signal from the debugger.
*/
if (p->p_stat == SSTOP || (p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(PS_NOCLDSTOP, 0, false);
+ sigswitch_unlock_and_switch_away(l);
mutex_enter(p->p_lock);
signo = sigchecktrace();
} else if (p->p_stat == SACTIVE)
@@ -2527,9 +2545,9 @@ repeat:
* The process is already stopping.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, false);
+ sigswitch_unlock_and_switch_away(l);
mutex_enter(p->p_lock);
- goto repeat; /* XXX */
+ goto repeat;
}
/* Needed for ktrace */
CVS commit: src/external/bsd/ipf/lib
Module Name:src Committed By: mrg Date: Sun Oct 13 01:17:24 UTC 2019 Modified Files: src/external/bsd/ipf/lib: Makefile Log Message: remove dated commented warning disable. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/lib/Makefile diff -u src/external/bsd/ipf/lib/Makefile:1.2 src/external/bsd/ipf/lib/Makefile:1.3 --- src/external/bsd/ipf/lib/Makefile:1.2 Sun Jul 22 14:27:51 2012 +++ src/external/bsd/ipf/lib/Makefile Sun Oct 13 01:17:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/07/22 14:27:51 darrenr Exp $ +# $NetBSD: Makefile,v 1.3 2019/10/13 01:17:24 mrg Exp $ LIBISPRIVATE= yes @@ -140,6 +140,4 @@ SRCS= addicmp.c \ v6ionames.c \ v6optvalue.c -#CPPFLAGS.printstate.c= -Wno-error - .include
CVS commit: src/external/bsd/ipf/lib
Module Name:src Committed By: mrg Date: Sun Oct 13 01:17:24 UTC 2019 Modified Files: src/external/bsd/ipf/lib: Makefile Log Message: remove dated commented warning disable. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: kamil Date: Sat Oct 12 19:59:57 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 9.99.17! struct proc change sigswitch() removed from public API To generate a diff of this commit: cvs rdiff -u -r1.617 -r1.618 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.617 src/sys/sys/param.h:1.618 --- src/sys/sys/param.h:1.617 Sat Oct 12 06:31:04 2019 +++ src/sys/sys/param.h Sat Oct 12 19:59:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.617 2019/10/12 06:31:04 maxv Exp $ */ +/* $NetBSD: param.h,v 1.618 2019/10/12 19:59:57 kamil Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 999001600 /* NetBSD 9.99.16 */ +#define __NetBSD_Version__ 999001700 /* NetBSD 9.99.17 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: kamil Date: Sat Oct 12 19:59:57 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 9.99.17! struct proc change sigswitch() removed from public API To generate a diff of this commit: cvs rdiff -u -r1.617 -r1.618 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: kamil Date: Sat Oct 12 19:57:09 UTC 2019 Modified Files: src/sys/kern: kern_sig.c src/sys/sys: signalvar.h Log Message: Refactor sigswitch() Make the function static as it is now local to kern_sig.c. Rename the 'relock' argument to 'proc_lock_held' as it is more verbose. This was suggested by mjg@freebsd. While there this flips the users between true<->false. Add additional KASSERT(9) calls here to validate whethe proc_lock is used accordingly. To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/sys/kern/kern_sig.c cvs rdiff -u -r1.96 -r1.97 src/sys/sys/signalvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: kamil
Date: Sat Oct 12 19:57:09 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
src/sys/sys: signalvar.h
Log Message:
Refactor sigswitch()
Make the function static as it is now local to kern_sig.c.
Rename the 'relock' argument to 'proc_lock_held' as it is more verbose.
This was suggested by mjg@freebsd. While there this flips the users between
true<->false.
Add additional KASSERT(9) calls here to validate whethe proc_lock is used
accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.96 -r1.97 src/sys/sys/signalvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.368 src/sys/kern/kern_sig.c:1.369
--- src/sys/kern/kern_sig.c:1.368 Sat Oct 12 10:55:23 2019
+++ src/sys/kern/kern_sig.c Sat Oct 12 19:57:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.368 2019/10/12 10:55:23 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.369 2019/10/12 19:57:09 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.368 2019/10/12 10:55:23 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.369 2019/10/12 19:57:09 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -125,6 +125,7 @@ static int sigchecktrace(void);
static int sigpost(struct lwp *, sig_t, int, int);
static int sigput(sigpend_t *, struct proc *, ksiginfo_t *);
static int sigunwait(struct proc *, const ksiginfo_t *);
+static void sigswitch(int, int, bool);
static void sigacts_poolpage_free(struct pool *, void *);
static void *sigacts_poolpage_alloc(struct pool *, int);
@@ -931,7 +932,7 @@ repeat:
* The process is already stopping.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, false);
+ sigswitch(0, p->p_xsig, true);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
goto repeat; /* XXX */
@@ -949,7 +950,7 @@ repeat:
p->p_sigctx.ps_faked = true;
p->p_sigctx.ps_lwp = ksi->ksi_lid;
p->p_sigctx.ps_info = ksi->ksi_info;
- sigswitch(0, signo, false);
+ sigswitch(0, signo, true);
if (ktrpoint(KTR_PSIG)) {
if (p->p_emul->e_ktrpsig)
@@ -1641,7 +1642,7 @@ repeat:
* The process is already stopping.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, false);
+ sigswitch(0, p->p_xsig, true);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
goto repeat; /* XXX */
@@ -1666,7 +1667,7 @@ repeat:
p->p_sigctx.ps_lwp = ksi.ksi_lid;
p->p_sigctx.ps_info = ksi.ksi_info;
- sigswitch(0, signo, false);
+ sigswitch(0, signo, true);
if (code == TRAP_CHLD) {
mutex_enter(proc_lock);
@@ -1686,8 +1687,8 @@ repeat:
/*
* Stop the current process and switch away when being stopped or traced.
*/
-void
-sigswitch(int ppmask, int signo, bool relock)
+static void
+sigswitch(int ppmask, int signo, bool proc_lock_held)
{
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
@@ -1697,6 +1698,12 @@ sigswitch(int ppmask, int signo, bool re
KASSERT(l->l_stat == LSONPROC);
KASSERT(p->p_nrlwps > 0);
+ if (proc_lock_held) {
+ KASSERT(mutex_owned(proc_lock));
+ } else {
+ KASSERT(!mutex_owned(proc_lock));
+ }
+
/*
* If we are exiting, demise now.
*
@@ -1704,7 +1711,7 @@ sigswitch(int ppmask, int signo, bool re
*/
if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
mutex_exit(p->p_lock);
- if (!relock) {
+ if (proc_lock_held) {
mutex_exit(proc_lock);
}
lwp_exit(l);
@@ -1728,7 +1735,7 @@ sigswitch(int ppmask, int signo, bool re
* a new signal, then signal the parent.
*/
if ((p->p_sflag & PS_STOPPING) != 0) {
- if (relock && !mutex_tryenter(proc_lock)) {
+ if (!proc_lock_held && !mutex_tryenter(proc_lock)) {
mutex_exit(p->p_lock);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
@@ -1748,6 +1755,7 @@ sigswitch(int ppmask, int signo, bool re
/*
* Unlock and switch away.
*/
+ KASSERT(!mutex_owned(proc_lock));
KERNEL_UNLOCK_ALL(l, );
if (p->p_stat == SSTOP || (p->p_sflag & PS_STOPPING) != 0) {
p->p_nrlwps--;
@@ -1837,7 +1845,7 @@ issignal(struct lwp *l)
* we awaken, check for a signal from the debugger.
*/
if (p->p_stat == SSTOP || (p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(PS_NOCLDSTOP, 0, true);
+ sigswitch(PS_NOCLDSTOP, 0, false);
mutex_enter(p->p_lock);
signo = sigchecktrace();
} else if (p->p_stat == SACTIVE)
@@ -1909,7 +1917,7 @@ issignal(struct lwp *l)
p->p_xsig = signo;
/* Handling of signal trace */
- sigswitch(0, signo, true);
+ sigswitch(0, signo, false);
mutex_enter(p->p_lock);
/* Check for a signal from the debugger. */
@@ -1966,7 +1974,7 @@ issignal(struct lwp *l)
p->p_xsig = signo;
p->p_sflag &= ~PS_CONTINUED;
signo = 0;
-
CVS commit: src/sys/sys
Module Name:src
Committed By: kamil
Date: Sat Oct 12 19:38:57 UTC 2019
Modified Files:
src/sys/sys: proc.h
Log Message:
Remove now unused p_oppid from struct proc
To generate a diff of this commit:
cvs rdiff -u -r1.356 -r1.357 src/sys/sys/proc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.356 src/sys/sys/proc.h:1.357
--- src/sys/sys/proc.h:1.356 Mon Sep 30 21:13:33 2019
+++ src/sys/sys/proc.h Sat Oct 12 19:38:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.356 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: proc.h,v 1.357 2019/10/12 19:38:57 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -311,7 +311,6 @@ struct proc {
sigpend_t p_sigpend; /* p: pending signals */
struct lcproc *p_lwpctl; /* p, a: _lwp_ctl() information */
pid_t p_ppid; /* :: cached parent pid */
- pid_t p_oppid; /* :: cached original parent pid */
char *p_path; /* :: full pathname of executable */
/*
CVS commit: src/sys/sys
Module Name:src Committed By: kamil Date: Sat Oct 12 19:38:57 UTC 2019 Modified Files: src/sys/sys: proc.h Log Message: Remove now unused p_oppid from struct proc To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/sys/sys/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Oct 12 18:35:52 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1661 -r1.1662 src/doc/3RDPARTY cvs rdiff -u -r1.2592 -r1.2593 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Oct 12 18:35:52 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1661 -r1.1662 src/doc/3RDPARTY cvs rdiff -u -r1.2592 -r1.2593 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1661 src/doc/3RDPARTY:1.1662 --- src/doc/3RDPARTY:1.1661 Fri Oct 11 07:05:41 2019 +++ src/doc/3RDPARTY Sat Oct 12 14:35:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1661 2019/10/11 11:05:41 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1662 2019/10/12 18:35:52 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1044,7 +1044,7 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 8.0 +Version: 8.1 Current Vers: 8.1 / portable 8.1p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2592 src/doc/CHANGES:1.2593 --- src/doc/CHANGES:1.2592 Fri Oct 11 07:05:41 2019 +++ src/doc/CHANGES Sat Oct 12 14:35:52 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2592 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2593 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -55,3 +55,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: services(5): Update to version 2019-10-04 from IANA. [sevan 20191009] dhcpcd(8): Import dhcpcd-8.1.0 [roy 20191011] + OpenSSH: Import 8.1. [christos 20191012]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sat Oct 12 18:34:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.875 -r1.876 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.234 -r1.235 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sat Oct 12 18:34:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.875 -r1.876 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.234 -r1.235 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.875 src/distrib/sets/lists/base/shl.mi:1.876 --- src/distrib/sets/lists/base/shl.mi:1.875 Sat Oct 12 05:09:14 2019 +++ src/distrib/sets/lists/base/shl.mi Sat Oct 12 14:34:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.875 2019/10/12 09:09:14 mrg Exp $ +# $NetBSD: shl.mi,v 1.876 2019/10/12 18:34:14 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -851,8 +851,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.34base-secsh-shlib compatfile -./usr/lib/libssh.so.34.0 base-secsh-shlib compatfile +./usr/lib/libssh.so.35base-secsh-shlib compatfile +./usr/lib/libssh.so.35.0 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.234 src/distrib/sets/lists/debug/shl.mi:1.235 --- src/distrib/sets/lists/debug/shl.mi:1.234 Sat Oct 12 05:09:14 2019 +++ src/distrib/sets/lists/debug/shl.mi Sat Oct 12 14:34:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.234 2019/10/12 09:09:14 mrg Exp $ +# $NetBSD: shl.mi,v 1.235 2019/10/12 18:34:14 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -291,7 +291,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.34.0.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.35.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=7,cxx,libstdcxx
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Sat Oct 12 18:32:22 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/bin/sftp-server: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/dist: auth-options.c auth-options.h auth-rhosts.c auth.c auth.h auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h canohost.c channels.c cipher.c cipher.h clientloop.c dh.c dh.h hmac.c hostfile.c kex.c kex.h kexgen.c krl.c krl.h log.h mac.c match.c misc.c misc.h moduli.c monitor.c monitor_wrap.c monitor_wrap.h mux.c nchan.c packet.c packet.h progressmeter.c readconf.c readpass.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c sftp-glob.c sftp-server-main.c sftp-server.c sftp.1 sftp.c ssh-add.c ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh.1 ssh.c ssh_api.c ssh_config.5 sshbuf-getput-basic.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.c sshd_config.5 sshkey-xmss.c sshkey.c sshkey.h sshlogin.c sshpty.c sshsig.c uidswap.c umac.h version.h xmalloc.c xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: Makefile shlib_version Removed Files: src/crypto/external/bsd/openssh/dist: crc32.c crc32.h uuencode.c uuencode.h Log Message: merge openssh-8.1 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/sftp-server/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.20 -r1.21 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/packet.h \ src/crypto/external/bsd/openssh/dist/sftp-server.c \ src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssh/dist/auth-options.h \ src/crypto/external/bsd/openssh/dist/auth2-passwd.c \ src/crypto/external/bsd/openssh/dist/dh.h \ src/crypto/external/bsd/openssh/dist/match.c \ src/crypto/external/bsd/openssh/dist/progressmeter.c \ src/crypto/external/bsd/openssh/dist/sshbuf.h \ src/crypto/external/bsd/openssh/dist/sshlogin.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \ src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \ src/crypto/external/bsd/openssh/dist/nchan.c \ src/crypto/external/bsd/openssh/dist/sftp-glob.c \ src/crypto/external/bsd/openssh/dist/xmalloc.c \ src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \ src/crypto/external/bsd/openssh/dist/ssh.1 \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/auth.h \ src/crypto/external/bsd/openssh/dist/auth2.c \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/cipher.c \ src/crypto/external/bsd/openssh/dist/mac.c cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \ src/crypto/external/bsd/openssh/dist/misc.h \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c cvs rdiff -u -r1.23 -r1.24 \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/scp.1 cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/canohost.c \ src/crypto/external/bsd/openssh/dist/readpass.c cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/authfile.c cvs rdiff -u -r1.8 -r1.9
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Sat Oct 12 18:32:22 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/bin/sftp-server: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/dist: auth-options.c auth-options.h auth-rhosts.c auth.c auth.h auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c authfile.h canohost.c channels.c cipher.c cipher.h clientloop.c dh.c dh.h hmac.c hostfile.c kex.c kex.h kexgen.c krl.c krl.h log.h mac.c match.c misc.c misc.h moduli.c monitor.c monitor_wrap.c monitor_wrap.h mux.c nchan.c packet.c packet.h progressmeter.c readconf.c readpass.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c sftp-client.c sftp-glob.c sftp-server-main.c sftp-server.c sftp.1 sftp.c ssh-add.c ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh.1 ssh.c ssh_api.c ssh_config.5 sshbuf-getput-basic.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.c sshd_config.5 sshkey-xmss.c sshkey.c sshkey.h sshlogin.c sshpty.c sshsig.c uidswap.c umac.h version.h xmalloc.c xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: Makefile shlib_version Removed Files: src/crypto/external/bsd/openssh/dist: crc32.c crc32.h uuencode.c uuencode.h Log Message: merge openssh-8.1 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/sftp-server/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.20 -r1.21 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/packet.h \ src/crypto/external/bsd/openssh/dist/sftp-server.c \ src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssh/dist/auth-options.h \ src/crypto/external/bsd/openssh/dist/auth2-passwd.c \ src/crypto/external/bsd/openssh/dist/dh.h \ src/crypto/external/bsd/openssh/dist/match.c \ src/crypto/external/bsd/openssh/dist/progressmeter.c \ src/crypto/external/bsd/openssh/dist/sshbuf.h \ src/crypto/external/bsd/openssh/dist/sshlogin.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \ src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \ src/crypto/external/bsd/openssh/dist/nchan.c \ src/crypto/external/bsd/openssh/dist/sftp-glob.c \ src/crypto/external/bsd/openssh/dist/xmalloc.c \ src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \ src/crypto/external/bsd/openssh/dist/ssh.1 \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/auth.h \ src/crypto/external/bsd/openssh/dist/auth2.c \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/cipher.c \ src/crypto/external/bsd/openssh/dist/mac.c cvs rdiff -u -r1.16 -r1.17 \ src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \ src/crypto/external/bsd/openssh/dist/misc.h \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c cvs rdiff -u -r1.23 -r1.24 \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/scp.1 cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/canohost.c \ src/crypto/external/bsd/openssh/dist/readpass.c cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/authfile.c cvs rdiff -u -r1.8 -r1.9
CVS commit: src/usr.bin/btpin
Module Name:src
Committed By: christos
Date: Sat Oct 12 17:50:56 UTC 2019
Modified Files:
src/usr.bin/btpin: btpin.c
Log Message:
avoid strcpy.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/btpin/btpin.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/btpin/btpin.c
diff -u src/usr.bin/btpin/btpin.c:1.7 src/usr.bin/btpin/btpin.c:1.8
--- src/usr.bin/btpin/btpin.c:1.7 Thu Dec 21 04:04:34 2017
+++ src/usr.bin/btpin/btpin.c Sat Oct 12 13:50:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: btpin.c,v 1.7 2017/12/21 09:04:34 plunky Exp $ */
+/* $NetBSD: btpin.c,v 1.8 2019/10/12 17:50:56 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.");
-__RCSID("$NetBSD: btpin.c,v 1.7 2017/12/21 09:04:34 plunky Exp $");
+__RCSID("$NetBSD: btpin.c,v 1.8 2019/10/12 17:50:56 christos Exp $");
#include
#include
@@ -132,8 +132,11 @@ main(int ac, char *av[])
} else {
if (len != -1)
usage();
+ len = strlen(pin);
+ if (len > HCI_PIN_SIZE)
+ len = HCI_PIN_SIZE;
- strncpy((char *)rp.pin, pin, HCI_PIN_SIZE);
+ memcpy(rp.pin, pin, len);
}
s = socket(PF_LOCAL, SOCK_STREAM, 0);
CVS commit: src/usr.sbin/catman
Module Name:src
Committed By: christos
Date: Sat Oct 12 17:26:26 UTC 2019
Modified Files:
src/usr.sbin/catman: catman.c
Log Message:
enlarge buffer sizes
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/catman/catman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/catman/catman.c
diff -u src/usr.sbin/catman/catman.c:1.37 src/usr.sbin/catman/catman.c:1.38
--- src/usr.sbin/catman/catman.c:1.37 Sun May 29 18:33:39 2016
+++ src/usr.sbin/catman/catman.c Sat Oct 12 13:26:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $ */
+/* $NetBSD: catman.c,v 1.38 2019/10/12 17:26:26 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $");
+__RCSID("$NetBSD: catman.c,v 1.38 2019/10/12 17:26:26 christos Exp $");
#endif /* not lint */
#include
@@ -340,14 +340,14 @@ scanmandir(const char *catdir, const cha
{
TAG *buildp, *crunchp;
ENTRY *e_build, *e_crunch;
- char manpage[PATH_MAX];
- char catpage[PATH_MAX];
+ char manpage[2 * PATH_MAX];
+ char catpage[2 * PATH_MAX];
char linkname[PATH_MAX];
char buffer[PATH_MAX], *bp;
- char tmp[PATH_MAX];
+ char tmp[2 * PATH_MAX];
char buildsuff[256], buildcmd[256];
char crunchsuff[256], crunchcmd[256];
- char match[256];
+ char match[2 * 256];
struct stat manstat;
struct stat catstat;
struct stat lnkstat;
@@ -570,7 +570,7 @@ makecat(const char *manpage, const char
const char *crunchcmd)
{
char crunchbuf[1024];
- char sysbuf[2048];
+ char sysbuf[2048 + 128];
size_t len;
len = snprintf(sysbuf, sizeof(sysbuf), buildcmd, manpage);
CVS commit: src/usr.sbin/catman
Module Name:src Committed By: christos Date: Sat Oct 12 17:26:26 UTC 2019 Modified Files: src/usr.sbin/catman: catman.c Log Message: enlarge buffer sizes To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/catman/catman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/include
Module Name:src
Committed By: christos
Date: Sat Oct 12 15:44:46 UTC 2019
Modified Files:
src/sys/arch/amd64/include: pcb.h
Log Message:
disable CTASSERT for lint
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/include/pcb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/pcb.h
diff -u src/sys/arch/amd64/include/pcb.h:1.30 src/sys/arch/amd64/include/pcb.h:1.31
--- src/sys/arch/amd64/include/pcb.h:1.30 Sat Oct 12 02:31:03 2019
+++ src/sys/arch/amd64/include/pcb.h Sat Oct 12 11:44:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.30 2019/10/12 06:31:03 maxv Exp $ */
+/* $NetBSD: pcb.h,v 1.31 2019/10/12 15:44:46 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -99,7 +99,9 @@ struct pcb {
union savefpu pcb_savefpu __aligned(64); /* floating point state */
/* DO NOT ADD ANYTHING HERE */
};
+#ifndef __lint__
__CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) == 128);
+#endif
#else /* __x86_64__ */
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: christos Date: Sat Oct 12 15:44:46 UTC 2019 Modified Files: src/sys/arch/amd64/include: pcb.h Log Message: disable CTASSERT for lint To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/include/pcb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Sat Oct 12 15:14:22 UTC 2019 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21796 Log Message: OpenSSH 8.1 was released on 2019-10-09. It is available from the mirrors listed at https://www.openssh.com/. OpenSSH is a 100% complete SSH protocol 2.0 implementation and includes sftp client and server support. Once again, we would like to thank the OpenSSH community for their continued support of the project, especially those who contributed code or patches, reported bugs, tested snapshots or donated to the project. More information on donations may be found at: http://www.openssh.com/donations.html Security * ssh(1), sshd(8), ssh-add(1), ssh-keygen(1): an exploitable integer overflow bug was found in the private key parsing code for the XMSS key type. This key type is still experimental and support for it is not compiled by default. No user-facing autoconf option exists in portable OpenSSH to enable it. This bug was found by Adam Zabrocki and reported via SecuriTeam's SSD program. * ssh(1), sshd(8), ssh-agent(1): add protection for private keys at rest in RAM against speculation and memory side-channel attacks like Spectre, Meltdown and Rambleed. This release encrypts private keys when they are not in use with a symmetric key that is derived from a relatively large "prekey" consisting of random data (currently 16KB). Potentially-incompatible changes This release includes a number of changes that may affect existing configurations: * ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. Certificates signed by RSA keys will therefore be incompatible with OpenSSH versions prior to 7.2 unless the default is overridden (using "ssh-keygen -t ssh-rsa -s ..."). Status: Vendor Tag: OPENSSH Release Tags: v81-20191009 C src/crypto/external/bsd/openssh/dist/match.c U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/OVERVIEW U src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305 U src/crypto/external/bsd/openssh/dist/PROTOCOL.key U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux N src/crypto/external/bsd/openssh/dist/PROTOCOL.sshsig U src/crypto/external/bsd/openssh/dist/README U src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h C src/crypto/external/bsd/openssh/dist/krl.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c C src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c C src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/auth2.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h U src/crypto/external/bsd/openssh/dist/bitmap.c U src/crypto/external/bsd/openssh/dist/bitmap.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h U src/crypto/external/bsd/openssh/dist/chacha.c U src/crypto/external/bsd/openssh/dist/chacha.h C src/crypto/external/bsd/openssh/dist/channels.c U src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-aesctr.c U src/crypto/external/bsd/openssh/dist/cipher-aesctr.h U src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c U src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h C src/crypto/external/bsd/openssh/dist/cipher.c C src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c U src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/crypto_api.h C src/crypto/external/bsd/openssh/dist/dh.c C
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Sat Oct 12 15:12:09 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: ticket 303 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Sat Oct 12 15:12:09 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: ticket 303 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.75 src/doc/CHANGES-9.0:1.1.2.76 --- src/doc/CHANGES-9.0:1.1.2.75 Sat Oct 12 14:49:29 2019 +++ src/doc/CHANGES-9.0 Sat Oct 12 15:12:09 2019 @@ -1,5 +1,5 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.75 2019/10/12 14:49:29 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.76 2019/10/12 15:12:09 bouyer Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -4504,3 +4504,9 @@ common/lib/libc/arch/aarch64/gen/byte_sw Remove htonll and ntohll as symbols from aarch64 libc. [maya, ticket #304] +sbin/newfs_msdos/mkfs_msdos.c 1.15 + + Allow FAT32 formatting of typical EFI partitions with default + parameters. + [martin, ticket #303] +
CVS commit: [netbsd-9] src/sbin/newfs_msdos
Module Name:src Committed By: bouyer Date: Sat Oct 12 15:11:43 UTC 2019 Modified Files: src/sbin/newfs_msdos [netbsd-9]: mkfs_msdos.c Log Message: Pull up following revision(s) (requested by martin in ticket #303): sbin/newfs_msdos/mkfs_msdos.c: revision 1.15 When we end up with too few clusters for the requested FAT type after configuring default values, retry with a smaller cluster size. This makes the typical invocation to create a spec conformant EFI boot partition work out of the box. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.6.1 src/sbin/newfs_msdos/mkfs_msdos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sbin/newfs_msdos
Module Name:src
Committed By: bouyer
Date: Sat Oct 12 15:11:43 UTC 2019
Modified Files:
src/sbin/newfs_msdos [netbsd-9]: mkfs_msdos.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #303):
sbin/newfs_msdos/mkfs_msdos.c: revision 1.15
When we end up with too few clusters for the requested FAT type after
configuring default values, retry with a smaller cluster size.
This makes the typical invocation to create a spec conformant EFI boot
partition work out of the box.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.6.1 src/sbin/newfs_msdos/mkfs_msdos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_msdos/mkfs_msdos.c
diff -u src/sbin/newfs_msdos/mkfs_msdos.c:1.14 src/sbin/newfs_msdos/mkfs_msdos.c:1.14.6.1
--- src/sbin/newfs_msdos/mkfs_msdos.c:1.14 Sun Feb 4 09:03:23 2018
+++ src/sbin/newfs_msdos/mkfs_msdos.c Sat Oct 12 15:11:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs_msdos.c,v 1.14 2018/02/04 09:03:23 mrg Exp $ */
+/* $NetBSD: mkfs_msdos.c,v 1.14.6.1 2019/10/12 15:11:42 bouyer Exp $ */
/*
* Copyright (c) 1998 Robert Nordier
@@ -37,7 +37,7 @@
static const char rcsid[] =
"$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
#else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.14 2018/02/04 09:03:23 mrg Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.14.6.1 2019/10/12 15:11:42 bouyer Exp $");
#endif
#endif /* not lint */
@@ -264,7 +264,10 @@ mkfs_msdos(const char *fname, const char
int ch, fd, fd1;
struct msdos_options o = *op;
int oflags = O_RDWR | O_CREAT;
+bool bspf_is_calculated;
+again:
+bspf_is_calculated = false;
if (o.block_size && o.sectors_per_cluster) {
warnx("Cannot specify both block size and sectors per cluster");
return -1;
@@ -556,6 +559,7 @@ mkfs_msdos(const char *fname, const char
x2 = howmany((RESFTE + MIN(x, maxcls(o.fat_type))) * (o.fat_type / BPN),
bpb.bps * NPB);
if (!bpb.bspf) {
+ bspf_is_calculated = true;
bpb.bspf = x2;
x1 += (bpb.bspf - 1) * bpb.nft;
}
@@ -569,6 +573,11 @@ mkfs_msdos(const char *fname, const char
return -1;
}
if (cls < mincls(o.fat_type)) {
+ if (bspf_is_calculated && o.sectors_per_cluster == 0 && bpb.spc > 2) {
+ /* retry with smaller cluster size */
+ o.sectors_per_cluster = 2;
+ goto again;
+ }
warnx("%u clusters too few clusters for FAT%u, need %u", cls,
o.fat_type, mincls(o.fat_type));
return -1;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Oct 12 14:49:29 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #301, #302 and #304 To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: martin Date: Sat Oct 12 14:48:32 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen [netbsd-9]: byte_swap_8.S Log Message: Pull up following revision(s) (requested by maya in ticket #304): common/lib/libc/arch/aarch64/gen/byte_swap_8.S: revision 1.2 Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 \ src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: martin Date: Sat Oct 12 14:48:32 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen [netbsd-9]: byte_swap_8.S Log Message: Pull up following revision(s) (requested by maya in ticket #304): common/lib/libc/arch/aarch64/gen/byte_swap_8.S: revision 1.2 Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 \ src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S diff -u src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1.28.1 --- src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 Sun Aug 10 05:47:35 2014 +++ src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Sat Oct 12 14:48:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: byte_swap_8.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */ +/* $NetBSD: byte_swap_8.S,v 1.1.28.1 2019/10/12 14:48:31 martin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,3 @@ ENTRY(FUNC) rev x0, x0 ret END(FUNC) -#if BYTE_ORDER == LITTLE_ENDIAN -STRONG_ALIAS(_C_LABEL(ntohll), FUNC) -STRONG_ALIAS(_C_LABEL(htonll), FUNC) -#endif
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Oct 12 14:49:29 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #301, #302 and #304 To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.74 src/doc/CHANGES-9.0:1.1.2.75 --- src/doc/CHANGES-9.0:1.1.2.74 Fri Oct 11 18:23:40 2019 +++ src/doc/CHANGES-9.0 Sat Oct 12 14:49:29 2019 @@ -1,5 +1,5 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.74 2019/10/11 18:23:40 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.75 2019/10/12 14:49:29 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -4392,3 +4392,115 @@ sys/netinet/if_arp.c1.289 ARP: Don't defend ARP probes. [roy, ticket #300] +sys/dev/tprof/tprof_x86_amd.c 1.5 +usr.sbin/tprof/arch/tprof_x86.c 1.9 +usr.sbin/tprof/tprof.81.15 + + Add support for AMD Family 15h. + [jmcneill, ticket #301] + +external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c up to 1.1.1.2 +external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h up to 1.1.1.2 +external/bsd/dhcpcd/NetBSD-upgrade up to 1.2 +external/bsd/dhcpcd/dist/compat/crypt/sha256.c delete +external/bsd/dhcpcd/dist/compat/crypt/hmac.cdelete +external/bsd/dhcpcd/dist/compat/crypt/hmac.hdelete +external/bsd/dhcpcd/dist/compat/crypt/md5.c delete +external/bsd/dhcpcd/dist/compat/crypt/md5.h delete +external/bsd/dhcpcd/dist/compat/crypt/sha256.h delete +external/bsd/dhcpcd/dist/compat/_strtoi.h delete +external/bsd/dhcpcd/dist/compat/arc4random.cdelete +external/bsd/dhcpcd/dist/compat/arc4random.hdelete +external/bsd/dhcpcd/dist/compat/arc4random_uniform.c delete +external/bsd/dhcpcd/dist/compat/arc4random_uniform.h delete +external/bsd/dhcpcd/dist/compat/bitops.hdelete +external/bsd/dhcpcd/dist/compat/consttime_memequal.h delete +external/bsd/dhcpcd/dist/compat/dprintf.c delete +external/bsd/dhcpcd/dist/compat/dprintf.h delete +external/bsd/dhcpcd/dist/compat/endian.hdelete +external/bsd/dhcpcd/dist/compat/pidfile.c delete +external/bsd/dhcpcd/dist/compat/pidfile.h delete +external/bsd/dhcpcd/dist/compat/queue.h delete +external/bsd/dhcpcd/dist/compat/rb.cdelete +external/bsd/dhcpcd/dist/compat/rbtree.hdelete +external/bsd/dhcpcd/dist/compat/reallocarray.c delete +external/bsd/dhcpcd/dist/compat/reallocarray.h delete +external/bsd/dhcpcd/dist/compat/strlcpy.c delete +external/bsd/dhcpcd/dist/compat/strlcpy.h delete +external/bsd/dhcpcd/dist/compat/strtoi.cdelete +external/bsd/dhcpcd/dist/compat/strtoi.hdelete +external/bsd/dhcpcd/dist/compat/strtou.cdelete +external/bsd/dhcpcd/dist/.gitignore delete +external/bsd/dhcpcd/dist/BUILDING.mddelete +external/bsd/dhcpcd/dist/Makefile delete +external/bsd/dhcpcd/dist/Makefile.inc delete +external/bsd/dhcpcd/dist/config-null.mk delete +external/bsd/dhcpcd/dist/configure delete +external/bsd/dhcpcd/dist/iconfig.mk delete +external/bsd/dhcpcd/dist/hooks/Makefile delete +external/bsd/dhcpcd/dist/hooks/50-dhcpcd-compat delete +external/bsd/dhcpcd/dist/hooks/50-yp.conf delete +external/bsd/dhcpcd/dist/src/Makefile delete +external/bsd/dhcpcd/dist/src/GNUmakefiledelete +external/bsd/dhcpcd/dist/src/dev.c delete +external/bsd/dhcpcd/dist/src/dhcpcd-definitions-small.conf delete +external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf delete +external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in delete +external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in delete +external/bsd/dhcpcd/dist/src/genembedc delete +external/bsd/dhcpcd/dist/src/genembedh delete +external/bsd/dhcpcd/dist/src/if-linux-wext.cdelete +external/bsd/dhcpcd/dist/src/if-linux.c delete +external/bsd/dhcpcd/dist/src/if-sun.c delete +external/bsd/dhcpcd/dist/src/dev/Makefile delete +external/bsd/dhcpcd/dist/src/dev/udev.c delete +external/bsd/dhcpcd/dist/tests/crypt/.gitignore delete +external/bsd/dhcpcd/dist/tests/crypt/GNUmakefile delete +external/bsd/dhcpcd/dist/tests/crypt/Makefile delete +external/bsd/dhcpcd/dist/tests/crypt/README.md delete +external/bsd/dhcpcd/dist/tests/crypt/run-test.c delete +external/bsd/dhcpcd/dist/tests/crypt/test.h delete +external/bsd/dhcpcd/dist/tests/crypt/test_hmac_md5.c delete +external/bsd/dhcpcd/dist/tests/Makefile delete +external/bsd/dhcpcd/dist/tests/eloop-bench/.gitignore delete +external/bsd/dhcpcd/dist/tests/eloop-bench/Makefile delete +external/bsd/dhcpcd/dist/tests/eloop-bench/README.md delete +external/bsd/dhcpcd/dist/tests/eloop-bench/eloop-bench.c delete
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat Oct 12 14:44:33 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/bsd/dhcpcd/dist/src [netbsd-9]: arp.c bpf.c bpf.h common.c common.h control.h defs.h dhcp-common.c dhcp-common.h dhcp.c dhcp.h dhcp6.c dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in if-bsd.c if-options.c if.c if.h ipv4.c ipv4.h ipv4ll.c ipv4ll.h ipv6.c ipv6.h ipv6nd.c route.c src/external/bsd/dhcpcd/sbin/dhcpcd [netbsd-9]: Makefile Added Files: src/external/bsd/dhcpcd [netbsd-9]: NetBSD-upgrade src/external/bsd/dhcpcd/dist/src [netbsd-9]: dhcpcd-embedded.c dhcpcd-embedded.h Removed Files: src/external/bsd/dhcpcd/dist [netbsd-9]: .gitignore BUILDING.md Makefile Makefile.inc config-null.mk configure iconfig.mk src/external/bsd/dhcpcd/dist/compat [netbsd-9]: _strtoi.h arc4random.c arc4random.h arc4random_uniform.c arc4random_uniform.h bitops.h consttime_memequal.h dprintf.c dprintf.h endian.h pidfile.c pidfile.h queue.h rb.c rbtree.h reallocarray.c reallocarray.h strlcpy.c strlcpy.h strtoi.c strtoi.h strtou.c src/external/bsd/dhcpcd/dist/compat/crypt [netbsd-9]: hmac.c hmac.h md5.c md5.h sha256.c sha256.h src/external/bsd/dhcpcd/dist/hooks [netbsd-9]: 50-dhcpcd-compat 50-yp.conf Makefile src/external/bsd/dhcpcd/dist/src [netbsd-9]: GNUmakefile Makefile dev.c dhcpcd-definitions-small.conf dhcpcd-definitions.conf dhcpcd-embedded.c.in dhcpcd-embedded.h.in genembedc genembedh if-linux-wext.c if-linux.c if-sun.c src/external/bsd/dhcpcd/dist/src/dev [netbsd-9]: Makefile udev.c src/external/bsd/dhcpcd/dist/tests [netbsd-9]: Makefile src/external/bsd/dhcpcd/dist/tests/crypt [netbsd-9]: .gitignore GNUmakefile Makefile README.md run-test.c test.h test_hmac_md5.c src/external/bsd/dhcpcd/dist/tests/eloop-bench [netbsd-9]: .gitignore Makefile README.md eloop-bench.c Log Message: Pull up the following revisions, requested by roy in ticket #302: external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c up to 1.1.1.2 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h up to 1.1.1.2 external/bsd/dhcpcd/NetBSD-upgrade up to 1.2 external/bsd/dhcpcd/dist/compat/crypt/sha256.c delete external/bsd/dhcpcd/dist/compat/crypt/hmac.cdelete external/bsd/dhcpcd/dist/compat/crypt/hmac.hdelete external/bsd/dhcpcd/dist/compat/crypt/md5.c delete external/bsd/dhcpcd/dist/compat/crypt/md5.h delete external/bsd/dhcpcd/dist/compat/crypt/sha256.h delete external/bsd/dhcpcd/dist/compat/_strtoi.h delete external/bsd/dhcpcd/dist/compat/arc4random.cdelete external/bsd/dhcpcd/dist/compat/arc4random.hdelete external/bsd/dhcpcd/dist/compat/arc4random_uniform.c delete external/bsd/dhcpcd/dist/compat/arc4random_uniform.h delete external/bsd/dhcpcd/dist/compat/bitops.hdelete external/bsd/dhcpcd/dist/compat/consttime_memequal.h delete external/bsd/dhcpcd/dist/compat/dprintf.c delete external/bsd/dhcpcd/dist/compat/dprintf.h delete external/bsd/dhcpcd/dist/compat/endian.hdelete external/bsd/dhcpcd/dist/compat/pidfile.c delete external/bsd/dhcpcd/dist/compat/pidfile.h delete external/bsd/dhcpcd/dist/compat/queue.h delete external/bsd/dhcpcd/dist/compat/rb.cdelete external/bsd/dhcpcd/dist/compat/rbtree.hdelete external/bsd/dhcpcd/dist/compat/reallocarray.c delete external/bsd/dhcpcd/dist/compat/reallocarray.h delete external/bsd/dhcpcd/dist/compat/strlcpy.c delete external/bsd/dhcpcd/dist/compat/strlcpy.h delete external/bsd/dhcpcd/dist/compat/strtoi.cdelete external/bsd/dhcpcd/dist/compat/strtoi.hdelete external/bsd/dhcpcd/dist/compat/strtou.cdelete external/bsd/dhcpcd/dist/.gitignore delete external/bsd/dhcpcd/dist/BUILDING.mddelete external/bsd/dhcpcd/dist/Makefile delete external/bsd/dhcpcd/dist/Makefile.inc delete external/bsd/dhcpcd/dist/config-null.mk delete external/bsd/dhcpcd/dist/configure delete external/bsd/dhcpcd/dist/iconfig.mk delete external/bsd/dhcpcd/dist/hooks/Makefile delete external/bsd/dhcpcd/dist/hooks/50-dhcpcd-compat delete external/bsd/dhcpcd/dist/hooks/50-yp.conf delete external/bsd/dhcpcd/dist/src/Makefile delete external/bsd/dhcpcd/dist/src/GNUmakefiledelete external/bsd/dhcpcd/dist/src/dev.c
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat Oct 12 14:44:33 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/bsd/dhcpcd/dist/src [netbsd-9]: arp.c bpf.c bpf.h common.c common.h control.h defs.h dhcp-common.c dhcp-common.h dhcp.c dhcp.h dhcp6.c dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in if-bsd.c if-options.c if.c if.h ipv4.c ipv4.h ipv4ll.c ipv4ll.h ipv6.c ipv6.h ipv6nd.c route.c src/external/bsd/dhcpcd/sbin/dhcpcd [netbsd-9]: Makefile Added Files: src/external/bsd/dhcpcd [netbsd-9]: NetBSD-upgrade src/external/bsd/dhcpcd/dist/src [netbsd-9]: dhcpcd-embedded.c dhcpcd-embedded.h Removed Files: src/external/bsd/dhcpcd/dist [netbsd-9]: .gitignore BUILDING.md Makefile Makefile.inc config-null.mk configure iconfig.mk src/external/bsd/dhcpcd/dist/compat [netbsd-9]: _strtoi.h arc4random.c arc4random.h arc4random_uniform.c arc4random_uniform.h bitops.h consttime_memequal.h dprintf.c dprintf.h endian.h pidfile.c pidfile.h queue.h rb.c rbtree.h reallocarray.c reallocarray.h strlcpy.c strlcpy.h strtoi.c strtoi.h strtou.c src/external/bsd/dhcpcd/dist/compat/crypt [netbsd-9]: hmac.c hmac.h md5.c md5.h sha256.c sha256.h src/external/bsd/dhcpcd/dist/hooks [netbsd-9]: 50-dhcpcd-compat 50-yp.conf Makefile src/external/bsd/dhcpcd/dist/src [netbsd-9]: GNUmakefile Makefile dev.c dhcpcd-definitions-small.conf dhcpcd-definitions.conf dhcpcd-embedded.c.in dhcpcd-embedded.h.in genembedc genembedh if-linux-wext.c if-linux.c if-sun.c src/external/bsd/dhcpcd/dist/src/dev [netbsd-9]: Makefile udev.c src/external/bsd/dhcpcd/dist/tests [netbsd-9]: Makefile src/external/bsd/dhcpcd/dist/tests/crypt [netbsd-9]: .gitignore GNUmakefile Makefile README.md run-test.c test.h test_hmac_md5.c src/external/bsd/dhcpcd/dist/tests/eloop-bench [netbsd-9]: .gitignore Makefile README.md eloop-bench.c Log Message: Pull up the following revisions, requested by roy in ticket #302: external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c up to 1.1.1.2 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h up to 1.1.1.2 external/bsd/dhcpcd/NetBSD-upgrade up to 1.2 external/bsd/dhcpcd/dist/compat/crypt/sha256.c delete external/bsd/dhcpcd/dist/compat/crypt/hmac.cdelete external/bsd/dhcpcd/dist/compat/crypt/hmac.hdelete external/bsd/dhcpcd/dist/compat/crypt/md5.c delete external/bsd/dhcpcd/dist/compat/crypt/md5.h delete external/bsd/dhcpcd/dist/compat/crypt/sha256.h delete external/bsd/dhcpcd/dist/compat/_strtoi.h delete external/bsd/dhcpcd/dist/compat/arc4random.cdelete external/bsd/dhcpcd/dist/compat/arc4random.hdelete external/bsd/dhcpcd/dist/compat/arc4random_uniform.c delete external/bsd/dhcpcd/dist/compat/arc4random_uniform.h delete external/bsd/dhcpcd/dist/compat/bitops.hdelete external/bsd/dhcpcd/dist/compat/consttime_memequal.h delete external/bsd/dhcpcd/dist/compat/dprintf.c delete external/bsd/dhcpcd/dist/compat/dprintf.h delete external/bsd/dhcpcd/dist/compat/endian.hdelete external/bsd/dhcpcd/dist/compat/pidfile.c delete external/bsd/dhcpcd/dist/compat/pidfile.h delete external/bsd/dhcpcd/dist/compat/queue.h delete external/bsd/dhcpcd/dist/compat/rb.cdelete external/bsd/dhcpcd/dist/compat/rbtree.hdelete external/bsd/dhcpcd/dist/compat/reallocarray.c delete external/bsd/dhcpcd/dist/compat/reallocarray.h delete external/bsd/dhcpcd/dist/compat/strlcpy.c delete external/bsd/dhcpcd/dist/compat/strlcpy.h delete external/bsd/dhcpcd/dist/compat/strtoi.cdelete external/bsd/dhcpcd/dist/compat/strtoi.hdelete external/bsd/dhcpcd/dist/compat/strtou.cdelete external/bsd/dhcpcd/dist/.gitignore delete external/bsd/dhcpcd/dist/BUILDING.mddelete external/bsd/dhcpcd/dist/Makefile delete external/bsd/dhcpcd/dist/Makefile.inc delete external/bsd/dhcpcd/dist/config-null.mk delete external/bsd/dhcpcd/dist/configure delete external/bsd/dhcpcd/dist/iconfig.mk delete external/bsd/dhcpcd/dist/hooks/Makefile delete external/bsd/dhcpcd/dist/hooks/50-dhcpcd-compat delete external/bsd/dhcpcd/dist/hooks/50-yp.conf delete external/bsd/dhcpcd/dist/src/Makefile delete external/bsd/dhcpcd/dist/src/GNUmakefiledelete external/bsd/dhcpcd/dist/src/dev.c
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat Oct 12 14:34:45 UTC 2019 Modified Files: src/sys/dev/tprof [netbsd-9]: tprof_x86_amd.c src/usr.sbin/tprof [netbsd-9]: tprof.8 src/usr.sbin/tprof/arch [netbsd-9]: tprof_x86.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #301): usr.sbin/tprof/tprof.8: revision 1.15 sys/dev/tprof/tprof_x86_amd.c: revision 1.5 usr.sbin/tprof/arch/tprof_x86.c: revision 1.9 Match Family 15h - Add support for AMD Family 15h - Add AMD Family 15h to supported model list To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/tprof/tprof_x86_amd.c cvs rdiff -u -r1.14 -r1.14.2.1 src/usr.sbin/tprof/tprof.8 cvs rdiff -u -r1.8 -r1.8.4.1 src/usr.sbin/tprof/arch/tprof_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sat Oct 12 14:34:45 UTC 2019
Modified Files:
src/sys/dev/tprof [netbsd-9]: tprof_x86_amd.c
src/usr.sbin/tprof [netbsd-9]: tprof.8
src/usr.sbin/tprof/arch [netbsd-9]: tprof_x86.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #301):
usr.sbin/tprof/tprof.8: revision 1.15
sys/dev/tprof/tprof_x86_amd.c: revision 1.5
usr.sbin/tprof/arch/tprof_x86.c: revision 1.9
Match Family 15h
-
Add support for AMD Family 15h
-
Add AMD Family 15h to supported model list
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/tprof/tprof_x86_amd.c
cvs rdiff -u -r1.14 -r1.14.2.1 src/usr.sbin/tprof/tprof.8
cvs rdiff -u -r1.8 -r1.8.4.1 src/usr.sbin/tprof/arch/tprof_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/tprof/tprof_x86_amd.c
diff -u src/sys/dev/tprof/tprof_x86_amd.c:1.4 src/sys/dev/tprof/tprof_x86_amd.c:1.4.2.1
--- src/sys/dev/tprof/tprof_x86_amd.c:1.4 Fri Jun 14 11:50:35 2019
+++ src/sys/dev/tprof/tprof_x86_amd.c Sat Oct 12 14:34:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_x86_amd.c,v 1.4 2019/06/14 11:50:35 msaitoh Exp $ */
+/* $NetBSD: tprof_x86_amd.c,v 1.4.2.1 2019/10/12 14:34:45 martin Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tprof_x86_amd.c,v 1.4 2019/06/14 11:50:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_x86_amd.c,v 1.4.2.1 2019/10/12 14:34:45 martin Exp $");
#include
#include
@@ -205,6 +205,7 @@ tprof_amd_ident(void)
switch (CPUID_TO_FAMILY(ci->ci_signature)) {
case 0x10:
+ case 0x15:
case 0x17:
return TPROF_IDENT_AMD_GENERIC;
}
Index: src/usr.sbin/tprof/tprof.8
diff -u src/usr.sbin/tprof/tprof.8:1.14 src/usr.sbin/tprof/tprof.8:1.14.2.1
--- src/usr.sbin/tprof/tprof.8:1.14 Wed May 29 17:09:17 2019
+++ src/usr.sbin/tprof/tprof.8 Sat Oct 12 14:34:45 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: tprof.8,v 1.14 2019/05/29 17:09:17 maxv Exp $
+.\" $NetBSD: tprof.8,v 1.14.2.1 2019/10/12 14:34:45 martin Exp $
.\"
.\" Copyright (c)2011 YAMAMOTO Takashi,
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd May 29, 2019
+.Dd October 11, 2019
.Dt TPROF 8
.Os
.Sh NAME
@@ -130,6 +130,8 @@ ARMv8
.It
x86 AMD Family 10h
.It
+x86 AMD Family 15h
+.It
x86 AMD Family 17h
.It
x86 Intel Generic (all Intel CPUs)
Index: src/usr.sbin/tprof/arch/tprof_x86.c
diff -u src/usr.sbin/tprof/arch/tprof_x86.c:1.8 src/usr.sbin/tprof/arch/tprof_x86.c:1.8.4.1
--- src/usr.sbin/tprof/arch/tprof_x86.c:1.8 Wed May 29 17:09:18 2019
+++ src/usr.sbin/tprof/arch/tprof_x86.c Sat Oct 12 14:34:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_x86.c,v 1.8 2019/05/29 17:09:18 maxv Exp $ */
+/* $NetBSD: tprof_x86.c,v 1.8.4.1 2019/10/12 14:34:45 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -655,6 +655,120 @@ static struct event_table amd_f10h = {
};
/*
+ * AMD Family 15h
+ */
+static struct name_to_event amd_f15h_names[] = {
+ { "FpPipeAssignment", 0x000, 0x77, true },
+ { "FpSchedulerEmpty", 0x001, 0x00, true },
+ { "FpRetSseAvxOps", 0x003, 0xff, true },
+ { "FpNumMovElim", 0x004, 0x0f, true },
+ { "FpRetiredSerOps", 0x005, 0x0f, true },
+ { "LsSegRegLoads", 0x020, 0x7f, true },
+ { "LsPipeRestartSelfMod", 0x021, 0x00, true },
+ { "LsPipeRestartVarious", 0x022, 0x1f, true },
+ { "LsLoadQueueStoreQFull", 0x023, 0x03, true },
+ { "LsLockedOps", 0x024, 0x00, true },
+ { "LsRetClflushInstr", 0x026, 0x00, true },
+ { "LsRetCpuidInstr", 0x027, 0x00, true },
+ { "LsDispatch", 0x029, 0x07, true },
+ { "LsCanStoreToLoadFwOps", 0x02a, 0x03, true },
+ { "LsSmisReceived", 0x02b, 0x00, true },
+ { "LsExecClflushInstr", 0x030, 0x00, true },
+ { "LsMisalignStore", 0x032, 0x00, true },
+ { "LsFpLoadBufStall", 0x034, 0x00, true },
+ { "LsStlf", 0x035, 0x00, true },
+ { "DcCacheAccess", 0x040, 0x00, true },
+ { "DcCacheMiss", 0x041, 0x00, true },
+ { "DcCacheFillL2Sys", 0x042, 0x1f, true },
+ { "DcCacheFillSys", 0x043, 0x00, true },
+ { "DcUnifiedTlbHit", 0x045, 0x77, true },
+ { "DcUnifiedTlbMiss", 0x046, 0x77, true },
+ { "DcMisalignAccess", 0x047, 0x00, true },
+ { "DcPrefetchInstrDisp", 0x04b, 0x07, true },
+ { "DcIneffSwPrefetch", 0x052, 0x09, true },
+ { "CuCmdVictimBuf", 0x060, 0x98, true },
+ { "CuCmdMaskedOps", 0x061, 0x65, true },
+ { "CuCmdReadBlkOps", 0x062, 0x77, true },
+ { "CuCmdChgDirtyOps", 0x063, 0x08, true },
+ { "CuDramSysReq", 0x064, 0x00, true },
+ { "CuMemReqByType", 0x065, 0x83, true },
+ { "CuDataCachePrefetch", 0x067, 0x03, true },
+ { "CuMabReq", 0x068, 0xff, true },
+ { "CuMabWaitCyc", 0x069, 0xff, true },
+ { "CuSysRespCacheFill", 0x06c, 0x3f, true },
+ { "CuOctwordsWritten", 0x06d, 0x01, true },
+ {
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sat Oct 12 12:04:37 UTC 2019
Modified Files:
src/sys/kern: sys_ptrace_common.c
Log Message:
Avoid signed integer overflow for -lwp where lwp is INT_MIN
Reported-by: syzbot+68b80b44b898e66da...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/sys_ptrace_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.66 src/sys/kern/sys_ptrace_common.c:1.67
--- src/sys/kern/sys_ptrace_common.c:1.66 Wed Oct 9 13:19:43 2019
+++ src/sys/kern/sys_ptrace_common.c Sat Oct 12 12:04:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.66 2019/10/09 13:19:43 kamil Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.67 2019/10/12 12:04:37 kamil Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.66 2019/10/09 13:19:43 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.67 2019/10/12 12:04:37 kamil Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -1202,8 +1202,12 @@ do_ptrace(struct ptrace_methods *ptm, st
signo = tmp;
tmp = 0; /* don't search for LWP */
}
- } else
+ } else if (tmp == INT_MIN) {
+ error = ESRCH;
+ break;
+ } else {
tmp = -tmp;
+ }
if (tmp > 0) {
if (req == PT_DETACH) {
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sat Oct 12 12:04:37 UTC 2019 Modified Files: src/sys/kern: sys_ptrace_common.c Log Message: Avoid signed integer overflow for -lwp where lwp is INT_MIN Reported-by: syzbot+68b80b44b898e66da...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sat Oct 12 10:55:23 UTC 2019
Modified Files:
src/sys/kern: kern_exec.c kern_fork.c kern_proc.c kern_sig.c
Log Message:
Remove p_oppid from struct proc
This field is not needed as it duplicated p_opptr that is alread safe to
use, unless proven otherwise.
eventswitch() already contained a check for != initproc (pid1).
Ride ABI bump for 9.99.16.
To generate a diff of this commit:
cvs rdiff -u -r1.482 -r1.483 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.214 -r1.215 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.235 -r1.236 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.367 -r1.368 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.482 src/sys/kern/kern_exec.c:1.483
--- src/sys/kern/kern_exec.c:1.482 Mon Sep 30 21:13:33 2019
+++ src/sys/kern/kern_exec.c Sat Oct 12 10:55:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.482 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: kern_exec.c,v 1.483 2019/10/12 10:55:23 kamil Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.482 2019/09/30 21:13:33 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.483 2019/10/12 10:55:23 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -2249,7 +2249,7 @@ spawn_return(void *arg)
}
mutex_enter(p->p_lock);
- eventswitch(TRAP_CHLD, PTRACE_POSIX_SPAWN, p->p_oppid);
+ eventswitch(TRAP_CHLD, PTRACE_POSIX_SPAWN, p->p_opptr->p_pid);
}
cpu_return:
@@ -2630,7 +2630,6 @@ do_posix_spawn(struct lwp *l1, pid_t *pi
if ((p1->p_slflag & (PSL_TRACEPOSIX_SPAWN|PSL_TRACED)) ==
(PSL_TRACEPOSIX_SPAWN|PSL_TRACED)) {
proc_changeparent(p2, p1->p_pptr);
- p2->p_oppid = p1->p_pid;
}
LIST_INSERT_AFTER(p1, p2, p_pglist);
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.214 src/sys/kern/kern_fork.c:1.215
--- src/sys/kern/kern_fork.c:1.214 Mon Sep 30 21:13:33 2019
+++ src/sys/kern/kern_fork.c Sat Oct 12 10:55:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.214 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: kern_fork.c,v 1.215 2019/10/12 10:55:23 kamil Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.214 2019/09/30 21:13:33 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.215 2019/10/12 10:55:23 kamil Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -510,10 +510,8 @@ fork1(struct lwp *l1, int flags, int exi
/*
* Trace fork(2) and vfork(2)-like events on demand in a debugger.
*/
- if (tracefork(p1, flags) || tracevfork(p1, flags)) {
+ if (tracefork(p1, flags) || tracevfork(p1, flags))
proc_changeparent(p2, p1->p_pptr);
- p2->p_oppid = p1->p_pid;
- }
LIST_INSERT_AFTER(p1, p2, p_pglist);
LIST_INSERT_HEAD(, p2, p_list);
@@ -640,7 +638,7 @@ child_return(void *arg)
mutex_enter(p->p_lock);
eventswitch(TRAP_CHLD,
ISSET(p->p_lflag, PL_PPWAIT) ? PTRACE_VFORK : PTRACE_FORK,
- p->p_oppid);
+ p->p_opptr->p_pid);
}
my_tracer_is_gone:
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.235 src/sys/kern/kern_proc.c:1.236
--- src/sys/kern/kern_proc.c:1.235 Mon Sep 30 21:13:33 2019
+++ src/sys/kern/kern_proc.c Sat Oct 12 10:55:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.235 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: kern_proc.c,v 1.236 2019/10/12 10:55:23 kamil Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.235 2019/09/30 21:13:33 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.236 2019/10/12 10:55:23 kamil Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -2263,7 +2263,6 @@ fill_proc(const struct proc *psrc, struc
COND_SET_VALUE(p->p_sigpend, psrc->p_sigpend, allowaddr);
COND_SET_VALUE(p->p_lwpctl, psrc->p_lwpctl, allowaddr);
p->p_ppid = psrc->p_ppid;
- p->p_oppid = psrc->p_oppid;
COND_SET_VALUE(p->p_path, psrc->p_path, allowaddr);
COND_SET_VALUE(p->p_sigctx, psrc->p_sigctx, allowaddr);
p->p_nice = psrc->p_nice;
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.367 src/sys/kern/kern_sig.c:1.368
--- src/sys/kern/kern_sig.c:1.367 Tue Oct 8 18:02:46 2019
+++ src/sys/kern/kern_sig.c Sat Oct 12 10:55:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.367 2019/10/08 18:02:46 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.368 2019/10/12 10:55:23 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.367 2019/10/08 18:02:46 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.368
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sat Oct 12 10:55:23 UTC 2019 Modified Files: src/sys/kern: kern_exec.c kern_fork.c kern_proc.c kern_sig.c Log Message: Remove p_oppid from struct proc This field is not needed as it duplicated p_opptr that is alread safe to use, unless proven otherwise. eventswitch() already contained a check for != initproc (pid1). Ride ABI bump for 9.99.16. To generate a diff of this commit: cvs rdiff -u -r1.482 -r1.483 src/sys/kern/kern_exec.c cvs rdiff -u -r1.214 -r1.215 src/sys/kern/kern_fork.c cvs rdiff -u -r1.235 -r1.236 src/sys/kern/kern_proc.c cvs rdiff -u -r1.367 -r1.368 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: mlelstv
Date: Sat Oct 12 09:46:18 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_gpio.c
Log Message:
off by one
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/broadcom/bcm2835_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.15 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.16
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.15 Thu Oct 3 11:24:27 2019
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Sat Oct 12 09:46:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.15 2019/10/03 11:24:27 mlelstv Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.16 2019/10/12 09:46:18 mlelstv Exp $ */
/*-
* Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.15 2019/10/03 11:24:27 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.16 2019/10/12 09:46:18 mlelstv Exp $");
/*
* Driver for BCM2835 GPIO
@@ -221,7 +221,7 @@ bcm283x_pinctrl_set_config(device_t dev,
for (int i = 0; i < npins; i++) {
const u_int pin = be32toh(pins[i]);
- if (pin > sc->sc_maxpins)
+ if (pin >= sc->sc_maxpins)
continue;
if (pull) {
const int value = be32toh(pull[npull == 1 ? 0 : i]);
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: mlelstv Date: Sat Oct 12 09:46:18 UTC 2019 Modified Files: src/sys/arch/arm/broadcom: bcm2835_gpio.c Log Message: off by one To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/broadcom/bcm2835_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs_msdos
Module Name:src
Committed By: martin
Date: Sat Oct 12 09:42:39 UTC 2019
Modified Files:
src/sbin/newfs_msdos: mkfs_msdos.c
Log Message:
When we end up with too few clusters for the requested FAT type after
configuring default values, retry with a smaller cluster size.
This makes the typical invocation to create a spec conformant EFI boot
partition work out of the box.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/newfs_msdos/mkfs_msdos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_msdos/mkfs_msdos.c
diff -u src/sbin/newfs_msdos/mkfs_msdos.c:1.14 src/sbin/newfs_msdos/mkfs_msdos.c:1.15
--- src/sbin/newfs_msdos/mkfs_msdos.c:1.14 Sun Feb 4 09:03:23 2018
+++ src/sbin/newfs_msdos/mkfs_msdos.c Sat Oct 12 09:42:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs_msdos.c,v 1.14 2018/02/04 09:03:23 mrg Exp $ */
+/* $NetBSD: mkfs_msdos.c,v 1.15 2019/10/12 09:42:38 martin Exp $ */
/*
* Copyright (c) 1998 Robert Nordier
@@ -37,7 +37,7 @@
static const char rcsid[] =
"$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
#else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.14 2018/02/04 09:03:23 mrg Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.15 2019/10/12 09:42:38 martin Exp $");
#endif
#endif /* not lint */
@@ -264,7 +264,10 @@ mkfs_msdos(const char *fname, const char
int ch, fd, fd1;
struct msdos_options o = *op;
int oflags = O_RDWR | O_CREAT;
+bool bspf_is_calculated;
+again:
+bspf_is_calculated = false;
if (o.block_size && o.sectors_per_cluster) {
warnx("Cannot specify both block size and sectors per cluster");
return -1;
@@ -556,6 +559,7 @@ mkfs_msdos(const char *fname, const char
x2 = howmany((RESFTE + MIN(x, maxcls(o.fat_type))) * (o.fat_type / BPN),
bpb.bps * NPB);
if (!bpb.bspf) {
+ bspf_is_calculated = true;
bpb.bspf = x2;
x1 += (bpb.bspf - 1) * bpb.nft;
}
@@ -569,6 +573,11 @@ mkfs_msdos(const char *fname, const char
return -1;
}
if (cls < mincls(o.fat_type)) {
+ if (bspf_is_calculated && o.sectors_per_cluster == 0 && bpb.spc > 2) {
+ /* retry with smaller cluster size */
+ o.sectors_per_cluster = 2;
+ goto again;
+ }
warnx("%u clusters too few clusters for FAT%u, need %u", cls,
o.fat_type, mincls(o.fat_type));
return -1;
CVS commit: src/sbin/newfs_msdos
Module Name:src Committed By: martin Date: Sat Oct 12 09:42:39 UTC 2019 Modified Files: src/sbin/newfs_msdos: mkfs_msdos.c Log Message: When we end up with too few clusters for the requested FAT type after configuring default values, retry with a smaller cluster size. This makes the typical invocation to create a spec conformant EFI boot partition work out of the box. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/newfs_msdos/mkfs_msdos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: maya Date: Sat Oct 12 09:22:36 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen: byte_swap_8.S Log Message: Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/arch/aarch64/gen
Module Name:src Committed By: maya Date: Sat Oct 12 09:22:36 UTC 2019 Modified Files: src/common/lib/libc/arch/aarch64/gen: byte_swap_8.S Log Message: Remove htonll and ntohll as symbols from aarch64 libc. Other architectures do not define them, and so we don't provide a function declaration in any header. This means a package may detect it with a link-test and then fail due to the missing declaration, like sysutils/collectd currently does. Done this way as aarch64 has not had a release yet. Discussed with releng. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S diff -u src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.2 --- src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S:1.1 Sun Aug 10 05:47:35 2014 +++ src/common/lib/libc/arch/aarch64/gen/byte_swap_8.S Sat Oct 12 09:22:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: byte_swap_8.S,v 1.1 2014/08/10 05:47:35 matt Exp $ */ +/* $NetBSD: byte_swap_8.S,v 1.2 2019/10/12 09:22:36 maya Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,3 @@ ENTRY(FUNC) rev x0, x0 ret END(FUNC) -#if BYTE_ORDER == LITTLE_ENDIAN -STRONG_ALIAS(_C_LABEL(ntohll), FUNC) -STRONG_ALIAS(_C_LABEL(htonll), FUNC) -#endif
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sat Oct 12 09:09:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: remove shared libraries from 'obsolete' lists. should fix eg: /usr/pkg/lib/libaudiofile.so.1: Shared object "libstdc++.so.8" not found oops. sorry for anyone affected by this. To generate a diff of this commit: cvs rdiff -u -r1.874 -r1.875 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sat Oct 12 09:09:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: remove shared libraries from 'obsolete' lists. should fix eg: /usr/pkg/lib/libaudiofile.so.1: Shared object "libstdc++.so.8" not found oops. sorry for anyone affected by this. To generate a diff of this commit: cvs rdiff -u -r1.874 -r1.875 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.874 src/distrib/sets/lists/base/shl.mi:1.875 --- src/distrib/sets/lists/base/shl.mi:1.874 Thu Oct 3 00:59:50 2019 +++ src/distrib/sets/lists/base/shl.mi Sat Oct 12 09:09:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.874 2019/10/03 00:59:50 mrg Exp $ +# $NetBSD: shl.mi,v 1.875 2019/10/12 09:09:14 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -859,8 +859,6 @@ ./usr/lib/libssl.so.14base-crypto-shlib compatfile,openssl=11 ./usr/lib/libssl.so.14.0 base-crypto-shlib compatfile,openssl=11 ./usr/lib/libstdc++.sobase-sys-shlib compatfile,gcc,cxx,libstdcxx -./usr/lib/libstdc++.so.8 base-sys-shlib compatfile,obsolete -./usr/lib/libstdc++.so.8.1 base-sys-shlib compatfile,obsolete ./usr/lib/libstdc++.so.9 base-sys-shlib compatfile,gcc=7,cxx,libstdcxx ./usr/lib/libstdc++.so.9.0 base-sys-shlib compatfile,gcc=7,cxx,libstdcxx ./usr/lib/libstdc++.so.9 base-sys-shlib compatfile,gcc=8,cxx,libstdcxx Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.233 src/distrib/sets/lists/debug/shl.mi:1.234 --- src/distrib/sets/lists/debug/shl.mi:1.233 Thu Oct 3 00:59:50 2019 +++ src/distrib/sets/lists/debug/shl.mi Sat Oct 12 09:09:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.233 2019/10/03 00:59:50 mrg Exp $ +# $NetBSD: shl.mi,v 1.234 2019/10/12 09:09:14 mrg Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -294,7 +294,6 @@ ./usr/libdata/debug/usr/lib/libssh.so.34.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 -./usr/libdata/debug/usr/lib/libstdc++.so.8.1.debug comp-sys-debug debug,compatfile,obsolete ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=7,cxx,libstdcxx ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=8,cxx,libstdcxx ./usr/libdata/debug/usr/lib/libterminfo.so.1.0.debug comp-sys-debug debug,compatfile
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Sat Oct 12 07:38:28 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1375 -r1.1376 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1374 -r1.1375 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Sat Oct 12 06:46:42 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Spell controller correctly To generate a diff of this commit: cvs rdiff -u -r1.1387 -r1.1388 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1387 src/sys/dev/pci/pcidevs:1.1388 --- src/sys/dev/pci/pcidevs:1.1387 Sat Sep 21 14:25:09 2019 +++ src/sys/dev/pci/pcidevs Sat Oct 12 06:46:42 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1387 2019/09/21 14:25:09 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1388 2019/10/12 06:46:42 skrll Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -6839,7 +6839,7 @@ product PROMISE PDC20271 0x6269 PDC20271 product PROMISE PDC20617 0x6617 PDC20617 Dual Ultra/133 IDE Controller product PROMISE PDC20620 0x6620 PDC20620 Dual Ultra/133 IDE Controller product PROMISE PDC20621 0x6621 PDC20621 Dual Ultra/133 IDE Controller -product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controler +product PROMISE PDC20618 0x6626 PDC20618 Dual Ultra/133 IDE Controller product PROMISE PDC20619 0x6629 PDC20619 Dual Ultra/133 IDE Controller product PROMISE PDC20277 0x7275 PDC20277 Ultra/133 IDE Controller
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Sat Oct 12 06:46:42 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Spell controller correctly To generate a diff of this commit: cvs rdiff -u -r1.1387 -r1.1388 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: skrll
Date: Sat Oct 12 06:46:13 UTC 2019
Modified Files:
src/sys/arch/arm/imx: files.imx51 files.imx6 files.imx7
src/sys/arch/arm/imx/fdt: files.imx6
Log Message:
Spell controller correctly
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/imx/files.imx51
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/files.imx7
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/fdt/files.imx6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/files.imx51
diff -u src/sys/arch/arm/imx/files.imx51:1.19 src/sys/arch/arm/imx/files.imx51:1.20
--- src/sys/arch/arm/imx/files.imx51:1.19 Wed Jul 24 12:33:18 2019
+++ src/sys/arch/arm/imx/files.imx51 Sat Oct 12 06:46:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx51,v 1.19 2019/07/24 12:33:18 hkenken Exp $
+# $NetBSD: files.imx51,v 1.20 2019/10/12 06:46:13 skrll Exp $
#
# Configuration info for the Freescale i.MX5x
#
@@ -110,13 +110,13 @@ file arch/arm/imx/imxusb.c imxehci
attach sdhc at axi with sdhc_axi
file arch/arm/imx/imx51_esdhc.c sdhc_axi
-# iic Controler
+# iic controller
device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at axi
file arch/arm/imx/imxi2c.c imxi2c
file arch/arm/imx/imx51_i2c.c imxi2c
-# SPI bus controlloer
+# SPI bus controller
# attach of this driver need to be specified in paltform configuration
# use flags to module version
device imxspi : spibus
@@ -136,7 +136,7 @@ defparam opt_imxspi.hIMXSPI_DEBUG
# device imxi2s {} : bus_dma_generic
# file arch/arm/imx/imx51_i2s.c imxi2s needs-flag
-# PWM controlloer
+# PWM controller
device imxpwm
file arch/arm/imx/imxpwm.c imxpwm
file arch/arm/imx/imx51_pwm.c imxpwm
Index: src/sys/arch/arm/imx/files.imx6
diff -u src/sys/arch/arm/imx/files.imx6:1.18 src/sys/arch/arm/imx/files.imx6:1.19
--- src/sys/arch/arm/imx/files.imx6:1.18 Sat Jul 27 08:02:04 2019
+++ src/sys/arch/arm/imx/files.imx6 Sat Oct 12 06:46:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.18 2019/07/27 08:02:04 skrll Exp $
+# $NetBSD: files.imx6,v 1.19 2019/10/12 06:46:13 skrll Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -71,7 +71,7 @@ device imxiomux
attach imxiomux at axi
file arch/arm/imx/imx6_iomux.c imxiomux
-# iMX iic Controler
+# iMX iic controller
device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at axi
file arch/arm/imx/imxi2c.c imxi2c
Index: src/sys/arch/arm/imx/files.imx7
diff -u src/sys/arch/arm/imx/files.imx7:1.8 src/sys/arch/arm/imx/files.imx7:1.9
--- src/sys/arch/arm/imx/files.imx7:1.8 Sat Jul 27 12:07:24 2019
+++ src/sys/arch/arm/imx/files.imx7 Sat Oct 12 06:46:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx7,v 1.8 2019/07/27 12:07:24 hkenken Exp $
+# $NetBSD: files.imx7,v 1.9 2019/10/12 06:46:13 skrll Exp $
#
# Configuration info for the Freescale i.MX7
#
@@ -60,7 +60,7 @@ device imxiomux
attach imxiomux at axi
file arch/arm/imx/imx7_iomux.c imxiomux
-# iMX iic Controler
+# iMX iic controller
device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at axi
file arch/arm/imx/imxi2c.c imxi2c
Index: src/sys/arch/arm/imx/fdt/files.imx6
diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.6 src/sys/arch/arm/imx/fdt/files.imx6:1.7
--- src/sys/arch/arm/imx/fdt/files.imx6:1.6 Mon Aug 19 11:41:36 2019
+++ src/sys/arch/arm/imx/fdt/files.imx6 Sat Oct 12 06:46:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.6 2019/08/19 11:41:36 hkenken Exp $
+# $NetBSD: files.imx6,v 1.7 2019/10/12 06:46:13 skrll Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -71,13 +71,13 @@ attach imxpcie at fdt with imxpcie_fdt
file arch/arm/imx/imxpcie.c imxpcie
file arch/arm/imx/fdt/imx6_pcie.c imxpcie_fdt
-# iMX iic Controler
+# iMX iic controller
device imxi2c: motoi2c, i2cbus, i2cexec
attach imxi2c at fdt
file arch/arm/imx/imxi2c.c imxi2c
file arch/arm/imx/fdt/imx6_i2c.c imxi2c
-# SPI bus controlloer
+# SPI bus controller
device imxspi : spibus
attach imxspi at fdt with imxspi_fdt
filearch/arm/imx/imxspi.c imxspi
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: skrll Date: Sat Oct 12 06:46:13 UTC 2019 Modified Files: src/sys/arch/arm/imx: files.imx51 files.imx6 files.imx7 src/sys/arch/arm/imx/fdt: files.imx6 Log Message: Spell controller correctly To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/imx/files.imx51 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/files.imx6 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/files.imx7 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/fdt/files.imx6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Sat Oct 12 06:31:04 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: amd64_trap.S genassym.cf locore.S machdep.c spl.S src/sys/arch/amd64/include: frameasm.h pcb.h proc.h src/sys/arch/i386/i386: genassym.cf i386_trap.S locore.S machdep.c spl.S src/sys/arch/i386/include: frameasm.h pcb.h proc.h src/sys/arch/x86/acpi: acpi_wakeup.c src/sys/arch/x86/include: cpu.h fpu.h src/sys/arch/x86/x86: cpu.c fpu.c ipi.c vm_machdep.c src/sys/arch/xen/x86: cpu.c xen_ipi.c src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c src/sys/sys: param.h Log Message: Rewrite the FPU code on x86. This greatly simplifies the logic and removes the dependency on IPL_HIGH. NVMM is updated accordingly. Posted on port-amd64 a week ago. Bump the kernel version to 9.99.16. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/amd64/amd64_trap.S cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.336 -r1.337 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/include/frameasm.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/include/pcb.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/include/proc.h cvs rdiff -u -r1.113 -r1.114 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/i386/i386_trap.S cvs rdiff -u -r1.171 -r1.172 src/sys/arch/i386/i386/locore.S cvs rdiff -u -r1.820 -r1.821 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/i386/spl.S cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/include/frameasm.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/include/pcb.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/include/proc.h cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.109 -r1.110 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/include/fpu.h cvs rdiff -u -r1.172 -r1.173 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/x86/fpu.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/ipi.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/vm_machdep.c cvs rdiff -u -r1.129 -r1.130 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c cvs rdiff -u -r1.616 -r1.617 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Sat Oct 12 06:31:04 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: amd64_trap.S genassym.cf locore.S machdep.c spl.S src/sys/arch/amd64/include: frameasm.h pcb.h proc.h src/sys/arch/i386/i386: genassym.cf i386_trap.S locore.S machdep.c spl.S src/sys/arch/i386/include: frameasm.h pcb.h proc.h src/sys/arch/x86/acpi: acpi_wakeup.c src/sys/arch/x86/include: cpu.h fpu.h src/sys/arch/x86/x86: cpu.c fpu.c ipi.c vm_machdep.c src/sys/arch/xen/x86: cpu.c xen_ipi.c src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c src/sys/sys: param.h Log Message: Rewrite the FPU code on x86. This greatly simplifies the logic and removes the dependency on IPL_HIGH. NVMM is updated accordingly. Posted on port-amd64 a week ago. Bump the kernel version to 9.99.16. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/amd64/amd64_trap.S cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.336 -r1.337 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/include/frameasm.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/include/pcb.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/include/proc.h cvs rdiff -u -r1.113 -r1.114 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/i386/i386_trap.S cvs rdiff -u -r1.171 -r1.172 src/sys/arch/i386/i386/locore.S cvs rdiff -u -r1.820 -r1.821 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/i386/spl.S cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/include/frameasm.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/include/pcb.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/include/proc.h cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.109 -r1.110 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/include/fpu.h cvs rdiff -u -r1.172 -r1.173 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/x86/fpu.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/ipi.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/vm_machdep.c cvs rdiff -u -r1.129 -r1.130 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c cvs rdiff -u -r1.616 -r1.617 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/amd64_trap.S diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.48 src/sys/arch/amd64/amd64/amd64_trap.S:1.49 --- src/sys/arch/amd64/amd64/amd64_trap.S:1.48 Sat May 18 13:32:12 2019 +++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Oct 12 06:31:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64_trap.S,v 1.48 2019/05/18 13:32:12 maxv Exp $ */ +/* $NetBSD: amd64_trap.S,v 1.49 2019/10/12 06:31:03 maxv Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc. @@ -672,6 +672,7 @@ calltrap: jmp .Lalltraps_checkast /* re-check ASTs */ 3: CHECK_DEFERRED_SWITCH jnz 9f + HANDLE_DEFERRED_FPU 6: #ifdef DIAGNOSTIC Index: src/sys/arch/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.76 src/sys/arch/amd64/amd64/genassym.cf:1.77 --- src/sys/arch/amd64/amd64/genassym.cf:1.76 Wed May 29 16:54:41 2019 +++ src/sys/arch/amd64/amd64/genassym.cf Sat Oct 12 06:31:03 2019 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.76 2019/05/29 16:54:41 maxv Exp $ +# $NetBSD: genassym.cf,v 1.77 2019/10/12 06:31:03 maxv Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -164,6 +164,7 @@ define PAGE_SIZE PAGE_SIZE define MDL_IRET MDL_IRET define MDL_COMPAT32 MDL_COMPAT32 +define MDL_FPU_IN_CPU MDL_FPU_IN_CPU define P_FLAG offsetof(struct proc, p_flag) define P_RASLIST offsetof(struct proc, p_raslist) @@ -188,6 +189,7 @@ define PCB_FLAGS offsetof(struct pcb, p define PCB_COMPAT32 PCB_COMPAT32 define PCB_FS offsetof(struct pcb, pcb_fs) define PCB_GS offsetof(struct pcb, pcb_gs) +define PCB_SAVEFPU offsetof(struct pcb, pcb_savefpu) define TF_RDI offsetof(struct trapframe, tf_rdi) define TF_RSI offsetof(struct trapframe, tf_rsi) @@ -244,7 +246,6 @@ define CPU_INFO_NSYSCALL offsetof(struct define CPU_INFO_NTRAP offsetof(struct cpu_info, ci_data.cpu_ntrap) define CPU_INFO_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr) define CPU_INFO_CURPRIORITY offsetof(struct cpu_info, ci_schedstate.spc_curpriority) -define CPU_INFO_FPCURLWP offsetof(struct cpu_info, ci_fpcurlwp) define CPU_INFO_GDT offsetof(struct cpu_info, ci_gdt) define CPU_INFO_ILEVEL offsetof(struct cpu_info, ci_ilevel) Index:
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sat Oct 12 06:00:52 UTC 2019 Modified Files: src/sys/dev/pci: if_et.c Log Message: Fix a bug that multicast address filter doesn't work correctly. XXX pullup-[789]. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_et.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sat Oct 12 06:00:52 UTC 2019
Modified Files:
src/sys/dev/pci: if_et.c
Log Message:
Fix a bug that multicast address filter doesn't work correctly.
XXX pullup-[789].
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_et.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.26 src/sys/dev/pci/if_et.c:1.27
--- src/sys/dev/pci/if_et.c:1.26 Thu Aug 1 13:36:37 2019
+++ src/sys/dev/pci/if_et.c Sat Oct 12 06:00:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_et.c,v 1.26 2019/08/01 13:36:37 msaitoh Exp $ */
+/* $NetBSD: if_et.c,v 1.27 2019/10/12 06:00:52 msaitoh Exp $ */
/* $OpenBSD: if_et.c,v 1.12 2008/07/11 09:29:02 kevlo $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.26 2019/08/01 13:36:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.27 2019/10/12 06:00:52 msaitoh Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -1304,7 +1304,6 @@ et_setmulti(struct et_softc *sc)
uint32_t rxmac_ctrl, pktfilt;
struct ether_multi *enm;
struct ether_multistep step;
- uint8_t addr[ETHER_ADDR_LEN];
int i, count;
pktfilt = CSR_READ_4(sc, ET_PKTFILT);
@@ -1316,19 +1315,13 @@ et_setmulti(struct et_softc *sc)
goto back;
}
- bcopy(etherbroadcastaddr, addr, ETHER_ADDR_LEN);
-
count = 0;
ETHER_LOCK(ec);
ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
uint32_t *hp, h;
- for (i = 0; i < ETHER_ADDR_LEN; i++) {
- addr[i] &= enm->enm_addrlo[i];
- }
-
- h = ether_crc32_be(addr, ETHER_ADDR_LEN);
+ h = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
h = (h & 0x3f80) >> 23;
hp = [0];
