CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Dec 13 08:29:03 UTC 2016

Modified Files:
src/sys/netinet: dccp_usrreq.c sctp_asconf.c tcp_congctl.c tcp_sack.c
tcp_vtw.c tcp_vtw.h
src/sys/netinet6: dccp6_usrreq.c in6_pcb.c in6_proto.c raw_ip6.c
sctp6_usrreq.c

Log Message:
Remove unnecessary inclusions of nd6.h


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/tcp_vtw.h
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet6/dccp6_usrreq.c
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.113 -r1.114 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet6/sctp6_usrreq.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/netinet/dccp_usrreq.c
diff -u src/sys/netinet/dccp_usrreq.c:1.9 src/sys/netinet/dccp_usrreq.c:1.10
--- src/sys/netinet/dccp_usrreq.c:1.9	Thu Jul  7 06:55:43 2016
+++ src/sys/netinet/dccp_usrreq.c	Tue Dec 13 08:29:03 2016
@@ -1,5 +1,5 @@
 /*	$KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $	*/
-/*	$NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $ */
+/*	$NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson 
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -108,7 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.
 #ifdef INET6
 #include 
 #include 
-#include 
 #include 
 #endif
 #include 

Index: src/sys/netinet/sctp_asconf.c
diff -u src/sys/netinet/sctp_asconf.c:1.5 src/sys/netinet/sctp_asconf.c:1.6
--- src/sys/netinet/sctp_asconf.c:1.5	Thu Jul  7 09:32:02 2016
+++ src/sys/netinet/sctp_asconf.c	Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $ */
+/*	$NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $ */
 /*	$KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_asconf.
 #include 
 #include 
 #include 
-#include 
 #include 
 #endif /* INET6 */
 

Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.21 src/sys/netinet/tcp_congctl.c:1.22
--- src/sys/netinet/tcp_congctl.c:1.21	Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/tcp_congctl.c	Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $	*/
+/*	$NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -176,7 +176,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl.
 #include 
 #include 
 #include 
-#include 
 #endif
 
 #include 

Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.32 src/sys/netinet/tcp_sack.c:1.33
--- src/sys/netinet/tcp_sack.c:1.32	Mon Aug 24 22:21:26 2015
+++ src/sys/netinet/tcp_sack.c	Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -144,7 +144,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
 #include 
 #include 
 #include 
-#include 
 #endif
 
 #ifndef INET6

Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.16 src/sys/netinet/tcp_vtw.c:1.17
--- src/sys/netinet/tcp_vtw.c:1.16	Thu Jul 28 07:54:31 2016
+++ src/sys/netinet/tcp_vtw.c	Tue Dec 13 08:29:03 2016
@@ -111,7 +111,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -123,7 +122,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Dec 13 08:29:03 UTC 2016

Modified Files:
src/sys/netinet: dccp_usrreq.c sctp_asconf.c tcp_congctl.c tcp_sack.c
tcp_vtw.c tcp_vtw.h
src/sys/netinet6: dccp6_usrreq.c in6_pcb.c in6_proto.c raw_ip6.c
sctp6_usrreq.c

Log Message:
Remove unnecessary inclusions of nd6.h


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/tcp_vtw.h
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet6/dccp6_usrreq.c
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.113 -r1.114 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet6/sctp6_usrreq.c

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

CVS commit: src/sys/fs/nfs/nlm

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:58:17 UTC 2016

Modified Files:
src/sys/fs/nfs/nlm: nlm_advlock.c nlm_prot_clnt.c nlm_prot_impl.c
nlm_prot_server.c nlm_prot_svc.c nlm_prot_xdr.c sm_inter_xdr.c

Log Message:
Update for location of newnfs headers, clean up some other #include


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/nlm/nlm_advlock.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/nlm/nlm_prot_clnt.c \
src/sys/fs/nfs/nlm/nlm_prot_server.c src/sys/fs/nfs/nlm/nlm_prot_svc.c \
src/sys/fs/nfs/nlm/nlm_prot_xdr.c src/sys/fs/nfs/nlm/sm_inter_xdr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/nlm/nlm_prot_impl.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/fs/nfs/nlm/nlm_advlock.c
diff -u src/sys/fs/nfs/nlm/nlm_advlock.c:1.1.1.2 src/sys/fs/nfs/nlm/nlm_advlock.c:1.2
--- src/sys/fs/nfs/nlm/nlm_advlock.c:1.1.1.2	Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/nlm/nlm_advlock.c	Tue Dec 13 21:58:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nlm_advlock.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $	*/
+/*	$NetBSD: nlm_advlock.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson 
@@ -28,7 +28,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_advlock.c 302216 2016-06-26 20:08:42Z kib "); */
-__RCSID("$NetBSD: nlm_advlock.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nlm_advlock.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 #include 
 #include 
@@ -48,12 +48,12 @@ __RCSID("$NetBSD: nlm_advlock.c,v 1.1.1.
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 /*
  * We need to keep track of the svid values used for F_FLOCK locks.

Index: src/sys/fs/nfs/nlm/nlm_prot_clnt.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_clnt.c:1.1.1.1	Mon Sep 30 07:19:43 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_clnt.c	Tue Dec 13 21:58:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nlm_prot_clnt.c,v 1.1.1.1 2013/09/30 07:19:43 dholland Exp $	*/
+/*	$NetBSD: nlm_prot_clnt.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $	*/
 /*
  * Please do not edit this file.
  * It was generated using rpcgen.
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
@@ -17,7 +17,7 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_clnt.c 180025 2008-06-26 10:21:54Z dfr "); */
-__RCSID("$NetBSD: nlm_prot_clnt.c,v 1.1.1.1 2013/09/30 07:19:43 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_clnt.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 enum clnt_stat 
 nlm_sm_notify_0(struct nlm_sm_status *argp, void *clnt_res, CLIENT *clnt, struct rpc_callextra *ext, struct timeval timo)
Index: src/sys/fs/nfs/nlm/nlm_prot_server.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_server.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_server.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_server.c:1.1.1.1	Mon Sep 30 07:19:45 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_server.c	Tue Dec 13 21:58:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nlm_prot_server.c,v 1.1.1.1 2013/09/30 07:19:45 dholland Exp $	*/
+/*	$NetBSD: nlm_prot_server.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson 
@@ -33,14 +33,14 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* __FBSDID("FreeBSD: head/sys/nlm/nlm_prot_server.c 197840 2009-10-07 19:50:14Z zml "); */
-__RCSID("$NetBSD: nlm_prot_server.c,v 1.1.1.1 2013/09/30 07:19:45 dholland Exp $");
+__RCSID("$NetBSD: nlm_prot_server.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $");
 
 #include 
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 /**/
 
Index: src/sys/fs/nfs/nlm/nlm_prot_svc.c
diff -u src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.1.1.1 src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.2
--- src/sys/fs/nfs/nlm/nlm_prot_svc.c:1.1.1.1	Mon Sep 30 07:19:46 2013
+++ src/sys/fs/nfs/nlm/nlm_prot_svc.c	Tue Dec 13 21:58:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nlm_prot_svc.c,v 1.1.1.1 2013/09/30 07:19:46 dholland Exp $	*/
+/*	$NetBSD: nlm_prot_svc.c,v 1.2 2016/12/13 21:58:17 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Authors: Doug Rabson 
@@ -29,8 +29,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #ifndef lint
@@ -39,7 +39,7 @@
 /* __RCSID("NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp "); */
 #endif /* not lint */
 /* 

CVS commit: src/sys/fs/nfs/nlm

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:58:17 UTC 2016

Modified Files:
src/sys/fs/nfs/nlm: nlm_advlock.c nlm_prot_clnt.c nlm_prot_impl.c
nlm_prot_server.c nlm_prot_svc.c nlm_prot_xdr.c sm_inter_xdr.c

Log Message:
Update for location of newnfs headers, clean up some other #include


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/nlm/nlm_advlock.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/nlm/nlm_prot_clnt.c \
src/sys/fs/nfs/nlm/nlm_prot_server.c src/sys/fs/nfs/nlm/nlm_prot_svc.c \
src/sys/fs/nfs/nlm/nlm_prot_xdr.c src/sys/fs/nfs/nlm/sm_inter_xdr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/nlm/nlm_prot_impl.c

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

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:49:02 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfskpiport.h

Log Message:
Disable duplicate typedef


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/common/nfskpiport.h

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

CVS commit: src/sys/fs/nfs/client

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:17:33 UTC 2016

Modified Files:
src/sys/fs/nfs/client: nfs_clkrpc.c nfs_clnfsiod.c nfs_clnode.c
nfs_clport.c nfs_clrpcops.c nfs_clstate.c nfs_clsubs.c
nfs_clvfsops.c nfs_clvnops.c nfsmount.h nfsnode.h

Log Message:
Adapt code for our location of the nfs headers, and some updates for
differences in kernel options(4) handling


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/client/nfs_clkrpc.c \
src/sys/fs/nfs/client/nfs_clnfsiod.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/client/nfs_clnode.c \
src/sys/fs/nfs/client/nfsmount.h src/sys/fs/nfs/client/nfsnode.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs_clport.c \
src/sys/fs/nfs/client/nfs_clrpcops.c src/sys/fs/nfs/client/nfs_clsubs.c \
src/sys/fs/nfs/client/nfs_clvfsops.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/client/nfs_clstate.c \
src/sys/fs/nfs/client/nfs_clvnops.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/fs/nfs/client/nfs_clkrpc.c
diff -u src/sys/fs/nfs/client/nfs_clkrpc.c:1.1.1.1 src/sys/fs/nfs/client/nfs_clkrpc.c:1.2
--- src/sys/fs/nfs/client/nfs_clkrpc.c:1.1.1.1	Mon Sep 30 07:19:04 2013
+++ src/sys/fs/nfs/client/nfs_clkrpc.c	Tue Dec 13 22:17:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_clkrpc.c,v 1.1.1.1 2013/09/30 07:19:04 dholland Exp $	*/
+/*	$NetBSD: nfs_clkrpc.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,11 +34,13 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clkrpc.c 255216 2013-09-04 22:47:56Z rmacklem "); */
-__RCSID("$NetBSD: nfs_clkrpc.c,v 1.1.1.1 2013/09/30 07:19:04 dholland Exp $");
+__RCSID("$NetBSD: nfs_clkrpc.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $");
 
+#ifdef NOTYET /* _KERNEL_OPT */
 #include "opt_kgssapi.h"
+#endif
 
-#include 
+#include 
 
 #include 
 #include 
Index: src/sys/fs/nfs/client/nfs_clnfsiod.c
diff -u src/sys/fs/nfs/client/nfs_clnfsiod.c:1.1.1.1 src/sys/fs/nfs/client/nfs_clnfsiod.c:1.2
--- src/sys/fs/nfs/client/nfs_clnfsiod.c:1.1.1.1	Mon Sep 30 07:19:30 2013
+++ src/sys/fs/nfs/client/nfs_clnfsiod.c	Tue Dec 13 22:17:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_clnfsiod.c,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $	*/
+/*	$NetBSD: nfs_clnfsiod.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnfsiod.c 249630 2013-04-18 23:20:16Z rmacklem "); */
-__RCSID("$NetBSD: nfs_clnfsiod.c,v 1.1.1.1 2013/09/30 07:19:30 dholland Exp $");
+__RCSID("$NetBSD: nfs_clnfsiod.c,v 1.2 2016/12/13 22:17:33 pgoyette Exp $");
 
 #include 
 #include 
@@ -66,10 +66,10 @@ __RCSID("$NetBSD: nfs_clnfsiod.c,v 1.1.1
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 extern struct mtx	ncl_iod_mutex;
 extern struct task	ncl_nfsiodnew_task;

Index: src/sys/fs/nfs/client/nfs_clnode.c
diff -u src/sys/fs/nfs/client/nfs_clnode.c:1.2 src/sys/fs/nfs/client/nfs_clnode.c:1.3
--- src/sys/fs/nfs/client/nfs_clnode.c:1.2	Fri Nov 18 22:58:08 2016
+++ src/sys/fs/nfs/client/nfs_clnode.c	Tue Dec 13 22:17:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $	*/
+/*	$NetBSD: nfs_clnode.c,v 1.3 2016/12/13 22:17:33 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsclient/nfs_clnode.c 302210 2016-06-26 14:18:28Z kib "); */
-__RCSID("$NetBSD: nfs_clnode.c,v 1.2 2016/11/18 22:58:08 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_clnode.c,v 1.3 2016/12/13 22:17:33 pgoyette Exp $");
 
 #include 
 #include 
@@ -52,13 +52,13 @@ __RCSID("$NetBSD: nfs_clnode.c,v 1.2 201
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include 
+#include 
 
 extern struct vop_vector newnfs_vnodeops;
 extern struct buf_ops buf_ops_newnfs;
Index: src/sys/fs/nfs/client/nfsmount.h
diff -u src/sys/fs/nfs/client/nfsmount.h:1.2 src/sys/fs/nfs/client/nfsmount.h:1.3
--- src/sys/fs/nfs/client/nfsmount.h:1.2	Fri Nov 18 22:58:08 2016
+++ src/sys/fs/nfs/client/nfsmount.h	Tue Dec 13 22:17:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $	*/
+/*	$NetBSD: nfsmount.h,v 1.3 2016/12/13 22:17:33 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,13 +31,13 @@
  * SUCH DAMAGE.
  *
  * FreeBSD: head/sys/fs/nfsclient/nfsmount.h 244042 2012-12-08 22:52:39Z rmacklem 
- * $NetBSD: nfsmount.h,v 1.2 2016/11/18 22:58:08 pgoyette Exp $

CVS commit: src/sys/fs/nfs/client

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:17:33 UTC 2016

Modified Files:
src/sys/fs/nfs/client: nfs_clkrpc.c nfs_clnfsiod.c nfs_clnode.c
nfs_clport.c nfs_clrpcops.c nfs_clstate.c nfs_clsubs.c
nfs_clvfsops.c nfs_clvnops.c nfsmount.h nfsnode.h

Log Message:
Adapt code for our location of the nfs headers, and some updates for
differences in kernel options(4) handling


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/client/nfs_clkrpc.c \
src/sys/fs/nfs/client/nfs_clnfsiod.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/client/nfs_clnode.c \
src/sys/fs/nfs/client/nfsmount.h src/sys/fs/nfs/client/nfsnode.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs_clport.c \
src/sys/fs/nfs/client/nfs_clrpcops.c src/sys/fs/nfs/client/nfs_clsubs.c \
src/sys/fs/nfs/client/nfs_clvfsops.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/client/nfs_clstate.c \
src/sys/fs/nfs/client/nfs_clvnops.c

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

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:31:51 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfs_commonacl.c nfs_commonkrpc.c
nfs_commonport.c nfs_commonsubs.c

Log Message:
More cleanup of #includes


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs_commonacl.c \
src/sys/fs/nfs/common/nfs_commonkrpc.c \
src/sys/fs/nfs/common/nfs_commonport.c \
src/sys/fs/nfs/common/nfs_commonsubs.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/fs/nfs/common/nfs_commonacl.c
diff -u src/sys/fs/nfs/common/nfs_commonacl.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonacl.c:1.2
--- src/sys/fs/nfs/common/nfs_commonacl.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonacl.c	Tue Dec 13 22:31:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_commonacl.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_commonacl.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2009 Rick Macklem, University of Guelph
  * All rights reserved.
@@ -28,10 +28,10 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonacl.c 297793 2016-04-10 23:07:00Z pfg "); */
-__RCSID("$NetBSD: nfs_commonacl.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonacl.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 #ifndef APPLEKEXT
-#include 
+#include 
 
 extern int nfsrv_useacl;
 #endif
Index: src/sys/fs/nfs/common/nfs_commonkrpc.c
diff -u src/sys/fs/nfs/common/nfs_commonkrpc.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonkrpc.c:1.2
--- src/sys/fs/nfs/common/nfs_commonkrpc.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonkrpc.c	Tue Dec 13 22:31:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_commonkrpc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_commonkrpc.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1991, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,19 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonkrpc.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_commonkrpc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonkrpc.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * Socket operations for use by nfs
  */
 
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#include "opt_newnfs.h"
+#if 0
 #include "opt_kgssapi.h"
-#include "opt_nfs.h"
+#endif
+#endif
 
 #include 
 #include 
@@ -60,11 +65,11 @@ __RCSID("$NetBSD: nfs_commonkrpc.c,v 1.1
 #include 
 
 #include 
-#include 
+#include 
 
 #include 
 
-#include 
+#include 
 
 #ifdef KDTRACE_HOOKS
 #include 
Index: src/sys/fs/nfs/common/nfs_commonport.c
diff -u src/sys/fs/nfs/common/nfs_commonport.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonport.c:1.2
--- src/sys/fs/nfs/common/nfs_commonport.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonport.c	Tue Dec 13 22:31:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_commonport.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_commonport.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,14 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonport.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_commonport.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonport.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * Functions that need to be different for different versions of BSD
  * kernel should be kept here, along with any global storage specific
  * to this BSD variant.
  */
-#include 
+#include 
 #include 
 #include 
 #include 
Index: src/sys/fs/nfs/common/nfs_commonsubs.c
diff -u src/sys/fs/nfs/common/nfs_commonsubs.c:1.1.1.2 src/sys/fs/nfs/common/nfs_commonsubs.c:1.2
--- src/sys/fs/nfs/common/nfs_commonsubs.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_commonsubs.c	Tue Dec 13 22:31:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_commonsubs.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_commonsubs.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfs/nfs_commonsubs.c 308708 2016-11-16 01:11:49Z cperciva "); */
-__RCSID("$NetBSD: nfs_commonsubs.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_commonsubs.c,v 1.2 2016/12/13 22:31:51 pgoyette Exp $");
 
 /*
  * These functions support the macros and help fiddle mbuf chains for
@@ -42,9 +42,12 @@ __RCSID("$NetBSD: nfs_commonsubs.c,v 1.1
  * copy data between mbuf chains and uio lists.
  */
 #ifndef APPLEKEXT
+#ifdef _KERNEL_OPT
 #include "opt_inet6.h"

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:31:51 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfs_commonacl.c nfs_commonkrpc.c
nfs_commonport.c nfs_commonsubs.c

Log Message:
More cleanup of #includes


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs_commonacl.c \
src/sys/fs/nfs/common/nfs_commonkrpc.c \
src/sys/fs/nfs/common/nfs_commonport.c \
src/sys/fs/nfs/common/nfs_commonsubs.c

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

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:41:46 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfs_diskless.c nfs_fha.c nfs_lock.c nfs_nfssvc.c

Log Message:
More cleanup of #includes


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs_diskless.c \
src/sys/fs/nfs/common/nfs_fha.c src/sys/fs/nfs/common/nfs_lock.c \
src/sys/fs/nfs/common/nfs_nfssvc.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/fs/nfs/common/nfs_diskless.c
diff -u src/sys/fs/nfs/common/nfs_diskless.c:1.1.1.2 src/sys/fs/nfs/common/nfs_diskless.c:1.2
--- src/sys/fs/nfs/common/nfs_diskless.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_diskless.c	Tue Dec 13 22:41:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_diskless.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_diskless.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,9 +35,11 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_diskless.c 297086 2016-03-20 21:48:26Z ian "); */
-__RCSID("$NetBSD: nfs_diskless.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_diskless.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
-#include "opt_bootp.h"
+#ifdef _KERNEL_OPT
+#include "opt_newnfs.h"
+#endif
 
 #include 
 #include 
@@ -50,14 +52,16 @@ __RCSID("$NetBSD: nfs_diskless.c,v 1.1.1
 #include 
 #include 
 #include 
+
 #include 
 #include 
 #include 
 
 #include 
-#include 
-#include 
-#include 
+
+#include 
+#include 
+#include 
 
 #define	NFS_IFACE_TIMEOUT_SECS	10 /* Timeout for interface to appear. */
 
@@ -424,7 +428,7 @@ decode_nfshandle(char *ev, u_char *fh, i
 	}
 }
 
-#if !defined(BOOTP_NFSROOT)
+#if !defined(NEW_NFS_BOOT_BOOTP)
 static void
 nfs_rootconf(void)
 {
Index: src/sys/fs/nfs/common/nfs_fha.c
diff -u src/sys/fs/nfs/common/nfs_fha.c:1.1.1.2 src/sys/fs/nfs/common/nfs_fha.c:1.2
--- src/sys/fs/nfs/common/nfs_fha.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_fha.c	Tue Dec 13 22:41:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_fha.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_fha.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  *
@@ -26,7 +26,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_fha.c 267479 2014-06-14 12:26:12Z mav "); */
-__RCSID("$NetBSD: nfs_fha.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_fha.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
 #include 
 #include 
@@ -40,7 +40,7 @@ __RCSID("$NetBSD: nfs_fha.c,v 1.1.1.2 20
 #include 
 
 #include 
-#include 
+#include 
 
 static MALLOC_DEFINE(M_NFS_FHA, "NFS FHA", "NFS FHA");
 
Index: src/sys/fs/nfs/common/nfs_lock.c
diff -u src/sys/fs/nfs/common/nfs_lock.c:1.1.1.2 src/sys/fs/nfs/common/nfs_lock.c:1.2
--- src/sys/fs/nfs/common/nfs_lock.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_lock.c	Tue Dec 13 22:41:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_lock.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_lock.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
@@ -31,7 +31,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_lock.c 303382 2016-07-27 11:08:59Z kib "); */
-__RCSID("$NetBSD: nfs_lock.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_lock.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
 #include 
 #include 
@@ -55,12 +55,12 @@ __RCSID("$NetBSD: nfs_lock.c,v 1.1.1.2 2
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 extern void (*nlminfo_release_p)(struct proc *p);
 
Index: src/sys/fs/nfs/common/nfs_nfssvc.c
diff -u src/sys/fs/nfs/common/nfs_nfssvc.c:1.1.1.2 src/sys/fs/nfs/common/nfs_nfssvc.c:1.2
--- src/sys/fs/nfs/common/nfs_nfssvc.c:1.1.1.2	Fri Nov 18 07:49:12 2016
+++ src/sys/fs/nfs/common/nfs_nfssvc.c	Tue Dec 13 22:41:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nfssvc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $	*/
+/*	$NetBSD: nfs_nfssvc.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,9 +34,11 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nfs/nfs_nfssvc.c 298788 2016-04-29 16:07:25Z pfg "); */
-__RCSID("$NetBSD: nfs_nfssvc.c,v 1.1.1.2 2016/11/18 07:49:12 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfssvc.c,v 1.2 2016/12/13 22:41:46 pgoyette Exp $");
 
-#include "opt_nfs.h"
+#ifdef _KERNEL_OPT
+#include "opt_newnfs.h"
+#endif
 
 #include 
 #include 
@@ -50,11 +52,10 @@ __RCSID("$NetBSD: nfs_nfssvc.c,v 1.1.1.2
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
-#include 
+#include 
 
 static 

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:41:46 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfs_diskless.c nfs_fha.c nfs_lock.c nfs_nfssvc.c

Log Message:
More cleanup of #includes


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs_diskless.c \
src/sys/fs/nfs/common/nfs_fha.c src/sys/fs/nfs/common/nfs_lock.c \
src/sys/fs/nfs/common/nfs_nfssvc.c

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

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:49:02 UTC 2016

Modified Files:
src/sys/fs/nfs/common: nfskpiport.h

Log Message:
Disable duplicate typedef


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/common/nfskpiport.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/fs/nfs/common/nfskpiport.h
diff -u src/sys/fs/nfs/common/nfskpiport.h:1.1.1.1 src/sys/fs/nfs/common/nfskpiport.h:1.2
--- src/sys/fs/nfs/common/nfskpiport.h:1.1.1.1	Mon Sep 30 07:19:40 2013
+++ src/sys/fs/nfs/common/nfskpiport.h	Tue Dec 13 22:49:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfskpiport.h,v 1.1.1.1 2013/09/30 07:19:40 dholland Exp $	*/
+/*	$NetBSD: nfskpiport.h,v 1.2 2016/12/13 22:49:02 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2009 Rick Macklem, University of Guelph
  * All rights reserved.
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * FreeBSD: head/sys/fs/nfs/nfskpiport.h 207785 2010-05-08 14:50:12Z rmacklem 
- * $NetBSD: nfskpiport.h,v 1.1.1.1 2013/09/30 07:19:40 dholland Exp $
+ * $NetBSD: nfskpiport.h,v 1.2 2016/12/13 22:49:02 pgoyette Exp $
  */
 
 #ifndef _NFS_NFSKPIPORT_H_
@@ -39,7 +39,9 @@ typedef	struct mount *		mount_t;
 #define	vfs_statfs(m)		(&((m)->mnt_stat))
 #define	vfs_flags(m)		((m)->mnt_flag)
 
+#if 0	/* Predefined in NetBSD sys/vnode.h */
 typedef struct vnode *		vnode_t;
+#endif
 #define	vnode_mount(v)		((v)->v_mount)
 #define	vnode_vtype(v)		((v)->v_type)
 

CVS commit: src/sys/fs/nfs/client

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:54:24 UTC 2016

Modified Files:
src/sys/fs/nfs/client: nfs.h

Log Message:
More changes for creds, mutex, etc.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs.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/fs/nfs/client/nfs.h
diff -u src/sys/fs/nfs/client/nfs.h:1.1.1.2 src/sys/fs/nfs/client/nfs.h:1.2
--- src/sys/fs/nfs/client/nfs.h:1.1.1.2	Fri Nov 18 07:49:11 2016
+++ src/sys/fs/nfs/client/nfs.h	Tue Dec 13 22:54:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $	*/
+/*	$NetBSD: nfs.h,v 1.2 2016/12/13 22:54:24 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * FreeBSD: head/sys/fs/nfsclient/nfs.h 276140 2014-12-23 14:24:36Z rmacklem 
- * $NetBSD: nfs.h,v 1.1.1.2 2016/11/18 07:49:11 pgoyette Exp $
+ * $NetBSD: nfs.h,v 1.2 2016/12/13 22:54:24 pgoyette Exp $
  */
 
 #ifndef _NFSCLIENT_NFS_H_
@@ -91,34 +91,35 @@ enum nfsiod_state {
 /*
  * Function prototypes.
  */
-int ncl_meta_setsize(struct vnode *, struct ucred *, struct thread *,
+int ncl_meta_setsize(struct vnode *, struct kauth_cred *, struct lwp *,
 u_quad_t);
 void ncl_doio_directwrite(struct buf *);
-int ncl_bioread(struct vnode *, struct uio *, int, struct ucred *);
-int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *);
-int ncl_vinvalbuf(struct vnode *, int, struct thread *, int);
-int ncl_asyncio(struct nfsmount *, struct buf *, struct ucred *,
-struct thread *);
-int ncl_doio(struct vnode *, struct buf *, struct ucred *, struct thread *,
+int ncl_bioread(struct vnode *, struct uio *, int, struct kauth_cred *);
+int ncl_biowrite(struct vnode *, struct uio *, int, struct kauth_cred *);
+int ncl_vinvalbuf(struct vnode *, int, struct kauth_cred *, int);
+int ncl_asyncio(struct nfsmount *, struct buf *, struct kauth_cred *,
+struct lwp *);
+int ncl_doio(struct vnode *, struct buf *, struct kauth_cred *, struct lwp *,
 int);
 void ncl_nhinit(void);
 void ncl_nhuninit(void);
 void ncl_nodelock(struct nfsnode *);
 void ncl_nodeunlock(struct nfsnode *);
 int ncl_getattrcache(struct vnode *, struct vattr *);
-int ncl_readrpc(struct vnode *, struct uio *, struct ucred *);
-int ncl_writerpc(struct vnode *, struct uio *, struct ucred *, int *, int *,
-int);
-int ncl_readlinkrpc(struct vnode *, struct uio *, struct ucred *);
-int ncl_readdirrpc(struct vnode *, struct uio *, struct ucred *,
-struct thread *);
-int ncl_readdirplusrpc(struct vnode *, struct uio *, struct ucred *,
-struct thread *);
-int ncl_writebp(struct buf *, int, struct thread *);
-int ncl_commit(struct vnode *, u_quad_t, int, struct ucred *, struct thread *);
+int ncl_readrpc(struct vnode *, struct uio *, struct kauth_cred *);
+int ncl_writerpc(struct vnode *, struct uio *, struct kauth_cred *, int *,
+int *, int);
+int ncl_readlinkrpc(struct vnode *, struct uio *, struct kauth_cred *);
+int ncl_readdirrpc(struct vnode *, struct uio *, struct kauth_cred *,
+struct lwp *);
+int ncl_readdirplusrpc(struct vnode *, struct uio *, struct kauth_cred *,
+struct lwp *);
+int ncl_writebp(struct buf *, int, struct lwp *);
+int ncl_commit(struct vnode *, u_quad_t, int, struct kauth_cred *,
+struct lwp *);
 void ncl_clearcommit(struct mount *);
-int ncl_fsinfo(struct nfsmount *, struct vnode *, struct ucred *,
-struct thread *);
+int ncl_fsinfo(struct nfsmount *, struct vnode *, struct kauth_cred *,
+struct lwp *);
 int ncl_init(struct vfsconf *);
 int ncl_uninit(struct vfsconf *);
 void	ncl_nfsiodnew(void);

CVS commit: src/sys/fs/nfs/client

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:54:24 UTC 2016

Modified Files:
src/sys/fs/nfs/client: nfs.h

Log Message:
More changes for creds, mutex, etc.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/client/nfs.h

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:   Wed Dec 14 07:37:26 UTC 2016

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

Log Message:
Add tests for flushing prefix and default router entries


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/tests/net/ndp/t_ra.sh:1.7
--- src/tests/net/ndp/t_ra.sh:1.6	Fri Nov 25 08:51:17 2016
+++ src/tests/net/ndp/t_ra.sh	Wed Dec 14 07:37:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ra.sh,v 1.6 2016/11/25 08:51:17 ozaki-r Exp $
+#	$NetBSD: t_ra.sh,v 1.7 2016/12/14 07:37:26 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -69,6 +69,17 @@ shmif0:\
 _EOF
 }
 
+dump_entries()
+{
+
+	echo ndp -n -a
+	rump.ndp -n -a
+	echo ndp -p
+	rump.ndp -p
+	echo ndp -r
+	rump.ndp -r
+}
+
 atf_test_case ra_basic cleanup
 ra_basic_head()
 {
@@ -156,8 +167,160 @@ ra_basic_cleanup()
 	cleanup
 }
 
+atf_test_case ra_flush_prefix_entries cleanup
+ra_flush_prefix_entries_head()
+{
+
+	atf_set "descr" "Tests for flushing prefixes (ndp -P)"
+	atf_set "require.progs" "rump_server rump.rtadvd rump.ndp rump.ifconfig"
+}
+
+ra_flush_prefix_entries_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..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
+
+	# Flush all the entries in the prefix list
+	atf_check -s exit:0 rump.ndp -P
+
+	$DEBUG && dump_entries
+	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:'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
+}
+
+atf_test_case ra_flush_defrouter_entries cleanup
+ra_flush_defrouter_entries_head()
+{
+
+	atf_set "descr" "Tests for flushing default routers (ndp -R)"
+	atf_set "require.progs" "rump_server rump.rtadvd rump.ndp rump.ifconfig"
+}
+
+ra_flush_defrouter_entries_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..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
+
+	# Flush all the entries in the default router list
+	atf_check -s exit:0 rump.ndp -R
+
+	$DEBUG && dump_entries
+	atf_check -s exit:0 -o empty rump.ndp -r
+	atf_check -s exit:0 -o match:'No advertising 

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 07:37:26 UTC 2016

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

Log Message:
Add tests for flushing prefix and default router entries


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

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 06:33:01 UTC 2016

Modified Files:
src/sys/netinet6: nd6_rtr.c

Log Message:
Reduce return points

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet6/nd6_rtr.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/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.126 src/sys/netinet6/nd6_rtr.c:1.127
--- src/sys/netinet6/nd6_rtr.c:1.126	Wed Dec 14 04:13:50 2016
+++ src/sys/netinet6/nd6_rtr.c	Wed Dec 14 06:33:01 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.126 2016/12/14 04:13:50 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.127 2016/12/14 06:33:01 ozaki-r Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.126 2016/12/14 04:13:50 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.127 2016/12/14 06:33:01 ozaki-r Exp $");
 
 #include 
 #include 
@@ -745,7 +745,7 @@ rtpref(struct nd_defrouter *dr)
 static struct nd_defrouter *
 defrtrlist_update(struct nd_defrouter *newdr)
 {
-	struct nd_defrouter *dr, *n;
+	struct nd_defrouter *dr, *n, *ret = NULL;
 	struct in6_ifextra *ext = newdr->ifp->if_afdata[AF_INET6];
 	int s = splsoftnet();
 
@@ -767,8 +767,8 @@ defrtrlist_update(struct nd_defrouter *n
 			 * to sort the entries.
 			 */
 			if (rtpref(newdr) == oldpref) {
-splx(s);
-return (dr);
+ret = dr;
+goto out;
 			}
 
 			/*
@@ -784,33 +784,25 @@ defrtrlist_update(struct nd_defrouter *n
 			n = dr;
 			goto insert;
 		}
-		splx(s);
-		return (dr);
+		ret = dr;
+		goto out;
 	}
 
-	if (ip6_maxifdefrouters >= 0 &&
-	ext->ndefrouters >= ip6_maxifdefrouters) {
-		splx(s);
-		return (NULL);
-	}
+	if (ip6_maxifdefrouters >= 0 && ext->ndefrouters >= ip6_maxifdefrouters)
+		goto out;
 
 	/* entry does not exist */
-	if (newdr->rtlifetime == 0) {
-		splx(s);
-		return (NULL);
-	}
+	if (newdr->rtlifetime == 0)
+		goto out;
 
 	if (ip6_rtadv_maxroutes <= nd6_numroutes) {
 		ICMP6_STATINC(ICMP6_STAT_DROPPED_RAROUTE);
-		splx(s);
-		return (NULL);
+		goto out;
 	}
 
 	n = (struct nd_defrouter *)malloc(sizeof(*n), M_IP6NDP, M_NOWAIT);
-	if (n == NULL) {
-		splx(s);
-		return (NULL);
-	}
+	if (n == NULL)
+		goto out;
 	memset(n, 0, sizeof(*n));
 	*n = *newdr;
 
@@ -836,9 +828,10 @@ insert:
 
 	ext->ndefrouters++;
 
+	ret = n;
+out:
 	splx(s);
-
-	return (n);
+	return ret;
 }
 
 static struct nd_pfxrouter *

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 06:33:01 UTC 2016

Modified Files:
src/sys/netinet6: nd6_rtr.c

Log Message:
Reduce return points

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet6/nd6_rtr.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/if_pppoe

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Dec 14 03:30:30 UTC 2016

Modified Files:
src/tests/net/if_pppoe: t_pppoe.sh

Log Message:
add wait_for_disconnected to run_test() as well as run_test6().

Before commited MP-safe patch, IPv4 test can run in time without
wait_for_disconnected. Currently, wait_for_disconnected is required
because of locking overhead.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/net/if_pppoe/t_pppoe.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/if_pppoe/t_pppoe.sh
diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.15 src/tests/net/if_pppoe/t_pppoe.sh:1.16
--- src/tests/net/if_pppoe/t_pppoe.sh:1.15	Mon Dec 12 09:56:58 2016
+++ src/tests/net/if_pppoe/t_pppoe.sh	Wed Dec 14 03:30:30 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_pppoe.sh,v 1.15 2016/12/12 09:56:58 knakahara Exp $
+#	$NetBSD: t_pppoe.sh,v 1.16 2016/12/14 03:30:30 knakahara Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -164,8 +164,11 @@ run_test()
 	unset RUMP_SERVER
 
 	# test for disconnection from server
-	atf_check -s exit:0 -x "env RUMP_SERVER=$SERVER rump.ifconfig pppoe0 down"
+	export RUMP_SERVER=$SERVER
+	atf_check -s exit:0 rump.ifconfig pppoe0 down
+	wait_for_disconnected
 	export RUMP_SERVER=$CLIENT
+	wait_for_disconnected
 	atf_check -s not-exit:0 -o ignore -e ignore \
 	rump.ping -c 1 -w $TIMEOUT $SERVER_IP
 	atf_check -s exit:0 -o match:'PADI sent' -x "$HIJACKING pppoectl -d pppoe0"
@@ -179,8 +182,11 @@ run_test()
 	unset RUMP_SERVER
 
 	# test for disconnection from client
-	atf_check -s exit:0 -x "env RUMP_SERVER=$CLIENT rump.ifconfig pppoe0 down"
+	export RUMP_SERVER=$CLIENT
+	atf_check -s exit:0 -x rump.ifconfig pppoe0 down
+	wait_for_disconnected
 	export RUMP_SERVER=$SERVER
+	wait_for_disconnected
 	$DEBUG && $HIJACKING pppoectl -d pppoe0
 	atf_check -s not-exit:0 -o ignore -e ignore \
 	rump.ping -c 1 -w $TIMEOUT $CLIENT_IP
@@ -205,6 +211,7 @@ run_test()
 	# test for invalid password
 	export RUMP_SERVER=$CLIENT
 	atf_check -s exit:0 rump.ifconfig pppoe0 down
+	wait_for_disconnected
 	local setup_clientparam="pppoectl pppoe0 myauthproto=$auth \
 'myauthname=$AUTHNAME' \
 'myauthsecret=invalidsecret' \
@@ -323,8 +330,8 @@ run_test6()
 	wait_for_disconnected
 
 	export RUMP_SERVER=$SERVER
-	$DEBUG && $HIJACKING pppoectl -d pppoe0
 	wait_for_disconnected
+	$DEBUG && $HIJACKING pppoectl -d pppoe0
 	atf_check -s not-exit:0 -o ignore -e ignore \
 	rump.ping6 -c 1 -X $TIMEOUT $CLIENT_IP6
 	atf_check -s exit:0 -o match:'initial' -x "$HIJACKING pppoectl -d pppoe0"

CVS commit: src/tests/net/if_pppoe

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Dec 14 03:30:30 UTC 2016

Modified Files:
src/tests/net/if_pppoe: t_pppoe.sh

Log Message:
add wait_for_disconnected to run_test() as well as run_test6().

Before commited MP-safe patch, IPv4 test can run in time without
wait_for_disconnected. Currently, wait_for_disconnected is required
because of locking overhead.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/net/if_pppoe/t_pppoe.sh

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

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 04:05:11 UTC 2016

Modified Files:
src/sys/netinet6: nd6.c nd6.h nd6_nbr.c

Log Message:
Make functions static


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.132 -r1.133 src/sys/netinet6/nd6_nbr.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.216 src/sys/netinet6/nd6.c:1.217
--- src/sys/netinet6/nd6.c:1.216	Mon Dec 12 03:55:57 2016
+++ src/sys/netinet6/nd6.c	Wed Dec 14 04:05:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.216 2016/12/12 03:55:57 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.c,v 1.217 2016/12/14 04:05:11 ozaki-r Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.216 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.217 2016/12/14 04:05:11 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -116,6 +116,7 @@ static void nd6_llinfo_timer(void *);
 static void nd6_timer(void *);
 static void nd6_timer_work(struct work *, void *);
 static void clear_llinfo_pqueue(struct llentry *);
+static struct nd_opt_hdr *nd6_option(union nd_opts *);
 
 static callout_t nd6_slowtimo_ch;
 static callout_t nd6_timer_ch;
@@ -259,7 +260,7 @@ nd6_option_init(void *opt, int icmp6len,
 /*
  * Take one ND option.
  */
-struct nd_opt_hdr *
+static struct nd_opt_hdr *
 nd6_option(union nd_opts *ndopts)
 {
 	struct nd_opt_hdr *nd_opt;

Index: src/sys/netinet6/nd6.h
diff -u src/sys/netinet6/nd6.h:1.78 src/sys/netinet6/nd6.h:1.79
--- src/sys/netinet6/nd6.h:1.78	Mon Dec 12 03:14:01 2016
+++ src/sys/netinet6/nd6.h	Wed Dec 14 04:05:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.h,v 1.78 2016/12/12 03:14:01 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.h,v 1.79 2016/12/14 04:05:11 ozaki-r Exp $	*/
 /*	$KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $	*/
 
 /*
@@ -422,7 +422,6 @@ struct nd_ifinfo *nd6_ifattach(struct if
 void nd6_ifdetach(struct ifnet *, struct in6_ifextra *);
 int nd6_is_addr_neighbor(const struct sockaddr_in6 *, struct ifnet *);
 void nd6_option_init(void *, int, union nd_opts *);
-struct nd_opt_hdr *nd6_option(union nd_opts *);
 int nd6_options(union nd_opts *);
 struct llentry *nd6_lookup(const struct in6_addr *, const struct ifnet *, bool);
 struct llentry *nd6_create(const struct in6_addr *, const struct ifnet *);
@@ -456,7 +455,6 @@ void nd6_ns_output(struct ifnet *, const
 const void *nd6_ifptomac(const struct ifnet *);
 void nd6_dad_start(struct ifaddr *, int);
 void nd6_dad_stop(struct ifaddr *);
-void nd6_dad_duplicated(struct ifaddr *);
 
 /* nd6_rtr.c */
 void nd6_rs_input(struct mbuf *, int, int);

Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.132 src/sys/netinet6/nd6_nbr.c:1.133
--- src/sys/netinet6/nd6_nbr.c:1.132	Mon Dec 12 03:55:57 2016
+++ src/sys/netinet6/nd6_nbr.c	Wed Dec 14 04:05:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.132 2016/12/12 03:55:57 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.133 2016/12/14 04:05:11 ozaki-r Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.132 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.133 2016/12/14 04:05:11 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -84,6 +84,7 @@ static void nd6_dad_timer(struct ifaddr 
 static void nd6_dad_ns_output(struct dadq *, struct ifaddr *);
 static void nd6_dad_ns_input(struct ifaddr *);
 static void nd6_dad_na_input(struct ifaddr *);
+static void nd6_dad_duplicated(struct ifaddr *);
 
 static int dad_ignore_ns = 0;	/* ignore NS in DAD - specwise incorrect*/
 static int dad_maxtry = 15;	/* max # of *tries* to transmit DAD packet */
@@ -1335,7 +1336,7 @@ done:
 #endif
 }
 
-void
+static void
 nd6_dad_duplicated(struct ifaddr *ifa)
 {
 	struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 04:05:11 UTC 2016

Modified Files:
src/sys/netinet6: nd6.c nd6.h nd6_nbr.c

Log Message:
Make functions static


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.132 -r1.133 src/sys/netinet6/nd6_nbr.c

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

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 04:13:50 UTC 2016

Modified Files:
src/sys/netinet6: nd6_rtr.c

Log Message:
Use macro to iterate on the nd_prefix list


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/nd6_rtr.c

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

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 04:13:50 UTC 2016

Modified Files:
src/sys/netinet6: nd6_rtr.c

Log Message:
Use macro to iterate on the nd_prefix list


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/nd6_rtr.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/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.125 src/sys/netinet6/nd6_rtr.c:1.126
--- src/sys/netinet6/nd6_rtr.c:1.125	Mon Dec 12 03:14:01 2016
+++ src/sys/netinet6/nd6_rtr.c	Wed Dec 14 04:13:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.125 2016/12/12 03:14:01 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.126 2016/12/14 04:13:50 ozaki-r Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.125 2016/12/12 03:14:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.126 2016/12/14 04:13:50 ozaki-r Exp $");
 
 #include 
 #include 
@@ -900,9 +900,8 @@ purge_detached(struct ifnet *ifp)
 	struct in6_ifaddr *ia;
 	struct ifaddr *ifa, *ifa_next;
 
-	for (pr = nd_prefix.lh_first; pr; pr = pr_next) {
+	ND_PREFIX_LIST_FOREACH_SAFE(pr, pr_next) {
 		int s;
-		pr_next = pr->ndpr_next;
 
 		/*
 		 * This function is called when we need to make more room for

CVS commit: src/tests/net/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 02:50:42 UTC 2016

Modified Files:
src/tests/net/net: t_ipv6address.sh

Log Message:
Rename dump because it's used in net_common.sh


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/net/net/t_ipv6address.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/net/t_ipv6address.sh
diff -u src/tests/net/net/t_ipv6address.sh:1.11 src/tests/net/net/t_ipv6address.sh:1.12
--- src/tests/net/net/t_ipv6address.sh:1.11	Thu Nov 24 09:06:09 2016
+++ src/tests/net/net/t_ipv6address.sh	Wed Dec 14 02:50:42 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ipv6address.sh,v 1.11 2016/11/24 09:06:09 ozaki-r Exp $
+#	$NetBSD: t_ipv6address.sh,v 1.12 2016/12/14 02:50:42 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -215,7 +215,7 @@ dump_bus()
 	shmif_dumpbus -p - ${BUS2}   2>/dev/null| tcpdump -n -e -r -
 }
 
-dump()
+_dump()
 {
 
 	export RUMP_SERVER=${SOCKSRC}
@@ -287,7 +287,7 @@ linklocal_body()
 	atf_check -s exit:0 -o ignore rump.ifconfig -w 10
 
 	$DEBUG && rump.ifconfig shmif0
-	$DEBUG && dump
+	$DEBUG && _dump
 
 	export RUMP_SERVER=${SOCKSRC}
 	atf_check -s exit:0 -o match:"0.0% packet loss" \
@@ -332,7 +332,7 @@ linklocal_body()
 linklocal_cleanup()
 {
 
-	$DEBUG && dump
+	$DEBUG && _dump
 	$DEBUG && dump_bus
 	cleanup_rump_servers
 }

CVS commit: src/tests/net/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Dec 14 02:50:42 UTC 2016

Modified Files:
src/tests/net/net: t_ipv6address.sh

Log Message:
Rename dump because it's used in net_common.sh


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/net/net/t_ipv6address.sh

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:   Wed Dec 14 06:26:04 UTC 2016

Modified Files:
src/doc: TODO.ptrace

Log Message:
Update TODO.ptrace

Add new entries:
 - add support for PT_STEP, PT_GETREGS, PT_SETREGS, PT_GETFPREGS,
   PT_SETFPREGS in all ports
 - integrate all ptrace(2) features in gdb
 - add ptrace(2) NetBSD support in LLDB

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/doc/TODO.ptrace:1.2
--- src/doc/TODO.ptrace:1.1	Tue Dec 13 09:44:35 2016
+++ src/doc/TODO.ptrace	Wed Dec 14 06:26:04 2016
@@ -1,4 +1,4 @@
-$NetBSD: TODO.ptrace,v 1.1 2016/12/13 09:44:35 kamil Exp $
+$NetBSD: TODO.ptrace,v 1.2 2016/12/14 06:26:04 kamil Exp $
 
 Items we (currently) plan to finish in the ptrace(2) field:
 
@@ -10,10 +10,14 @@ Items we (currently) plan to finish in t
  - add PT_DUMPCORE tests in the ATF framework
  - add ATF tests for PT_WRITE_I and PIOD_WRITE_I - test mprotect restrictions
  - add ATF tests for PIOD_READ_AUXV
- - document more all MD specific ptrace(2) interfaces
+ - document all MD specific ptrace(2) interfaces
(PT_GETXMMREGS, PT_SETXMMREGS, ...)
  - add tests for the procfs interface covering all functions available on the
same level as ptrace(2)
+ - add support for PT_STEP, PT_GETREGS, PT_SETREGS, PT_GETFPREGS, PT_SETFPREGS
+   in all ports
+ - integrate all ptrace(2) features in gdb
+ - add ptrace(2) NetBSD support in LLDB
 
 and of course: fix as many bugs as possible.
 

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Wed Dec 14 06:26:04 UTC 2016

Modified Files:
src/doc: TODO.ptrace

Log Message:
Update TODO.ptrace

Add new entries:
 - add support for PT_STEP, PT_GETREGS, PT_SETREGS, PT_GETFPREGS,
   PT_SETFPREGS in all ports
 - integrate all ptrace(2) features in gdb
 - add ptrace(2) NetBSD support in LLDB

Sponsored by 


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

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

Re: NET_MPSAFE [was Re: CVS commit: src/sys]

[Ryota Ozaki]

On Mon, Dec 12, 2016 at 10:41 PM, Roy Marples  wrote:
> On 2016-12-12 13:26, Ryota Ozaki wrote:
>>
>> On Tue, Nov 29, 2016 at 12:37 AM, Roy Marples  wrote:
>>>
>>> On 28/11/2016 09:43, Ryota Ozaki wrote:

 (2) MP-ification of IPv6-specific stuffs
 (nd_defrouter, nd_prefix, etc.)
>>>
>>>
>>> Rip the ND RA stuff out, let userland handle it entirely.
>>> Less work, less code, less bloat :)
>>
>>
>> Nobody objects? :)
>>
>> ...but I think we (IIJ) still need the feature.
>
>
> I'm sure someone would object once it's been ripped out ;)
> I'm actualy surprised no-one has so far 
>
> IIJ could use dhcpcd just to handle IPv6 RS/RA alongside their existing
> offering I would imagine.

That's one option though, migrating to dhcpcd is a pretty big task for us
and we don't have time to do so :-/

  ozaki-r

CVS commit: src/tests/kernel

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Wed Dec 14 06:19:59 UTC 2016

Modified Files:
src/tests/kernel: Makefile

Log Message:
Define -D_KERNTYPES in CPPFLAGS unconditionally to fix MKRUMP=no build

Reported by Robert Swindells

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/tests/kernel/Makefile

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:   Wed Dec 14 06:19:59 UTC 2016

Modified Files:
src/tests/kernel: Makefile

Log Message:
Define -D_KERNTYPES in CPPFLAGS unconditionally to fix MKRUMP=no build

Reported by Robert Swindells

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/tests/kernel/Makefile

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/Makefile
diff -u src/tests/kernel/Makefile:1.43 src/tests/kernel/Makefile:1.44
--- src/tests/kernel/Makefile:1.43	Fri Dec  2 05:54:15 2016
+++ src/tests/kernel/Makefile	Wed Dec 14 06:19:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/12/02 05:54:15 kamil Exp $
+# $NetBSD: Makefile,v 1.44 2016/12/14 06:19:59 kamil Exp $
 
 NOMAN=		# defined
 
@@ -46,10 +46,10 @@ LDADD.t_extattrctl+= -lrump -lpthread
 LDADD.t_filedesc+=  ${LDADD.t_rnd}
 LDADD.t_rnd+=  -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
 LDADD.t_rnd+=  -lrump -lpthread
-CPPFLAGS+=	-D_KERNTYPES
 
 .endif
 
+CPPFLAGS+=	-D_KERNTYPES
 
 .PATH:			${NETBSDSRCDIR}/sys/kern
 TESTS_C+=		t_extent

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:52:46 UTC 2016

Modified Files:
src/sys/fs/nfs/common: bootp_subr.c krpc.h nfs.h nfs_mountcommon.h
nfs_var.h nfsclstate.h nfsm_subs.h nfsport.h nfsrvcache.h
nfsrvstate.h

Log Message:
Mostly mechanical updates for caddr_t, thread, mutex, and credentials


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/common/bootp_subr.c \
src/sys/fs/nfs/common/nfsport.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/common/krpc.h \
src/sys/fs/nfs/common/nfs_mountcommon.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs.h \
src/sys/fs/nfs/common/nfs_var.h src/sys/fs/nfs/common/nfsclstate.h \
src/sys/fs/nfs/common/nfsrvcache.h src/sys/fs/nfs/common/nfsrvstate.h
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/common/nfsm_subs.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/fs/nfs/common/bootp_subr.c
diff -u src/sys/fs/nfs/common/bootp_subr.c:1.2 src/sys/fs/nfs/common/bootp_subr.c:1.3
--- src/sys/fs/nfs/common/bootp_subr.c:1.2	Fri Nov 18 22:37:50 2016
+++ src/sys/fs/nfs/common/bootp_subr.c	Tue Dec 13 22:52:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootp_subr.c,v 1.2 2016/11/18 22:37:50 pgoyette Exp $	*/
+/*	$NetBSD: bootp_subr.c,v 1.3 2016/12/13 22:52:46 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1995 Gordon Ross, Adam Glass
  * Copyright (c) 1992 Regents of the University of California.
@@ -43,7 +43,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/nfs/bootp_subr.c 297326 2016-03-27 23:16:37Z ian "); */
-__RCSID("$NetBSD: bootp_subr.c,v 1.2 2016/11/18 22:37:50 pgoyette Exp $");
+__RCSID("$NetBSD: bootp_subr.c,v 1.3 2016/12/13 22:52:46 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_newnfs.h"
@@ -63,6 +63,14 @@ __RCSID("$NetBSD: bootp_subr.c,v 1.2 201
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+#if 0
+#include 
+#endif
 
 #include 
 #include 
@@ -76,6 +84,10 @@ __RCSID("$NetBSD: bootp_subr.c,v 1.2 201
 #include 
 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -236,13 +248,16 @@ struct bootpc_globalcontext {
 
 static char bootp_cookie[128];
 static struct socket *bootp_so;
+
+#if 0	/* Need to init sysctl variables in the module initialization code */
 SYSCTL_STRING(_kern, OID_AUTO, bootp_cookie, CTLFLAG_RD,
 	bootp_cookie, 0, "Cookie (T134) supplied by bootp server");
+#endif
 
 /* mountd RPC */
 static int	md_mount(struct sockaddr_in *mdsin, char *path, u_char *fhp,
-		int *fhsizep, struct nfs_args *args, struct thread *td);
-static int	setfs(struct sockaddr_in *addr, char *path, char *p,
+		int *fhsizep, struct nfs_args *args, struct lwp *td);
+static int	setmyfs(struct sockaddr_in *addr, char *path, char *p,
 		const struct in_addr *siaddr);
 static int	getdec(char **ptr);
 static int	getip(char **ptr, struct in_addr *ip);
@@ -254,7 +269,7 @@ static void	print_sin_addr(struct sockad
 static void	clear_sinaddr(struct sockaddr_in *sin);
 static void	allocifctx(struct bootpc_globalcontext *gctx);
 static void	bootpc_compose_query(struct bootpc_ifcontext *ifctx,
-		struct thread *td);
+		struct lwp *td);
 static unsigned char *bootpc_tag(struct bootpc_tagcontext *tctx,
 		struct bootp_packet *bp, int len, int tag);
 static void bootpc_tag_helper(struct bootpc_tagcontext *tctx,
@@ -270,13 +285,13 @@ void bootpboot_p_iflist(void);
 #endif
 
 static int	bootpc_call(struct bootpc_globalcontext *gctx,
-		struct thread *td);
+		struct lwp *td);
 
 static void	bootpc_fakeup_interface(struct bootpc_ifcontext *ifctx,
-		struct thread *td);
+		struct lwp *td);
 
 static void	bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
-		struct bootpc_globalcontext *gctx, struct thread *td);
+		struct bootpc_globalcontext *gctx, struct lwp *td);
 
 static void	bootpc_decode_reply(struct nfsv3_diskless *nd,
 		struct bootpc_ifcontext *ifctx,
@@ -577,7 +592,7 @@ bootpc_received(struct bootpc_globalcont
 }
 
 static int
-bootpc_call(struct bootpc_globalcontext *gctx, struct thread *td)
+bootpc_call(struct bootpc_globalcontext *gctx, struct lwp *td)
 {
 	struct sockaddr_in *sin, dst;
 	struct uio auio;
@@ -595,14 +610,10 @@ bootpc_call(struct bootpc_globalcontext 
 
 	tv.tv_sec = 1;
 	tv.tv_usec = 0;
-	bzero(, sizeof(sopt));
-	sopt.sopt_dir = SOPT_SET;
-	sopt.sopt_level = SOL_SOCKET;
-	sopt.sopt_name = SO_RCVTIMEO;
-	sopt.sopt_val = 
-	sopt.sopt_valsize = sizeof tv;
+	sockopt_init(, SOL_SOCKET, SO_RCVTIMEO, sizeof(tv));
+	error = sockopt_set(, , sizeof(tv));
+	sockopt_destroy();
 
-	error = sosetopt(bootp_so, );
 	if (error != 0)
 		goto out;
 
@@ -610,11 +621,10 @@ bootpc_call(struct bootpc_globalcontext 
 	 * Enable broadcast.
 	 */
 	on = 1;
-	sopt.sopt_name = SO_BROADCAST;
-	sopt.sopt_val = 
-	sopt.sopt_valsize = sizeof on;
+	sockopt_init(, SOL_SOCKET, SO_BROADCAST, 

CVS commit: src/sys/fs/nfs/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 22:52:46 UTC 2016

Modified Files:
src/sys/fs/nfs/common: bootp_subr.c krpc.h nfs.h nfs_mountcommon.h
nfs_var.h nfsclstate.h nfsm_subs.h nfsport.h nfsrvcache.h
nfsrvstate.h

Log Message:
Mostly mechanical updates for caddr_t, thread, mutex, and credentials


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/common/bootp_subr.c \
src/sys/fs/nfs/common/nfsport.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/fs/nfs/common/krpc.h \
src/sys/fs/nfs/common/nfs_mountcommon.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/common/nfs.h \
src/sys/fs/nfs/common/nfs_var.h src/sys/fs/nfs/common/nfsclstate.h \
src/sys/fs/nfs/common/nfsrvcache.h src/sys/fs/nfs/common/nfsrvstate.h
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/common/nfsm_subs.h

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

CVS commit: src/share/man/man4

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:55:40 UTC 2016

Modified Files:
src/share/man/man4: options.4

Log Message:
KSTACK_CHECK_DR0 is no longer available

It used to detect stackoverflow on the i386 port.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.455 -r1.456 src/share/man/man4/options.4

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:   Tue Dec 13 11:01:10 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
options(4): Remove KSTACK_CHECK_DR0.


To generate a diff of this commit:
cvs rdiff -u -r1. -r1.2223 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. src/doc/CHANGES:1.2223
--- src/doc/CHANGES:1.	Sun Dec 11 12:51:09 2016
+++ src/doc/CHANGES	Tue Dec 13 11:01:10 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1. $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2223 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -429,3 +429,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	speaker(4):Synthesized beep for platforms with audio [nat 20161208]
 	crash(8): Add sparc support.  [mrg 20161210]
 	cgd(4): Add aes-xts. [alnsn 20161211]
+	options(4): Remove KSTACK_CHECK_DR0. [kamil 20161213]

CVS commit: src/share/man/man4

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:55:40 UTC 2016

Modified Files:
src/share/man/man4: options.4

Log Message:
KSTACK_CHECK_DR0 is no longer available

It used to detect stackoverflow on the i386 port.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.455 -r1.456 src/share/man/man4/options.4

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

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.455 src/share/man/man4/options.4:1.456
--- src/share/man/man4/options.4:1.455	Thu Dec  1 02:12:21 2016
+++ src/share/man/man4/options.4	Tue Dec 13 10:55:40 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.455 2016/12/01 02:12:21 mrg Exp $
+.\"	$NetBSD: options.4,v 1.456 2016/12/13 10:55:40 kamil Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -2517,10 +2517,6 @@ bus using information from the
 See
 .Xr pcibios 4
 for details.
-.It Cd options KSTACK_CHECK_DR0
-Detect kernel stack overflow using DR0 register.
-This option uses DR0 register exclusively so you can't use DR0 register for
-other purpose (e.g., hardware breakpoint) if you turn this on.
 .It Cd options MTRR
 Include support for accessing MTRR registers from user-space.
 See

CVS commit: src/tests/kernel

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 12:25:05 UTC 2016

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

Log Message:
Remove dbregs[12] from t_ptrace_wait{,3,4,6,id,pid}

CPU Debug Registers won't be exposed as is to userland.

Hardware Watchpoints will be exported to userland dedicated interface
through the ptrace(2) interface.

Sponsored by 


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

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 12:25:05 UTC 2016

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

Log Message:
Remove dbregs[12] from t_ptrace_wait{,3,4,6,id,pid}

CPU Debug Registers won't be exposed as is to userland.

Hardware Watchpoints will be exported to userland dedicated interface
through the ptrace(2) interface.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/tests/kernel/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/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.46 src/tests/kernel/t_ptrace_wait.c:1.47
--- src/tests/kernel/t_ptrace_wait.c:1.46	Thu Dec  8 13:32:17 2016
+++ src/tests/kernel/t_ptrace_wait.c	Tue Dec 13 12:25:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.46 2016/12/08 13:32:17 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.47 2016/12/13 12:25:05 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.46 2016/12/08 13:32:17 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.47 2016/12/13 12:25:05 kamil Exp $");
 
 #include 
 #include 
@@ -3907,118 +3907,6 @@ ATF_TC_BODY(fpregs2, tc)
 }
 #endif
 
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs1);
-ATF_TC_HEAD(dbregs1, tc)
-{
-	atf_tc_set_md_var(tc, "descr",
-	"Verify plain PT_GETDBREGS call without further steps");
-}
-
-ATF_TC_BODY(dbregs1, tc)
-{
-	const int exitval = 5;
-	const int sigval = SIGSTOP;
-	pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-	int status;
-#endif
-	struct dbreg r;
-
-	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 GETDBREGS for the child process\n");
-	ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
-
-	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_DBREGS)
-ATF_TC(dbregs2);
-ATF_TC_HEAD(dbregs2, tc)
-{
-	atf_tc_set_md_var(tc, "descr",
-	"Verify PT_GETDBREGS and PT_SETDBREGS calls without changing "
-	"regs");
-}
-
-ATF_TC_BODY(dbregs2, tc)
-{
-	const int exitval = 5;
-	const int sigval = SIGSTOP;
-	pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-	int status;
-#endif
-	struct dbreg r;
-
-	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 GETDBREGS for the child process\n");
-	ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
-
-	printf("Call SETDBREGS for the child (without changed regs)\n");
-	ATF_REQUIRE(ptrace(PT_SETDBREGS, child, , 0) != -1);
-
-	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(PT_STEP)
 ATF_TC(step1);
 ATF_TC_HEAD(step1, tc)
@@ -4641,9 +4529,6 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC_HAVE_FPREGS(tp, fpregs1);
 	ATF_TP_ADD_TC_HAVE_FPREGS(tp, fpregs2);
 
-	ATF_TP_ADD_TC_HAVE_DBREGS(tp, dbregs1);
-	

CVS commit: src/sys/arch

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:54:27 UTC 2016

Modified Files:
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: trap.c
src/sys/arch/x86/include: cpufunc.h
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/conf: files.compat files.xen
src/sys/arch/xen/x86: xen_pmap.c
Removed Files:
src/sys/arch/i386/i386: db_dbgreg.S

Log Message:
Torn down KSTACK_CHECK_DR0, i386-only feature to detect stack overflow

This feature was intended to detect stack overflow with CPU Debug Registers
(x86). It was never ported to other ports, neither amd64 and should be
adapted for SMP...

Currently there might be better ways to detect stack overflows like page
mapping protection. Since the number of Debug Registers is restricted
(4 on x86), torn it down completely.

This interface introduced helper functions for Debug Registers, they will
be replaced with the new  interface.

KSTACK_CHECK_DR0 was disabled by default and won't affect ordinary users.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.7 -r0 src/sys/arch/i386/i386/db_dbgreg.S
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.230 -r1.231 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/x86/xen_pmap.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/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.374 src/sys/arch/i386/conf/files.i386:1.375
--- src/sys/arch/i386/conf/files.i386:1.374	Wed Feb 12 23:24:09 2014
+++ src/sys/arch/i386/conf/files.i386	Tue Dec 13 10:54:27 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.374 2014/02/12 23:24:09 dsl Exp $
+#	$NetBSD: files.i386,v 1.375 2016/12/13 10:54:27 kamil Exp $
 #
 # new style config file for i386 architecture
 #
@@ -41,9 +41,6 @@ defflag	opt_pcibios.h	PCIBIOS PCIBIOSVER
 			PCIBIOS_INTR_GUESS PCIINTR_DEBUG
 defparam opt_pcibios.h	PCIBIOS_IRQS_HINT
 
-# kernel stack debug
-defflag	opt_kstack_dr0.h		KSTACK_CHECK_DR0
-
 # splraise()/spllower() debug
 defflag	opt_spldebug.h			SPLDEBUG
 
@@ -63,7 +60,6 @@ file	arch/i386/i386/aout_machdep.c	exec_
 file	arch/i386/i386/busfunc.S
 file	arch/i386/i386/cpufunc.S
 file	arch/i386/i386/cpu_in_cksum.S	(inet | inet6) & cpu_in_cksum
-file	arch/i386/i386/db_dbgreg.S	ddb | kstack_check_dr0
 file	arch/i386/i386/db_disasm.c	ddb
 file	arch/i386/i386/db_interface.c	ddb
 file	arch/i386/i386/db_machdep.c	ddb

Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.280 src/sys/arch/i386/i386/trap.c:1.281
--- src/sys/arch/i386/i386/trap.c:1.280	Sun Sep 25 12:53:24 2016
+++ src/sys/arch/i386/i386/trap.c	Tue Dec 13 10:54:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.280 2016/09/25 12:53:24 maxv Exp $	*/
+/*	$NetBSD: trap.c,v 1.281 2016/12/13 10:54:27 kamil Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,14 +68,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.280 2016/09/25 12:53:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.281 2016/12/13 10:54:27 kamil Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_vm86.h"
-#include "opt_kstack_dr0.h"
 #include "opt_xen.h"
 #include "opt_dtrace.h"
 
@@ -233,24 +232,6 @@ trap_print(const struct trapframe *frame
 	l, l->l_proc->p_pid, l->l_lid, KSTACK_LOWEST_ADDR(l));
 }
 
-static void
-check_dr0(void)
-{
-#ifdef KSTACK_CHECK_DR0
-	u_int mask, dr6 = rdr6();
-
-	mask = 1 << 0; /* dr0 */
-	if (dr6 & mask) {
-		panic("trap on DR0: maybe kernel stack overflow\n");
-#if 0
-		dr6 &= ~mask;
-		ldr6(dr6);
-		return;
-#endif
-	}
-#endif
-}
-
 /*
  * trap(frame): exception, fault, and trap interface to BSD kernel.
  *
@@ -323,9 +304,7 @@ trap(struct trapframe *frame)
 
 	default:
 	we_re_toast:
-		if (type == T_TRCTRAP)
-			check_dr0();
-		else
+		if (type != T_TRCTRAP)
 			trap_print(frame, l);
 
 		if (kdb_trap(type, 0, frame))

Index: src/sys/arch/x86/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.21 src/sys/arch/x86/include/cpufunc.h:1.22
--- src/sys/arch/x86/include/cpufunc.h:1.21	Tue Dec 13 10:21:33 2016
+++ src/sys/arch/x86/include/cpufunc.h	Tue Dec 13 10:54:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.21 2016/12/13 10:21:33 kamil Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.22 2016/12/13 10:54:27 kamil Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -68,7 +68,6 @@ void	lcr8(vaddr_t);
 vaddr_t	rcr8(void);
 void	tlbflush(void);
 void	tlbflushg(void);
-void	dr0(void *, uint32_t, uint32_t, uint32_t);
 register_t	

CVS commit: src/sys/arch

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:54:27 UTC 2016

Modified Files:
src/sys/arch/i386/conf: files.i386
src/sys/arch/i386/i386: trap.c
src/sys/arch/x86/include: cpufunc.h
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/conf: files.compat files.xen
src/sys/arch/xen/x86: xen_pmap.c
Removed Files:
src/sys/arch/i386/i386: db_dbgreg.S

Log Message:
Torn down KSTACK_CHECK_DR0, i386-only feature to detect stack overflow

This feature was intended to detect stack overflow with CPU Debug Registers
(x86). It was never ported to other ports, neither amd64 and should be
adapted for SMP...

Currently there might be better ways to detect stack overflows like page
mapping protection. Since the number of Debug Registers is restricted
(4 on x86), torn it down completely.

This interface introduced helper functions for Debug Registers, they will
be replaced with the new  interface.

KSTACK_CHECK_DR0 was disabled by default and won't affect ordinary users.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.7 -r0 src/sys/arch/i386/i386/db_dbgreg.S
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.230 -r1.231 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/x86/xen_pmap.c

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:   Tue Dec 13 09:44:35 UTC 2016

Added Files:
src/doc: TODO.ptrace

Log Message:
Add initial TODO list for the ptrace(2) (and procfs) interface.

Sponsored by 


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

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

Added files:

Index: src/doc/TODO.ptrace
diff -u /dev/null src/doc/TODO.ptrace:1.1
--- /dev/null	Tue Dec 13 09:44:35 2016
+++ src/doc/TODO.ptrace	Tue Dec 13 09:44:35 2016
@@ -0,0 +1,20 @@
+$NetBSD: TODO.ptrace,v 1.1 2016/12/13 09:44:35 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
+ - add new ptrace(2) calls to lock (suspend) and unlock LWP within a process
+ - add PT_DUMPCORE tests in the ATF framework
+ - add ATF tests for PT_WRITE_I and PIOD_WRITE_I - test mprotect restrictions
+ - add ATF tests for PIOD_READ_AUXV
+ - document more all MD specific ptrace(2) interfaces
+   (PT_GETXMMREGS, PT_SETXMMREGS, ...)
+ - add tests for the procfs interface covering all functions available on the
+   same level as ptrace(2)
+
+and of course: fix as many bugs as possible.
+
+Features in ELF, DWARF, CTF, DTrace are out of scope of the above list.

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 09:44:35 UTC 2016

Added Files:
src/doc: TODO.ptrace

Log Message:
Add initial TODO list for the ptrace(2) (and procfs) interface.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 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/arch

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:21:33 UTC 2016

Modified Files:
src/sys/arch/x86/include: cpufunc.h
src/sys/arch/xen/x86: xenfunc.c

Log Message:
Switch x86 CPU Debug Register types from vaddr_t to register_t

This is more opaque and appropriate type, as vaddr_t is meant to be used
for vitual address value. Not all DR on x86 are used to represent virtual
address (DR6 and DR7 are definitely not).

No functional change intended.

Change suggested by 

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/x86/xenfunc.c

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

CVS commit: src/doc/roadmaps

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Dec 13 09:51:34 UTC 2016

Modified Files:
src/doc/roadmaps: networking

Log Message:
Add a bit for Mobile IPv6.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/doc/roadmaps/networking

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

Modified files:

Index: src/doc/roadmaps/networking
diff -u src/doc/roadmaps/networking:1.11 src/doc/roadmaps/networking:1.12
--- src/doc/roadmaps/networking:1.11	Wed May 18 09:12:04 2016
+++ src/doc/roadmaps/networking	Tue Dec 13 09:51:34 2016
@@ -1,4 +1,4 @@
-$NetBSD: networking,v 1.11 2016/05/18 09:12:04 ozaki-r Exp $
+$NetBSD: networking,v 1.12 2016/12/13 09:51:34 rjs Exp $
 
 NetBSD Networking Roadmap
 =
@@ -46,8 +46,8 @@ the specific drivers.
 2. Mobile IPv6
 --
 
-Responsible: TBD
-Status: not started
+Responsible: rjs
+Status: compiles, not debugged yet.
 Comment[christos]: XXX: Fill in the project description and justification.
 
 3. network driver polling

CVS commit: src/doc/roadmaps

[Robert Swindells]

Module Name:src
Committed By:   rjs
Date:   Tue Dec 13 09:51:34 UTC 2016

Modified Files:
src/doc/roadmaps: networking

Log Message:
Add a bit for Mobile IPv6.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/doc/roadmaps/networking

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Dec 13 10:01:44 UTC 2016

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h

Log Message:
- Change to use 2500Base-KX correctly on C2000(I354). It worked, but the
output of ifconfig and if_baudrate was not good. Tested by nils@:
  - The STATUS_TBIMODE bit in the STATUS register is deleted since 82575,
so check for 82575 and newer first and then check for old devices.
  - Check the 2P5_SKU and 2P5_SKU_OVER bit for KX.
  - Set IFM_2500_SX instead of IFM_1000_SX for 2.5G.
- Check SERDES's speed directly from the PCS layer (PCS_LSTS register) for old
  devices.
- Style fix.


To generate a diff of this commit:
cvs rdiff -u -r1.456 -r1.457 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/if_wmreg.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.456 src/sys/dev/pci/if_wm.c:1.457
--- src/sys/dev/pci/if_wm.c:1.456	Thu Dec  8 01:12:01 2016
+++ src/sys/dev/pci/if_wm.c	Tue Dec 13 10:01:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.456 2016/12/08 01:12:01 ozaki-r Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.457 2016/12/13 10:01:44 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.456 2016/12/08 01:12:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.457 2016/12/13 10:01:44 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2411,100 +2411,91 @@ alloc_retry:
 	|| sc->sc_type == WM_T_82574 || sc->sc_type == WM_T_82583) {
 		/* STATUS_TBIMODE reserved/reused, can't rely on it */
 		wm_gmii_mediainit(sc, wmp->wmp_product);
-	} else if (sc->sc_type < WM_T_82543 ||
-	(CSR_READ(sc, WMREG_STATUS) & STATUS_TBIMODE) != 0) {
-		if (sc->sc_mediatype == WM_MEDIATYPE_COPPER) {
-			aprint_error_dev(sc->sc_dev,
-			"WARNING: TBIMODE set on 1000BASE-T product!\n");
-			sc->sc_mediatype = WM_MEDIATYPE_FIBER;
-		}
-		wm_tbi_mediainit(sc);
-	} else {
-		switch (sc->sc_type) {
-		case WM_T_82575:
-		case WM_T_82576:
-		case WM_T_82580:
-		case WM_T_I350:
-		case WM_T_I354:
-		case WM_T_I210:
-		case WM_T_I211:
-			reg = CSR_READ(sc, WMREG_CTRL_EXT);
-			link_mode = reg & CTRL_EXT_LINK_MODE_MASK;
-			switch (link_mode) {
-			case CTRL_EXT_LINK_MODE_1000KX:
-aprint_verbose_dev(sc->sc_dev, "1000KX\n");
-sc->sc_mediatype = WM_MEDIATYPE_SERDES;
+	} else if ((sc->sc_type == WM_T_82575) || (sc->sc_type == WM_T_82576)
+	|| (sc->sc_type ==WM_T_82580) || (sc->sc_type ==WM_T_I350)
+	|| (sc->sc_type ==WM_T_I354) || (sc->sc_type ==WM_T_I210)
+	|| (sc->sc_type ==WM_T_I211)) {
+		reg = CSR_READ(sc, WMREG_CTRL_EXT);
+		link_mode = reg & CTRL_EXT_LINK_MODE_MASK;
+		switch (link_mode) {
+		case CTRL_EXT_LINK_MODE_1000KX:
+			aprint_verbose_dev(sc->sc_dev, "1000KX\n");
+			sc->sc_mediatype = WM_MEDIATYPE_SERDES;
+			break;
+		case CTRL_EXT_LINK_MODE_SGMII:
+			if (wm_sgmii_uses_mdio(sc)) {
+aprint_verbose_dev(sc->sc_dev,
+"SGMII(MDIO)\n");
+sc->sc_flags |= WM_F_SGMII;
+sc->sc_mediatype = WM_MEDIATYPE_COPPER;
 break;
-			case CTRL_EXT_LINK_MODE_SGMII:
-if (wm_sgmii_uses_mdio(sc)) {
-	aprint_verbose_dev(sc->sc_dev,
-	"SGMII(MDIO)\n");
-	sc->sc_flags |= WM_F_SGMII;
+			}
+			aprint_verbose_dev(sc->sc_dev, "SGMII(I2C)\n");
+			/*FALLTHROUGH*/
+		case CTRL_EXT_LINK_MODE_PCIE_SERDES:
+			sc->sc_mediatype = wm_sfp_get_media_type(sc);
+			if (sc->sc_mediatype == WM_MEDIATYPE_UNKNOWN) {
+if (link_mode
+== CTRL_EXT_LINK_MODE_SGMII) {
 	sc->sc_mediatype = WM_MEDIATYPE_COPPER;
-	break;
-}
-aprint_verbose_dev(sc->sc_dev, "SGMII(I2C)\n");
-/*FALLTHROUGH*/
-			case CTRL_EXT_LINK_MODE_PCIE_SERDES:
-sc->sc_mediatype = wm_sfp_get_media_type(sc);
-if (sc->sc_mediatype == WM_MEDIATYPE_UNKNOWN) {
-	if (link_mode
-	== CTRL_EXT_LINK_MODE_SGMII) {
-		sc->sc_mediatype
-		= WM_MEDIATYPE_COPPER;
-		sc->sc_flags |= WM_F_SGMII;
-	} else {
-		sc->sc_mediatype
-		= WM_MEDIATYPE_SERDES;
-		aprint_verbose_dev(sc->sc_dev,
-		"SERDES\n");
-	}
-	break;
-}
-if (sc->sc_mediatype == WM_MEDIATYPE_SERDES)
+	sc->sc_flags |= WM_F_SGMII;
+} else {
+	sc->sc_mediatype = WM_MEDIATYPE_SERDES;
 	aprint_verbose_dev(sc->sc_dev,
 	"SERDES\n");
-
-/* Change current link mode setting */
-reg &= ~CTRL_EXT_LINK_MODE_MASK;
-switch (sc->sc_mediatype) {
-case WM_MEDIATYPE_COPPER:
-	reg |= CTRL_EXT_LINK_MODE_SGMII;
-	break;
-case WM_MEDIATYPE_SERDES:
-	reg |= CTRL_EXT_LINK_MODE_PCIE_SERDES;
-	break;
-default:
-	break;
 }
-CSR_WRITE(sc, WMREG_CTRL_EXT, reg);
 break;
-			case CTRL_EXT_LINK_MODE_GMII:
+			}
+			if (sc->sc_mediatype == WM_MEDIATYPE_SERDES)
+

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Dec 13 10:01:44 UTC 2016

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h

Log Message:
- Change to use 2500Base-KX correctly on C2000(I354). It worked, but the
output of ifconfig and if_baudrate was not good. Tested by nils@:
  - The STATUS_TBIMODE bit in the STATUS register is deleted since 82575,
so check for 82575 and newer first and then check for old devices.
  - Check the 2P5_SKU and 2P5_SKU_OVER bit for KX.
  - Set IFM_2500_SX instead of IFM_1000_SX for 2.5G.
- Check SERDES's speed directly from the PCS layer (PCS_LSTS register) for old
  devices.
- Style fix.


To generate a diff of this commit:
cvs rdiff -u -r1.456 -r1.457 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/if_wmreg.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

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 10:21:33 UTC 2016

Modified Files:
src/sys/arch/x86/include: cpufunc.h
src/sys/arch/xen/x86: xenfunc.c

Log Message:
Switch x86 CPU Debug Register types from vaddr_t to register_t

This is more opaque and appropriate type, as vaddr_t is meant to be used
for vitual address value. Not all DR on x86 are used to represent virtual
address (DR6 and DR7 are definitely not).

No functional change intended.

Change suggested by 

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/x86/xenfunc.c

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

Modified files:

Index: src/sys/arch/x86/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.20 src/sys/arch/x86/include/cpufunc.h:1.21
--- src/sys/arch/x86/include/cpufunc.h:1.20	Sun Nov 27 14:49:21 2016
+++ src/sys/arch/x86/include/cpufunc.h	Tue Dec 13 10:21:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.20 2016/11/27 14:49:21 kamil Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.21 2016/12/13 10:21:33 kamil Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -69,18 +69,18 @@ vaddr_t	rcr8(void);
 void	tlbflush(void);
 void	tlbflushg(void);
 void	dr0(void *, uint32_t, uint32_t, uint32_t);
-vaddr_t	rdr0(void);
-void	ldr0(vaddr_t);
-vaddr_t	rdr1(void);
-void	ldr1(vaddr_t);
-vaddr_t	rdr2(void);
-void	ldr2(vaddr_t);
-vaddr_t	rdr3(void);
-void	ldr3(vaddr_t);
-vaddr_t	rdr6(void);
-void	ldr6(vaddr_t);
-vaddr_t	rdr7(void);
-void	ldr7(vaddr_t);
+register_t	rdr0(void);
+void		ldr0(register_t);
+register_t	rdr1(void);
+void		ldr1(register_t);
+register_t	rdr2(void);
+void		ldr2(register_t);
+register_t	rdr3(void);
+void		ldr3(register_t);
+register_t	rdr6(void);
+void		ldr6(register_t);
+register_t	rdr7(void);
+void		ldr7(register_t);
 void	wbinvd(void);
 void	breakpoint(void);
 void	x86_hlt(void);

Index: src/sys/arch/xen/x86/xenfunc.c
diff -u src/sys/arch/xen/x86/xenfunc.c:1.14 src/sys/arch/xen/x86/xenfunc.c:1.15
--- src/sys/arch/xen/x86/xenfunc.c:1.14	Sun Nov 27 14:49:21 2016
+++ src/sys/arch/xen/x86/xenfunc.c	Tue Dec 13 10:21:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenfunc.c,v 1.14 2016/11/27 14:49:21 kamil Exp $	*/
+/*	$NetBSD: xenfunc.c,v 1.15 2016/12/13 10:21:33 kamil Exp $	*/
 
 /*
  *
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.14 2016/11/27 14:49:21 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.15 2016/12/13 10:21:33 kamil Exp $");
 
 #include 
 
@@ -121,7 +121,7 @@ tlbflushg(void)
 	tlbflush();
 }
 
-vaddr_t
+register_t
 rdr0(void)
 {
 
@@ -129,13 +129,13 @@ rdr0(void)
 }
 
 void
-ldr0(vaddr_t val)
+ldr0(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(0, val);
 }
 
-vaddr_t
+register_t
 rdr1(void)
 {
 
@@ -143,13 +143,13 @@ rdr1(void)
 }
 
 void
-ldr1(vaddr_t val)
+ldr1(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(1, val);
 }
 
-vaddr_t
+register_t
 rdr2(void)
 {
 
@@ -157,13 +157,13 @@ rdr2(void)
 }
 
 void
-ldr2(vaddr_t val)
+ldr2(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(2, val);
 }
 
-vaddr_t
+register_t
 rdr3(void)
 {
 
@@ -171,12 +171,12 @@ rdr3(void)
 }
 
 void
-ldr3(vaddr_t val)
+ldr3(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(3, val);
 }
-vaddr_t
+register_t
 rdr6(void)
 {
 
@@ -184,13 +184,13 @@ rdr6(void)
 }
 
 void
-ldr6(vaddr_t val)
+ldr6(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(6, val);
 }
 
-vaddr_t
+register_t
 rdr7(void)
 {
 
@@ -198,7 +198,7 @@ rdr7(void)
 }
 
 void
-ldr7(vaddr_t val)
+ldr7(register_t val)
 {
 
 	HYPERVISOR_set_debugreg(7, val);

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Dec 13 11:00:20 UTC 2016

Modified Files:
src/share/man/man4: options.4

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.456 -r1.457 src/share/man/man4/options.4

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

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Dec 13 11:00:20 UTC 2016

Modified Files:
src/share/man/man4: options.4

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.456 -r1.457 src/share/man/man4/options.4

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

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.456 src/share/man/man4/options.4:1.457
--- src/share/man/man4/options.4:1.456	Tue Dec 13 10:55:40 2016
+++ src/share/man/man4/options.4	Tue Dec 13 11:00:20 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.456 2016/12/13 10:55:40 kamil Exp $
+.\"	$NetBSD: options.4,v 1.457 2016/12/13 11:00:20 wiz Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd November 30, 2016
+.Dd December 13, 2016
 .Dt OPTIONS 4
 .Os
 .Sh NAME

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 11:01:10 UTC 2016

Modified Files:
src/doc: CHANGES

Log Message:
options(4): Remove KSTACK_CHECK_DR0.


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

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 12:59:46 UTC 2016

Modified Files:
src/tests/kernel/arch/amd64: Makefile

Log Message:
Define in CPPFLAGS symbol _KERNTYPES in order to get PRIxREGISTER

This type will be used in t_ptrace_wait* for the printf(3) function.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/arch/amd64/Makefile

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/Makefile
diff -u src/tests/kernel/arch/amd64/Makefile:1.1 src/tests/kernel/arch/amd64/Makefile:1.2
--- src/tests/kernel/arch/amd64/Makefile:1.1	Fri Dec  2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/Makefile	Tue Dec 13 12:59:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/02 05:54:15 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/13 12:59:46 kamil Exp $
 
 NOMAN=		# defined
 
@@ -13,4 +13,6 @@ TESTS_C+=	t_ptrace_wait6
 TESTS_C+=	t_ptrace_waitid
 TESTS_C+=	t_ptrace_waitpid
 
+CPPFLAGS+=	-D_KERNTYPES
+
 .include 

CVS commit: src/tests/kernel/arch/amd64

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 12:59:46 UTC 2016

Modified Files:
src/tests/kernel/arch/amd64: Makefile

Log Message:
Define in CPPFLAGS symbol _KERNTYPES in order to get PRIxREGISTER

This type will be used in t_ptrace_wait* for the printf(3) function.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/arch/amd64/Makefile

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:   Tue Dec 13 13:09:00 UTC 2016

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

Log Message:
Remove dbregs* in arch/amd64/t_ptrace_wait*

CPU Debug Registers won't be exposed as is to userland.

Hardware Watchpoints will be exported to userland dedicated interface
through the ptrace(2) interface.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.7
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.6	Tue Dec 13 13:04:18 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c	Tue Dec 13 13:09:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $");
 
 #include 
 #include 
@@ -54,36 +54,6 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.6 
 #include "../../t_ptrace_wait.h"
 
 
-union u {
-	long raw;
-	struct {
-		long local_dr0_breakpoint : 1;	/* 0 */
-		long global_dr0_breakpoint : 1;	/* 1 */
-		long local_dr1_breakpoint : 1;	/* 2 */
-		long global_dr1_breakpoint : 1;	/* 3 */
-		long local_dr2_breakpoint : 1;	/* 4 */
-		long global_dr2_breakpoint : 1;	/* 5 */
-		long local_dr3_breakpoint : 1;	/* 6 */
-		long global_dr3_breakpoint : 1;	/* 7 */
-		long local_exact_breakpt : 1;	/* 8 */
-		long global_exact_breakpt : 1;	/* 9 */
-		long reserved_10 : 1;		/* 10 */
-		long rest_trans_memory : 1;	/* 11 */
-		long reserved_12 : 1;		/* 12 */
-		long general_detect_enable : 1;	/* 13 */
-		long reserved_14 : 1;		/* 14 */
-		long reserved_15 : 1;		/* 15 */
-		long condition_dr0 : 2;		/* 16-17 */
-		long len_dr0 : 2;		/* 18-19 */
-		long condition_dr1 : 2;		/* 20-21 */
-		long len_dr1 : 2;		/* 22-23 */
-		long condition_dr2 : 2;		/* 24-25 */
-		long len_dr2 : 2;		/* 26-27 */
-		long condition_dr3 : 2;		/* 28-29 */
-		long len_dr3 : 2;		/* 30-31 */
-	} bits;
-};
-
 #if defined(HAVE_GPREGS)
 ATF_TC(regs1);
 ATF_TC_HEAD(regs1, tc)
@@ -167,1617 +137,12 @@ ATF_TC_BODY(regs1, tc)
 }
 #endif
 
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_print);
-ATF_TC_HEAD(dbregs_print, tc)
-{
-	atf_tc_set_md_var(tc, "descr",
-	"Verify plain PT_GETDBREGS with printing Debug Registers");
-}
-
-ATF_TC_BODY(dbregs_print, tc)
-{
-	const int exitval = 5;
-	const int sigval = SIGSTOP;
-	pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-	int status;
-#endif
-	struct dbreg r;
-	size_t i;
-
-	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 GETDBREGS for the child process\n");
-	ATF_REQUIRE(ptrace(PT_GETDBREGS, child, , 0) != -1);
-
-	printf("State of the debug registers:\n");
-	for (i = 0; i < __arraycount(r.dbregs); i++)
-		printf("r[%zu]=%#lx\n", i, r.dbregs[i]);
-
-	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_DBREGS)
-ATF_TC(dbregs_preserve_dr0);
-ATF_TC_HEAD(dbregs_preserve_dr0, tc)
-{
-	atf_tc_set_md_var(tc, "descr",
-	"Verify that setting DR0 is preserved across ptrace(2) calls");
-}
-
-ATF_TC_BODY(dbregs_preserve_dr0, tc)
-{
-	const int exitval = 5;
-	const int sigval = SIGSTOP;
-	pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-	int status;
-#endif
-	struct dbreg r1;
-	struct dbreg r2;
-	/* Number of available CPU Debug Registers on AMD64 */
-	const size_t len = 16;
-	size_t i;
-	int watchme;
-
-	printf("Assert that known number of Debug Registers (%zu) is valid\n",
-	len);
-	

CVS commit: src/tests/kernel/arch/amd64

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 13:09:00 UTC 2016

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

Log Message:
Remove dbregs* in arch/amd64/t_ptrace_wait*

CPU Debug Registers won't be exposed as is to userland.

Hardware Watchpoints will be exported to userland dedicated interface
through the ptrace(2) interface.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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:   Tue Dec 13 13:04:18 UTC 2016

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

Log Message:
Add regs1 in arch/amd64/t_ptrace_wait*

regs1:
Call PT_GETREGS and iterate over General Purpose registers

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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:   Tue Dec 13 13:04:18 UTC 2016

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

Log Message:
Add regs1 in arch/amd64/t_ptrace_wait*

regs1:
Call PT_GETREGS and iterate over General Purpose registers

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.6
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.5	Wed Dec  7 22:24:44 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c	Tue Dec 13 13:04:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.5 2016/12/07 22:24:44 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.5 2016/12/07 22:24:44 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $");
 
 #include 
 #include 
@@ -84,6 +84,88 @@ union u {
 	} bits;
 };
 
+#if defined(HAVE_GPREGS)
+ATF_TC(regs1);
+ATF_TC_HEAD(regs1, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	"Call PT_GETREGS and iterate over General Purpose registers");
+}
+
+ATF_TC_BODY(regs1, tc)
+{
+	const int exitval = 5;
+	const int sigval = SIGSTOP;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	int status;
+#endif
+	struct reg r;
+
+	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(ptrace(PT_GETREGS, child, , 0) != -1);
+
+	printf("RAX=%#" PRIxREGISTER "\n", r.regs[_REG_RAX]);
+	printf("RBX=%#" PRIxREGISTER "\n", r.regs[_REG_RBX]);
+	printf("RCX=%#" PRIxREGISTER "\n", r.regs[_REG_RCX]);
+	printf("RDX=%#" PRIxREGISTER "\n", r.regs[_REG_RDX]);
+
+	printf("RDI=%#" PRIxREGISTER "\n", r.regs[_REG_RDI]);
+	printf("RSI=%#" PRIxREGISTER "\n", r.regs[_REG_RSI]);
+
+	printf("GS=%#" PRIxREGISTER "\n", r.regs[_REG_GS]);
+	printf("FS=%#" PRIxREGISTER "\n", r.regs[_REG_FS]);
+	printf("ES=%#" PRIxREGISTER "\n", r.regs[_REG_ES]);
+	printf("DS=%#" PRIxREGISTER "\n", r.regs[_REG_DS]);
+	printf("CS=%#" PRIxREGISTER "\n", r.regs[_REG_CS]);
+	printf("SS=%#" PRIxREGISTER "\n", r.regs[_REG_SS]);
+
+	printf("RSP=%#" PRIxREGISTER "\n", r.regs[_REG_RSP]);
+	printf("RIP=%#" PRIxREGISTER "\n", r.regs[_REG_RIP]);
+
+	printf("RFLAGS=%#" PRIxREGISTER "\n", r.regs[_REG_RFLAGS]);
+
+	printf("R8=%#" PRIxREGISTER "\n", r.regs[_REG_R8]);
+	printf("R9=%#" PRIxREGISTER "\n", r.regs[_REG_R9]);
+	printf("R10=%#" PRIxREGISTER "\n", r.regs[_REG_R10]);
+	printf("R11=%#" PRIxREGISTER "\n", r.regs[_REG_R11]);
+	printf("R12=%#" PRIxREGISTER "\n", r.regs[_REG_R12]);
+	printf("R13=%#" PRIxREGISTER "\n", r.regs[_REG_R13]);
+	printf("R14=%#" PRIxREGISTER "\n", r.regs[_REG_R14]);
+	printf("R15=%#" PRIxREGISTER "\n", r.regs[_REG_R15]);
+
+	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_DBREGS)
 ATF_TC(dbregs_print);
@@ -1673,6 +1755,8 @@ ATF_TP_ADD_TCS(tp)
 	setvbuf(stdout, NULL, _IONBF, 0);
 	setvbuf(stderr, NULL, _IONBF, 0);
 
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs1);
+
 	ATF_TP_ADD_TC_HAVE_DBREGS(tp, dbregs_print);
 
 	ATF_TP_ADD_TC_HAVE_DBREGS(tp, dbregs_preserve_dr0);

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 17:12:51 UTC 2016

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

Log Message:
Add rescan for audio children.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/audio.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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 17:12:51 UTC 2016

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

Log Message:
Add rescan for audio children.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 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.277 src/sys/dev/audio.c:1.278
--- src/sys/dev/audio.c:1.277	Sun Dec 11 05:28:00 2016
+++ src/sys/dev/audio.c	Tue Dec 13 12:12:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.277 2016/12/11 10:28:00 martin Exp $	*/
+/*	$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.277 2016/12/11 10:28:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -305,6 +305,8 @@ int	audioprobe(device_t, cfdata_t, void 
 void	audioattach(device_t, device_t, void *);
 int	audiodetach(device_t, int);
 int	audioactivate(device_t, enum devact);
+void	audiochilddet(device_t, device_t);
+int	audiorescan(device_t, const char *, const int *);
 
 #ifdef AUDIO_PM_IDLE
 static void	audio_idle(void *);
@@ -436,8 +438,8 @@ const struct audio_params audio_default 
 };
 
 CFATTACH_DECL3_NEW(audio, sizeof(struct audio_softc),
-audioprobe, audioattach, audiodetach, audioactivate, NULL, NULL,
-DVF_DETACH_SHUTDOWN);
+audioprobe, audioattach, audiodetach, audioactivate, audiorescan,
+audiochilddet, DVF_DETACH_SHUTDOWN);
 
 extern struct cfdriver audio_cd;
 
@@ -837,6 +839,7 @@ bad_rec:
 	audio_rec_thread, sc, >sc_recthread, "audiorec");
 	kthread_create(PRI_NONE, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
 	audio_play_thread, sc, >sc_playthread, "audiomix");
+	audiorescan(self, "audio", NULL);
 }
 
 int
@@ -971,6 +974,37 @@ audiodetach(device_t self, int flags)
 	return 0;
 }
 
+void
+audiochilddet(device_t self, device_t child)
+{
+
+	/* we hold no child references, so do nothing */
+}
+
+static int
+audiosearch(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
+
+	if (config_match(parent, cf, aux))
+		config_attach_loc(parent, cf, locs, aux, NULL);
+
+	return 0;
+}
+
+int
+audiorescan(device_t self, const char *ifattr, const int *flags)
+{
+	struct audio_softc *sc = device_private(self);
+
+	if (!ifattr_match(ifattr, "audio"))
+		return 0;
+
+	config_search_loc(audiosearch, sc->dev, "audio", NULL, NULL);
+
+	return 0;
+}
+
+
 int
 au_portof(struct audio_softc *sc, char *name, int class)
 {

CVS commit: src

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Dec 13 18:00:10 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/kernel/arch: Makefile
Added Files:
src/tests/kernel/arch/i386: Makefile Makefile.inc t_ptrace_wait.c
t_ptrace_wait3.c t_ptrace_wait4.c t_ptrace_wait6.c
t_ptrace_waitid.c t_ptrace_waitpid.c

Log Message:
Add regs1 in arch/i386/t_ptrace_wait*

regs1:
Call PT_GETREGS and iterate over General Purpose registers

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.707 -r1.708 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.137 -r1.138 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/arch/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/arch/i386/Makefile \
src/tests/kernel/arch/i386/Makefile.inc \
src/tests/kernel/arch/i386/t_ptrace_wait.c \
src/tests/kernel/arch/i386/t_ptrace_wait3.c \
src/tests/kernel/arch/i386/t_ptrace_wait4.c \
src/tests/kernel/arch/i386/t_ptrace_wait6.c \
src/tests/kernel/arch/i386/t_ptrace_waitid.c \
src/tests/kernel/arch/i386/t_ptrace_waitpid.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:   Tue Dec 13 18:00:10 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/kernel/arch: Makefile
Added Files:
src/tests/kernel/arch/i386: Makefile Makefile.inc t_ptrace_wait.c
t_ptrace_wait3.c t_ptrace_wait4.c t_ptrace_wait6.c
t_ptrace_waitid.c t_ptrace_waitpid.c

Log Message:
Add regs1 in arch/i386/t_ptrace_wait*

regs1:
Call PT_GETREGS and iterate over General Purpose registers

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.707 -r1.708 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.137 -r1.138 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/arch/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/kernel/arch/i386/Makefile \
src/tests/kernel/arch/i386/Makefile.inc \
src/tests/kernel/arch/i386/t_ptrace_wait.c \
src/tests/kernel/arch/i386/t_ptrace_wait3.c \
src/tests/kernel/arch/i386/t_ptrace_wait4.c \
src/tests/kernel/arch/i386/t_ptrace_wait6.c \
src/tests/kernel/arch/i386/t_ptrace_waitid.c \
src/tests/kernel/arch/i386/t_ptrace_waitpid.c

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

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.184 src/distrib/sets/lists/debug/mi:1.185
--- src/distrib/sets/lists/debug/mi:1.184	Fri Dec  9 06:12:02 2016
+++ src/distrib/sets/lists/debug/mi	Tue Dec 13 18:00:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.184 2016/12/09 06:12:02 kamil Exp $
+# $NetBSD: mi,v 1.185 2016/12/13 18:00:10 kamil Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -1665,6 +1665,12 @@
 ./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait6.debug	tests-kernel-tests	debug,atf,compattestfile,machine=amd64
 ./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitid.debug	tests-kernel-tests	debug,atf,compattestfile,machine=amd64
 ./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitpid.debug	tests-kernel-tests	debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait3.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait4.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait6.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_waitid.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_waitpid.debug	tests-kernel-tests	debug,atf,compattestfile,machine=i386
 ./usr/libdata/debug/usr/tests/kernel/h_ps_strings1.debug		tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/h_ps_strings2.debug		tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/kqueue/read/t_fifo.debug		tests-kernel-tests	debug,atf,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.707 src/distrib/sets/lists/tests/mi:1.708
--- src/distrib/sets/lists/tests/mi:1.707	Fri Dec  9 06:12:02 2016
+++ src/distrib/sets/lists/tests/mi	Tue Dec 13 18:00:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.707 2016/12/09 06:12:02 kamil Exp $
+# $NetBSD: mi,v 1.708 2016/12/13 18:00:10 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -57,6 +57,7 @@
 ./usr/libdata/debug/usr/tests/kernel	tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/archtests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/arch/amd64tests-kernel-tests	compattestfile,atf
+./usr/libdata/debug/usr/tests/kernel/arch/i386tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueuetests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/read			tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write			tests-kernel-tests	compattestfile,atf
@@ -2095,6 +2096,15 @@
 ./usr/tests/kernel/arch/amd64/t_ptrace_wait6	tests-kernel-tests	compattestfile,atf,machine=amd64
 ./usr/tests/kernel/arch/amd64/t_ptrace_waitid	tests-kernel-tests	compattestfile,atf,machine=amd64
 ./usr/tests/kernel/arch/amd64/t_ptrace_waitpid	tests-kernel-tests	compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/i386			tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/arch/i386/Atffile		tests-kernel-tests	

CVS commit: src/usr.sbin/sysinst

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Dec 13 19:03:49 UTC 2016

Modified Files:
src/usr.sbin/sysinst: net.c

Log Message:
ping is not a reliable means of testing if connectivity to download sets
actually works, so remove it.
Hopefully fixes PR kern/51531.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/net.c

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

CVS commit: src/usr.sbin/sysinst

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Dec 13 19:03:49 UTC 2016

Modified Files:
src/usr.sbin/sysinst: net.c

Log Message:
ping is not a reliable means of testing if connectivity to download sets
actually works, so remove it.
Hopefully fixes PR kern/51531.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/net.c

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

Modified files:

Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.22 src/usr.sbin/sysinst/net.c:1.23
--- src/usr.sbin/sysinst/net.c:1.22	Tue Nov 22 12:04:35 2016
+++ src/usr.sbin/sysinst/net.c	Tue Dec 13 19:03:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.22 2016/11/22 12:04:35 roy Exp $	*/
+/*	$NetBSD: net.c,v 1.23 2016/12/13 19:03:49 roy Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -837,27 +837,13 @@ done:
 	 */
 	if (!nfs_root) {
 		msg_display_add(MSG_wait_network);
-		run_program(RUN_DISPLAY | RUN_PROGRESS,
+		network_up = !run_program(RUN_DISPLAY | RUN_PROGRESS,
 		"/sbin/ifconfig -w 15 -W 5");
+	} else {
+		/* Assume network is up. */
+		network_up = 1;
 	}
 
-	/*
-	 * ping should be verbose, so users can see the cause
-	 * of a network failure.
-	 */
-	if (net_defroute[0] != '\0' && network_up)
-		network_up = !run_program(RUN_DISPLAY | RUN_PROGRESS,
-		"/sbin/ping -v -c 5 -w 5 -o -n %s", net_defroute);
-	if (net_namesvr[0] != '\0' && network_up) {
-#ifdef INET6
-		if (strchr(net_namesvr, ':'))
-			network_up = !run_program(RUN_DISPLAY | RUN_PROGRESS,
-			"/sbin/ping6 -v -c 3 -n %s", net_namesvr);
-		else
-#endif
-			network_up = !run_program(RUN_DISPLAY | RUN_PROGRESS,
-			"/sbin/ping -v -c 5 -w 5 -o -n %s", net_namesvr);
-	}
 	fflush(NULL);
 
 	return network_up;

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:50:13 UTC 2016

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

Log Message:
fix format warning.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/spkr_synth.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/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.7 src/sys/dev/spkr_synth.c:1.8
--- src/sys/dev/spkr_synth.c:1.7	Tue Dec 13 15:20:34 2016
+++ src/sys/dev/spkr_synth.c	Tue Dec 13 15:50:13 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spkr_synth.c,v 1.7 2016/12/13 20:20:34 christos Exp $	*/
+/*	$NetBSD: spkr_synth.c,v 1.8 2016/12/13 20:50:13 christos Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.7 2016/12/13 20:20:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.8 2016/12/13 20:50:13 christos Exp $");
 
 #include 
 #include 
@@ -147,7 +147,7 @@ spkr_synth_attach(device_t parent, devic
 	cv_init(>sc_bellcv, "bellcv");
 
 	kthread_create(PRI_BIO, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
-	bell_thread, sc, >sc_bellthread, device_xname(self));
+	bell_thread, sc, >sc_bellthread, "%s", device_xname(self));
 
 	spkr_attach(self, spkr_synth_tone, spkr_synth_rest);
 }

CVS commit: src/sys/arch/arm/iomd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:18:06 UTC 2016

Modified Files:
src/sys/arch/arm/iomd: vidcaudio.c

Log Message:
back to passing device_t


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/iomd/vidcaudio.c

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

CVS commit: src/sys/arch/arm/iomd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:18:06 UTC 2016

Modified Files:
src/sys/arch/arm/iomd: vidcaudio.c

Log Message:
back to passing device_t


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/iomd/vidcaudio.c

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

Modified files:

Index: src/sys/arch/arm/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.54 src/sys/arch/arm/iomd/vidcaudio.c:1.55
--- src/sys/arch/arm/iomd/vidcaudio.c:1.54	Fri Dec  9 08:26:47 2016
+++ src/sys/arch/arm/iomd/vidcaudio.c	Tue Dec 13 15:18:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.54 2016/12/09 13:26:47 christos Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.55 2016/12/13 20:18:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,7 +65,7 @@
 
 #include 	/* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.54 2016/12/09 13:26:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.55 2016/12/13 20:18:06 christos Exp $");
 
 #include 
 #include/* autoconfig functions */
@@ -270,8 +270,7 @@ vidcaudio_attach(device_t parent, device
 
 	beepdev = audio_attach_mi(_hw_if, sc, self);
 #if NPCKBD > 0
-	int unit = device_unit(beepdev);
-	pckbd_hookup_bell(audiobell, );
+	pckbd_hookup_bell(audiobell, beepdev);
 #endif
 }
 

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:18:32 UTC 2016

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

Log Message:
back to passing device


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/audiobell.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/audiobell.c
diff -u src/sys/dev/audiobell.c:1.11 src/sys/dev/audiobell.c:1.12
--- src/sys/dev/audiobell.c:1.11	Fri Dec  9 08:26:11 2016
+++ src/sys/dev/audiobell.c	Tue Dec 13 15:18:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: audiobell.c,v 1.11 2016/12/09 13:26:11 christos Exp $	*/
+/*	$NetBSD: audiobell.c,v 1.12 2016/12/13 20:18:32 christos Exp $	*/
 
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.11 2016/12/09 13:26:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.12 2016/12/13 20:18:32 christos Exp $");
 
 #include 
 #include 
@@ -137,14 +137,14 @@ audiobell_synthesize(uint8_t *buf, u_int
 }
 
 void
-audiobell(void *unit, u_int pitch, u_int period, u_int volume, int poll)
+audiobell(void *v, u_int pitch, u_int period, u_int volume, int poll)
 {
 	uint8_t *buf;
 	struct audio_info ai;
 	struct uio auio;
 	struct iovec aiov;
 	int size, len, offset;
-	dev_t audio = (dev_t)(AUDIO_DEVICE | *(int *)unit);
+	dev_t audio = AUDIO_DEVICE | device_unit((device_t)v);
 
 	/* The audio system isn't built for polling. */
 	if (poll) return;

CVS commit: src/sys/dev

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:18:32 UTC 2016

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

Log Message:
back to passing device


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/audiobell.c

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

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:20:34 UTC 2016

Modified Files:
src/sys/conf: files
src/sys/dev: files.audio spkr.c spkr_synth.c spkrvar.h
src/sys/dev/isa: spkr_pcppi.c

Log Message:
Restructure speaker devices so that there can be multiple of them, and have
proper softc's.


To generate a diff of this commit:
cvs rdiff -u -r1.1166 -r1.1167 src/sys/conf/files
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/files.audio
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spkr.c src/sys/dev/spkrvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/spkr_synth.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/isa/spkr_pcppi.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/conf/files
diff -u src/sys/conf/files:1.1166 src/sys/conf/files:1.1167
--- src/sys/conf/files:1.1166	Tue Nov  1 20:11:59 2016
+++ src/sys/conf/files	Tue Dec 13 15:20:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1166 2016/11/02 00:11:59 pgoyette Exp $
+#	$NetBSD: files,v 1.1167 2016/12/13 20:20:34 christos Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20150846
@@ -331,6 +331,10 @@ define 	pckbport	{[slot = -1]}
 define	pckbport_machdep_cnattach
 define	firmload
 
+# speaker devices, attaches to audio or pcppi drivers
+device	spkr
+file	dev/spkr.c			spkr
+
 include "dev/files.audio"
 
 # High definition audio

Index: src/sys/dev/files.audio
diff -u src/sys/dev/files.audio:1.7 src/sys/dev/files.audio:1.8
--- src/sys/dev/files.audio:1.7	Sun Dec 11 01:30:11 2016
+++ src/sys/dev/files.audio	Tue Dec 13 15:20:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.audio,v 1.7 2016/12/11 06:30:11 christos Exp $
+#	$NetBSD: files.audio,v 1.8 2016/12/13 20:20:34 christos Exp $
 
 define	audiobus	{ }
 define	midibus		{ }
@@ -17,8 +17,7 @@ device	audio {}: audiodev, auconv, aurat
 attach	audio at audiobus
 device	midi: audio
 attach	midi at midibus
-device	spkr: audiobell
-attach  spkr at audio with spkr_synth
+attach	spkr at audio with spkr_synth
 
 # console bell via audio device
 #
@@ -26,12 +25,11 @@ define	audiobell
 
 file	dev/auconv.c			auconv
 file	dev/audio.c			audio			needs-flag
-file	dev/audiobell.c			audiobell		needs-flag
+file	dev/audiobell.c			spkr_synth		needs-flag
 file	dev/aurateconv.c		aurateconv		needs-flag
 file	dev/auvolconv.c			auvolconv
 file	dev/midi.c			midi			needs-flag
 file	dev/midictl.c			midisyn
 file	dev/midisyn.c			midisyn
 file	dev/mulaw.c			mulaw			needs-flag
-file	dev/spkr.c			spkr			needs-flag
 file	dev/spkr_synth.c		spkr_synth		needs-flag

Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.3 src/sys/dev/spkr.c:1.4
--- src/sys/dev/spkr.c:1.3	Fri Dec  9 00:17:03 2016
+++ src/sys/dev/spkr.c	Tue Dec 13 15:20:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $	*/
+/*	$NetBSD: spkr.c,v 1.4 2016/12/13 20:20:34 christos Exp $	*/
 
 /*
  * Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.4 2016/12/13 20:20:34 christos Exp $");
 
 #include 
 #include 
@@ -82,9 +82,9 @@ const struct cdevsw spkr_cdevsw = {
 	.d_flag = D_OTHER
 };
 
-static void playinit(void);
-static void playtone(int, int, int);
-static void playstring(char *, int);
+static void playinit(struct spkr_softc *);
+static void playtone(struct spkr_softc *, int, int, int);
+static void playstring(struct spkr_softc *, const char *, size_t);
 
 / PLAY STRING INTERPRETER BEGINS HERE **
  *
@@ -96,13 +96,6 @@ static void playstring(char *, int);
 
 #define dtoi(c)		((c) - '0')
 
-static int octave;	/* currently selected octave */
-static int whole;	/* whole-note time at current tempo, in ticks */
-static int value;	/* whole divisor for note time, quarter note = 1 */
-static int fill;	/* controls spacing of notes */
-static bool octtrack;	/* octave-tracking on? */
-static bool octprefix;	/* override current octave-tracking state? */
-
 /*
  * Magic number avoidance...
  */
@@ -144,221 +137,211 @@ static const int pitchtab[] =
 #define NOCTAVES (int)(__arraycount(pitchtab) / OCTAVE_NOTES)
 
 static void
-playinit(void)
+playinit(struct spkr_softc *sc)
 {
-octave = DFLT_OCTAVE;
-whole = (hz * SECS_PER_MIN * WHOLE_NOTE) / DFLT_TEMPO;
-fill = NORMAL;
-value = DFLT_VALUE;
-octtrack = false;
-octprefix = true;	/* act as though there was an initial O(n) */
+	sc->sc_octave = DFLT_OCTAVE;
+	sc->sc_whole = (hz * SECS_PER_MIN * WHOLE_NOTE) / DFLT_TEMPO;
+	sc->sc_fill = NORMAL;
+	sc->sc_value = DFLT_VALUE;
+	sc->sc_octtrack = false;
+	sc->sc_octprefix = true;/* act as though there was an initial O(n) */
 }
 
-static void
-playtone(int pitch, int val, int sustain)
 /* play tone of proper duration for current rhythm signature */
+static void
+playtone(struct spkr_softc *sc, int pitch, int val, int sustain)
 {

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:42:21 UTC 2016

Modified Files:
src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
src/sys/arch/algor/conf: P5064 P6032
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/amiga/conf: AMIGA DRACO GENERIC GENERIC.in MDINSTALL
src/sys/arch/amigappc/conf: GENERIC NULL
src/sys/arch/atari/conf: GENERIC.in HADES HADES.in MILAN-ISAIDE
MILAN-PCIIDE
src/sys/arch/bebox/conf: GENERIC INSTALL
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/epoc32/conf: GENERIC
src/sys/arch/evbarm/conf: ALLWINNER_A80 ARMADILLO9 BPI CUBIEBOARD
GUMSTIX HDL_G HPT5325 HUMMINGBIRD_A31 IMX23_OLINUXINO LUBBOCK
MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 POGO RPI SHEEVAPLUG
SMDK2410 TEGRA TS7200 TWINTAIL
src/sys/arch/evbmips/conf: ALCHEMY LOONGSON MALTA
src/sys/arch/evbppc/conf: EV64260 OPENBLOCKS266_OPT PMPPC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3
src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3_DOM0
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mmeye/conf: MMEYE_WLF
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/playstation2/conf: DEBUG
src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
src/sys/arch/prep/conf: GENERIC
src/sys/arch/sandpoint/conf: ENCPP1
src/sys/arch/sgimips/conf: GENERIC32_IP2x GENERIC32_IP3x
src/sys/arch/shark/conf: GENERIC INSTALL
src/sys/arch/sparc/conf: INSTALL KRUPS MRCOFFEE TADPOLE3GX
src/sys/arch/sparc64/conf: GENERIC NONPLUS64
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/vax/conf: GENERIC
src/sys/arch/x68k/conf: GENERIC INSTALL
src/sys/arch/zaurus/conf: GENERIC INSTALL

Log Message:
wildcard speaker attachments, now that we can handle many of them.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/AMIGA
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.313 -r1.314 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/conf/MDINSTALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/conf/HADES.in
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/bebox/conf/INSTALL
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ALLWINNER_A80 \
src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/ARMADILLO9 \
src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/HDL_G \
src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/HPT5325 \
src/sys/arch/evbarm/conf/MV2120
cvs 

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Dec 13 20:42:21 UTC 2016

Modified Files:
src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
src/sys/arch/algor/conf: P5064 P6032
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/amiga/conf: AMIGA DRACO GENERIC GENERIC.in MDINSTALL
src/sys/arch/amigappc/conf: GENERIC NULL
src/sys/arch/atari/conf: GENERIC.in HADES HADES.in MILAN-ISAIDE
MILAN-PCIIDE
src/sys/arch/bebox/conf: GENERIC INSTALL
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/epoc32/conf: GENERIC
src/sys/arch/evbarm/conf: ALLWINNER_A80 ARMADILLO9 BPI CUBIEBOARD
GUMSTIX HDL_G HPT5325 HUMMINGBIRD_A31 IMX23_OLINUXINO LUBBOCK
MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 POGO RPI SHEEVAPLUG
SMDK2410 TEGRA TS7200 TWINTAIL
src/sys/arch/evbmips/conf: ALCHEMY LOONGSON MALTA
src/sys/arch/evbppc/conf: EV64260 OPENBLOCKS266_OPT PMPPC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3
src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3_DOM0
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mmeye/conf: MMEYE_WLF
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/playstation2/conf: DEBUG
src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
src/sys/arch/prep/conf: GENERIC
src/sys/arch/sandpoint/conf: ENCPP1
src/sys/arch/sgimips/conf: GENERIC32_IP2x GENERIC32_IP3x
src/sys/arch/shark/conf: GENERIC INSTALL
src/sys/arch/sparc/conf: INSTALL KRUPS MRCOFFEE TADPOLE3GX
src/sys/arch/sparc64/conf: GENERIC NONPLUS64
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/vax/conf: GENERIC
src/sys/arch/x68k/conf: GENERIC INSTALL
src/sys/arch/zaurus/conf: GENERIC INSTALL

Log Message:
wildcard speaker attachments, now that we can handle many of them.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/AMIGA
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.313 -r1.314 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/conf/MDINSTALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/conf/HADES.in
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/bebox/conf/INSTALL
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ALLWINNER_A80 \
src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/ARMADILLO9 \
src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/HDL_G \
src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/HPT5325 \
src/sys/arch/evbarm/conf/MV2120
cvs 

CVS commit: src/sys/fs/nfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:44:01 UTC 2016

Modified Files:
src/sys/fs/nfs: files.newnfs

Log Message:
One more option for the opt_ file.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/fs/nfs/files.newnfs

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

Modified files:

Index: src/sys/fs/nfs/files.newnfs
diff -u src/sys/fs/nfs/files.newnfs:1.6 src/sys/fs/nfs/files.newnfs:1.7
--- src/sys/fs/nfs/files.newnfs:1.6	Fri Nov 18 22:41:18 2016
+++ src/sys/fs/nfs/files.newnfs	Tue Dec 13 21:44:01 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.newnfs,v 1.6 2016/11/18 22:41:18 pgoyette Exp $
+#	$NetBSD: files.newnfs,v 1.7 2016/12/13 21:44:01 pgoyette Exp $
 
 deffs NEW_NFSCLIENT
 defflag opt_newnfs.h			DTRACEALL
@@ -7,6 +7,7 @@ defflag opt_newnfs.h			DTRACEALL
 	NEW_NFSLOCKD
 	DTNFSCL
 	NEW_NFS_BOOT
+	NFS4_ACL_EXTATTR_NAME
 
 # XXX
 define	new_nfsclient: vfs, net

CVS commit: src/sys/fs/nfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:44:01 UTC 2016

Modified Files:
src/sys/fs/nfs: files.newnfs

Log Message:
One more option for the opt_ file.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/fs/nfs/files.newnfs

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

CVS commit: src/sys/fs/nfs/server

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:50:32 UTC 2016

Modified Files:
src/sys/fs/nfs/server: nfs_fha_new.c nfs_nfsdcache.c nfs_nfsdkrpc.c
nfs_nfsdport.c nfs_nfsdserv.c nfs_nfsdsocket.c nfs_nfsdstate.c
nfs_nfsdsubs.c

Log Message:
Update locations for new nfs header files.

XXX Some #includes are just disabled (via #if 0) and will need to be
XXX resolved before further progress can be made.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/server/nfs_fha_new.c \
src/sys/fs/nfs/server/nfs_nfsdport.c \
src/sys/fs/nfs/server/nfs_nfsdsocket.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/server/nfs_nfsdcache.c \
src/sys/fs/nfs/server/nfs_nfsdkrpc.c src/sys/fs/nfs/server/nfs_nfsdserv.c \
src/sys/fs/nfs/server/nfs_nfsdstate.c \
src/sys/fs/nfs/server/nfs_nfsdsubs.c

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

CVS commit: src/sys/fs/nfs/server

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Dec 13 21:50:32 UTC 2016

Modified Files:
src/sys/fs/nfs/server: nfs_fha_new.c nfs_nfsdcache.c nfs_nfsdkrpc.c
nfs_nfsdport.c nfs_nfsdserv.c nfs_nfsdsocket.c nfs_nfsdstate.c
nfs_nfsdsubs.c

Log Message:
Update locations for new nfs header files.

XXX Some #includes are just disabled (via #if 0) and will need to be
XXX resolved before further progress can be made.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/fs/nfs/server/nfs_fha_new.c \
src/sys/fs/nfs/server/nfs_nfsdport.c \
src/sys/fs/nfs/server/nfs_nfsdsocket.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/server/nfs_nfsdcache.c \
src/sys/fs/nfs/server/nfs_nfsdkrpc.c src/sys/fs/nfs/server/nfs_nfsdserv.c \
src/sys/fs/nfs/server/nfs_nfsdstate.c \
src/sys/fs/nfs/server/nfs_nfsdsubs.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/fs/nfs/server/nfs_fha_new.c
diff -u src/sys/fs/nfs/server/nfs_fha_new.c:1.1.1.2 src/sys/fs/nfs/server/nfs_fha_new.c:1.2
--- src/sys/fs/nfs/server/nfs_fha_new.c:1.1.1.2	Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/server/nfs_fha_new.c	Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_fha_new.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $	*/
+/*	$NetBSD: nfs_fha_new.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
  * Copyright (c) 2013 Spectra Logic Corporation
@@ -27,17 +27,17 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_fha_new.c 259765 2013-12-23 08:43:16Z mav "); */
-__RCSID("$NetBSD: nfs_fha_new.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_fha_new.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
 
-#include 
+#include 
 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 static void fhanew_init(void *foo);
 static void fhanew_uninit(void *foo);
Index: src/sys/fs/nfs/server/nfs_nfsdport.c
diff -u src/sys/fs/nfs/server/nfs_nfsdport.c:1.1.1.2 src/sys/fs/nfs/server/nfs_nfsdport.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdport.c:1.1.1.2	Fri Nov 18 07:49:14 2016
+++ src/sys/fs/nfs/server/nfs_nfsdport.c	Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nfsdport.c,v 1.1.1.2 2016/11/18 07:49:14 pgoyette Exp $	*/
+/*	$NetBSD: nfs_nfsdport.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,9 +34,11 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdport.c 308212 2016-11-02 12:43:15Z kib "); */
-__RCSID("$NetBSD: nfs_nfsdport.c,v 1.1.1.2 2016/11/18 07:49:14 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdport.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
 
+#if 0
 #include 
+#endif
 
 /*
  * Functions that perform the vfs operations required by the routines in
@@ -44,11 +46,14 @@ __RCSID("$NetBSD: nfs_nfsdport.c,v 1.1.1
  * portable.
  */
 
-#include 
+#include 
 #include 
 #include 
+
+#if 0
 #include 
 #include 
+#endif
 
 FEATURE(nfsd, "NFSv4 server");
 
Index: src/sys/fs/nfs/server/nfs_nfsdsocket.c
diff -u src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.1.1.2 src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.2
--- src/sys/fs/nfs/server/nfs_nfsdsocket.c:1.1.1.2	Fri Nov 18 07:49:13 2016
+++ src/sys/fs/nfs/server/nfs_nfsdsocket.c	Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nfsdsocket.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $	*/
+/*	$NetBSD: nfs_nfsdsocket.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,14 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdsocket.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: nfs_nfsdsocket.c,v 1.1.1.2 2016/11/18 07:49:13 pgoyette Exp $");
+__RCSID("$NetBSD: nfs_nfsdsocket.c,v 1.2 2016/12/13 21:50:32 pgoyette Exp $");
 
 /*
  * Socket operations for use by the nfs server.
  */
 
 #ifndef APPLEKEXT
-#include 
+#include 
 
 extern struct nfsstatsv1 nfsstatsv1;
 extern struct nfsrvfh nfs_pubfh, nfs_rootfh;

Index: src/sys/fs/nfs/server/nfs_nfsdcache.c
diff -u src/sys/fs/nfs/server/nfs_nfsdcache.c:1.3 src/sys/fs/nfs/server/nfs_nfsdcache.c:1.4
--- src/sys/fs/nfs/server/nfs_nfsdcache.c:1.3	Fri Nov 18 08:31:30 2016
+++ src/sys/fs/nfs/server/nfs_nfsdcache.c	Tue Dec 13 21:50:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nfsdcache.c,v 1.3 2016/11/18 08:31:30 pgoyette Exp $	*/
+/*	$NetBSD: nfs_nfsdcache.c,v 1.4 2016/12/13 21:50:32 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #include 
 /* __FBSDID("FreeBSD: head/sys/fs/nfsserver/nfs_nfsdcache.c 304026 2016-08-12 22:44:59Z rmacklem "); */
-__RCSID("$NetBSD: