CVS commit: src/sys/arch/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 06:29:11 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: trap.c

Log Message:
Remove needless goto's. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/powerpc/ibm4xx/trap.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/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 06:29:11 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: trap.c

Log Message:
Remove needless goto's. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/powerpc/ibm4xx/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/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.67 src/sys/arch/powerpc/ibm4xx/trap.c:1.68
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.67	Sat Oct 18 08:33:26 2014
+++ src/sys/arch/powerpc/ibm4xx/trap.c	Fri Dec 16 06:29:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.67 2014/10/18 08:33:26 snj Exp $	*/
+/*	$NetBSD: trap.c,v 1.68 2016/12/16 06:29:11 rin Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.67 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.68 2016/12/16 06:29:11 rin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -206,7 +206,7 @@ trap(struct trapframe *tf)
 			rv = uvm_fault(map, trunc_page(va), ftype);
 			pcb->pcb_onfault = fb;
 			if (rv == 0)
-goto done;
+return;
 			if (fb != NULL) {
 tf->tf_pid = KERNEL_PID;
 tf->tf_srr0 = fb->fb_pc;
@@ -217,7 +217,7 @@ trap(struct trapframe *tf)
 tf->tf_fixreg[3] = 1; /* Return TRUE */
 memcpy(>tf_fixreg[13], fb->fb_fixreg,
 sizeof(fb->fb_fixreg));
-goto done;
+return;
 			}
 		}
 		goto brain_damage;
@@ -331,16 +331,17 @@ trap(struct trapframe *tf)
 tf->tf_cr = fb->fb_cr;
 memcpy(>tf_fixreg[13], fb->fb_fixreg,
 sizeof(fb->fb_fixreg));
-goto done;
+return;
 			}
 		}
 		goto brain_damage;
+
 	default:
- brain_damage:
+brain_damage:
 		printf("trap type 0x%x at 0x%lx\n", type, tf->tf_srr0);
 #if defined(DDB) || defined(KGDB)
 		if (kdb_trap(type, tf))
-			goto done;
+			return;
 #endif
 #ifdef TRAP_PANICWAIT
 		printf("Press a key to panic.\n");
@@ -351,8 +352,6 @@ trap(struct trapframe *tf)
 
 	/* Invoke MI userret code */
 	mi_userret(l);
- done:
-	return;
 }
 
 int

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Dec 16 04:45:04 UTC 2016

Modified Files:
src/include: dirent.h
src/lib/libc/compat/gen: compat_alphasort.c compat_scandir.c
src/lib/libc/compat/include: dirent.h
src/lib/libc/gen: alphasort.c initdir.c scandir.3 scandir.c
src/usr.sbin/lpr/lpc: cmds.c

Log Message:
scandir/alphasort take "const struct dirent **" not "const void *" in
modern unix.  since we claim to be 'IEEE Std 1003.1-2008', make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/include/dirent.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/gen/compat_alphasort.c \
src/lib/libc/compat/gen/compat_scandir.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compat/include/dirent.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/alphasort.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/initdir.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/scandir.3
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/scandir.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/lpr/lpc/cmds.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/dirent.h
diff -u src/include/dirent.h:1.35 src/include/dirent.h:1.36
--- src/include/dirent.h:1.35	Mon Jul 30 23:11:13 2012
+++ src/include/dirent.h	Fri Dec 16 04:45:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dirent.h,v 1.35 2012/07/30 23:11:13 yamt Exp $	*/
+/*	$NetBSD: dirent.h,v 1.36 2016/12/16 04:45:04 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -109,10 +109,12 @@ long telldir(DIR *);
 DIR *fdopendir(int);
 DIR *__opendir2(const char *, int) __RENAME(__opendir230);
 int scandir(const char *, struct dirent ***,
-int (*)(const struct dirent *), int (*)(const void *, const void *))
+int (*)(const struct dirent *), int (*)(const struct dirent **,
+const struct dirent **))
 __RENAME(__scandir30);
 int getdents(int, char *, size_t) __RENAME(__getdents30);
-int alphasort(const void *, const void *) __RENAME(__alphasort30);
+int alphasort(const struct dirent **, const struct dirent **)
+__RENAME(__alphasort30);
 #endif
 #endif /* defined(_NETBSD_SOURCE) */
 __END_DECLS

Index: src/lib/libc/compat/gen/compat_alphasort.c
diff -u src/lib/libc/compat/gen/compat_alphasort.c:1.1 src/lib/libc/compat/gen/compat_alphasort.c:1.2
--- src/lib/libc/compat/gen/compat_alphasort.c:1.1	Tue Feb 24 18:42:36 2009
+++ src/lib/libc/compat/gen/compat_alphasort.c	Fri Dec 16 04:45:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_alphasort.c,v 1.1 2009/02/24 18:42:36 christos Exp $	*/
+/*	$NetBSD: compat_alphasort.c,v 1.2 2016/12/16 04:45:04 mrg Exp $	*/
 
 #include 
 #define __LIBC12_SOURCE__
