CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Feb 18 07:27:15 UTC 2019
Modified Files:
src/sys/dev/mii: dmphy.c
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/dmphy.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/mii/dmphy.c
diff -u src/sys/dev/mii/dmphy.c:1.37 src/sys/dev/mii/dmphy.c:1.38
--- src/sys/dev/mii/dmphy.c:1.37 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/mii/dmphy.c Mon Feb 18 07:27:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.37 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: dmphy.c,v 1.38 2019/02/18 07:27:15 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.37 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.38 2019/02/18 07:27:15 msaitoh Exp $");
#include
#include
@@ -234,7 +234,7 @@ dmphy_status(struct mii_softc *sc)
if (bmcr & BMCR_AUTOEN) {
/*
- * The PAR status bits are only valid of autonegotiation
+ * The PAR status bits are only valid if autonegotiation
* has completed (or it's disabled).
*/
if ((bmsr & BMSR_ACOMP) == 0) {
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src Committed By: msaitoh Date: Mon Feb 18 06:27:10 UTC 2019 Modified Files: src/sys/arch/evbppc/obs405: obs600_autoconf.c Log Message: Fix compile error reported by Kazuhiro Ito in PR kern/52704. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs600_autoconf.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/evbppc/obs405/obs600_autoconf.c diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 --- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.7 Thu Nov 21 13:52:27 2013 +++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Mon Feb 18 06:27:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_autoconf.c,v 1.7 2013/11/21 13:52:27 kiyohara Exp $ */ +/* $NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $ */ /* * Copyright 2004 Shigeyuki Fukushima. @@ -33,7 +33,7 @@ * DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.7 2013/11/21 13:52:27 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $"); #include "dwctwo.h" @@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs600_autoc #include #include +#include #include "dwc2_core.h" /* This parameters was set from u-boot. */
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Mon Feb 18 05:41:20 UTC 2019
Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c
Log Message:
- Add wbnoinvd, virt_ssbd, tme, cldemote, movdiri, movdir64b and pconfig.
- Move AMD 0x8008 ebx's ibpb, ibrs and stibp to x86_features[8] linux
mapping.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/procfs_machdep.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/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.27 src/sys/arch/x86/x86/procfs_machdep.c:1.28
--- src/sys/arch/x86/x86/procfs_machdep.c:1.27 Sun Jan 6 15:37:17 2019
+++ src/sys/arch/x86/x86/procfs_machdep.c Mon Feb 18 05:41:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.27 2019/01/06 15:37:17 christos Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.28 2019/02/18 05:41:20 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.27 2019/01/06 15:37:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.28 2019/02/18 05:41:20 msaitoh Exp $");
#include
#include
@@ -115,14 +115,14 @@ static const char * const x86_features[]
"hw_pstate", "proc_feedback", "sme", NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ NULL, "ibrs", "ibpb", "stibp", NULL, NULL, NULL, NULL},
{ /* (8) Linux mapping */
"tpr_shadow", "vnmi", "flexpriority", "ept",
"vpid", "npt", "lbrv", "svm_lock",
"nrip_save", "tsc_scale", "vmcb_clean", "flushbyasid",
"decodeassists", "pausefilter", "pfthreshold", "vmmcall",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, "ept_ad", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (9) Intel-defined: 0007 ebx */
@@ -153,9 +153,9 @@ static const char * const x86_features[]
{ /* (13) AMD 0x8008 ebx */
"clzero", "irperf", "xsaveerptr", NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, "ibpb", NULL, "ibrs", "stibp",
+ NULL, "wbnoinvd", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ NULL, "virt_ssbd", NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (14) 0x0006 eax */
"dtherm", "ida", "arat", NULL, "pln", NULL, "pts", "hwp",
@@ -176,9 +176,9 @@ static const char * const x86_features[]
NULL, "avx512vbmi", "umip", "pku",
"ospke", NULL, "avx512_vbmi2", NULL,
"gfni", "vaes", "vpclmulqdq", "avx512_vnni",
- "avx512_bitalg", NULL, "avx512_vpopcntdq", NULL,
+ "avx512_bitalg", "tme", "avx512_vpopcntdq", NULL,
"la57", NULL, NULL, NULL, NULL, NULL, "rdpid", NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ NULL, "cldemote", NULL, "movdiri", "movdir64b", NULL, NULL, NULL},
{ /* (17) 0x8007 ebx */
"overflow_recov", "succor", NULL, "smca", NULL, NULL, NULL, NULL,
@@ -189,7 +189,7 @@ static const char * const x86_features[]
{ /* (18) Intel 0x0007 edx */
NULL, NULL, "avx512_4vnniw", "avx512_4fmaps", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, "pconfig", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
"flush_l1d", "arch_capabilities", NULL, "ssbd"},
};
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jakllsch
Date: Mon Feb 18 02:42:27 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_lcdc.c
Log Message:
Fix copy/paste issue that resulted in tcon0 ch0/ch1 crtc clk mixup.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_lcdc.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/sunxi/sunxi_lcdc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.4 src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.4 Mon Feb 4 12:10:13 2019
+++ src/sys/arch/arm/sunxi/sunxi_lcdc.c Mon Feb 18 02:42:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lcdc.c,v 1.4 2019/02/04 12:10:13 jmcneill Exp $ */
+/* $NetBSD: sunxi_lcdc.c,v 1.5 2019/02/18 02:42:27 jakllsch Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.4 2019/02/04 12:10:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.5 2019/02/18 02:42:27 jakllsch Exp $");
#include
#include
@@ -244,13 +244,13 @@ sunxi_lcdc_tcon0_commit(struct drm_encod
TCON_WRITE(sc, TCON0_IO_POL_REG, val);
if (sc->sc_clk_ch[0] != NULL) {
- error = clk_set_rate(sc->sc_clk_ch[1], mode->crtc_clock * 1000);
+ error = clk_set_rate(sc->sc_clk_ch[0], mode->crtc_clock * 1000);
if (error != 0) {
device_printf(sc->sc_dev, "failed to set CH0 PLL rate to %u Hz: %d\n",
mode->crtc_clock * 1000, error);
return;
}
- error = clk_enable(sc->sc_clk_ch[1]);
+ error = clk_enable(sc->sc_clk_ch[0]);
if (error != 0) {
device_printf(sc->sc_dev, "failed to enable CH0 PLL: %d\n", error);
return;
CVS commit: src/sys/arch
Module Name:src
Committed By: thorpej
Date: Mon Feb 18 01:12:25 UTC 2019
Modified Files:
src/sys/arch/atari/atari: trap.c
src/sys/arch/atari/conf: files.atari
src/sys/arch/atari/include: cpu.h
src/sys/arch/cesfic/cesfic: trap.c
src/sys/arch/cesfic/conf: files.cesfic
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/hp300/conf: files.hp300
src/sys/arch/hp300/hp300: trap.c
src/sys/arch/hp300/include: cpu.h
src/sys/arch/luna68k/conf: files.luna68k
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/luna68k/luna68k: trap.c
src/sys/arch/m68k/include: frame.h
src/sys/arch/mac68k/conf: files.mac68k
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mac68k/mac68k: trap.c
src/sys/arch/mvme68k/conf: files.mvme68k
src/sys/arch/mvme68k/mvme68k: trap.c
src/sys/arch/news68k/conf: files.news68k
src/sys/arch/news68k/include: cpu.h
src/sys/arch/news68k/news68k: trap.c
src/sys/arch/next68k/conf: files.next68k
src/sys/arch/next68k/include: cpu.h
src/sys/arch/next68k/next68k: trap.c
src/sys/arch/x68k/conf: files.x68k
src/sys/arch/x68k/include: cpu.h
src/sys/arch/x68k/x68k: trap.c
Added Files:
src/sys/arch/m68k/m68k: m68k_trap.c
Log Message:
Refactor the 68040 writeback() from each m68k port's trap handler into a
shared copy: m68040_writeback(). It is essentially a copy of the Atari
version, with some minor cosmetic tweaks and one small performance optimization
from the mvme68k port.
Tested by rjs@ on a Quadra 950. (Thanks!)
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/atari/atari/trap.c
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/atari/conf/files.atari
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/atari/include/cpu.h
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/cesfic/cesfic/trap.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/conf/files.cesfic
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/luna68k/conf/files.luna68k
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/luna68k/luna68k/trap.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/m68k/include/frame.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/m68k/m68k_trap.c
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/mac68k/conf/files.mac68k
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/mac68k/mac68k/trap.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mvme68k/conf/files.mvme68k
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/mvme68k/mvme68k/trap.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/news68k/conf/files.news68k
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/news68k/trap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/next68k/conf/files.next68k
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/next68k/next68k/trap.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x68k/include/cpu.h
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/x68k/x68k/trap.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/atari/atari/trap.c
diff -u src/sys/arch/atari/atari/trap.c:1.113 src/sys/arch/atari/atari/trap.c:1.114
--- src/sys/arch/atari/atari/trap.c:1.113 Wed Mar 4 20:29:59 2015
+++ src/sys/arch/atari/atari/trap.c Mon Feb 18 01:12:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.113 2015/03/04 20:29:59 martin Exp $ */
+/* $NetBSD: trap.c,v 1.114 2019/02/18 01:12:22 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.113 2015/03/04 20:29:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.114 2019/02/18 01:12:22 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -93,9 +93,6 @@ void trap(struct frame *, int, u_int, u_
static void panictrap(int, u_int, u_int, struct frame *);
static void trapcpfault(struct lwp *, struct frame *, int);
static void userret(struct lwp *, struct frame *fp, u_quad_t, u_int, int);
-#ifdef M68040
-static int writeback(struct frame *, int);
-#endif /* M68040 */
const char *trap_type[] = {
"Bus error",
@@ -220,7 +217,7 @@ again:
"pid %d(%s): writeback aborted in sigreturn, pc=%x\n",
p->p_pid, p->p_comm, fp->f_pc, faultaddr);
#endif
- } else if ((sig = writeback(fp, fromtrap))) {
+ } else if ((sig = m68040_writeback(fp, fromtrap))) {
ksiginfo_t ksi;
beenhere = 1;
oticks = p->p_sticks;
@@ -633,7 +630,7 @@
CVS commit: src
Module Name:src Committed By: rin Date: Mon Feb 18 00:42:55 UTC 2019 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: Belatedly add debugging symbols for t_atomic_*. To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.807 -r1.808 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.155 -r1.156 src/etc/mtree/NetBSD.dist.tests 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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.276 src/distrib/sets/lists/debug/mi:1.277 --- src/distrib/sets/lists/debug/mi:1.276 Sun Feb 3 13:01:57 2019 +++ src/distrib/sets/lists/debug/mi Mon Feb 18 00:42:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.276 2019/02/03 13:01:57 martin Exp $ +# $NetBSD: mi,v 1.277 2019/02/18 00:42:55 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1889,6 +1889,13 @@ ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_bpfjit.debug tests-lib-debug debug,atf,sljit,compattestfile ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_cop.debug tests-lib-debug debug,atf,sljit,compattestfile ./usr/libdata/debug/usr/tests/lib/libbpfjit/t_extmem.debug tests-lib-debug debug,atf,sljit,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_add.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_and.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_cas.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_dec.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_inc.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_or.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/atomic/t_atomic_swap.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/c063/t_faccessat.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/c063/t_fchmodat.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/c063/t_fchownat.debug tests-lib-debug debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.807 src/distrib/sets/lists/tests/mi:1.808 --- src/distrib/sets/lists/tests/mi:1.807 Sun Feb 17 12:24:17 2019 +++ src/distrib/sets/lists/tests/mi Mon Feb 18 00:42:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.807 2019/02/17 12:24:17 isaki Exp $ +# $NetBSD: mi,v 1.808 2019/02/18 00:42:55 rin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -89,6 +89,7 @@ ./usr/libdata/debug/usr/tests/lib/libbluetoothtests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libbpfjittests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc tests-lib-debug compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libc/atomictests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/c063tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/dbtests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gentests-lib-debug compattestfile,atf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.155 src/etc/mtree/NetBSD.dist.tests:1.156 --- src/etc/mtree/NetBSD.dist.tests:1.155 Sun Feb 17 12:24:17 2019 +++ src/etc/mtree/NetBSD.dist.tests Mon Feb 18 00:42:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.155 2019/02/17 12:24:17 isaki Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.156 2019/02/18 00:42:54 rin Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -75,6 +75,7 @@ ./usr/libdata/debug/usr/tests/lib/libbluetooth ./usr/libdata/debug/usr/tests/lib/libbpfjit ./usr/libdata/debug/usr/tests/lib/libc +./usr/libdata/debug/usr/tests/lib/libc/atomic ./usr/libdata/debug/usr/tests/lib/libc/c063 ./usr/libdata/debug/usr/tests/lib/libc/db ./usr/libdata/debug/usr/tests/lib/libc/gen
CVS commit: src/external/bsd/libnv/lib
Module Name:src
Committed By: bad
Date: Sun Feb 17 23:54:08 UTC 2019
Modified Files:
src/external/bsd/libnv/lib: Makefile
Log Message:
make libnv not LIBISPRIVATE when RUMPRUN=yes.
include bsd.init.mk earlier to pick up MAKECONF for RUMPRUN.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libnv/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/libnv/lib/Makefile
diff -u src/external/bsd/libnv/lib/Makefile:1.1 src/external/bsd/libnv/lib/Makefile:1.2
--- src/external/bsd/libnv/lib/Makefile:1.1 Sat Sep 8 14:11:11 2018
+++ src/external/bsd/libnv/lib/Makefile Sun Feb 17 23:54:08 2019
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2018/09/08 14:11:11 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/02/17 23:54:08 bad Exp $
-LIBISPRIVATE= yes
+WARNS?= 5
+
+.include
+
+.if ${RUMPRUN:Uno} != "yes"
+LIBISPRIVATE?= yes
+.endif
LIB= nv
#USE_SHLIBDIR= yes
#SHLIB_MAJOR= 1
#SHLIB_MINOR= 0
-WARNS?= 5
-
-.include
-
#INCS= nv.h dnv.h
#INCSDIR= /usr/include
#MAN= nv.3
CVS commit: src/sys/rump
Module Name:src Committed By: bad Date: Sun Feb 17 23:50:53 UTC 2019 Modified Files: src/sys/rump: listsrcdirs Log Message: npfctl needs externalbsd/libnv. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/rump/listsrcdirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/listsrcdirs diff -u src/sys/rump/listsrcdirs:1.35 src/sys/rump/listsrcdirs:1.36 --- src/sys/rump/listsrcdirs:1.35 Sun Apr 1 04:35:06 2018 +++ src/sys/rump/listsrcdirs Sun Feb 17 23:50:53 2019 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: listsrcdirs,v 1.35 2018/04/01 04:35:06 ryo Exp $ +# $NetBSD: listsrcdirs,v 1.36 2019/02/17 23:50:53 bad Exp $ # # @@ -109,7 +109,7 @@ lsrc usr /sbin/ rndctl route setkey sy lsrc usr /usr.bin/ kdump ktrace mixerctl sockstat lsrc usr /usr.sbin/ arp dumpfs mdconfig ndp npf pcictl lsrc usr /usr.sbin/ rtadvd vnconfig wlanctl -lsrc usr /external/bsd/ libelf libpcap tcpdump wpa +lsrc usr /external/bsd/ libelf libnv libpcap tcpdump wpa lsrc usr /crypto/ Makefile.openssl lsrc usr /crypto/dist/ ipsec-tools lsrc usr /crypto/external/bsd/ openssl
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: bad
Date: Sun Feb 17 23:35:50 UTC 2019
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Linux doesn't have paccept().
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.126 src/lib/librumphijack/hijack.c:1.127
--- src/lib/librumphijack/hijack.c:1.126 Sun Dec 16 14:03:37 2018
+++ src/lib/librumphijack/hijack.c Sun Feb 17 23:35:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.126 2018/12/16 14:03:37 hannken Exp $ */
+/* $NetBSD: hijack.c,v 1.127 2019/02/17 23:35:50 bad Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.126 2018/12/16 14:03:37 hannken Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.127 2019/02/17 23:35:50 bad Exp $");
#endif
#include
@@ -89,7 +89,10 @@ __RCSID("$NetBSD: hijack.c,v 1.126 2018/
enum dualcall {
DUALCALL_WRITE, DUALCALL_WRITEV, DUALCALL_PWRITE, DUALCALL_PWRITEV,
DUALCALL_IOCTL, DUALCALL_FCNTL,
- DUALCALL_SOCKET, DUALCALL_ACCEPT, DUALCALL_PACCEPT,
+ DUALCALL_SOCKET, DUALCALL_ACCEPT,
+#ifndef __linux__
+ DUALCALL_PACCEPT,
+#endif
DUALCALL_BIND, DUALCALL_CONNECT,
DUALCALL_GETPEERNAME, DUALCALL_GETSOCKNAME, DUALCALL_LISTEN,
DUALCALL_RECVFROM, DUALCALL_RECVMSG,
@@ -272,7 +275,9 @@ struct sysnames {
} syscnames[] = {
{ DUALCALL_SOCKET, S(REALSOCKET), RSYS_NAME(SOCKET) },
{ DUALCALL_ACCEPT, "accept", RSYS_NAME(ACCEPT) },
+#ifndef __linux__
{ DUALCALL_PACCEPT, "paccept", RSYS_NAME(PACCEPT) },
+#endif
{ DUALCALL_BIND, "bind", RSYS_NAME(BIND) },
{ DUALCALL_CONNECT, "connect", RSYS_NAME(CONNECT) },
{ DUALCALL_GETPEERNAME, "getpeername", RSYS_NAME(GETPEERNAME) },
@@ -1382,6 +1387,7 @@ accept(int s, struct sockaddr *addr, soc
return fd;
}
+#ifndef __linux__
int
paccept(int s, struct sockaddr *addr, socklen_t *addrlen,
const sigset_t * restrict sigmask, int flags)
@@ -1410,6 +1416,7 @@ paccept(int s, struct sockaddr *addr, so
return fd;
}
+#endif
/*
* ioctl() and fcntl() are varargs calls and need special treatment.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: bad Date: Sun Feb 17 23:33:20 UTC 2019 Modified Files: src/lib/librumphijack: Makefile Log Message: compile hijack.c with -D_INCOMPLETE_XOPEN_C063 so that AT_FDCWD is alwasy defined for rumpkernels. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/librumphijack/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumphijack/Makefile diff -u src/lib/librumphijack/Makefile:1.20 src/lib/librumphijack/Makefile:1.21 --- src/lib/librumphijack/Makefile:1.20 Thu May 11 04:33:14 2017 +++ src/lib/librumphijack/Makefile Sun Feb 17 23:33:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/05/11 04:33:14 sevan Exp $ +# $NetBSD: Makefile,v 1.21 2019/02/17 23:33:20 bad Exp $ # LIB= rumphijack @@ -11,6 +11,7 @@ MAN= rumphijack.3 SRCS= hijack.c hijackdlsym.c CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT +CPPFLAGS.hijack.c+= -D_INCOMPLETE_XOPEN_C063 WARNS?= 5
CVS commit: src/sys/kern
Module Name:src Committed By: bad Date: Sun Feb 17 23:17:42 UTC 2019 Modified Files: src/sys/kern: subr_bufq.c Log Message: rename module_name to strategy_module_name to avoid fatal shadowing of module_name() when compiled with older external gcc. NFC To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/kern/subr_bufq.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/subr_bufq.c diff -u src/sys/kern/subr_bufq.c:1.26 src/sys/kern/subr_bufq.c:1.27 --- src/sys/kern/subr_bufq.c:1.26 Tue Jan 23 22:08:55 2018 +++ src/sys/kern/subr_bufq.c Sun Feb 17 23:17:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_bufq.c,v 1.26 2018/01/23 22:08:55 pgoyette Exp $ */ +/* $NetBSD: subr_bufq.c,v 1.27 2019/02/17 23:17:41 bad Exp $ */ /* NetBSD: subr_disk.c,v 1.70 2005/08/20 12:00:01 yamt Exp $ */ /*- @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_bufq.c,v 1.26 2018/01/23 22:08:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_bufq.c,v 1.27 2019/02/17 23:17:41 bad Exp $"); #include #include @@ -135,7 +135,7 @@ bufq_alloc(struct bufq_state **bufqp, co int error = 0; u_int gen; bool found_exact; - char module_name[MAXPATHLEN]; + char strategy_module_name[MAXPATHLEN]; KASSERT((flags & BUFQ_EXACT) == 0 || strategy != BUFQ_STRAT_ANY); @@ -179,10 +179,12 @@ bufq_alloc(struct bufq_state **bufqp, co break; /* Try to autoload the bufq strategy module */ - strlcpy(module_name, "bufq_", sizeof(module_name)); - strlcat(module_name, strategy, sizeof(module_name)); + strlcpy(strategy_module_name, "bufq_", + sizeof(strategy_module_name)); + strlcat(strategy_module_name, strategy, + sizeof(strategy_module_name)); mutex_exit(_mutex); - (void) module_autoload(module_name, MODULE_CLASS_BUFQ); + (void) module_autoload(strategy_module_name, MODULE_CLASS_BUFQ); mutex_enter(_mutex); } while (gen != module_gen);
CVS commit: src/usr.sbin/ifwatchd
Module Name:src Committed By: gutteridge Date: Sun Feb 17 20:50:25 UTC 2019 Modified Files: src/usr.sbin/ifwatchd: ifwatchd.8 Log Message: ifwatchd(8): remove lingering references to dhclient(8). In this case, its replacement handles carrier detection itself. Addresses part of PR misc/53669. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/ifwatchd/ifwatchd.8 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/ifwatchd/ifwatchd.8 diff -u src/usr.sbin/ifwatchd/ifwatchd.8:1.28 src/usr.sbin/ifwatchd/ifwatchd.8:1.29 --- src/usr.sbin/ifwatchd/ifwatchd.8:1.28 Sun Sep 23 07:24:20 2018 +++ src/usr.sbin/ifwatchd/ifwatchd.8 Sun Feb 17 20:50:25 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ifwatchd.8,v 1.28 2018/09/23 07:24:20 maxv Exp $ +.\" $NetBSD: ifwatchd.8,v 1.29 2019/02/17 20:50:25 gutteridge Exp $ .\" .\" Copyright (c) 2001-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 22, 2018 +.Dd February 17, 2019 .Dt IFWATCHD 8 .Os .Sh NAME @@ -163,33 +163,6 @@ Use in your .Pa /etc/ifconfig.pppoe0 file in the on-demand case. -.Pp -The next example is for dhclient users. -.Bd -literal -offset indent -# ifwatchd -i -c /etc/dhcp/carrier-detect tlp0 -.Ed -.Pp -With the above command, the carrier-detect script will be invoked when -a carrier is detected on the interface -.Ar tlp0 . -Note that the -.Fl i -flag prevents any action based on the initial state. -A script like the following should work for most users, although it -will not work for machines with multiple interfaces running -.Cm dhclient . -.Bd -literal -offset indent -#! /bin/sh -# Arguments: ifname tty speed address destination -# If there is a dhclient already running, kill it. -# (This step could be put in a distinct no-carrier script, -# if desired.) -if [ -f /var/run/dhclient.pid ]; then - /bin/kill `/bin/cat /var/run/dhclient.pid` -fi -# Start dhclient again on this interface -/sbin/dhclient $1 -.Ed .Sh PARAMETERS PASSED TO SCRIPTS The invoked scripts get passed these parameters: .Bl -tag -width destination
CVS commit: src/usr.sbin/pf/etc/defaults
Module Name:src
Committed By: gutteridge
Date: Sun Feb 17 20:45:47 UTC 2019
Modified Files:
src/usr.sbin/pf/etc/defaults: pf.boot.conf
Log Message:
pf.boot.conf: remove lingering references to dhclient(8), and while
here, capitalize acronyms. Addresses part of PR misc/53669.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/pf/etc/defaults/pf.boot.conf
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/pf/etc/defaults/pf.boot.conf
diff -u src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.4 src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.5
--- src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.4 Fri May 26 15:40:27 2017
+++ src/usr.sbin/pf/etc/defaults/pf.boot.conf Sun Feb 17 20:45:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: pf.boot.conf,v 1.4 2017/05/26 15:40:27 hauke Exp $
+# $NetBSD: pf.boot.conf,v 1.5 2019/02/17 20:45:47 gutteridge Exp $
#
# /etc/defaults/pf.boot.conf --
# initial configuration for pf(4)
@@ -15,12 +15,12 @@ block all
# Don't block loopback.
pass on lo0
-# Allow outgoing dns, needed by pfctl to resolve names.
+# Allow outgoing DNS, needed by pfctl to resolve names.
pass out proto { tcp, udp } from any to any port 53 keep state
-# Allow outgoing ping request, might be needed by dhclient to validate
-# old (but valid) leases in /var/db/dhclient.leases in case it needs to
-# fall back to such a lease (the dhcp server can be down or not responding).
+# Allow outgoing ping request, might be used by a DHCP client to validate
+# old (but valid) leases in case it needs to fall back to such a lease
+# (the DHCP server can be down or not responding).
pass out inet proto icmp all icmp-type echoreq keep state
# Allow IPv6 router/neighbor solicitation and advertisement.
@@ -29,5 +29,5 @@ pass in inet6 proto ipv6-icmp all icmp6-
pass out inet6 proto ipv6-icmp all icmp6-type routersol
pass in inet6 proto ipv6-icmp all icmp6-type routeradv
-# Enable carp, to avoid spurious failovers.
+# Enable CARP, to avoid spurious failovers.
pass proto carp
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Sun Feb 17 20:25:46 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm_x86.c
Log Message:
Fix handling of SIB instructions. We were jumping to the SIB node _before_
fetching the displacement, so the node would always think there was no
displacement.
This didn't alter the final GPA we would be touching - because it is
fetched from the kernel directly and not from the computation -, but it
altered the instruction length, and on some guests (like Fedora 64bit),
the VCPU would resume execution at the wrong RIP and crash.
Now these guests work.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libnvmm/libnvmm_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/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.23 src/lib/libnvmm/libnvmm_x86.c:1.24
--- src/lib/libnvmm/libnvmm_x86.c:1.23 Fri Feb 15 16:42:27 2019
+++ src/lib/libnvmm/libnvmm_x86.c Sun Feb 17 20:25:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.23 2019/02/15 16:42:27 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.24 2019/02/17 20:25:46 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -2233,15 +2233,15 @@ node_regmodrm(struct x86_decode_fsm *fsm
strg->u.reg = reg;
}
+ /* The displacement applies to RM. */
+ strm->disp.type = get_disp_type(instr);
+
if (has_sib(instr)) {
/* Overwrites RM */
fsm_advance(fsm, 1, node_sib);
return 0;
}
- /* The displacement applies to RM. */
- strm->disp.type = get_disp_type(instr);
-
if (is_rip_relative(fsm, instr)) {
/* Overwrites RM */
strm->type = STORE_REG;
CVS commit: src/sys/modules/lfs
Module Name:src
Committed By: rin
Date: Sun Feb 17 14:04:31 UTC 2019
Modified Files:
src/sys/modules/lfs: Makefile
Log Message:
For vax, GCC 6.5 and 7.4 cannot compile lfs_inode.c with
-DDIAGNOSTIC and -O2/-O1.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/lfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lfs/Makefile
diff -u src/sys/modules/lfs/Makefile:1.9 src/sys/modules/lfs/Makefile:1.10
--- src/sys/modules/lfs/Makefile:1.9 Sun Feb 17 04:05:53 2019
+++ src/sys/modules/lfs/Makefile Sun Feb 17 14:04:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/17 04:05:53 rin Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/17 14:04:31 rin Exp $
.include "../Makefile.inc"
@@ -18,4 +18,9 @@ SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_i
WARNS= 3
+.if ${MACHINE} == "vax"
+# GCC 6.5 and 7.4 cannot compile this with -DDIAGNOSTIC and -O2/-O1
+COPTS.lfs_inode.c+= -O0
+.endif
+
.include
CVS commit: src/sys/uvm
Module Name:src
Committed By: rin
Date: Sun Feb 17 13:46:03 UTC 2019
Modified Files:
src/sys/uvm: uvm_coredump.c
Log Message:
VM_MAXUSER_ADDRESS can be undefined when compiling module/coredump;
it varies between machines for evbppc (and possibly evbppc64).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/uvm/uvm_coredump.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/uvm/uvm_coredump.c
diff -u src/sys/uvm/uvm_coredump.c:1.6 src/sys/uvm/uvm_coredump.c:1.7
--- src/sys/uvm/uvm_coredump.c:1.6 Tue Jan 7 07:59:03 2014
+++ src/sys/uvm/uvm_coredump.c Sun Feb 17 13:46:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_coredump.c,v 1.6 2014/01/07 07:59:03 dsl Exp $ */
+/* $NetBSD: uvm_coredump.c,v 1.7 2019/02/17 13:46:03 rin Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_coredump.c,v 1.6 2014/01/07 07:59:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_coredump.c,v 1.7 2019/02/17 13:46:03 rin Exp $");
/*
* uvm_coredump.c: glue functions for coredump
@@ -130,8 +130,10 @@ uvm_coredump_walkmap(struct proc *p, int
*/
KASSERT(!UVM_ET_ISSUBMAP(entry));
+#ifdef VM_MAXUSER_ADDRESS
KASSERT(state.start < VM_MAXUSER_ADDRESS);
KASSERT(state.end <= VM_MAXUSER_ADDRESS);
+#endif
if (entry->object.uvm_obj == NULL &&
entry->aref.ar_amap == NULL) {
state.realend = state.start;
CVS commit: src/sys/modules/exec_elf32
Module Name:src
Committed By: rin
Date: Sun Feb 17 13:21:55 UTC 2019
Modified Files:
src/sys/modules/exec_elf32: Makefile
Log Message:
Set WARNS=3 to appease sign-compare warnings for mips, mips64, and sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/exec_elf32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/exec_elf32/Makefile
diff -u src/sys/modules/exec_elf32/Makefile:1.3 src/sys/modules/exec_elf32/Makefile:1.4
--- src/sys/modules/exec_elf32/Makefile:1.3 Wed Oct 13 14:15:23 2010
+++ src/sys/modules/exec_elf32/Makefile Sun Feb 17 13:21:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/10/13 14:15:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2019/02/17 13:21:55 rin Exp $
.include "../Makefile.inc"
@@ -21,4 +21,6 @@ CPPFLAGS+= -DPAX_ASLR
.PATH: ${S}/kern
SRCS= exec_elf32.c core_elf32.c
+WARNS= 3
+
.include
CVS commit: src
Module Name:src
Committed By: isaki
Date: Sun Feb 17 12:24:17 UTC 2019
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/lib/libc: Makefile
Added Files:
src/tests/lib/libc/atomic: Makefile t_atomic_add.c t_atomic_and.c
t_atomic_cas.c t_atomic_dec.c t_atomic_inc.c t_atomic_or.c
t_atomic_swap.c
Log Message:
Add ATF tests for atomic_ops(3).
To generate a diff of this commit:
cvs rdiff -u -r1.806 -r1.807 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.154 -r1.155 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.48 -r1.49 src/tests/lib/libc/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/atomic/Makefile \
src/tests/lib/libc/atomic/t_atomic_add.c \
src/tests/lib/libc/atomic/t_atomic_and.c \
src/tests/lib/libc/atomic/t_atomic_cas.c \
src/tests/lib/libc/atomic/t_atomic_dec.c \
src/tests/lib/libc/atomic/t_atomic_inc.c \
src/tests/lib/libc/atomic/t_atomic_or.c \
src/tests/lib/libc/atomic/t_atomic_swap.c
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.806 src/distrib/sets/lists/tests/mi:1.807
--- src/distrib/sets/lists/tests/mi:1.806 Sat Feb 9 00:14:43 2019
+++ src/distrib/sets/lists/tests/mi Sun Feb 17 12:24:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.806 2019/02/09 00:14:43 mrg Exp $
+# $NetBSD: mi,v 1.807 2019/02/17 12:24:17 isaki Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2442,6 +2442,15 @@
./usr/tests/lib/libctests-lib-tests compattestfile,atf
./usr/tests/lib/libc/Atffile tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/Kyuafile tests-lib-tests compattestfile,atf,kyua
+./usr/tests/lib/libc/atomic tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/Atffile tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_add tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_and tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_cas tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_dec tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_inc tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_or tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/atomic/t_atomic_swap tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/c063 tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/c063/Atffile tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/c063/Kyuafile tests-lib-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.154 src/etc/mtree/NetBSD.dist.tests:1.155
--- src/etc/mtree/NetBSD.dist.tests:1.154 Sun Dec 23 15:43:42 2018
+++ src/etc/mtree/NetBSD.dist.tests Sun Feb 17 12:24:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.154 2018/12/23 15:43:42 jakllsch Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.155 2019/02/17 12:24:17 isaki Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -259,6 +259,7 @@
./usr/tests/lib/csu
./usr/tests/lib/libbluetooth
./usr/tests/lib/libc
+./usr/tests/lib/libc/atomic
./usr/tests/lib/libc/c063
./usr/tests/lib/libc/db
./usr/tests/lib/libc/gen
Index: src/tests/lib/libc/Makefile
diff -u src/tests/lib/libc/Makefile:1.48 src/tests/lib/libc/Makefile:1.49
--- src/tests/lib/libc/Makefile:1.48 Fri Aug 3 04:24:41 2018
+++ src/tests/lib/libc/Makefile Sun Feb 17 12:24:17 2019
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2018/08/03 04:24:41 kamil Exp $
+# $NetBSD: Makefile,v 1.49 2019/02/17 12:24:17 isaki Exp $
.include "Makefile.inc"
.include
SUBDIR+= tls_dso .WAIT sync
+TESTS_SUBDIRS+= atomic
TESTS_SUBDIRS+= c063 db gen hash inet locale misc net regex rpc setjmp stdlib
TESTS_SUBDIRS+= stdio string sys termios time tls ttyio
Added files:
Index: src/tests/lib/libc/atomic/Makefile
diff -u /dev/null src/tests/lib/libc/atomic/Makefile:1.1
--- /dev/null Sun Feb 17 12:24:17 2019
+++ src/tests/lib/libc/atomic/Makefile Sun Feb 17 12:24:17 2019
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/02/17 12:24:17 isaki Exp $
+
+.include
+
+TESTSDIR= ${TESTSBASE}/lib/libc/atomic
+
+TESTS_C+= t_atomic_add
+TESTS_C+= t_atomic_and
+TESTS_C+= t_atomic_cas
+TESTS_C+= t_atomic_dec
+TESTS_C+= t_atomic_inc
+TESTS_C+= t_atomic_or
+TESTS_C+= t_atomic_swap
+
+MKMAN=no
+
+BINDIR= ${TESTSDIR}
+
+.include
Index: src/tests/lib/libc/atomic/t_atomic_add.c
diff -u /dev/null src/tests/lib/libc/atomic/t_atomic_add.c:1.1
--- /dev/null Sun Feb 17 12:24:17 2019
+++ src/tests/lib/libc/atomic/t_atomic_add.c Sun Feb 17 12:24:17 2019
@@ -0,0 +1,125 @@
+/* $NetBSD: t_atomic_add.c,v 1.1 2019/02/17 12:24:17 isaki Exp $ */
+
+/*
+ * Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
+ *
+ *
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: rin
Date: Sun Feb 17 09:33:19 UTC 2019
Modified Files:
src/sys/dev/usb: if_axen.c if_axenreg.h
Log Message:
Remove unused.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_axenreg.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/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.36 src/sys/dev/usb/if_axen.c:1.37
--- src/sys/dev/usb/if_axen.c:1.36 Thu Feb 7 10:36:20 2019
+++ src/sys/dev/usb/if_axen.c Sun Feb 17 09:33:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.36 2019/02/07 10:36:20 mlelstv Exp $ */
+/* $NetBSD: if_axen.c,v 1.37 2019/02/17 09:33:19 rin Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.36 2019/02/07 10:36:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.37 2019/02/17 09:33:19 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -950,7 +950,6 @@ axen_rx_list_init(struct axen_softc *sc)
for (i = 0; i < AXEN_RX_LIST_CNT; i++) {
c = >axen_rx_chain[i];
c->axen_sc = sc;
- c->axen_idx = i;
if (c->axen_xfer == NULL) {
int err = usbd_create_xfer(sc->axen_ep[AXEN_ENDPT_RX],
sc->axen_rx_bufsz, 0, 0, >axen_xfer);
@@ -976,7 +975,6 @@ axen_tx_list_init(struct axen_softc *sc)
for (i = 0; i < AXEN_TX_LIST_CNT; i++) {
c = >axen_tx_chain[i];
c->axen_sc = sc;
- c->axen_idx = i;
if (c->axen_xfer == NULL) {
int err = usbd_create_xfer(sc->axen_ep[AXEN_ENDPT_TX],
sc->axen_tx_bufsz, USBD_FORCE_SHORT_XFER, 0,
Index: src/sys/dev/usb/if_axenreg.h
diff -u src/sys/dev/usb/if_axenreg.h:1.10 src/sys/dev/usb/if_axenreg.h:1.11
--- src/sys/dev/usb/if_axenreg.h:1.10 Wed Feb 6 08:38:41 2019
+++ src/sys/dev/usb/if_axenreg.h Sun Feb 17 09:33:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axenreg.h,v 1.10 2019/02/06 08:38:41 rin Exp $ */
+/* $NetBSD: if_axenreg.h,v 1.11 2019/02/17 09:33:19 rin Exp $ */
/* $OpenBSD: if_axenreg.h,v 1.1 2013/10/07 05:37:41 yuo Exp $ */
/*
@@ -243,17 +243,13 @@ struct axen_chain {
struct axen_softc *axen_sc;
struct usbd_xfer *axen_xfer;
uint8_t *axen_buf;
- int axen_accum;
- int axen_idx;
};
struct axen_cdata {
struct axen_chain axen_tx_chain[AXEN_TX_LIST_CNT];
struct axen_chain axen_rx_chain[AXEN_RX_LIST_CNT];
int axen_tx_prod;
- int axen_tx_cons;
int axen_tx_cnt;
- int axen_rx_prod;
};
struct axen_qctrl {
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Sun Feb 17 09:29:35 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Add new ATF t_ptrace_wait* vfork(2) tests
Add traceme_vfork_signalmasked_crash and traceme_vfork_signalignored_crash
tests for crash signals (SIGTRAP, SIGSEGV, SIGILL, SIGFPE, SIGBUS).
These new scenario assert that signal masked/ignored are delivered to
vfork(2)ed child.
All tests pass.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 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.91 src/tests/lib/libc/sys/t_ptrace_wait.c:1.92
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.91 Sun Feb 17 05:21:49 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sun Feb 17 09:29:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.91 2019/02/17 05:21:49 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.92 2019/02/17 09:29:35 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.91 2019/02/17 05:21:49 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.92 2019/02/17 09:29:35 kamil Exp $");
#include
#include
@@ -1585,6 +1585,179 @@ TRACEME_VFORK_CRASH(traceme_vfork_crash_
///
+static void
+traceme_vfork_signalmasked_crash(int sig)
+{
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ sigset_t intmask;
+
+#ifndef PTRACE_ILLEGAL_ASM
+ if (sig == SIGILL)
+ atf_tc_skip("PTRACE_ILLEGAL_ASM not defined");
+#endif
+
+ DPRINTF("Before forking process PID=%d\n", getpid());
+ SYSCALL_REQUIRE((child = vfork()) != -1);
+ if (child == 0) {
+ DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ sigemptyset();
+ sigaddset(, sig);
+ sigprocmask(SIG_BLOCK, , NULL);
+
+ DPRINTF("Before executing a trap\n");
+ switch (sig) {
+ case SIGTRAP:
+ trigger_trap();
+ break;
+ case SIGSEGV:
+ trigger_segv();
+ break;
+ case SIGILL:
+ trigger_ill();
+ break;
+ case SIGFPE:
+ trigger_fpe();
+ break;
+ case SIGBUS:
+ trigger_bus();
+ break;
+ default:
+ /* NOTREACHED */
+ FORKEE_ASSERTX(0 && "This shall not be reached");
+ }
+
+ /* NOTREACHED */
+ FORKEE_ASSERTX(0 && "This shall not be reached");
+ }
+ DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+ validate_status_signaled(status, sig, 1);
+
+ DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+
+#define TRACEME_VFORK_SIGNALMASKED_CRASH(test, sig) \
+ATF_TC(test);\
+ATF_TC_HEAD(test, tc) \
+{ \
+ atf_tc_set_md_var(tc, "descr", \
+ "Verify PT_TRACE_ME followed by a crash signal " #sig " in a " \
+ "vfork(2)ed child with a masked signal"); \
+} \
+ \
+ATF_TC_BODY(test, tc) \
+{ \
+ \
+ traceme_vfork_signalmasked_crash(sig);\
+}
+
+TRACEME_VFORK_SIGNALMASKED_CRASH(traceme_vfork_signalmasked_crash_trap, SIGTRAP)
+TRACEME_VFORK_SIGNALMASKED_CRASH(traceme_vfork_signalmasked_crash_segv, SIGSEGV)
+TRACEME_VFORK_SIGNALMASKED_CRASH(traceme_vfork_signalmasked_crash_ill, SIGILL)
+TRACEME_VFORK_SIGNALMASKED_CRASH(traceme_vfork_signalmasked_crash_fpe, SIGFPE)
+TRACEME_VFORK_SIGNALMASKED_CRASH(traceme_vfork_signalmasked_crash_bus, SIGBUS)
+
+///
+
+static void
+traceme_vfork_signalignored_crash(int sig)
+{
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct sigaction sa;
+
+#ifndef PTRACE_ILLEGAL_ASM
+ if (sig == SIGILL)
+ atf_tc_skip("PTRACE_ILLEGAL_ASM not defined");
+#endif
+
+ DPRINTF("Before forking process PID=%d\n", getpid());
+ SYSCALL_REQUIRE((child = vfork()) != -1);
+ if (child == 0) {
+ DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ memset(, 0, sizeof(sa));
+ sa.sa_handler = SIG_IGN;
+ sigemptyset(_mask);
+
+ FORKEE_ASSERT(sigaction(sig, , NULL) != -1);
+
+ DPRINTF("Before executing a trap\n");
+ switch (sig) {
+ case SIGTRAP:
+ trigger_trap();
+ break;
+ case SIGSEGV:
+ trigger_segv();
+ break;
+ case SIGILL:
+ trigger_ill();
+ break;
+ case SIGFPE:
+ trigger_fpe();
+ break;
+ case SIGBUS:
+ trigger_bus();
+ break;
+ default:
+ /* NOTREACHED */
+ FORKEE_ASSERTX(0 && "This shall not be reached");
+ }
+
+ /* NOTREACHED */
+ FORKEE_ASSERTX(0 &&
