CVS commit: src/sys

2017-03-13 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 14 04:25:10 UTC 2017

Modified Files:
src/sys/net: if.c rtsock.c
src/sys/netinet6: ip6_input.c nd6_nbr.c

Log Message:
Replace DIAGNOSTIC + panic with KASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/sys/net/if.c
cvs rdiff -u -r1.203 -r1.204 src/sys/net/rtsock.c
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.137 -r1.138 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/net/if.c
diff -u src/sys/net/if.c:1.383 src/sys/net/if.c:1.384
--- src/sys/net/if.c:1.383	Thu Mar  9 09:57:36 2017
+++ src/sys/net/if.c	Tue Mar 14 04:25:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.383 2017/03/09 09:57:36 knakahara Exp $	*/
+/*	$NetBSD: if.c,v 1.384 2017/03/14 04:25:10 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.383 2017/03/09 09:57:36 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.384 2017/03/14 04:25:10 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1371,11 +1371,7 @@ again:
 		if (family == AF_LINK)
 			continue;
 		dp = pffinddomain(family);
-#ifdef DIAGNOSTIC
-		if (dp == NULL)
-			panic("if_detach: no domain for AF %d",
-			family);
-#endif
+		KASSERTMSG(dp != NULL, "no domain for AF %d", family);
 		/*
 		 * XXX These PURGEIF calls are redundant with the
 		 * purge-all-families calls below, but are left in for

Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.203 src/sys/net/rtsock.c:1.204
--- src/sys/net/rtsock.c:1.203	Tue Mar 14 04:23:15 2017
+++ src/sys/net/rtsock.c	Tue Mar 14 04:25:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.204 2017/03/14 04:25:10 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.204 2017/03/14 04:25:10 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1449,10 +1449,7 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
 		default:
 			continue;
 		}
-#ifdef DIAGNOSTIC
-		if (m == NULL)
-			panic("%s: called with wrong command", __func__);
-#endif
+		KASSERTMSG(m != NULL, "called with wrong command");
 		COMPATNAME(route_enqueue)(m, sa ? sa->sa_family : 0);
 	}
 #undef cmdpass

Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.176 src/sys/netinet6/ip6_input.c:1.177
--- src/sys/netinet6/ip6_input.c:1.176	Wed Mar  1 08:54:12 2017
+++ src/sys/netinet6/ip6_input.c	Tue Mar 14 04:25:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.176 2017/03/01 08:54:12 ozaki-r Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.177 2017/03/14 04:25:10 ozaki-r Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.176 2017/03/01 08:54:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.177 2017/03/14 04:25:10 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -1322,10 +1322,7 @@ ip6_notify_pmtu(struct in6pcb *in6p, con
 	if (mtu == NULL)
 		return;
 
-#ifdef DIAGNOSTIC
-	if (so == NULL)		/* I believe this is impossible */
-		panic("ip6_notify_pmtu: socket is NULL");
-#endif
+	KASSERT(so != NULL);
 
 	memset(, 0, sizeof(mtuctl));	/* zero-clear for safety */
 	mtuctl.ip6m_mtu = *mtu;

Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.137 src/sys/netinet6/nd6_nbr.c:1.138
--- src/sys/netinet6/nd6_nbr.c:1.137	Tue Feb 21 03:58:24 2017
+++ src/sys/netinet6/nd6_nbr.c	Tue Mar 14 04:25:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.137 2017/02/21 03:58:24 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.138 2017/03/14 04:25:10 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.137 2017/02/21 03:58:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138 2017/03/14 04:25:10 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -394,14 +394,9 @@ nd6_ns_output(struct ifnet *ifp, const s
 	/* estimate the size of message */
 	maxlen = sizeof(*ip6) + sizeof(*nd_ns);
 	maxlen += (sizeof(struct nd_opt_hdr) + ifp->if_addrlen + 7) & ~7;
-#ifdef DIAGNOSTIC
-	if (max_linkhdr + maxlen >= MCLBYTES) {
-		printf("nd6_ns_output: max_linkhdr + maxlen >= MCLBYTES "
-		"(%d + %d > %d)\n", max_linkhdr, maxlen, MCLBYTES);
-		panic("nd6_ns_output: insufficient MCLBYTES");
-		/* NOTREACHED */
-	}
-#endif
+	KASSERTMSG(max_linkhdr + maxlen < MCLBYTES,
+	"max_linkhdr + maxlen >= MCLBYTES (%d + %d >= %d)",
+	max_linkhdr, maxlen, MCLBYTES);
 
 

CVS commit: src/sys/netinet6

2017-03-13 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 14 04:24:04 UTC 2017

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

Log Message:
Replace DIAGNOSTIC + panic with CTASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/netinet6/icmp6.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/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.210 src/sys/netinet6/icmp6.c:1.211
--- src/sys/netinet6/icmp6.c:1.210	Fri Feb 17 03:57:17 2017
+++ src/sys/netinet6/icmp6.c	Tue Mar 14 04:24:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: icmp6.c,v 1.210 2017/02/17 03:57:17 ozaki-r Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.211 2017/03/14 04:24:04 ozaki-r Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.210 2017/02/17 03:57:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.211 2017/03/14 04:24:04 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2074,10 +2074,7 @@ icmp6_reflect(struct mbuf *m, size_t off
 	 * If there are extra headers between IPv6 and ICMPv6, strip
 	 * off that header first.
 	 */
-#ifdef DIAGNOSTIC
-	if (sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) > MHLEN)
-		panic("assumption failed in icmp6_reflect");
-#endif
+	CTASSERT(sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) <= MHLEN);
 	if (off > sizeof(struct ip6_hdr)) {
 		size_t l;
 		struct ip6_hdr nip6;



CVS commit: src/sys/net

2017-03-13 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 14 04:23:15 UTC 2017

Modified Files:
src/sys/net: rtsock.c

Log Message:
Avoid debug printf just if DIAGNOSTIC


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/net/rtsock.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/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.202 src/sys/net/rtsock.c:1.203
--- src/sys/net/rtsock.c:1.202	Tue Feb 21 04:00:01 2017
+++ src/sys/net/rtsock.c	Tue Mar 14 04:23:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.202 2017/02/21 04:00:01 ozaki-r Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.202 2017/02/21 04:00:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.203 2017/03/14 04:23:15 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1064,8 +1064,8 @@ rt_getlen(int type)
 #ifdef COMPAT_70
 		return sizeof(struct ifa_msghdr70);
 #else
-#ifdef DIAGNOSTIC
-		printf("RTM_ONEWADDR\n");
+#ifdef RTSOCK_DEBUG
+		printf("%s: unsupported RTM type %d\n", __func__, type);
 #endif
 		return -1;
 #endif
@@ -1078,8 +1078,8 @@ rt_getlen(int type)
 #ifdef COMPAT_14
 		return sizeof(struct if_msghdr14);
 #else
-#ifdef DIAGNOSTIC
-		printf("RTM_OOIFINFO\n");
+#ifdef RTSOCK_DEBUG
+		printf("%s: unsupported RTM type RTM_OOIFINFO\n", __func__);
 #endif
 		return -1;
 #endif
@@ -1087,8 +1087,8 @@ rt_getlen(int type)
 #ifdef COMPAT_50
 		return sizeof(struct if_msghdr50);
 #else
-#ifdef DIAGNOSTIC
-		printf("RTM_OIFINFO\n");
+#ifdef RTSOCK_DEBUG
+		printf("%s: unsupported RTM type RTM_OIFINFO\n", __func__);
 #endif
 		return -1;
 #endif
@@ -1671,8 +1671,8 @@ sysctl_iflist(int af, struct rt_walkarg 
 		break;
 #endif
 	default:
-#ifdef DIAGNOSTIC
-		printf("sysctl_iflist\n");
+#ifdef RTSOCK_DEBUG
+		printf("%s: unsupported IFLIST type %d\n", __func__, type);
 #endif
 		return EINVAL;
 	}



CVS commit: src/sys/netinet6

2017-03-13 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 14 04:21:38 UTC 2017

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

Log Message:
Remove unnecessary NULL check


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 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.134 src/sys/netinet6/nd6_rtr.c:1.135
--- src/sys/netinet6/nd6_rtr.c:1.134	Fri Mar  3 06:27:20 2017
+++ src/sys/netinet6/nd6_rtr.c	Tue Mar 14 04:21:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.134 2017/03/03 06:27:20 msaitoh Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.135 2017/03/14 04:21:38 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.134 2017/03/03 06:27:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.135 2017/03/14 04:21:38 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -581,11 +581,6 @@ defrouter_delreq(struct nd_defrouter *dr
 	} def, mask, gw;
 	int error;
 
-#ifdef DIAGNOSTIC
-	if (dr == NULL)
-		panic("dr == NULL in defrouter_delreq");
-#endif
-
 	memset(, 0, sizeof(def));
 	memset(, 0, sizeof(mask));
 	memset(, 0, sizeof(gw));	/* for safety */



CVS commit: src/sys/dev/pci

2017-03-13 Thread NONAKA Kimihiro
Module Name:src
Committed By:   nonaka
Date:   Tue Mar 14 04:06:58 UTC 2017

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Added Intel Wireless 3168 entry.


To generate a diff of this commit:
cvs rdiff -u -r1.1280 -r1.1281 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1280 src/sys/dev/pci/pcidevs:1.1281
--- src/sys/dev/pci/pcidevs:1.1280	Mon Feb 27 01:33:21 2017
+++ src/sys/dev/pci/pcidevs	Tue Mar 14 04:06:58 2017
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1280 2017/02/27 01:33:21 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1281 2017/03/14 04:06:58 nonaka Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3440,7 +3440,8 @@ product INTEL WIFI_LINK_8260_1	0x24f3	Du
 product INTEL WIFI_LINK_8260_2	0x24f4	Dual Band Wireless AC 8260
 product INTEL WIFI_LINK_4165_1	0x24f5	Dual Band Wireless AC 4165
 product INTEL WIFI_LINK_4165_2	0x24f6	Dual Band Wireless AC 4165
-product INTEL WIFI_LINK_8265_2	0x24fd	Dual Band Wireless AC 8265
+product INTEL WIFI_LINK_3168	0x24fb	Dual Band Wireless AC 3168
+product INTEL WIFI_LINK_8265	0x24fd	Dual Band Wireless AC 8265
 product INTEL 82820_MCH		0x2501	82820 MCH (Camino)
 product INTEL 82820_AGP		0x250f	82820 AGP
 product INTEL 82850_HB		0x2530	82850 Host



CVS commit: src/sys/kern

2017-03-13 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Mar 14 03:13:50 UTC 2017

Modified Files:
src/sys/kern: subr_pool.c

Log Message:
#if DIAGNOSTIC panic ---> KASSERT

- Omit mutex_exit before panic.  No need.
- Sprinkle some more information into a few messages.
- Prefer __diagused over #if DIAGNOSTIC for declarations,
  to reduce conditionals.

ok mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/kern/subr_pool.c

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

Modified files:

Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.206 src/sys/kern/subr_pool.c:1.207
--- src/sys/kern/subr_pool.c:1.206	Fri Feb  5 03:04:52 2016
+++ src/sys/kern/subr_pool.c	Tue Mar 14 03:13:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.206 2016/02/05 03:04:52 knakahara Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.207 2017/03/14 03:13:50 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.206 2016/02/05 03:04:52 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.207 2017/03/14 03:13:50 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -382,12 +382,10 @@ pr_rmpage(struct pool *pp, struct pool_i
 	 * If the page was idle, decrement the idle page count.
 	 */
 	if (ph->ph_nmissing == 0) {
-#ifdef DIAGNOSTIC
-		if (pp->pr_nidle == 0)
-			panic("pr_rmpage: nidle inconsistent");
-		if (pp->pr_nitems < pp->pr_itemsperpage)
-			panic("pr_rmpage: nitems inconsistent");
-#endif
+		KASSERT(pp->pr_nidle != 0);
+		KASSERTMSG((pp->pr_nitems >= pp->pr_itemsperpage),
+		"nitems=%u < itemsperpage=%u",
+		pp->pr_nitems, pp->pr_itemsperpage);
 		pp->pr_nidle--;
 	}
 
@@ -525,10 +523,9 @@ pool_init(struct pool *pp, size_t size, 
 		prsize = sizeof(struct pool_item);
 
 	prsize = roundup(prsize, align);
-#ifdef DIAGNOSTIC
-	if (prsize > palloc->pa_pagesz)
-		panic("pool_init: pool item size (%zu) too large", prsize);
-#endif
+	KASSERTMSG((prsize <= palloc->pa_pagesz),
+	"pool_init: pool item size (%zu) larger than page size (%u)",
+	prsize, palloc->pa_pagesz);
 
 	/*
 	 * Initialize the pool structure.
@@ -698,14 +695,8 @@ pool_destroy(struct pool *pp)
 	mutex_enter(>pr_lock);
 
 	KASSERT(pp->pr_cache == NULL);
-
-#ifdef DIAGNOSTIC
-	if (pp->pr_nout != 0) {
-		panic("pool_destroy: pool busy: still out: %u",
-		pp->pr_nout);
-	}
-#endif
-
+	KASSERTMSG((pp->pr_nout == 0),
+	"pool_destroy: pool busy: still out: %u", pp->pr_nout);
 	KASSERT(LIST_EMPTY(>pr_fullpages));
 	KASSERT(LIST_EMPTY(>pr_partpages));
 
@@ -726,10 +717,8 @@ pool_set_drain_hook(struct pool *pp, voi
 {
 
 	/* XXX no locking -- must be used just after pool_init() */
-#ifdef DIAGNOSTIC
-	if (pp->pr_drain_hook != NULL)
-		panic("pool_set_drain_hook(%s): already set", pp->pr_wchan);
-#endif
+	KASSERTMSG((pp->pr_drain_hook == NULL),
+	"pool_set_drain_hook(%s): already set", pp->pr_wchan);
 	pp->pr_drain_hook = fn;
 	pp->pr_drain_hook_arg = arg;
 }
@@ -757,15 +746,13 @@ pool_get(struct pool *pp, int flags)
 	struct pool_item_header *ph;
 	void *v;
 
-#ifdef DIAGNOSTIC
-	if (pp->pr_itemsperpage == 0)
-		panic("pool_get: pool '%s': pr_itemsperpage is zero, "
-		"pool not initialized?", pp->pr_wchan);
-	if ((cpu_intr_p() || cpu_softintr_p()) && pp->pr_ipl == IPL_NONE &&
-	!cold && panicstr == NULL)
-		panic("pool '%s' is IPL_NONE, but called from "
-		"interrupt context\n", pp->pr_wchan);
-#endif
+	KASSERTMSG((pp->pr_itemsperpage != 0),
+	"pool_get: pool '%s': pr_itemsperpage is zero, "
+	"pool not initialized?", pp->pr_wchan);
+	KASSERTMSG((!(cpu_intr_p() || cpu_softintr_p())
+		|| pp->pr_ipl != IPL_NONE || cold || panicstr != NULL),
+	"pool '%s' is IPL_NONE, but called from interrupt context",
+	pp->pr_wchan);
 	if (flags & PR_WAITOK) {
 		ASSERT_SLEEPABLE();
 	}
@@ -777,12 +764,8 @@ pool_get(struct pool *pp, int flags)
 	 * and we can wait, then wait until an item has been returned to
 	 * the pool.
 	 */
-#ifdef DIAGNOSTIC
-	if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) {
-		mutex_exit(>pr_lock);
-		panic("pool_get: %s: crossed hard limit", pp->pr_wchan);
-	}
-#endif
+	KASSERTMSG((pp->pr_nout <= pp->pr_hardlimit),
+	"pool_get: %s: crossed hard limit", pp->pr_wchan);
 	if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) {
 		if (pp->pr_drain_hook != NULL) {
 			/*
@@ -830,14 +813,10 @@ pool_get(struct pool *pp, int flags)
 	if ((ph = pp->pr_curpage) == NULL) {
 		int error;
 
-#ifdef DIAGNOSTIC
-		if (pp->pr_nitems != 0) {
-			mutex_exit(>pr_lock);
-			printf("pool_get: %s: curpage NULL, nitems %u\n",
-			pp->pr_wchan, pp->pr_nitems);
-			panic("pool_get: nitems inconsistent");
-		}
-#endif
+		KASSERTMSG((pp->pr_nitems == 0),
+		"pool_get: nitems inconsistent"
+		": %s: curpage NULL, nitems %u",
+		pp->pr_wchan, 

CVS commit: src/sys/dev/pci

2017-03-13 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Mon Mar 13 21:06:51 UTC 2017

Modified Files:
src/sys/dev/pci: vioscsi.c

Log Message:
several small tweaks:
- use MSIX if available
- fix off-by-one for nluns/ntargets (code inspection, not actual effect)
- when virtio_enqueue_reserve() fails, do not execute vioscsi_req_put()
  and hence virtio_dequeue_commit() as there is nothing to commit, just
  unload the xs and return; also report XS_RESOURCE_SHORTAGE, it's
  semi-normal situation
- set status/resid in vioscsi_req_done() before the switch, so that
  the override for VIRTIO_SCSI_S_BAD_TARGET actually has effect
- g/c vioscsi_req_put(), call the appropriate cleanup routines directly
- stop initializing id/task_attr in vioscsi_req_get(), it's overwritten
  in vioscsi_scsipi_request() anyway


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

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

Modified files:

Index: src/sys/dev/pci/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.10 src/sys/dev/pci/vioscsi.c:1.11
--- src/sys/dev/pci/vioscsi.c:1.10	Mon Mar 13 20:47:38 2017
+++ src/sys/dev/pci/vioscsi.c	Mon Mar 13 21:06:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vioscsi.c,v 1.10 2017/03/13 20:47:38 jdolecek Exp $	*/
+/*	$NetBSD: vioscsi.c,v 1.11 2017/03/13 21:06:50 jdolecek Exp $	*/
 /*	$OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.10 2017/03/13 20:47:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.11 2017/03/13 21:06:50 jdolecek Exp $");
 
 #include 
 #include 
@@ -85,7 +85,6 @@ static int	 vioscsi_vq_done(struct virtq
 static void	 vioscsi_req_done(struct vioscsi_softc *, struct virtio_softc *,
 struct vioscsi_req *);
 static struct vioscsi_req *vioscsi_req_get(struct vioscsi_softc *);
-static void	 vioscsi_req_put(struct vioscsi_softc *, struct vioscsi_req *);
 
 static const char *const vioscsi_vq_names[] = {
 	"control",
@@ -133,6 +132,8 @@ vioscsi_attach(device_t parent, device_t
 	vsc->sc_intrhand = virtio_vq_intr;
 	vsc->sc_flags = 0;
 
+	vsc->sc_flags |= VIRTIO_F_PCI_INTR_MSIX;
+
 	features = virtio_negotiate_features(vsc, 0);
 	snprintb(buf, sizeof(buf), VIRTIO_COMMON_FLAG_BITS, features);
 	aprint_normal(": Features: %s\n", buf);
@@ -193,8 +194,8 @@ vioscsi_attach(device_t parent, device_t
 	chan->chan_adapter = adapt;
 	chan->chan_bustype = _bustype;
 	chan->chan_channel = 0;
-	chan->chan_ntargets = max_target;
-	chan->chan_nluns = max_lun;
+	chan->chan_ntargets = max_target + 1;
+	chan->chan_nluns = max_lun + 1;
 	chan->chan_id = 0;
 	chan->chan_flags = SCSIPI_CHAN_NOSETTLE;
 
@@ -223,7 +224,7 @@ vioscsi_scsipi_request(struct scsipi_cha
 	struct scsipi_periph *periph;
 	struct vioscsi_req *vr;
 	struct virtio_scsi_req_hdr *req;
-	struct virtqueue *vq = >sc_vqs[2];
+	struct virtqueue *vq = >sc_vqs[VIOSCSI_VQ_REQUEST];
 	int slot, error;
 
 	DPRINTF(("%s: enter\n", __func__));
@@ -325,10 +326,10 @@ vioscsi_scsipi_request(struct scsipi_cha
 	default:
 		aprint_error_dev(sc->sc_dev, "error %d loading DMA map\n",
 		error);
-	stuffup:
+stuffup:
 		xs->error = XS_DRIVER_STUFFUP;
 nomore:
-		vioscsi_req_put(sc, vr);
+		/* nothing else to free */
 		scsipi_done(xs);
 		return;
 	}
@@ -340,7 +341,9 @@ nomore:
 	error = virtio_enqueue_reserve(vsc, vq, slot, nsegs);
 	if (error) {
 		DPRINTF(("%s: error reserving %d\n", __func__, error));
-		goto stuffup;
+		bus_dmamap_unload(vsc->sc_dmat, vr->vr_data);
+		xs->error = XS_RESOURCE_SHORTAGE;
+		goto nomore;
 	}
 
 	bus_dmamap_sync(vsc->sc_dmat, vr->vr_control,
@@ -411,6 +414,9 @@ vioscsi_req_done(struct vioscsi_softc *s
 	bus_dmamap_sync(vsc->sc_dmat, vr->vr_data, 0, xs->datalen,
 	XS2DMAPOST(xs));
 
+	xs->status = vr->vr_res.status;
+	xs->resid = vr->vr_res.residual;
+
 	switch (vr->vr_res.response) {
 	case VIRTIO_SCSI_S_OK:
 		sense_len = MIN(sizeof(xs->sense), vr->vr_res.sense_len);
@@ -433,14 +439,12 @@ vioscsi_req_done(struct vioscsi_softc *s
 		break;
 	}
 
-	xs->status = vr->vr_res.status;
-	xs->resid = vr->vr_res.residual;
-
 	DPRINTF(("%s: done %d, %d, %d\n", __func__,
 	xs->error, xs->status, xs->resid));
 
+	bus_dmamap_unload(vsc->sc_dmat, vr->vr_data);
 	vr->vr_xs = NULL;
-	vioscsi_req_put(sc, vr);
+
 	scsipi_done(xs);
 }
 
@@ -460,7 +464,11 @@ vioscsi_vq_done(struct virtqueue *vq)
 			break;
 
 		DPRINTF(("%s: slot=%d\n", __func__, slot));
+
 		vioscsi_req_done(sc, vsc, >sc_reqs[slot]);
+
+		virtio_dequeue_commit(vsc, vq, slot);
+
 		ret = 1;
 	}
 
@@ -484,28 +492,11 @@ vioscsi_req_get(struct vioscsi_softc *sc
 	KASSERT(slot < sc->sc_nreqs);
 	vr = >sc_reqs[slot];
 
-	vr->vr_req.id = slot;
-	vr->vr_req.task_attr = VIRTIO_SCSI_S_SIMPLE;
-
 	DPRINTF(("%s: %p, %d\n", __func__, vr, slot));
 
 	return vr;
 }
 
-static void
-vioscsi_req_put(struct vioscsi_softc *sc, struct vioscsi_req *vr)
-{
-	struct 

CVS commit: src/sys/dev/pci

2017-03-13 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Mon Mar 13 20:47:38 UTC 2017

Modified Files:
src/sys/dev/pci: vioscsi.c

Log Message:
replace req queue offset with define, only set & start the req interrupt for
that queue; add some masks for the lun for visibility; use slot as tag number

no actual functional change, just small cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/vioscsi.c

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

Modified files:

Index: src/sys/dev/pci/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.9 src/sys/dev/pci/vioscsi.c:1.10
--- src/sys/dev/pci/vioscsi.c:1.9	Tue Mar  7 22:03:04 2017
+++ src/sys/dev/pci/vioscsi.c	Mon Mar 13 20:47:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vioscsi.c,v 1.9 2017/03/07 22:03:04 jdolecek Exp $	*/
+/*	$NetBSD: vioscsi.c,v 1.10 2017/03/13 20:47:38 jdolecek Exp $	*/
 /*	$OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.9 2017/03/07 22:03:04 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.10 2017/03/13 20:47:38 jdolecek Exp $");
 
 #include 
 #include 
@@ -57,6 +57,10 @@ struct vioscsi_softc {
 	struct scsipi_channel 	 sc_channel;
 
 	struct virtqueue	 sc_vqs[3];
+#define VIOSCSI_VQ_CONTROL	0
+#define VIOSCSI_VQ_EVENT	1
+#define VIOSCSI_VQ_REQUEST	2
+
 	struct vioscsi_req	*sc_reqs;
 	int			 sc_nreqs;
 	bus_dma_segment_tsc_reqs_segs[1];
@@ -159,14 +163,18 @@ vioscsi_attach(device_t parent, device_t
 			"failed to allocate virtqueue %zu\n", i);
 			return;
 		}
-		sc->sc_vqs[i].vq_done = vioscsi_vq_done;
+
+		if (i == VIOSCSI_VQ_REQUEST)
+			sc->sc_vqs[i].vq_done = vioscsi_vq_done;
 	}
 
-	int qsize = sc->sc_vqs[2].vq_num;
+	int qsize = sc->sc_vqs[VIOSCSI_VQ_REQUEST].vq_num;
 	aprint_normal_dev(sc->sc_dev, "qsize %d\n", qsize);
 	if (vioscsi_alloc_reqs(sc, vsc, qsize, seg_max))
 		return;
 
+	virtio_start_vq_intr(vsc, >sc_vqs[VIOSCSI_VQ_REQUEST]);
+
 	/*
 	 * Fill in the scsipi_adapter.
 	 */
@@ -240,10 +248,10 @@ vioscsi_scsipi_request(struct scsipi_cha
 	xs = arg;
 	periph = xs->xs_periph;
 
-	vr = vioscsi_req_get(sc);
 	/*
 	 * This can happen when we run out of queue slots.
 	 */
+	vr = vioscsi_req_get(sc);
 	if (vr == NULL) {
 		xs->error = XS_RESOURCE_SHORTAGE;
 		scsipi_done(xs);
@@ -267,8 +275,8 @@ vioscsi_scsipi_request(struct scsipi_cha
 	}
 	req->lun[0] = 1;
 	req->lun[1] = periph->periph_target - 1;
-	req->lun[2] = 0x40 | (periph->periph_lun >> 8);
-	req->lun[3] = periph->periph_lun;
+	req->lun[2] = 0x40 | ((periph->periph_lun >> 8) & 0x3F);
+	req->lun[3] = periph->periph_lun & 0xFF;
 	memset(req->lun + 4, 0, 4);
 	DPRINTF(("%s: command for %u:%u at slot %d\n", __func__,
 	periph->periph_target - 1, periph->periph_lun, slot));
@@ -294,7 +302,7 @@ vioscsi_scsipi_request(struct scsipi_cha
 		req->task_attr = VIRTIO_SCSI_S_SIMPLE;
 		break;
 	}
-	req->id = (intptr_t)vr;
+	req->id = slot;
 
 	if ((size_t)xs->cmdlen > sizeof(req->cdb)) {
 		DPRINTF(("%s: bad cmdlen %zu > %zu\n", __func__,
@@ -465,7 +473,7 @@ static struct vioscsi_req *
 vioscsi_req_get(struct vioscsi_softc *sc)
 {
 	struct virtio_softc *vsc = device_private(device_parent(sc->sc_dev));
-	struct virtqueue *vq = >sc_vqs[2];
+	struct virtqueue *vq = >sc_vqs[VIOSCSI_VQ_REQUEST];
 	struct vioscsi_req *vr;
 	int r, slot;
 



CVS commit: src/sys/ufs/lfs

2017-03-13 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Mar 13 14:24:20 UTC 2017

Modified Files:
src/sys/ufs/lfs: lfs_alloc.c lfs_bio.c lfs_segment.c lfs_syscalls.c
lfs_vfsops.c ulfs_bmap.c ulfs_vnops.c

Log Message:
#if DIAGNOSTIC panic ---> KASSERT

Replace some #if DEBUG by this too.  DEBUG is only for expensive
assertions; these are not.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.135 -r1.136 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.263 -r1.264 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.172 -r1.173 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.352 -r1.353 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/lfs/ulfs_bmap.c
cvs rdiff -u -r1.44 -r1.45 src/sys/ufs/lfs/ulfs_vnops.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/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.133 src/sys/ufs/lfs/lfs_alloc.c:1.134
--- src/sys/ufs/lfs/lfs_alloc.c:1.133	Sun Aug  7 05:09:12 2016
+++ src/sys/ufs/lfs/lfs_alloc.c	Mon Mar 13 14:24:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_alloc.c,v 1.133 2016/08/07 05:09:12 dholland Exp $	*/
+/*	$NetBSD: lfs_alloc.c,v 1.134 2017/03/13 14:24:20 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.133 2016/08/07 05:09:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.134 2017/03/13 14:24:20 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -168,10 +168,8 @@ lfs_extend_ifile(struct lfs *fs, kauth_c
 	 */
 	LFS_GET_HEADFREE(fs, cip, cbp, );
 	LFS_PUT_HEADFREE(fs, cip, cbp, i);
-#ifdef DIAGNOSTIC
-	if (lfs_sb_getfreehd(fs) == LFS_UNUSED_INUM)
-		panic("inode 0 allocated [2]");
-#endif /* DIAGNOSTIC */
+	KASSERTMSG((lfs_sb_getfreehd(fs) != LFS_UNUSED_INUM),
+	"inode 0 allocated [2]");
 
 	/* inode number to stop at (XXX: why *x*max?) */
 	xmax = i + lfs_sb_getifpb(fs);
@@ -298,10 +296,8 @@ lfs_valloc(struct vnode *pvp, int mode, 
 			return error;
 		}
 	}
-#ifdef DIAGNOSTIC
-	if (lfs_sb_getfreehd(fs) == LFS_UNUSED_INUM)
-		panic("inode 0 allocated [3]");
-#endif /* DIAGNOSTIC */
+	KASSERTMSG((lfs_sb_getfreehd(fs) != LFS_UNUSED_INUM),
+	"inode 0 allocated [3]");
 
 	/* Set superblock modified bit */
 	mutex_enter(_lock);
@@ -667,12 +663,8 @@ lfs_vfree(struct vnode *vp, ino_t ino, i
 			}
 		}
 	}
-#ifdef DIAGNOSTIC
 	/* XXX: shouldn't this check be further up *before* we trash the fs? */
-	if (ino == LFS_UNUSED_INUM) {
-		panic("inode 0 freed");
-	}
-#endif /* DIAGNOSTIC */
+	KASSERTMSG((ino != LFS_UNUSED_INUM), "inode 0 freed");
 
 	/*
 	 * Update the segment summary for the segment where the on-disk
@@ -681,18 +673,12 @@ lfs_vfree(struct vnode *vp, ino_t ino, i
 	if (old_iaddr != LFS_UNUSED_DADDR) {
 		/* load it */
 		LFS_SEGENTRY(sup, fs, lfs_dtosn(fs, old_iaddr), bp);
-#ifdef DIAGNOSTIC
 		/* the number of bytes in the segment should not become < 0 */
-		if (sup->su_nbytes < DINOSIZE(fs)) {
-			printf("lfs_vfree: negative byte count"
-			   " (segment %" PRIu32 " short by %d)\n",
-			   lfs_dtosn(fs, old_iaddr),
-			   (int)DINOSIZE(fs) -
-sup->su_nbytes);
-			panic("lfs_vfree: negative byte count");
-			sup->su_nbytes = DINOSIZE(fs);
-		}
-#endif
+		KASSERTMSG((sup->su_nbytes >= DINOSIZE(fs)),
+		"lfs_vfree: negative byte count"
+		" (segment %" PRIu32 " short by %d)\n",
+		lfs_dtosn(fs, old_iaddr),
+		(int)DINOSIZE(fs) - sup->su_nbytes);
 		/* update the number of bytes in the segment */
 		sup->su_nbytes -= DINOSIZE(fs);
 		/* write the segment entry */

Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.135 src/sys/ufs/lfs/lfs_bio.c:1.136
--- src/sys/ufs/lfs/lfs_bio.c:1.135	Sat Oct  3 09:31:29 2015
+++ src/sys/ufs/lfs/lfs_bio.c	Mon Mar 13 14:24:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_bio.c,v 1.135 2015/10/03 09:31:29 hannken Exp $	*/
+/*	$NetBSD: lfs_bio.c,v 1.136 2017/03/13 14:24:20 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.135 2015/10/03 09:31:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.136 2017/03/13 14:24:20 riastradh Exp $");
 
 #include 
 #include 
@@ -315,11 +315,9 @@ lfs_bwrite(void *v)
 	} */ *ap = v;
 	struct buf *bp = ap->a_bp;
 
-#ifdef DIAGNOSTIC
-	if (VTOI(bp->b_vp)->i_lfs->lfs_ronly == 0 && (bp->b_flags & B_ASYNC)) {
-		panic("bawrite LFS buffer");
-	}
-#endif /* DIAGNOSTIC */
+	KASSERTMSG((VTOI(bp->b_vp)->i_lfs->lfs_ronly ||
+		!(bp->b_flags & B_ASYNC)),
+	"bawrite LFS buffer");
 	return lfs_bwrite_ext(bp, 0);
 }
 
@@ -385,10 +383,7 @@ lfs_availwait(struct lfs *fs, int fsb)
 #endif
 
 		lfs_wakeup_cleaner(fs);
-#ifdef DIAGNOSTIC
-		if 

CVS commit: src/sys/ufs/lfs

2017-03-13 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Mar 13 13:45:53 UTC 2017

Modified Files:
src/sys/ufs/lfs: lfs_inode.c

Log Message:
#if DIAGNOSTIC panic ---> KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/ufs/lfs/lfs_inode.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/ufs/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.147 src/sys/ufs/lfs/lfs_inode.c:1.148
--- src/sys/ufs/lfs/lfs_inode.c:1.147	Tue Sep  1 06:13:09 2015
+++ src/sys/ufs/lfs/lfs_inode.c	Mon Mar 13 13:45:53 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_inode.c,v 1.147 2015/09/01 06:13:09 dholland Exp $	*/
+/*	$NetBSD: lfs_inode.c,v 1.148 2017/03/13 13:45:53 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.147 2015/09/01 06:13:09 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.148 2017/03/13 13:45:53 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -243,10 +243,8 @@ lfs_truncate(struct vnode *ovp, off_t le
 	(oip->i_size < fs->um_maxsymlinklen ||
 	 (fs->um_maxsymlinklen == 0 &&
 	  lfs_dino_getblocks(fs, oip->i_din) == 0))) {
-#ifdef DIAGNOSTIC
-		if (length != 0)
-			panic("lfs_truncate: partial truncate of symlink");
-#endif
+		KASSERTMSG((length == 0),
+		"partial truncate of symlink: %jd", (intmax_t)length);
 		memset((char *)SHORTLINK(oip), 0, (u_int)oip->i_size);
 		oip->i_size = 0;
 		lfs_dino_setsize(fs, oip->i_din, 0);
@@ -589,15 +587,16 @@ done:
 	mutex_enter(_lock);
 	lfs_sb_addbfree(fs, blocksreleased);
 	mutex_exit(_lock);
-#ifdef DIAGNOSTIC
-	if (oip->i_size == 0 &&
-	(lfs_dino_getblocks(fs, oip->i_din) != 0 || oip->i_lfs_effnblks != 0)) {
-		printf("lfs_truncate: truncate to 0 but %jd blks/%jd effblks\n",
-		   (intmax_t)lfs_dino_getblocks(fs, oip->i_din),
-		   (intmax_t)oip->i_lfs_effnblks);
-		panic("lfs_truncate: persistent blocks");
-	}
-#endif
+
+	KASSERTMSG((oip->i_size != 0 ||
+		lfs_dino_getblocks(fs, oip->i_din) == 0),
+	"truncate to 0 but %jd blks/%jd effblks",
+	lfs_dino_getblocks(fs, oip->i_din),
+	oip->i_lfs_effnblks);
+	KASSERTMSG((oip->i_size != 0 || oip->i_lfs_effnblks == 0),
+	"truncate to 0 but %jd blks/%jd effblks",
+	lfs_dino_getblocks(fs, oip->i_din),
+	oip->i_lfs_effnblks);
 
 	/*
 	 * If we truncated to zero, take us off the paging queue.



CVS commit: src/share/misc

2017-03-13 Thread Leonardo Taccari
Module Name:src
Committed By:   leot
Date:   Mon Mar 13 11:50:06 UTC 2017

Modified Files:
src/share/misc: acronyms.comp

Log Message:
Add UB (undefined behavior)

Seen in several commit messages


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/share/misc/acronyms.comp

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

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.177 src/share/misc/acronyms.comp:1.178
--- src/share/misc/acronyms.comp:1.177	Tue Mar  7 16:40:16 2017
+++ src/share/misc/acronyms.comp	Mon Mar 13 11:50:06 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.177 2017/03/07 16:40:16 dholland Exp $
+$NetBSD: acronyms.comp,v 1.178 2017/03/13 11:50:06 leot Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -1323,6 +1323,7 @@ UAC	user {access,account} control
 UAF	use-after-free
 UART	universal asynchronous receiver/transmitter
 UAT	user acceptance testing
+UB	undefined behavior
 UC	uncacheable
 UCS	uniform-cost search
 UDMA	ultra DMA



CVS commit: [netbsd-7-nhusb] src

2017-03-13 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Mar 13 07:41:28 UTC 2017

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-nhusb]: moduli
src/crypto/external/bsd/openssl/dist/crypto/ecdsa [netbsd-7-nhusb]:
ecs_ossl.c
src/crypto/external/bsd/openssl/dist/crypto/evp [netbsd-7-nhusb]:
e_rc4_hmac_md5.c
src/distrib/notes/common [netbsd-7-nhusb]: main
src/distrib/sets/lists/base [netbsd-7-nhusb]: mi
src/doc [netbsd-7-nhusb]: 3RDPARTY CHANGES-7.1
src/etc/etc.luna68k [netbsd-7-nhusb]: MAKEDEV.conf
src/external/bsd/bind [netbsd-7-nhusb]: Makefile.inc
src/external/bsd/bind/dist [netbsd-7-nhusb]: CHANGES README
config.guess config.sub srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7-nhusb]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7-nhusb]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7-nhusb]:
root.db
src/external/bsd/bind/dist/contrib/dnsperf-2.1.0.0-1 [netbsd-7-nhusb]:
config.guess config.sub
src/external/bsd/bind/dist/contrib/idn/idnkit-1.0-src [netbsd-7-nhusb]:
config.guess config.sub
src/external/bsd/bind/dist/contrib/nslint-3.0a2 [netbsd-7-nhusb]:
config.guess config.sub
src/external/bsd/bind/dist/doc/arm [netbsd-7-nhusb]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7-nhusb]: api message.c
rdataset.c resolver.c
src/external/bsd/bind/dist/unit/atf-src/admin [netbsd-7-nhusb]:
config.guess config.sub
src/external/bsd/blacklist/bin [netbsd-7-nhusb]: blacklistctl.c
src/external/bsd/tcpdump/bin [netbsd-7-nhusb]: Makefile
src/external/bsd/tcpdump/dist [netbsd-7-nhusb]: CHANGES CREDITS
INSTALL.txt Makefile.in README.md VERSION aclocal.m4 addrtoname.c
addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h
checksum.c config.guess config.h.in config.sub configure
configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c
gmpls.h gmt2local.c gmt2local.h in_cksum.c install-sh interface.h
ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c
machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h
nfsfh.h nlpid.c nlpid.h openflow.h ospf.h oui.c oui.h parsenfsfh.c
pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c
print-802_15_4.c print-ah.c print-aodv.c print-ap1394.c
print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c
print-babel.c print-beep.c print-bfd.c print-bgp.c print-bootp.c
print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c
print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c
print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c
print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c
print-fddi.c print-forces.c print-fr.c print-frag6.c print-geonet.c
print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c
print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c
print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c
print-isoclns.c print-juniper.c print-krb.c print-l2tp.c
print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c
print-lspping.c print-lwapp.c print-lwres.c print-mobile.c
print-mobility.c print-mpcp.c print-mpls.c print-mptcp.c
print-msdp.c print-msnlb.c print-nflog.c print-nfs.c print-ntp.c
print-null.c print-olsr.c print-openflow-1.0.c print-openflow.c
print-ospf.c print-ospf6.c print-otv.c print-pflog.c print-pfsync.c