@@ -16,5 +16,6 @@ __warn_references(alphasort,
 #endif
 
 #define dirent dirent12
+#define ALPHASORTARG void *
 
 #include "gen/alphasort.c"
Index: src/lib/libc/compat/gen/compat_scandir.c
diff -u src/lib/libc/compat/gen/compat_scandir.c:1.1 src/lib/libc/compat/gen/compat_scandir.c:1.2
--- src/lib/libc/compat/gen/compat_scandir.c:1.1	Tue Sep 13 01:44:09 2005
+++ src/lib/libc/compat/gen/compat_scandir.c	Fri Dec 16 04:45:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_scandir.c,v 1.1 2005/09/13 01:44:09 christos Exp $	*/
+/*	$NetBSD: compat_scandir.c,v 1.2 2016/12/16 04:45:04 mrg Exp $	*/
 
 #include 
 #define __LIBC12_SOURCE__
@@ -16,5 +16,6 @@ __warn_references(scandir,
 #endif
 
 #define dirent dirent12
+#define COMPARARG void *
 
 #include "gen/scandir.c"

Index: src/lib/libc/compat/include/dirent.h
diff -u src/lib/libc/compat/include/dirent.h:1.7 src/lib/libc/compat/include/dirent.h:1.8
--- src/lib/libc/compat/include/dirent.h:1.7	Tue Feb 24 18:42:36 2009
+++ src/lib/libc/compat/include/dirent.h	Fri Dec 16 04:45:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dirent.h,v 1.7 2009/02/24 18:42:36 christos Exp $	*/
+/*	$NetBSD: dirent.h,v 1.8 2016/12/16 04:45:04 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -61,13 +61,14 @@ DIR *__opendir230(const char *, int);
 int scandir(const char *, struct dirent12 ***,
 int (*)(const struct dirent12 *), int (*)(const void *, const void *));
 int __scandir30(const char *, struct dirent ***,
-int (*)(const struct dirent *), int (*)(const void *, const void *));
+int (*)(const struct dirent *),
+int (*)(const struct dirent **, const struct dirent **));
 
 int getdents(int, char *, size_t);
 int __getdents30(int, char *, size_t);
 
 int alphasort(const void *, const void *);
-int __alphasort30(const void *, const void *);
+int __alphasort30(const struct dirent **, const struct dirent **);
 
 int getdirentries(int, char *, int, long *);
 

Index: src/lib/libc/gen/alphasort.c
diff -u src/lib/libc/gen/alphasort.c:1.2 src/lib/libc/gen/alphasort.c:1.3
--- src/lib/libc/gen/alphasort.c:1.2	Sun Mar  1 19:59:55 2009
+++ src/lib/libc/gen/alphasort.c	Fri Dec 16 04:45:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: alphasort.c,v 1.2 2009/03/01 19:59:55 christos Exp $	*/
+/*	$NetBSD: alphasort.c,v 1.3 2016/12/16 04:45:04 mrg Exp $	*/
 
 /*
  * 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Dec 16 04:45:04 UTC 2016

Modified Files:
src/include: dirent.h
src/lib/libc/compat/gen: compat_alphasort.c compat_scandir.c
src/lib/libc/compat/include: dirent.h
src/lib/libc/gen: alphasort.c initdir.c scandir.3 scandir.c
src/usr.sbin/lpr/lpc: cmds.c

Log Message:
scandir/alphasort take "const struct dirent **" not "const void *" in
modern unix.  since we claim to be 'IEEE Std 1003.1-2008', make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/include/dirent.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/gen/compat_alphasort.c \
src/lib/libc/compat/gen/compat_scandir.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compat/include/dirent.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/alphasort.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/initdir.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/scandir.3
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/gen/scandir.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/lpr/lpc/cmds.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/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 04:27:03 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix typo: s/IPKBD/IPKDB/


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.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/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 04:27:03 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix typo: s/IPKBD/IPKDB/


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/ibm4xx_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/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.20 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.21
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.20	Fri Dec 16 03:59:31 2016
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c	Fri Dec 16 04:27:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_machdep.c,v 1.20 2016/12/16 03:59:31 rin Exp $	*/
+/*	$NetBSD: ibm4xx_machdep.c,v 1.21 2016/12/16 04:27:03 rin Exp $	*/
 /*	Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.20 2016/12/16 03:59:31 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.21 2016/12/16 04:27:03 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -135,7 +135,7 @@ extern const uint32_t errata51handler[],
 #if defined(DDB)
 extern const uint32_t ddblow[], ddbsize;
 #endif
-#if defined(IPKBD)
+#if defined(IPKDB)
 extern const uint32_t ipkdblow[], ipkdbsize;
 #endif
 static const struct exc_info trap_table[] = {
@@ -153,7 +153,7 @@ static const struct exc_info trap_table[
 #if defined(DDB)
 	{ EXC_PGM,	ddblow,		(uintptr_t) },
 #endif
-#if defined(IPKBD)
+#if defined(IPKDB)
 	{ EXC_PGM,	ipkdblow,	(uintptr_t) },
 #endif
 };

CVS commit: src/sys/arch/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 03:59:31 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix comments. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/ibm4xx/ibm4xx_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/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.19 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.20
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.19	Thu Dec 15 12:10:01 2016
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c	Fri Dec 16 03:59:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_machdep.c,v 1.19 2016/12/15 12:10:01 rin Exp $	*/
+/*	$NetBSD: ibm4xx_machdep.c,v 1.20 2016/12/16 03:59:31 rin Exp $	*/
 /*	Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.19 2016/12/15 12:10:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.20 2016/12/16 03:59:31 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -152,10 +152,10 @@ static const struct exc_info trap_table[
 			errata51handler, (uintptr_t) },
 #if defined(DDB)
 	{ EXC_PGM,	ddblow,		(uintptr_t) },
-#endif /* DDB */
+#endif
 #if defined(IPKBD)
 	{ EXC_PGM,	ipkdblow,	(uintptr_t) },
-#endif /* DDB */
+#endif
 };
 
 /*

CVS commit: src/sys/arch/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Dec 16 03:59:31 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix comments. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Dec 16 03:49:45 UTC 2016

Modified Files:
src/tests/net/ndp: t_ra.sh

Log Message:
Add a test case that deletes auto-configured addresses


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/ndp/t_ra.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/ndp/t_ra.sh
diff -u src/tests/net/ndp/t_ra.sh:1.8 src/tests/net/ndp/t_ra.sh:1.9
--- src/tests/net/ndp/t_ra.sh:1.8	Fri Dec 16 03:14:23 2016
+++ src/tests/net/ndp/t_ra.sh	Fri Dec 16 03:49:45 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ra.sh,v 1.8 2016/12/16 03:14:23 ozaki-r Exp $
+#	$NetBSD: t_ra.sh,v 1.9 2016/12/16 03:49:45 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -310,10 +310,79 @@ ra_flush_defrouter_entries_cleanup()
 	cleanup
 }
 
+atf_test_case ra_delete_address cleanup
+ra_delete_address_head()
+{
+
+	atf_set "descr" "Tests for deleting auto-configured address"
+	atf_set "require.progs" "rump_server rump.rtadvd rump.ndp rump.ifconfig"
+}
+
+ra_delete_address_body()
+{
+
+	rump_server_fs_start $RUMPSRV netinet6
+	rump_server_start $RUMPCLI netinet6
+
+	setup_shmif0 ${RUMPSRV} ${IP6SRV}
+	setup_shmif0 ${RUMPCLI} ${IP6CLI}
+
+	export RUMP_SERVER=${RUMPSRV}
+	atf_check -s exit:0 -o match:'0.->.1' rump.sysctl -w net.inet6.ip6.forwarding=1
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 mkdir -p /rump/var/chroot/rtadvd
+	unset LD_PRELOAD
+	unset RUMP_SERVER
+
+	create_rtadvdconfig
+
+	export RUMP_SERVER=${RUMPCLI}
+	atf_check -s exit:0 -o match:'0.->.1' rump.sysctl -w net.inet6.ip6.accept_rtadv=1
+	unset RUMP_SERVER
+
+	export RUMP_SERVER=${RUMPSRV}
+	atf_check -s exit:0 rump.rtadvd -c ${CONFIG} shmif0
+	atf_check -s exit:0 sleep 3
+	atf_check -s exit:0 -o ignore -e empty cat ${PIDFILE}
+	unset RUMP_SERVER
+
+	export RUMP_SERVER=${RUMPCLI}
+	$DEBUG && dump_entries
+	atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
+	atf_check -s exit:0 -o match:'advertised' rump.ndp -p
+	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
+
+	$DEBUG && rump.ifconfig shmif0
+	atf_check -s exit:0 rump.ifconfig shmif0 inet6 \
+	$(rump.ifconfig shmif0 |awk '/AUTOCONF/ {print $2}') delete
+	unset RUMP_SERVER
+
+	atf_check -s exit:0 kill -TERM `cat ${PIDFILE}`
+	wait_term ${PIDFILE}
+
+	rump_server_destroy_ifaces
+}
+
+ra_delete_address_cleanup()
+{
+
+	if [ -f ${PIDFILE} ]; then
+		kill -TERM `cat ${PIDFILE}`
+		wait_term ${PIDFILE}
+	fi
+
+	$DEBUG && dump
+	cleanup
+}
+
 atf_init_test_cases()
 {
 
 	atf_add_test_case ra_basic
 	atf_add_test_case ra_flush_prefix_entries
 	atf_add_test_case ra_flush_defrouter_entries
+	atf_add_test_case ra_delete_address
 }

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Dec 16 03:49:45 UTC 2016

Modified Files:
src/tests/net/ndp: t_ra.sh

Log Message:
Add a test case that deletes auto-configured addresses


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/ndp/t_ra.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Dec 16 03:14:23 UTC 2016

Modified Files:
src/tests/net/ndp: t_ra.sh

Log Message:
Improve stability of the tests

- Do ifconfig -w 10 after ifconfig up
- Accept /1d0h0m..s/ in addition to /23h59m..s/ for expiration time
- Prevent new RA messages from coming after flushing entries

The changes should fix flapping of test results on babylon5.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ndp/t_ra.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Dec 16 03:14:23 UTC 2016

Modified Files:
src/tests/net/ndp: t_ra.sh

Log Message:
Improve stability of the tests

- Do ifconfig -w 10 after ifconfig up
- Accept /1d0h0m..s/ in addition to /23h59m..s/ for expiration time
- Prevent new RA messages from coming after flushing entries

The changes should fix flapping of test results on babylon5.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ndp/t_ra.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/ndp/t_ra.sh
diff -u src/tests/net/ndp/t_ra.sh:1.7 src/tests/net/ndp/t_ra.sh:1.8
--- src/tests/net/ndp/t_ra.sh:1.7	Wed Dec 14 07:37:26 2016
+++ src/tests/net/ndp/t_ra.sh	Fri Dec 16 03:14:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ra.sh,v 1.7 2016/12/14 07:37:26 ozaki-r Exp $
+#	$NetBSD: t_ra.sh,v 1.8 2016/12/16 03:14:23 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -43,6 +43,7 @@ setup_shmif0()
 	export RUMP_SERVER=$sock
 	atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${IP6ADDR}
 	atf_check -s exit:0 rump.ifconfig shmif0 up
+	atf_check -s exit:0 rump.ifconfig -w 10
 
 	$DEBUG && rump.ifconfig
 }
@@ -144,7 +145,7 @@ ra_basic_body()
 	atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
 	atf_check -s exit:0 -o match:'advertised' rump.ndp -p
 	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
-	atf_check -s exit:0 -o match:'23h59m..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
 	unset RUMP_SERVER
@@ -208,10 +209,14 @@ ra_flush_prefix_entries_body()
 	atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
 	atf_check -s exit:0 -o match:'advertised' rump.ndp -p
 	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
-	atf_check -s exit:0 -o match:'23h59m..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
 
+	# Terminate rtadvd to prevent new RA messages from coming
+	# Note that ifconfig down; kill -TERM doesn't work
+	kill -KILL `cat ${PIDFILE}`
+
 	# Flush all the entries in the prefix list
 	atf_check -s exit:0 rump.ndp -P
 
@@ -219,25 +224,17 @@ ra_flush_prefix_entries_body()
 	atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
 	atf_check -s exit:0 -o empty rump.ndp -p
 	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
-	atf_check -s exit:0 -o match:'23h59m..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
 	atf_check -s exit:0 -o not-match:'fc00:1:' rump.ifconfig shmif0 inet6
 	unset RUMP_SERVER
 
-	atf_check -s exit:0 kill -TERM `cat ${PIDFILE}`
-	wait_term ${PIDFILE}
-
 	rump_server_destroy_ifaces
 }
 
 ra_flush_prefix_entries_cleanup()
 {
 
-	if [ -f ${PIDFILE} ]; then
-		kill -TERM `cat ${PIDFILE}`
-		wait_term ${PIDFILE}
-	fi
-
 	$DEBUG && dump
 	cleanup
 }
@@ -283,10 +280,14 @@ ra_flush_defrouter_entries_body()
 	atf_check -s exit:0 -o match:'if=shmif0' rump.ndp -r
 	atf_check -s exit:0 -o match:'advertised' rump.ndp -p
 	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
-	atf_check -s exit:0 -o match:'23h59m..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
 
+	# Terminate rtadvd to prevent new RA messages from coming
+	# Note that ifconfig down; kill -TERM doesn't work
+	kill -KILL `cat ${PIDFILE}`
+
 	# Flush all the entries in the default router list
 	atf_check -s exit:0 rump.ndp -R
 
@@ -294,25 +295,17 @@ ra_flush_defrouter_entries_body()
 	atf_check -s exit:0 -o empty rump.ndp -r
 	atf_check -s exit:0 -o match:'No advertising router' rump.ndp -p
 	atf_check -s exit:0 -o match:'linkmtu=1300' rump.ndp -n -i shmif0
-	atf_check -s exit:0 -o match:'23h59m..s S R' rump.ndp -n -a
+	atf_check -s exit:0 -o match:'(23h59m|1d0h0m)..s S R' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ndp -n -a
 	atf_check -s exit:0 -o match:'fc00:1:' rump.ifconfig shmif0 inet6
 	unset RUMP_SERVER
 
-	atf_check -s exit:0 kill -TERM `cat ${PIDFILE}`
-	wait_term ${PIDFILE}
-
 	rump_server_destroy_ifaces
 }
 
 ra_flush_defrouter_entries_cleanup()
 {
 
-	if [ -f ${PIDFILE} ]; then
-		kill -TERM `cat ${PIDFILE}`
-		wait_term ${PIDFILE}
-	fi
-
 	$DEBUG && dump
 	cleanup
 }

CVS commit: src/sys/dev/pci

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri Dec 16 01:42:04 UTC 2016

Modified Files:
src/sys/dev/pci: pm2reg.h

Log Message:
add bit definitions for dither and alpha blending registers


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/pm2reg.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/pci/pm2reg.h
diff -u src/sys/dev/pci/pm2reg.h:1.10 src/sys/dev/pci/pm2reg.h:1.11
--- src/sys/dev/pci/pm2reg.h:1.10	Wed Dec 17 16:50:08 2014
+++ src/sys/dev/pci/pm2reg.h	Fri Dec 16 01:42:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pm2reg.h,v 1.10 2014/12/17 16:50:08 macallan Exp $	*/
+/*	$NetBSD: pm2reg.h,v 1.11 2016/12/16 01:42:04 macallan Exp $	*/
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -319,8 +319,64 @@
 #define PM2_RE_SCISSOR_MINYX	0x8188
 #define PM2_RE_SCISSOR_MAXYX	0x8190
 #define PM2_RE_TEXMAP_FORMAT	0x8588
+/* format to write into the framebuffer */
 #define PM2_RE_DITHER_MODE	0x8818
+#define		PM2DM_ENABLE		0x0001
+#define		PM2DM_DITHER_ENABLE	0x0002
+#define		PM2DM_COLOUR_FORMAT_M	0x003c
+#define		PM2DM_		0x
+#define		PM2DM_5551F		0x0004
+#define		PM2DM_		0x0008
+#define		PM2DM_332F		0x0014
+#define		PM2DM_332B		0x0018
+#define		PM2DM_2321F		0x0024
+#define		PM2DM_2321B		0x0028
+#define		PM2DM_232FO		0x002c
+#define		PM2DM_232BO		0x0030
+#define		PM2DM_5551B		0x0034
+#define		PM2DM_CI8		0x0038
+#define		PM2DM_565F		0x0001	/* XXX */
+#define		PM2DM_565B		0x00010004	/* XXX */
+#define		PM2DM_X_OFFSET_M	0x00c0
+#define		PM2DM_Y_OFFSET_M	0x0300
+#define		PM2DM_RGB		0x0400	/* BGR otherwise */
+#define		PM2DM_LINE		0x0800	/* ordered otherw. */
+#define		PM2DM_FORCE_ALPHA_0	0x1000
+#define		PM2DM_FORCE_ALPHA_F8	0x2000
+#define		PM2DM_COLOUR_FORMAT_X	0x0001	/* upper bit */
+
 #define PM2_RE_ALPHA_MODE	0x8810
+#define		PM2AL_ENABLE		0x0001
+#define		PM2AL_OPERATION_MASK	0x00fe
+/* values according to manual, xf86-video-glint disagrees */
+#define		PM2AL_OP_FORMAT		16	/* needs to be shifted? */
+#define		PM2AL_OP_BLEND		84
+#define		PM2AL_OP_PREMULT	81
+/*
+ * XXX
+ * format of incoming data
+ * the 5th bit is in bit 16
+ */
+#define		PM2AL_COLOUR_FORMAT_M	0x0f00
+#define		PM2AL_		0x
+#define		PM2AL_5551F		0x0100
+#define		PM2AL_		0x0200
+#define		PM2AL_332F		0x0500
+#define		PM2AL_332B		0x0600
+#define		PM2AL_2321F		0x0900
+#define		PM2AL_2321B		0x0a00
+#define		PM2AL_232FO		0x0b00
+#define		PM2AL_232BO		0x0c00
+#define		PM2AL_5551B		0x0d00
+#define		PM2AL_CI8		0x0e00
+#define		PM2AL_565F		0x0001	/* XXX */
+#define		PM2AL_565B		0x00010100	/* XXX */
+#define		PM2AL_NO_ALPHA		0x1000	/* XXX */
+#define		PM2AL_RGB		0x2000	/* BGR otherwise */
+#define		PM2AL_RAMP		0x4000	/* RGB otherwise */
+#define		PM2AL_COLOUR_FORMAT_X	0x0001
+#define		PM2AL_COLOUR_CONV_SHIFT	0x0002	/* scale otherwise */
+#define		PM2AL_ALPHA_CONV_SHIFT	0x0004	/* scale otherwise */
 #define PM2_RE_TEX_COLOUR_MODE	0x8680
 #define PM2_RE_TEX_READ_MODE	0x8670
 #define PM2_RE_TEX_LUT_MODE	0x8678

CVS commit: src/sys/dev/pci

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri Dec 16 01:42:04 UTC 2016

Modified Files:
src/sys/dev/pci: pm2reg.h

Log Message:
add bit definitions for dither and alpha blending registers


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/pm2reg.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

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Dec 15 22:01:57 UTC 2016

Modified Files:
src/sys/dev: audio.c

Log Message:
In the n == VAUDIOCHANS case we need to call mutex_exit() before
returning.

Perhaps this will address PR kern/51721


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.278 src/sys/dev/audio.c:1.279
--- src/sys/dev/audio.c:1.278	Tue Dec 13 17:12:51 2016
+++ src/sys/dev/audio.c	Thu Dec 15 22:01:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $	*/
+/*	$NetBSD: audio.c,v 1.279 2016/12/15 22:01:57 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.279 2016/12/15 22:01:57 pgoyette Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -5001,8 +5001,10 @@ audio_suspend(device_t dv, const pmf_qua
 		if (sc->sc_audiopid[n].pid == curproc->p_pid)
 			break;
 	}
-	if (n == VAUDIOCHANS)
+	if (n == VAUDIOCHANS) {
+		mutex_exit(sc->sc_lock);
 		return false;
+	}
 
 	audio_mixer_capture(sc);
 	mutex_enter(sc->sc_intr_lock);

CVS commit: src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Dec 15 22:01:57 UTC 2016

Modified Files:
src/sys/dev: audio.c

Log Message:
In the n == VAUDIOCHANS case we need to call mutex_exit() before
returning.

Perhaps this will address PR kern/51721


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/dev/audio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/sys/dev/pci

[Christos Zoulas]

In article <58524a1b.5060...@netbsd.org>,
Nick Hudson   wrote:
>On 12/14/16 22:21, Christos Zoulas wrote:
>> Module Name: src
>> Committed By:christos
>> Date:Wed Dec 14 22:21:13 UTC 2016
>>
>> Modified Files:
>>  src/sys/dev/pci: if_sk.c
>>
>> Log Message:
>> Tidy up and make it look like the other drivers.
>
>Isn't ether_ioctl and an ifflags_cb (see ether_set_ifflags_cb) the 
>prefer method now?

Yes, we should just churn all the drivers for it.

christos

CVS commit: src/sys/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Dec 15 20:04:36 UTC 2016

Modified Files:
src/sys/sys: ptrace.h

Log Message:
Simplify #ifdefs so this compiles on architectures that do not support
watchpoints.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/sys/ptrace.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Dec 15 20:04:36 UTC 2016

Modified Files:
src/sys/sys: ptrace.h

Log Message:
Simplify #ifdefs so this compiles on architectures that do not support
watchpoints.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/sys/ptrace.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/ptrace.h
diff -u src/sys/sys/ptrace.h:1.50 src/sys/sys/ptrace.h:1.51
--- src/sys/sys/ptrace.h:1.50	Thu Dec 15 12:04:18 2016
+++ src/sys/sys/ptrace.h	Thu Dec 15 20:04:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.50 2016/12/15 12:04:18 kamil Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.51 2016/12/15 20:04:36 martin Exp $	*/
 
 /*-
  * Copyright (c) 1984, 1993
@@ -118,7 +118,6 @@ struct ptrace_lwpinfo {
 #define PL_EVENT_NONE	0
 #define PL_EVENT_SIGNAL	1
 
-#ifdef __HAVE_PTRACE_WATCHPOINTS
 /*
  * Hardware Watchpoints
  *
@@ -127,9 +126,10 @@ struct ptrace_lwpinfo {
 typedef struct ptrace_watchpoint {
 	int		pw_index;	/* HW Watchpoint ID (count from 0) */
 	lwpid_t		pw_lwpid;	/* LWP described */
+#ifdef __HAVE_PTRACE_WATCHPOINTS
 	struct mdpw	pw_md;		/* MD fields */
-} ptrace_watchpoint_t;
 #endif
+} ptrace_watchpoint_t;
 
 #ifdef _KERNEL
 
@@ -264,10 +264,8 @@ int	process_write_watchpoint(struct lwp 
 #endif
 #endif
 
-#ifdef __HAVE_PROCFS_MACHDEP
 int	ptrace_machdep_dorequest(struct lwp *, struct lwp *, int,
 	void *, int);
-#endif
 
 #ifndef FIX_SSTEP
 #define FIX_SSTEP(p)

CVS commit: src/sys/dev/usb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Thu Dec 15 17:21:21 UTC 2016

Modified Files:
src/sys/dev/usb: uftdi.c

Log Message:
allow suspend with uftdi(4). it works fine.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/uftdi.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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.63 src/sys/dev/usb/uftdi.c:1.64
--- src/sys/dev/usb/uftdi.c:1.63	Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uftdi.c	Thu Dec 15 17:21:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.63 2016/11/25 12:56:29 skrll Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.64 2016/12/15 17:21:21 maya Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.63 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.64 2016/12/15 17:21:21 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -341,6 +341,9 @@ uftdi_attach(device_t parent, device_t s
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
 
+	if (!pmf_device_register(self, NULL, NULL))
+		aprint_error_dev(self, "couldn't establish power handler\n");
+
 	return;
 
 bad:

CVS commit: src/sys/dev/usb

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Thu Dec 15 17:21:21 UTC 2016

Modified Files:
src/sys/dev/usb: uftdi.c

Log Message:
allow suspend with uftdi(4). it works fine.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/uftdi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 15:03:17 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Document PT_GETVECREGS and PT_SETVECREGS (ppc ports specific)

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/sys/ptrace.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 15:03:17 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Document PT_GETVECREGS and PT_SETVECREGS (ppc ports specific)

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/sys/ptrace.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.43 src/lib/libc/sys/ptrace.2:1.44
--- src/lib/libc/sys/ptrace.2:1.43	Thu Dec 15 14:49:46 2016
+++ src/lib/libc/sys/ptrace.2	Thu Dec 15 15:03:17 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ptrace.2,v 1.43 2016/12/15 14:49:46 kamil Exp $
+.\"	$NetBSD: ptrace.2,v 1.44 2016/12/15 15:03:17 kamil Exp $
 .\"
 .\" This file is in the public domain.
 .Dd November 1, 2016
@@ -417,6 +417,33 @@ The
 argument contains the LWP ID of the thread whose registers are to
 be written.
 If zero is supplied, the first thread of the process is written.
+.It Dv PT_GETVECREGS
+This request reads the traced process' vector registers into
+the
+.Dq Li "struct vreg"
+(defined in
+.In machine/reg.h )
+pointed to by
+.Fa addr .
+The
+.Fa data
+argument contains the LWP ID of the thread whose registers are to
+be read.
+If zero is supplied, the first thread of the process is read.
+.It Dv PT_SETVECREGS
+This request is the converse of
+.Dv PT_GETVECREGS ;
+it loads the traced process' vector registers from the
+.Dq Li "struct vreg"
+(defined in
+.In machine/reg.h )
+pointed to by
+.Fa addr .
+The
+.Fa data
+argument contains the LWP ID of the thread whose registers are to
+be written.
+If zero is supplied, the first thread of the process is written.
 .El
 .Sh ERRORS
 Some requests can cause

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 14:49:46 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Document PT_GETXMMREGS and PT_SETXMMREGS (i386 port specific)

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/sys/ptrace.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 14:49:46 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Document PT_GETXMMREGS and PT_SETXMMREGS (i386 port specific)

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/sys/ptrace.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.42 src/lib/libc/sys/ptrace.2:1.43
--- src/lib/libc/sys/ptrace.2:1.42	Thu Dec 15 13:06:08 2016
+++ src/lib/libc/sys/ptrace.2	Thu Dec 15 14:49:46 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ptrace.2,v 1.42 2016/12/15 13:06:08 kamil Exp $
+.\"	$NetBSD: ptrace.2,v 1.43 2016/12/15 14:49:46 kamil Exp $
 .\"
 .\" This file is in the public domain.
 .Dd November 1, 2016
@@ -390,6 +390,33 @@ The
 argument contains the LWP ID of the thread whose registers are to
 be written.
 If zero is supplied, the first thread of the process is written.
+.It Dv PT_GETXMMREGS
+This request reads the traced process' XMM registers into
+the
+.Dq Li "struct xmmregs"
+(defined in
+.In machine/reg.h )
+pointed to by
+.Fa addr .
+The
+.Fa data
+argument contains the LWP ID of the thread whose registers are to
+be read.
+If zero is supplied, the first thread of the process is read.
+.It Dv PT_SETXMMREGS
+This request is the converse of
+.Dv PT_GETXMMREGS ;
+it loads the traced process' XMM registers from the
+.Dq Li "struct xmmregs"
+(defined in
+.In machine/reg.h )
+pointed to by
+.Fa addr .
+The
+.Fa data
+argument contains the LWP ID of the thread whose registers are to
+be written.
+If zero is supplied, the first thread of the process is written.
 .El
 .Sh ERRORS
 Some requests can cause

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 13:06:08 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Remove dead text, some of it commented in this file for years

For example PT_READ_U/PT_WRITE_U has been removed by  in 19950126.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/sys/ptrace.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.41 src/lib/libc/sys/ptrace.2:1.42
--- src/lib/libc/sys/ptrace.2:1.41	Sat Dec 10 20:02:07 2016
+++ src/lib/libc/sys/ptrace.2	Thu Dec 15 13:06:08 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ptrace.2,v 1.41 2016/12/10 20:02:07 kamil Exp $
+.\"	$NetBSD: ptrace.2,v 1.42 2016/12/15 13:06:08 kamil Exp $
 .\"
 .\" This file is in the public domain.
 .Dd November 1, 2016
@@ -102,44 +102,6 @@ except that they write rather than read.
 The
 .Fa data
 argument supplies the value to be written.
-.\" .It Dv PT_READ_U
-.\" This request reads an
-.\" .Li int
-.\" from the traced process' user structure.
-.\" The
-.\" .Fa addr
-.\" argument specifies the location of the int relative to the base of the
-.\" user structure; it will usually be an integer value cast to
-.\" .Li void *
-.\" either explicitly or via the presence of a prototype for
-.\" .Eo \&
-.\" .Fn ptrace
-.\" .Ec .
-.\" Unlike
-.\" .Dv PT_READ_I
-.\" and
-.\" .Dv PT_READ_D ,
-.\" .Fa addr
-.\" must be aligned on an
-.\" .Li int
-.\" boundary.
-.\" The value read is returned as the return value from
-.\" .Eo \&
-.\" .Fn ptrace
-.\" .Ec .
-.\" .It Dv PT_WRITE_U
-.\" This request writes an
-.\" .Li int
-.\" into the traced process' user structure.
-.\" .Fa addr
-.\" specifies the offset, just as for
-.\" .Dv PT_READ_U ,
-.\" and
-.\" .Fa data
-.\" specifies the value to be written, just as for
-.\" .Dv PT_WRITE_I
-.\" and
-.\" .Dv PT_WRITE_D .
 .It Dv PT_CONTINUE
 The traced process continues execution.
 .Fa addr
@@ -428,108 +390,6 @@ The
 argument contains the LWP ID of the thread whose registers are to
 be written.
 If zero is supplied, the first thread of the process is written.
-.\" .It Dv PT_SYSCALL
-.\" This request is like
-.\" .Dv PT_CONTINUE
-.\" except that the process will stop next time it executes any system
-.\" call.
-.\" Information about the system call can be examined with
-.\" .Dv PT_READ_U
-.\" and potentially modified with
-.\" .Dv PT_WRITE_U
-.\" through the
-.\" .Li u_kproc.kp_proc.p_md
-.\" element of the user structure (see below).
-.\" If the process is continued
-.\" with another
-.\" .Dv PT_SYSCALL
-.\" request, it will stop again on exit from the syscall, at which point
-.\" the return values can be examined and potentially changed.
-.\" The
-.\" .Li u_kproc.kp_proc.p_md
-.\" element is of type
-.\" .Dq Li "struct mdproc" ,
-.\" which should be declared by including
-.\" .In sys/param.h ,
-.\" .In sys/user.h ,
-.\" and
-.\" .In machine/proc.h ,
-.\" and contains the following fields (among others):
-.\" .Bl -item -compact -offset indent
-.\" .It
-.\" .Li syscall_num
-.\" .It
-.\" .Li syscall_nargs
-.\" .It
-.\" .Li syscall_args[8]
-.\" .It
-.\" .Li syscall_err
-.\" .It
-.\" .Li syscall_rv[2]
-.\" .El
-.\" When a process stops on entry to a syscall,
-.\" .Li syscall_num
-.\" holds the number of the syscall,
-.\" .Li syscall_nargs
-.\" holds the number of arguments it expects, and
-.\" .Li syscall_args
-.\" holds the arguments themselves.
-.\" (Only the first
-.\" .Li syscall_nargs
-.\" elements of
-.\" .Li syscall_args
-.\" are guaranteed to be useful.)
-.\" When a process stops on exit from a syscall,
-.\" .Li syscall_num
-.\" is
-.\" .Eo \&
-.\" .Li \-1
-.\" .Ec ,
-.\" .Li syscall_err
-.\" holds the error number
-.\" .Po
-.\" see
-.\" .Xr errno 2
-.\" .Pc ,
-.\" or 0 if no error occurred, and
-.\" .Li syscall_rv
-.\" holds the return values.
-.\" (If the syscall returns only one value, only
-.\" .Li syscall_rv[0]
-.\" is useful.)
-.\" The tracing process can modify any of these with
-.\" .Dv PT_WRITE_U ;
-.\" only some modifications are useful.
-.\" .Pp
-.\" On entry to a syscall,
-.\" .Li syscall_num
-.\" can be changed, and the syscall actually performed will correspond to
-.\" the new number (it is the responsibility of the tracing process to fill
-.\" in
-.\" .Li syscall_args
-.\" appropriately for the new call, but there is no need to modify
-.\" .Eo \&
-.\" .Li syscall_nargs
-.\" .Ec ).
-.\" If the new syscall number is 0, no syscall is actually performed;
-.\" instead,
-.\" .Li syscall_err
-.\" and
-.\" .Li syscall_rv
-.\" are passed back to the traced process directly (and therefore should be
-.\" filled in).
-.\" If the syscall number is otherwise out of range, a dummy
-.\" syscall which simply produces an
-.\" .Er ENOSYS
-.\" error is effectively performed.
-.\" .Pp
-.\" On exit from a syscall, only
-.\" .Li syscall_err
-.\" and
-.\" .Li 

CVS commit: src/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 13:06:08 UTC 2016

Modified Files:
src/lib/libc/sys: ptrace.2

Log Message:
ptrace(2): Remove dead text, some of it commented in this file for years

For example PT_READ_U/PT_WRITE_U has been removed by  in 19950126.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/sys/ptrace.2

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

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Dec 15 12:56:52 UTC 2016

Modified Files:
src/distrib/sets/lists/modules: ad.arm ad.mips md.amd64 md.hppa md.i386
md.ia64 mi
src/distrib/sets/lists/tests: mi
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: md.amd64 md.mac68k mi shl.mi
src/distrib/sets/lists/xetc: mi
src/distrib/sets/lists/xserver: md.sgimips md.sparc mi

Log Message:
More sets list sorting (maybe this time they're really all done)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/modules/ad.arm \
src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/modules/md.hppa
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.ia64
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.708 -r1.709 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.mac68k
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/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/modules/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.9 src/distrib/sets/lists/modules/ad.arm:1.10
--- src/distrib/sets/lists/modules/ad.arm:1.9	Wed Oct 19 09:44:00 2016
+++ src/distrib/sets/lists/modules/ad.arm	Thu Dec 15 12:56:52 2016
@@ -1,13 +1,13 @@
-# $NetBSD: ad.arm,v 1.9 2016/10/19 09:44:00 skrll Exp $
+# $NetBSD: ad.arm,v 1.10 2016/12/15 12:56:52 kre Exp $
 
 ./@MODULEDIR@/compat_netbsd32			base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/exec_elf32			base-kernel-modules	kmod
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.9 src/distrib/sets/lists/modules/ad.mips:1.10
--- src/distrib/sets/lists/modules/ad.mips:1.9	Wed Oct 19 09:44:00 2016
+++ src/distrib/sets/lists/modules/ad.mips	Thu Dec 15 12:56:52 2016
@@ -1,12 +1,12 @@
-# $NetBSD: ad.mips,v 1.9 2016/10/19 09:44:00 skrll Exp $
+# $NetBSD: ad.mips,v 1.10 2016/12/15 12:56:52 kre Exp $
 ./@MODULEDIR@/compat_netbsd32			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_ptrace			base-kernel-modules	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_ptrace			base-kernel-modules	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 

CVS commit: src/distrib/sets/lists

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Dec 15 12:56:52 UTC 2016

Modified Files:
src/distrib/sets/lists/modules: ad.arm ad.mips md.amd64 md.hppa md.i386
md.ia64 mi
src/distrib/sets/lists/tests: mi
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: md.amd64 md.mac68k mi shl.mi
src/distrib/sets/lists/xetc: mi
src/distrib/sets/lists/xserver: md.sgimips md.sparc mi

Log Message:
More sets list sorting (maybe this time they're really all done)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/modules/ad.arm \
src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/modules/md.hppa
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.ia64
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.708 -r1.709 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.mac68k
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:51:02 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
ptrace(2): Add hardware assisted breakpoint/watchpoint API:
   PT_READ_WATCHPOINT, PT_WRITE_WATCHPOINT and PT_COUNT_WATCHPOINTS


To generate a diff of this commit:
cvs rdiff -u -r1.2223 -r1.2224 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/CHANGES
diff -u src/doc/CHANGES:1.2223 src/doc/CHANGES:1.2224
--- src/doc/CHANGES:1.2223	Tue Dec 13 11:01:10 2016
+++ src/doc/CHANGES	Thu Dec 15 12:51:02 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2223 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2224 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -430,3 +430,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	crash(8): Add sparc support.  [mrg 20161210]
 	cgd(4): Add aes-xts. [alnsn 20161211]
 	options(4): Remove KSTACK_CHECK_DR0. [kamil 20161213]
+	ptrace(2): Add hardware assisted breakpoint/watchpoint API:
+		PT_READ_WATCHPOINT, PT_WRITE_WATCHPOINT and
+		PT_COUNT_WATCHPOINTS [kamil 20161215]

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:51:02 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
ptrace(2): Add hardware assisted breakpoint/watchpoint API:
   PT_READ_WATCHPOINT, PT_WRITE_WATCHPOINT and PT_COUNT_WATCHPOINTS


To generate a diff of this commit:
cvs rdiff -u -r1.2223 -r1.2224 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

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:42:38 UTC 2016

Modified Files:
src/doc: TODO.ptrace

Log Message:
Update TODO.ptrace with recent changes

Hardware assisted breakpoint/watchpoint API has been merged with current.

Add note about pthread_dbg(3) API needed to be refactored and limited to
querying POSIX thread private data fields.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/doc/TODO.ptrace

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/TODO.ptrace
diff -u src/doc/TODO.ptrace:1.3 src/doc/TODO.ptrace:1.4
--- src/doc/TODO.ptrace:1.3	Thu Dec 15 07:47:08 2016
+++ src/doc/TODO.ptrace	Thu Dec 15 12:42:38 2016
@@ -1,8 +1,7 @@
-$NetBSD: TODO.ptrace,v 1.3 2016/12/15 07:47:08 kamil Exp $
+$NetBSD: TODO.ptrace,v 1.4 2016/12/15 12:42:38 kamil Exp $
 
 Items we (currently) plan to finish in the ptrace(2) field:
 
- - merge hardware watchpoint (breakpoint) support with HEAD
  - verify ppid of core dump generated with PT_DUMPCORE
it must point to the real parent, not tracer
  - adapt OpenBSD regress test (regress/sys/ptrace/ptrace.c) for the ATF context
@@ -21,7 +20,8 @@ Items we (currently) plan to finish in t
  - add support for detecting equivalent events to PTRACE_O_TRACEEXEC,
PTRACE_O_TRACECLONE, PTRACE_O_TRACEEXIT from Linux
  - exect(3) rething or remove -- maybe PT_TRACE_ME + PTRACE_O_TRACEEXEC?
-   
+ - refactor pthread_dbg(3) to only query private pthread_t data, otherwise it
+   duplicates ptrace(2) interface and cannot cover all types of threads
 
 and of course: fix as many bugs as possible.
 

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:42:38 UTC 2016

Modified Files:
src/doc: TODO.ptrace

Log Message:
Update TODO.ptrace with recent changes

Hardware assisted breakpoint/watchpoint API has been merged with current.

Add note about pthread_dbg(3) API needed to be refactored and limited to
querying POSIX thread private data fields.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/doc/TODO.ptrace

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:20:39 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Welcome to NetBSD 7.99.50!

New ptrace(2) calls for hardware assisted watchpoints/breakpoints:
 - PT_COUNT_WATCHPOINTS,
 - PT_READ_WATCHPOINT,
 - PT_WRITE_WATCHPOINT.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.516 -r1.517 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.516 src/sys/sys/param.h:1.517
--- src/sys/sys/param.h:1.516	Thu Dec 15 09:39:24 2016
+++ src/sys/sys/param.h	Thu Dec 15 12:20:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.516 2016/12/15 09:39:24 ozaki-r Exp $	*/
+/*	$NetBSD: param.h,v 1.517 2016/12/15 12:20:39 kamil Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799004900	/* NetBSD 7.99.49 */
+#define	__NetBSD_Version__	799005000	/* NetBSD 7.99.50 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/sys/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:20:39 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Welcome to NetBSD 7.99.50!

New ptrace(2) calls for hardware assisted watchpoints/breakpoints:
 - PT_COUNT_WATCHPOINTS,
 - PT_READ_WATCHPOINT,
 - PT_WRITE_WATCHPOINT.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.516 -r1.517 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/tests/kernel/arch/amd64

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:15:20 UTC 2016

Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c

Log Message:
Add ATF tests for hardware assisted watchpoints on amd64

Addedd tests:
 - watchpoint_count
 - watchpoint_read
 - watchpoint_write_unmodified
 - watchpoint_trap_code[0123]
 - watchpoint_trap_data_write[0123]
 - watchpoint_trap_data_rw[0123]

These code will be reused later for i386 and moved to a common place like
tests/kernel/arch/x86.

These tests are x86 specific only. The same API but different private
ptrace_watchpoint MD part has to be used on other ports.

All tests pass on amd64.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/kernel/arch/amd64/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/kernel/arch/amd64

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:15:20 UTC 2016

Modified Files:
src/tests/kernel/arch/amd64: t_ptrace_wait.c

Log Message:
Add ATF tests for hardware assisted watchpoints on amd64

Addedd tests:
 - watchpoint_count
 - watchpoint_read
 - watchpoint_write_unmodified
 - watchpoint_trap_code[0123]
 - watchpoint_trap_data_write[0123]
 - watchpoint_trap_data_rw[0123]

These code will be reused later for i386 and moved to a common place like
tests/kernel/arch/x86.

These tests are x86 specific only. The same API but different private
ptrace_watchpoint MD part has to be used on other ports.

All tests pass on amd64.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/kernel/arch/amd64/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/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.7 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.8
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.7	Tue Dec 13 13:09:00 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c	Thu Dec 15 12:15:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.8 2016/12/15 12:15:20 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.8 2016/12/15 12:15:20 kamil Exp $");
 
 #include 
 #include 
@@ -37,6 +37,7 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.7 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -137,6 +138,1229 @@ ATF_TC_BODY(regs1, tc)
 }
 #endif
 
+#if defined(__HAVE_PTRACE_WATCHPOINTS)
+ATF_TC(watchpoint_count);
+ATF_TC_HEAD(watchpoint_count, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	"Call PT_COUNT_WATCHPOINTS and assert four available watchpoints");
+}
+
+ATF_TC_BODY(watchpoint_count, tc)
+{
+	const int exitval = 5;
+	const int sigval = SIGSTOP;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	int status;
+#endif
+	int N;
+
+	printf("Before forking process PID=%d\n", getpid());
+	ATF_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		printf("Before raising %s from child\n", strsignal(sigval));
+		FORKEE_ASSERT(raise(sigval) == 0);
+
+		printf("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	printf("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	printf("Call GETREGS for the child process\n");
+	ATF_REQUIRE((N = ptrace(PT_COUNT_WATCHPOINTS, child, NULL, 0)) != -1);
+	printf("Reported %d watchpoints\n", N);
+
+	ATF_REQUIRE_EQ_MSG(N, 4, "Expected 4 hw watchpoints - got %d", N);
+
+	printf("Before resuming the child process where it left off and "
+	"without signal to be sent\n");
+	ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+	printf("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+	validate_status_exited(status, exitval);
+
+	printf("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));
+}
+#endif
+
+#if defined(__HAVE_PTRACE_WATCHPOINTS)
+ATF_TC(watchpoint_read);
+ATF_TC_HEAD(watchpoint_read, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	"Call PT_COUNT_WATCHPOINTS and assert four available watchpoints");
+}
+
+ATF_TC_BODY(watchpoint_read, tc)
+{
+	const int exitval = 5;
+	const int sigval = SIGSTOP;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	int status;
+#endif
+	int i, N;
+	struct ptrace_watchpoint pw;
+	int len = sizeof(pw);
+
+	printf("Before forking process PID=%d\n", getpid());
+	ATF_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		printf("Before raising %s from child\n", strsignal(sigval));
+		FORKEE_ASSERT(raise(sigval) == 0);
+
+		printf("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	printf("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	printf("Call GETREGS for the child process\n");
+	ATF_REQUIRE((N = ptrace(PT_COUNT_WATCHPOINTS, child, NULL, 0)) != -1);
+
+	ATF_REQUIRE_EQ_MSG(N, 4, "Expected 4 hw watchpoints - got %d", N);
+
+	for (i = 0; i < N; i++) {
+		printf("Before reading 

CVS commit: src/sys/arch/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 12:10:02 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix build without DDB.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/ibm4xx/ibm4xx_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/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.18 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.19
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.18	Mon Dec 12 11:38:26 2011
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c	Thu Dec 15 12:10:01 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_machdep.c,v 1.18 2011/12/12 11:38:26 kiyohara Exp $	*/
+/*	$NetBSD: ibm4xx_machdep.c,v 1.19 2016/12/15 12:10:01 rin Exp $	*/
 /*	Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,13 +68,14 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.18 2011/12/12 11:38:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.19 2016/12/15 12:10:01 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
+#include "ksyms.h" /* for NKSYMS */
 
 #include 
 #include 
@@ -131,8 +132,10 @@ extern const uint32_t tlbdmiss4xx[], tlb
 extern const uint32_t pitfitwdog[], pitfitwdogsize;
 extern const uint32_t debugtrap[], debugsize;
 extern const uint32_t errata51handler[], errata51size;
-#ifdef DDB
+#if defined(DDB)
 extern const uint32_t ddblow[], ddbsize;
+#endif
+#if defined(IPKBD)
 extern const uint32_t ipkdblow[], ipkdbsize;
 #endif
 static const struct exc_info trap_table[] = {

CVS commit: src/sys/arch/powerpc/ibm4xx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 12:10:02 UTC 2016

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Fix build without DDB.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:04:18 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c
process_machdep.c trap.c
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/amd64/include: proc.h ptrace.h userret.h
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: machdep.c process_machdep.c
src/sys/arch/i386/include: proc.h ptrace.h userret.h
src/sys/arch/x86/include: Makefile dbregs.h
src/sys/arch/x86/x86: vm_machdep.c
src/sys/arch/xen/conf: files.xen
src/sys/compat/netbsd32: netbsd32_ptrace.c
src/sys/kern: sys_ptrace.c sys_ptrace_common.c
src/sys/sys: ptrace.h
Added Files:
src/sys/arch/x86/x86: dbregs.c

Log Message:
Add support for hardware assisted watchpoints/breakpoints API in ptrace(2)

Add new ptrace(2) calls:
 - PT_COUNT_WATCHPOINTS - count the number of available hardware watchpoints
 - PT_READ_WATCHPOINT   - read struct ptrace_watchpoint from the kernel state
 - PT_WRITE_WATCHPOINT  - write new struct ptrace_watchpoint state, this
  includes enabling and disabling watchpoints

The ptrace_watchpoint structure contains MI and MD parts:

typedef struct ptrace_watchpoint {
int pw_index;   /* HW Watchpoint ID (count from 0) */
lwpid_t pw_lwpid;   /* LWP described */
struct mdpw pw_md;  /* MD fields */
} ptrace_watchpoint_t;

For example amd64 defines MD as follows:
struct mdpw {
void*md_address;
int  md_condition;
int  md_length;
};

These calls are protected with the __HAVE_PTRACE_WATCHPOINTS guard.

Tested on amd64, initial support added for i386 and XEN.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/process_machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amd64/include/proc.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/include/ptrace.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/include/userret.h
cvs rdiff -u -r1.375 -r1.376 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.766 -r1.767 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/include/proc.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/include/ptrace.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/include/userret.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/include/dbregs.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/dbregs.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/vm_machdep.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_ptrace.c
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/sys_ptrace.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.49 -r1.50 src/sys/sys/ptrace.h

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/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.239 src/distrib/sets/lists/comp/md.amd64:1.240
--- src/distrib/sets/lists/comp/md.amd64:1.239	Wed Dec 14 12:59:51 2016
+++ src/distrib/sets/lists/comp/md.amd64	Thu Dec 15 12:04:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.239 2016/12/14 12:59:51 kre Exp $
+# $NetBSD: md.amd64,v 1.240 2016/12/15 12:04:18 kamil Exp $
 
 ./usr/include/amd64comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -496,6 +496,7 @@
 ./usr/include/x86/cpu_ucode.h			comp-c-include
 ./usr/include/x86/cputypes.h			comp-c-include
 ./usr/include/x86/cpuvar.h			comp-c-include
+./usr/include/x86/dbregs.h			comp-c-include
 ./usr/include/x86/float.h			comp-c-include
 ./usr/include/x86/fpu.hcomp-c-include
 ./usr/include/x86/ieee.h			comp-c-include

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.159 src/distrib/sets/lists/comp/md.i386:1.160
--- src/distrib/sets/lists/comp/md.i386:1.159	Sat Oct 15 11:34:30 2016
+++ src/distrib/sets/lists/comp/md.i386	Thu Dec 15 12:04:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.159 2016/10/15 11:34:30 christos Exp $
+# $NetBSD: md.i386,v 1.160 2016/12/15 12:04:18 kamil Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		

CVS commit: src

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 12:04:18 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c
process_machdep.c trap.c
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/amd64/include: proc.h ptrace.h userret.h
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: machdep.c process_machdep.c
src/sys/arch/i386/include: proc.h ptrace.h userret.h
src/sys/arch/x86/include: Makefile dbregs.h
src/sys/arch/x86/x86: vm_machdep.c
src/sys/arch/xen/conf: files.xen
src/sys/compat/netbsd32: netbsd32_ptrace.c
src/sys/kern: sys_ptrace.c sys_ptrace_common.c
src/sys/sys: ptrace.h
Added Files:
src/sys/arch/x86/x86: dbregs.c

Log Message:
Add support for hardware assisted watchpoints/breakpoints API in ptrace(2)

Add new ptrace(2) calls:
 - PT_COUNT_WATCHPOINTS - count the number of available hardware watchpoints
 - PT_READ_WATCHPOINT   - read struct ptrace_watchpoint from the kernel state
 - PT_WRITE_WATCHPOINT  - write new struct ptrace_watchpoint state, this
  includes enabling and disabling watchpoints

The ptrace_watchpoint structure contains MI and MD parts:

typedef struct ptrace_watchpoint {
int pw_index;   /* HW Watchpoint ID (count from 0) */
lwpid_t pw_lwpid;   /* LWP described */
struct mdpw pw_md;  /* MD fields */
} ptrace_watchpoint_t;

For example amd64 defines MD as follows:
struct mdpw {
void*md_address;
int  md_condition;
int  md_length;
};

These calls are protected with the __HAVE_PTRACE_WATCHPOINTS guard.

Tested on amd64, initial support added for i386 and XEN.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/process_machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amd64/include/proc.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/include/ptrace.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/include/userret.h
cvs rdiff -u -r1.375 -r1.376 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.766 -r1.767 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/include/proc.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/include/ptrace.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/include/userret.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/include/dbregs.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/dbregs.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/vm_machdep.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_ptrace.c
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/sys_ptrace.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.49 -r1.50 src/sys/sys/ptrace.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/powerpc/fpu

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 11:32:03 UTC 2016

Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c

Log Message:
Fix build without DDB.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/fpu/fpu_emu.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/powerpc/fpu

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 11:32:03 UTC 2016

Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c

Log Message:
Fix build without DDB.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/fpu/fpu_emu.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/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.17 src/sys/arch/powerpc/fpu/fpu_emu.c:1.18
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.17	Tue Aug 12 20:27:10 2014
+++ src/sys/arch/powerpc/fpu/fpu_emu.c	Thu Dec 15 11:32:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_emu.c,v 1.17 2014/08/12 20:27:10 joerg Exp $ */
+/*	$NetBSD: fpu_emu.c,v 1.18 2016/12/15 11:32:03 rin Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.17 2014/08/12 20:27:10 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.18 2016/12/15 11:32:03 rin Exp $");
 
 #include "opt_ddb.h"
 
@@ -248,14 +248,14 @@ fpu_emulate(struct trapframe *tf, struct
 	case NOTFPU:
 	default:
 		DPRINTF(FPE_EX, ("fpu_emulate: SIGILL\n"));
-#ifdef DEBUG
+#if defined(DDB) && defined(DEBUG)
 		if (fpe_debug & FPE_EX) {
 			printf("fpu_emulate:  illegal insn %x at %p:",
 			insn.i_int, (void *) (tf->tf_srr0));
 			opc_disasm((vaddr_t)(tf->tf_srr0), insn.i_int);
 		}
 #endif
-#if defined(PPC_IBM4XX) && defined(DEBUG)
+#if defined(PPC_IBM4XX) && defined(DDB) && defined(DEBUG)
 		/*
 		*  retry an illegal insn once due to cache issues.
 		*/
@@ -265,7 +265,7 @@ fpu_emulate(struct trapframe *tf, struct
 Debugger();
 		}
 		lastill = tf->tf_srr0;
-#endif /* PPC_IBM4XX && DEBUG */
+#endif /* PPC_IBM4XX && DDB && DEBUG */
 		return false;
 	}
 }

CVS commit: src/external/gpl3/gdb/dist/gdb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 10:01:16 UTC 2016

Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-tdep.c

Log Message:
Skip the initial GP load in function prologue when inserting a breakpoint.

GNU ld for alpha is so clever that the redundant GP load in function
entrypoint is skipped. we must therefore skip initial GP loads; otherwise
breakpoints in function entrypoints can also be skipped.

Reported to upstream (Bug 20969):
  https://sourceware.org/bugzilla/show_bug.cgi?id=20969

ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/gpl3/gdb/dist/gdb/alpha-tdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/alpha-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.1.1.5 src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.1.1.5	Wed Oct 12 16:47:13 2016
+++ src/external/gpl3/gdb/dist/gdb/alpha-tdep.c	Thu Dec 15 10:01:16 2016
@@ -757,6 +757,31 @@ alpha_skip_prologue (struct gdbarch *gdb
   return pc + offset;
 }
 
+/* GNU ld for alpha is so clever that the redundant GP load in function
+   entrypoint is skipped.  We must therefore skip initial GP loads; otherwise
+   breakpoints in function entrypoints can also be skipped.  */
+
+static CORE_ADDR
+alpha_skip_entrypoint (struct gdbarch *gdbarch, CORE_ADDR pc)
+{
+  unsigned long inst;
+  gdb_byte buf[ALPHA_INSN_SIZE];
+
+  /* Refer to the comment in alpha_skip_prologue above.  */
+  if (target_read_memory (pc, buf, sizeof (buf)))
+return pc;
+
+  /* Skip a GP load in the first two words in the function entrypoint.  */
+  inst = alpha_read_insn (gdbarch, pc);
+  if ((inst & 0x) != 0x27bb)	/* ldah $gp,n($t12) */
+return pc;
+  inst = alpha_read_insn (gdbarch, pc + ALPHA_INSN_SIZE);
+  if ((inst & 0x) != 0x23bd)	/* lda $gp,n($gp) */
+return pc;
+
+  return pc + 2 * ALPHA_INSN_SIZE;
+}
+
 
 static const int ldl_l_opcode = 0x2a;
 static const int ldq_l_opcode = 0x2b;
@@ -1802,6 +1827,9 @@ alpha_gdbarch_init (struct gdbarch_info 
   /* Prologue heuristics.  */
   set_gdbarch_skip_prologue (gdbarch, alpha_skip_prologue);
 
+  /* Entrypoint heuristics.  */
+  set_gdbarch_skip_entrypoint (gdbarch, alpha_skip_entrypoint);
+
   /* Disassembler.  */
   set_gdbarch_print_insn (gdbarch, print_insn_alpha);
 

CVS commit: src/external/gpl3/gdb/dist/gdb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Dec 15 10:01:16 UTC 2016

Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-tdep.c

Log Message:
Skip the initial GP load in function prologue when inserting a breakpoint.

GNU ld for alpha is so clever that the redundant GP load in function
entrypoint is skipped. we must therefore skip initial GP loads; otherwise
breakpoints in function entrypoints can also be skipped.

Reported to upstream (Bug 20969):
  https://sourceware.org/bugzilla/show_bug.cgi?id=20969

ok martin


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/gpl3/gdb/dist/gdb/alpha-tdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:39:24 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Bump for move of bpf_mtap and if_ipackets++

Welcome to 7.99.49


To generate a diff of this commit:
cvs rdiff -u -r1.515 -r1.516 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/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:39:24 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Bump for move of bpf_mtap and if_ipackets++

Welcome to 7.99.49


To generate a diff of this commit:
cvs rdiff -u -r1.515 -r1.516 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.515 src/sys/sys/param.h:1.516
--- src/sys/sys/param.h:1.515	Wed Dec 14 15:48:55 2016
+++ src/sys/sys/param.h	Thu Dec 15 09:39:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.515 2016/12/14 15:48:55 hannken Exp $	*/
+/*	$NetBSD: param.h,v 1.516 2016/12/15 09:39:24 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799004800	/* NetBSD 7.99.48 */
+#define	__NetBSD_Version__	799004900	/* NetBSD 7.99.49 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:35:25 UTC 2016

Modified Files:
src/sys/dev/ic: hd64570.c midway.c
src/sys/dev/pci: if_lmc.c
src/sys/netisdn: i4b_ipr.c

Log Message:
Annotate bpf_mtap still running in Rx hardware interrupt with "XXX not in 
softint"


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netisdn/i4b_ipr.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/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.50 src/sys/dev/ic/hd64570.c:1.51
--- src/sys/dev/ic/hd64570.c:1.50	Fri Jun 10 13:27:13 2016
+++ src/sys/dev/ic/hd64570.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64570.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: hd64570.c,v 1.51 2016/12/15 09:35:24 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.51 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -1574,7 +1574,7 @@ sca_frame_process(sca_port_t *scp)
 		return;
 	}
 
-	bpf_mtap(>sp_if, m);
+	bpf_mtap(>sp_if, m); /* XXX not in softint */
 
 	scp->sp_if.if_ipackets++;
 

Index: src/sys/dev/ic/midway.c
diff -u src/sys/dev/ic/midway.c:1.97 src/sys/dev/ic/midway.c:1.98
--- src/sys/dev/ic/midway.c:1.97	Fri Jun 10 13:27:13 2016
+++ src/sys/dev/ic/midway.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: midway.c,v 1.97 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: midway.c,v 1.98 2016/12/15 09:35:24 ozaki-r Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 
 /*
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.97 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.98 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "opt_natm.h"
 
@@ -2766,7 +2766,7 @@ EN_INTR_TYPE en_intr(void *arg)
 	  ifp->if_ipackets++;
 #endif
 
-	  bpf_mtap(ifp, m);
+	  bpf_mtap(ifp, m); /* XXX not in softint */
 
 	  atm_input(ifp, , m, sc->rxslot[slot].rxhand);
 	}

Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.61 src/sys/dev/pci/if_lmc.c:1.62
--- src/sys/dev/pci/if_lmc.c:1.61	Fri Jun 10 13:31:43 2016
+++ src/sys/dev/pci/if_lmc.c	Thu Dec 15 09:35:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.61 2016/06/10 13:31:43 ozaki-r Exp $ */
+/* $NetBSD: if_lmc.c,v 1.62 2016/12/15 09:35:24 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. 
@@ -74,7 +74,7 @@
  */
 
 # include 
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.61 2016/06/10 13:31:43 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.62 2016/12/15 09:35:24 ozaki-r Exp $");
 # include 	/* OS version */
 # include "opt_inet.h"	/* INET6, INET */
 # include "opt_altq_enabled.h" /* ALTQ */
@@ -4294,7 +4294,7 @@ rxintr_cleanup(softc_t *sc)
 sc->status.cntrs.ipackets++;
 
 /* Berkeley Packet Filter */
-LMC_BPF_MTAP(sc, first_mbuf);
+LMC_BPF_MTAP(sc, first_mbuf); /* XXX not in softint */
 
 /* Give this good packet to the network stacks. */
 sc->quota--;
@@ -4446,7 +4446,7 @@ txintr_cleanup(softc_t *sc)
 sc->status.cntrs.opackets++;
 
 /* Berkeley Packet Filter */
-LMC_BPF_MTAP(sc, m);
+LMC_BPF_MTAP(sc, m); /* XXX not in softint */
 	}
 
   m_freem(m);

Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.39 src/sys/netisdn/i4b_ipr.c:1.40
--- src/sys/netisdn/i4b_ipr.c:1.39	Fri Jun 10 13:27:16 2016
+++ src/sys/netisdn/i4b_ipr.c	Thu Dec 15 09:35:24 2016
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	-
  *
- *	$Id: i4b_ipr.c,v 1.39 2016/06/10 13:27:16 ozaki-r Exp $
+ *	$Id: i4b_ipr.c,v 1.40 2016/12/15 09:35:24 ozaki-r Exp $
  *
  * $FreeBSD$
  *
@@ -59,7 +59,7 @@
  *---*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.39 2016/06/10 13:27:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.40 2016/12/15 09:35:24 ozaki-r Exp $");
 
 #include "irip.h"
 #include "opt_irip.h"
@@ -1070,7 +1070,7 @@ error:
 		mm.m_len = 4;
 		mm.m_data = (char *)
 
-		bpf_mtap(>sc_if, );
+		bpf_mtap(>sc_if, ); /* XXX not in softint */
 	}
 #endif /* NBPFILTER > 0  || NBPF > 0 */
 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:35:25 UTC 2016

Modified Files:
src/sys/dev/ic: hd64570.c midway.c
src/sys/dev/pci: if_lmc.c
src/sys/netisdn: i4b_ipr.c

Log Message:
Annotate bpf_mtap still running in Rx hardware interrupt with "XXX not in 
softint"


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netisdn/i4b_ipr.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

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:33:25 UTC 2016

Modified Files:
src/sys/dev/ic: sgec.c
src/sys/dev/pci: if_de.c

Log Message:
Move bpf_mtap in Tx hardware intrrupt to if_start

The intention of the change is to prevent bpf_mtap from running in
hardware interrupt context. if_start is a usual place to do bpf_mtap
on Tx.

Proposed on tech-kern and tech-net


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/sgec.c
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/pci/if_de.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/ic/sgec.c
diff -u src/sys/dev/ic/sgec.c:1.44 src/sys/dev/ic/sgec.c:1.45
--- src/sys/dev/ic/sgec.c:1.44	Thu Dec 15 09:28:05 2016
+++ src/sys/dev/ic/sgec.c	Thu Dec 15 09:33:25 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: sgec.c,v 1.44 2016/12/15 09:28:05 ozaki-r Exp $ */
+/*  $NetBSD: sgec.c,v 1.45 2016/12/15 09:33:25 ozaki-r Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.44 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.45 2016/12/15 09:33:25 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -421,6 +421,8 @@ zestart(struct ifnet *ifp)
 		if ((ZE_RCSR(ZE_CSR5) & ZE_NICSR5_TS) != ZE_NICSR5_TS_RUN)
 			ZE_WCSR(ZE_CSR1, -1);
 		sc->sc_nexttx = nexttx;
+
+		bpf_mtap(ifp, m);
 	}
 	if (sc->sc_inq == (TXDESCS - 1))
 		ifp->if_flags |= IFF_OACTIVE;
@@ -504,7 +506,6 @@ sgec_intr(struct ze_softc *sc)
 			ifp->if_opackets++;
 			bus_dmamap_unload(sc->sc_dmat, map);
 			KASSERT(sc->sc_txmbuf[lastack]);
-			bpf_mtap(ifp, sc->sc_txmbuf[lastack]);
 			m_freem(sc->sc_txmbuf[lastack]);
 			sc->sc_txmbuf[lastack] = 0;
 			if (++lastack == TXDESCS)

Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.149 src/sys/dev/pci/if_de.c:1.150
--- src/sys/dev/pci/if_de.c:1.149	Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_de.c	Thu Dec 15 09:33:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.149 2016/12/15 09:28:05 ozaki-r Exp $	*/
+/*	$NetBSD: if_de.c,v 1.150 2016/12/15 09:33:25 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -37,7 +37,7 @@
  *   board which support 21040, 21041, or 21140 (mostly).
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.149 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.150 2016/12/15 09:33:25 ozaki-r Exp $");
 
 #define	TULIP_HDR_DATA
 
@@ -3894,8 +3894,6 @@ tulip_tx_intr(
 		TULIP_TXMAP_POSTSYNC(sc, map);
 		tulip_free_txmap(sc, map);
 #endif /* TULIP_BUS_DMA */
-		if (sc->tulip_bpf != NULL)
-			bpf_mtap(>tulip_if, m);
 		m_freem(m);
 #if defined(TULIP_DEBUG)
 		} else {
@@ -4548,6 +4546,8 @@ tulip_txput(
 } while ((m0 = m0->m_next) != NULL);
 #endif /* TULIP_BUS_DMA */
 
+if (sc->tulip_bpf != NULL)
+	bpf_mtap(>tulip_if, m);
 /*
  * The descriptors have been filled in.  Now get ready
  * to transmit.

CVS commit: src/sys/dev

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:33:25 UTC 2016

Modified Files:
src/sys/dev/ic: sgec.c
src/sys/dev/pci: if_de.c

Log Message:
Move bpf_mtap in Tx hardware intrrupt to if_start

The intention of the change is to prevent bpf_mtap from running in
hardware interrupt context. if_start is a usual place to do bpf_mtap
on Tx.

Proposed on tech-kern and tech-net


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/sgec.c
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/pci/if_de.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Dec 15 09:28:07 UTC 2016

Modified Files:
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/amiga/dev: if_es.c if_qn.c
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/broadcom: bcm53xx_eth.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/arm/gemini: gemini_gmac.c if_gpn.c
src/sys/arch/arm/imx: if_enet.c
src/sys/arch/arm/omap: if_cpsw.c omapl1x_emac.c
src/sys/arch/arm/rockchip: rockchip_emac.c
src/sys/arch/arm/xscale: ixp425_if_npe.c
src/sys/arch/emips/ebus: if_le_ebus.c
src/sys/arch/evbppc/virtex/dev: if_temac.c
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/mac68k/nubus: if_netdock_nubus.c
src/sys/arch/macppc/dev: am79c950.c if_bm.c if_gm.c
src/sys/arch/mips/adm5120/dev: if_admsw.c
src/sys/arch/mips/alchemy/dev: if_aumac.c
src/sys/arch/mips/atheros/dev: if_ae.c
src/sys/arch/mips/cavium/dev: if_cnmac.c
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/mips/sibyte/dev: sbmac.c
src/sys/arch/newsmips/apbus: if_sn.c
src/sys/arch/next68k/dev: mb8795.c
src/sys/arch/playstation2/dev: if_smap.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/arch/powerpc/ibm4xx/dev: if_emac.c
src/sys/arch/sgimips/hpc: if_sq.c
src/sys/arch/sgimips/mace: if_mec.c
src/sys/arch/sun2/dev: if_ec.c
src/sys/arch/sun3/dev: if_ie.c
src/sys/arch/usermode/dev: if_veth.c
src/sys/arch/x86/pci: if_vmx.c
src/sys/arch/xen/xen: if_xennet_xenbus.c xennetback_xenbus.c
src/sys/dev/bi: if_ni.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: aic6915.c cs89x0.c dm9000.c dp8390.c dp83932.c
dwc_gmac.c elink3.c elinkxl.c gem.c hme.c i82557.c i82586.c
i82596.c lan9118.c lance.c lemac.c mb86950.c mb86960.c mtd803.c
pdq_ifsubr.c rrunner.c rtl8169.c rtl81x9.c seeq8005.c sgec.c
smc83c170.c smc90cx6.c smc91cxx.c tropic.c tulip.c
src/sys/dev/if_ndis: if_ndis.c
src/sys/dev/isa: if_eg.c if_el.c if_iy.c
src/sys/dev/marvell: if_gfe.c if_mvgbe.c if_mvxpe.c
src/sys/dev/ofw: ofnet.c
src/sys/dev/pci: if_age.c if_alc.c if_ale.c if_bce.c if_bge.c if_bnx.c
if_cas.c if_de.c if_dge.c if_et.c if_jme.c if_kse.c if_lii.c
if_msk.c if_nfe.c if_pcn.c if_sip.c if_sk.c if_ste.c if_stge.c
if_ti.c if_tl.c if_txp.c if_vge.c if_vioif.c if_vr.c if_vte.c
if_wm.c if_xge.c
src/sys/dev/pci/ixgbe: ix_txrx.c
src/sys/dev/pcmcia: if_cnw.c if_malo_pcmcia.c if_xi.c
src/sys/dev/qbus: if_de.c if_qe.c if_qt.c
src/sys/dev/sbus: be.c qe.c
src/sys/dev/scsipi: if_se.c
src/sys/dev/usb: if_aue.c if_axe.c if_axen.c if_cdce.c if_cue.c
if_kue.c if_smsc.c if_udav.c if_upl.c if_url.c if_urndis.c
src/sys/net: if.c if_tap.c if_vlan.c
src/sys/net/agr: if_agr.c
src/sys/net80211: ieee80211_input.c
src/sys/netinet: ip_etherip.c
src/sys/netinet6: ip6_etherip.c
src/sys/netisdn: i4b_isppp.c
src/sys/rump/net/lib/libshmif: if_shmem.c
src/sys/rump/net/lib/libvirtif: if_virt.c

Log Message:
Move bpf_mtap and if_ipackets++ on Rx of each driver to percpuq if_input

The benefits of the change are:
- We can reduce codes
- We can provide the same behavior between drivers
  - Where/When if_ipackets is counted up
  - Note that some drivers still update packet statistics in their own
way (periodical update)
- Moved bpf_mtap run in softint
  - This makes it easy to MP-ify bpf

Proposed on tech-kern and tech-net


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/dev/if_qn.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/if_gpn.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/omap/if_cpsw.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omapl1x_emac.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/rockchip/rockchip_emac.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/xscale/ixp425_if_npe.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/virtex/dev/if_temac.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mac68k/nubus/if_netdock_nubus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 15 09:17:26 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config: Makefile
Added Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
Removed Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.7

Log Message:
add the xkeyboard-config manual as a .man, so that the normal X processing
of it happens.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man

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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.137 src/distrib/sets/lists/xbase/mi:1.138
--- src/distrib/sets/lists/xbase/mi:1.137	Wed Nov 23 09:50:52 2016
+++ src/distrib/sets/lists/xbase/mi	Thu Dec 15 09:17:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.137 2016/11/23 09:50:52 snj Exp $
+# $NetBSD: mi,v 1.138 2016/12/15 09:17:26 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1393,6 +1393,7 @@
 ./usr/X11R7/man/cat7/XOrgFoundation.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat7/XProjectTeam.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat7/Xsecurity.0			-unknown-	.cat,xorg
+./usr/X11R7/man/cat7/xkeyboard-config.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/html1	base-x11-root	xorg
 ./usr/X11R7/man/html1/appres.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/atobm.html			-unknown-	html,xorg
@@ -1536,7 +1537,7 @@
 ./usr/X11R7/man/html7/XOrgFoundation.html		-unknown-	html,xorg
 ./usr/X11R7/man/html7/XProjectTeam.html			-unknown-	html,xorg
 ./usr/X11R7/man/html7/Xsecurity.html			-unknown-	html,xorg
-#./usr/X11R7/man/html7/xkeyboard-config.html		-unknown-	html,xorg
+./usr/X11R7/man/html7/xkeyboard-config.html		-unknown-	html,xorg
 ./usr/X11R7/man/man1	base-x11-root	xorg
 ./usr/X11R7/man/man1/appres.1-unknown-	.man,xorg
 ./usr/X11R7/man/man1/atobm.1-unknown-	.man,xorg
@@ -1681,7 +1682,7 @@
 ./usr/X11R7/man/man7/XOrgFoundation.7			-unknown-	.man,xorg
 ./usr/X11R7/man/man7/XProjectTeam.7			-unknown-	.man,xorg
 ./usr/X11R7/man/man7/Xsecurity.7			-unknown-	.man,xorg
-#./usr/X11R7/man/man7/xkeyboard-config.7			-unknown-	.man,xorg
+./usr/X11R7/man/man7/xkeyboard-config.7			-unknown-	.man,xorg
 ./usr/X11R7/man/whatis.db-unknown-	man,xorg,!makemandb
 ./usr/X11R7/share	base-x11-root	xorg
 ./usr/X11R7/share/aclocalbase-x11-root	xorg

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.11 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.11	Wed Nov 23 09:50:52 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Thu Dec 15 09:17:26 2016
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.11 2016/11/23 09:50:52 snj Exp $
+#	$NetBSD: Makefile,v 1.12 2016/12/15 09:17:26 mrg Exp $
 
 .include 
 
 # XXX when updating to a new xkeyboard-config, regenerate with xsltproc
-#MAN=		xkeyboard-config.7
+MAN=		xkeyboard-config.7
 
 SUBDIR=		compat geometry keycodes rules symbols types
 

Added files:

Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u /dev/null src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.1
--- /dev/null	Thu Dec 15 09:17:26 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Thu Dec 15 09:17:26 2016
@@ -0,0 +1,1341 @@
+.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.19" "X Version 11"
+.SH NAME
+xkeyboard-config \- XKB data description files
+.SH DESCRIPTION
+xkeyboard-config provides the description files for the X Keyboard
+Extension (XKB). The configuration options below are usually applied with
+setxkbmap(1).
+.SH MODELS
+.TS
+left,box;
+lB lB
+___
+lB l.
+Model	Description
+pc101	Generic 101-key PC
+pc102	Generic 102-key (Intl) PC
+pc104	Generic 104-key PC
+pc105	Generic 105-key (Intl) PC
+dell101	Dell 101-key PC
+latitude	Dell Latitude series laptop
+dellm65	Dell Precision M65
+everex	Everex STEPnote
+flexpro	Keytronic FlexPro
+microsoft	Microsoft Natural
+omnikey101	Northgate OmniKey 101
+winbook	Winbook Model XP5
+pc98	PC-98xx Series
+a4techKB21	A4Tech KB-21
+a4techKBS8	A4Tech KBS-8
+a4_rfkb23	A4Tech Wireless Desktop RFKB-23
+airkey	Acer AirKey V
+azonaRF2300	Azona RF2300 wireless Internet Keyboard
+scorpius	Advance Scorpius KI
+brother	Brother Internet Keyboard
+btc5113rf	BTC 5113RF Multimedia
+btc5126t	BTC 5126T
+btc6301urf	BTC 6301URF
+btc9000	BTC 9000
+btc9000a	BTC 9000A

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Dec 15 09:17:26 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config: Makefile
Added Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
Removed Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.7

Log Message:
add the xkeyboard-config manual as a .man, so that the normal X processing
of it happens.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/kernel

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 08:57:24 UTC 2016

Modified Files:
src/tests/kernel: t_ptrace_wait.h

Log Message:
Prepare t_ptrace_wait.h for hardware watchpoints API

Add new symbol ATF_TP_ADD_TC_HAVE_PTRACE_WATCHPOINTS() to be protected with
the __HAVE_PTRACE_WATCHPOINTS guard.

XXX:
Mark check_happy() with __attribute__((optimize("O0"))).
Disabled optimization is required to make tests for hardware assisted
traps in .text functional.

Tested with GCC 5.4 on NetBSD 7.99.47 amd64

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_ptrace_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/kernel/t_ptrace_wait.h
diff -u src/tests/kernel/t_ptrace_wait.h:1.2 src/tests/kernel/t_ptrace_wait.h:1.3
--- src/tests/kernel/t_ptrace_wait.h:1.2	Mon Dec  5 20:10:10 2016
+++ src/tests/kernel/t_ptrace_wait.h	Thu Dec 15 08:57:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.h,v 1.2 2016/12/05 20:10:10 christos Exp $	*/
+/*	$NetBSD: t_ptrace_wait.h,v 1.3 2016/12/15 08:57:24 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -374,7 +374,13 @@ dsum(unsigned n)
 	return sum;
 }
 
-static int __used
+/*
+ * XXX: Disabled optimization is required to make tests for hardware assisted
+ * traps in .text functional
+ *
+ * Tested with GCC 5.4 on NetBSD 7.99.47 amd64
+ */
+static int __used __attribute__((optimize("O0")))
 check_happy(unsigned n)
 {
 	for (;;) {
@@ -418,3 +424,9 @@ check_happy(unsigned n)
 #else
 #define ATF_TP_ADD_TC_PT_STEP(a,b)
 #endif
+
+#if defined(__HAVE_PTRACE_WATCHPOINTS)
+#define ATF_TP_ADD_TC_HAVE_PTRACE_WATCHPOINTS(a,b)	ATF_TP_ADD_TC(a,b)
+#else
+#define ATF_TP_ADD_TC_HAVE_PTRACE_WATCHPOINTS(a,b)
+#endif

CVS commit: src/tests/kernel

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu Dec 15 08:57:24 UTC 2016

Modified Files:
src/tests/kernel: t_ptrace_wait.h

Log Message:
Prepare t_ptrace_wait.h for hardware watchpoints API

Add new symbol ATF_TP_ADD_TC_HAVE_PTRACE_WATCHPOINTS() to be protected with
the __HAVE_PTRACE_WATCHPOINTS guard.

XXX:
Mark check_happy() with __attribute__((optimize("O0"))).
Disabled optimization is required to make tests for hardware assisted
traps in .text functional.

Tested with GCC 5.4 on NetBSD 7.99.47 amd64

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_ptrace_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/sys/arch (lapic va change)

[Paul Goyette]

Module Name:src
Committed By:   maxv
Date:   Sun Dec 11 08:31:53 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/x86/x86: pmap.c

Log Message:
Kenter local_apic_va to a fake physical page, because our x86
implementation expects this va to be valid even if no lapic is
present; which probably is a bug in itself, but let's just reproduce
the old behavior and rehide that bug.


This change (and the subsequent fix for the build break) breaks the 
installation process when running under pkgsrc/emulators/qemu-2.7.0nb1


Booting the install media image gets as far as the end of device 
auto-configuration, and hangs after reporting the boot device and 
/path/to/modules.  It never gets to starting the init(8) process.


Reverting this fix (and the build break fix) restores the ability to 
finish booting, and actually gets into sysinst.


I don't know what the correct fix is, but I think we should revert this 
commit (at least for amd64, not sure about i386) until it is better 
understood and can be fixed properly.


This problem doesn't seem to be affecting the rel-eng amd64 test-bed, 
probably because it is likely running an older version of qemu?


XXX  Note that this is not the only problem with amd64 on -HEAD.  The 
rel-eng test-bed has not had a successful install for several days.  It 
seems to "hang" and time-out while running 'progress cp /usr/mdec/boot 
/mnt2/boot' command.  (My own system, after reverting the lapic changes, 
hangs at the exact same place.)  Perhaps I should start a separate 
thread for this 2nd issue?




+--+--++
| Paul Goyette | PGP Key fingerprint: | E-mail addresses:  |
| (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+--+--++