CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Thu Jan 19 06:58:55 UTC 2017
Modified Files:
src/sys/net: route.c rtsock.c
Log Message:
Disable rt_update mechanism by default
This is a workaround for PR kern/51877. Enable again once the issue
is fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/net/route.c
cvs rdiff -u -r1.199 -r1.200 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/route.c
diff -u src/sys/net/route.c:1.187 src/sys/net/route.c:1.188
--- src/sys/net/route.c:1.187 Tue Jan 17 07:53:06 2017
+++ src/sys/net/route.c Thu Jan 19 06:58:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.187 2017/01/17 07:53:06 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.188 2017/01/19 06:58:55 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.187 2017/01/17 07:53:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.188 2017/01/19 06:58:55 ozaki-r Exp $");
#include
#ifdef RTFLUSH_DEBUG
@@ -288,7 +288,9 @@ static int rtcache_setdst_locked(struct
static void rtcache_ref(struct rtentry *, struct route *);
+#ifdef NET_MPSAFE
static void rt_update_wait(void);
+#endif
static bool rt_wait_ok(void);
static void rt_wait_refcnt(const char *, struct rtentry *, int);
@@ -561,7 +563,9 @@ rtalloc1_locked(const struct sockaddr *d
struct rtentry *rt;
int s;
+#ifdef NET_MPSAFE
retry:
+#endif
s = splsoftnet();
rtbl = rt_gettable(dst->sa_family);
if (rtbl == NULL)
@@ -574,6 +578,7 @@ retry:
if (!ISSET(rt->rt_flags, RTF_UP))
goto miss;
+#ifdef NET_MPSAFE
if (ISSET(rt->rt_flags, RTF_UPDATING) &&
/* XXX updater should be always able to acquire */
curlwp != rt_update_global.lwp) {
@@ -596,6 +601,7 @@ retry:
RTCACHE_WLOCK();
goto retry;
}
+#endif /* NET_MPSAFE */
rt_ref(rt);
RT_REFCNT_TRACE(rt);
@@ -689,7 +695,9 @@ _rt_free(struct rtentry *rt)
* Need to avoid a deadlock on rt_wait_refcnt of update
* and a conflict on psref_target_destroy of update.
*/
+#ifdef NET_MPSAFE
rt_update_wait();
+#endif
RT_REFCNT_TRACE(rt);
KASSERTMSG(rt->rt_refcnt >= 0, "refcnt=%d", rt->rt_refcnt);
@@ -755,6 +763,7 @@ rt_free(struct rtentry *rt)
}
}
+#ifdef NET_MPSAFE
static void
rt_update_wait(void)
{
@@ -767,6 +776,7 @@ rt_update_wait(void)
}
mutex_exit(_update_global.lock);
}
+#endif
int
rt_update_prepare(struct rtentry *rt)
@@ -1964,7 +1974,9 @@ rtcache_validate_locked(struct route *ro
{
struct rtentry *rt = NULL;
+#ifdef NET_MPSAFE
retry:
+#endif
rt = ro->_ro_rt;
rtcache_invariants(ro);
@@ -1975,6 +1987,7 @@ retry:
RT_RLOCK();
if (rt != NULL && (rt->rt_flags & RTF_UP) != 0 && rt->rt_ifp != NULL) {
+#ifdef NET_MPSAFE
if (ISSET(rt->rt_flags, RTF_UPDATING)) {
if (rt_wait_ok()) {
RT_UNLOCK();
@@ -1987,6 +2000,7 @@ retry:
rt = NULL;
}
} else
+#endif
rtcache_ref(rt, ro);
} else
rt = NULL;
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.199 src/sys/net/rtsock.c:1.200
--- src/sys/net/rtsock.c:1.199 Mon Dec 12 03:55:57 2016
+++ src/sys/net/rtsock.c Thu Jan 19 06:58:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.199 2016/12/12 03:55:57 ozaki-r Exp $ */
+/* $NetBSD: rtsock.c,v 1.200 2017/01/19 06:58:55 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,13 +61,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.199 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.200 2017/01/19 06:58:55 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_mpls.h"
#include "opt_compat_netbsd.h"
#include "opt_sctp.h"
+#include "opt_net_mpsafe.h"
#endif
#include
@@ -887,11 +888,15 @@ COMPATNAME(route_output)(struct mbuf *m,
break;
case RTM_CHANGE:
+#ifdef NET_MPSAFE
error = rt_update_prepare(rt);
if (error == 0) {
error = route_output_change(rt, , rtm);
rt_update_finish(rt);
}
+#else
+ error = route_output_change(rt, , rtm);
+#endif
if (error != 0)
goto flush;
/*FALLTHROUGH*/
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Thu Jan 19 06:58:55 UTC 2017 Modified Files: src/sys/net: route.c rtsock.c Log Message: Disable rt_update mechanism by default This is a workaround for PR kern/51877. Enable again once the issue is fixed. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/net/route.c cvs rdiff -u -r1.199 -r1.200 src/sys/net/rtsock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Jan 19 06:56:33 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe_common.c ixgbe_phy.c ixgbe_type.h ixgbe_x540.c ixgbe_x550.c Log Message: Reduce diff against FreeBSD. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_common.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_phy.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe_type.h cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_x540.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_x550.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Jan 19 06:56:33 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe_common.c ixgbe_phy.c
ixgbe_type.h ixgbe_x540.c ixgbe_x550.c
Log Message:
Reduce diff against FreeBSD. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_x550.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.15 src/sys/dev/pci/ixgbe/ix_txrx.c:1.16
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.15 Wed Jan 18 08:15:22 2017
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Jan 19 06:56:33 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.15 2017/01/18 08:15:22 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.16 2017/01/19 06:56:33 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -516,6 +516,7 @@ ixgbe_xmit(struct tx_ring *txr, struct m
return 0;
}
+
/*
*
* Allocate memory for tx_buffer structures. The tx_buffer stores all
@@ -2396,4 +2397,3 @@ tx_fail:
fail:
return (error);
}
-
Index: src/sys/dev/pci/ixgbe/ixgbe_common.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.11 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.12
--- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.11 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_common.c Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_common.c 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_common.c,v 1.11 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_common.c,v 1.12 2017/01/19 06:56:33 msaitoh Exp $*/
#include "ixgbe_common.h"
#include "ixgbe_phy.h"
@@ -201,7 +201,7 @@ bool ixgbe_device_supports_autoneg_fc(st
}
if (!supported) {
- ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
+ ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
"Device %x does not support flow control autoneg",
hw->device_id);
}
Index: src/sys/dev/pci/ixgbe/ixgbe_phy.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.10 src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.10 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_phy.c Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 303032 2016-07-19 17:31:48Z sbruno $*/
-/*$NetBSD: ixgbe_phy.c,v 1.10 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_phy.c,v 1.11 2017/01/19 06:56:33 msaitoh Exp $*/
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -1535,7 +1535,7 @@ s32 ixgbe_identify_sfp_module_generic(st
hw->phy.type = ixgbe_phy_sfp_intel;
break;
default:
- hw->phy.type = ixgbe_phy_sfp_unknown;
+hw->phy.type = ixgbe_phy_sfp_unknown;
break;
}
}
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.17 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.18
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.17 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_type.h 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_type.h,v 1.17 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.18 2017/01/19 06:56:33 msaitoh Exp $*/
#ifndef _IXGBE_TYPE_H_
#define _IXGBE_TYPE_H_
@@ -121,10 +121,10 @@
#define IXGBE_SUBDEV_ID_82599_SFP_LOM 0x06EE
#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A
#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529
+#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D
#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A
#define IXGBE_DEV_ID_82599_QSFP_SF_QP 0x1558
-#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
#define IXGBE_DEV_ID_82599EN_SFP 0x1557
#define IXGBE_SUBDEV_ID_82599EN_SFP_OCP1 0x0001
#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
Index: src/sys/dev/pci/ixgbe/ixgbe_x540.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.8 src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.9
--- src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.8 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_x540.c Thu Jan 19 06:56:33 2017
@@ -82,7 +82,7 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw
/* PHY */
phy->ops.init =
CVS commit: [netbsd-7-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jan 19 06:45:07 UTC 2017 Modified Files: src/sys/dev/usb [netbsd-7-nhusb]: usbdevs Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.680.2.4.2.2 -r1.680.2.4.2.3 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jan 19 06:45:07 UTC 2017 Modified Files: src/sys/dev/usb [netbsd-7-nhusb]: usbdevs Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.680.2.4.2.2 -r1.680.2.4.2.3 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.680.2.4.2.2 src/sys/dev/usb/usbdevs:1.680.2.4.2.3 --- src/sys/dev/usb/usbdevs:1.680.2.4.2.2 Wed Jan 18 08:46:43 2017 +++ src/sys/dev/usb/usbdevs Thu Jan 19 06:45:06 2017 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.680.2.4.2.2 2017/01/18 08:46:43 skrll Exp $ +$NetBSD: usbdevs,v 1.680.2.4.2.3 2017/01/19 06:45:06 skrll Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1368,6 +1368,7 @@ product DLINK RTL8192CU_2 0x3309 RTL8192 product DLINK RTL8192CU_3 0x330a RTL8192CU product DLINK RTL8192CU_4 0x330b RTL8192CU product DLINK DWA131B 0x330d DWA-131 rev B +product DLINK DWA125D1 0x330f DWA-125 rev D1 product DLINK DWL122 0x3700 Wireless DWL122 product DLINK DWLG120 0x3701 DWL-G120 product DLINK DWL120F 0x3702 DWL-120 rev F
CVS commit: [netbsd-7-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jan 19 06:45:34 UTC 2017 Modified Files: src/sys/dev/usb [netbsd-7-nhusb]: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.672.2.4.2.2 -r1.672.2.4.2.3 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.673.2.4.2.2 -r1.673.2.4.2.3 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Jan 19 06:45:34 UTC 2017
Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.672.2.4.2.2 -r1.672.2.4.2.3 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.4.2.2 -r1.673.2.4.2.3 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.4.2.2 src/sys/dev/usb/usbdevs.h:1.672.2.4.2.3
--- src/sys/dev/usb/usbdevs.h:1.672.2.4.2.2 Wed Jan 18 08:46:43 2017
+++ src/sys/dev/usb/usbdevs.h Thu Jan 19 06:45:33 2017
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.680.2.4.2.1 2016/09/06 20:33:09 skrll Exp
+ * NetBSD: usbdevs,v 1.680.2.4.2.3 2017/01/19 06:45:06 skrll Exp
*/
/*
@@ -1375,6 +1375,7 @@
#define USB_PRODUCT_DLINK_RTL8192CU_3 0x330a /* RTL8192CU */
#define USB_PRODUCT_DLINK_RTL8192CU_4 0x330b /* RTL8192CU */
#define USB_PRODUCT_DLINK_DWA131B 0x330d /* DWA-131 rev B */
+#define USB_PRODUCT_DLINK_DWA125D1 0x330f /* DWA-125 rev D1 */
#define USB_PRODUCT_DLINK_DWL122 0x3700 /* Wireless DWL122 */
#define USB_PRODUCT_DLINK_DWLG120 0x3701 /* DWL-G120 */
#define USB_PRODUCT_DLINK_DWL120F 0x3702 /* DWL-120 rev F */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.4.2.2 src/sys/dev/usb/usbdevs_data.h:1.673.2.4.2.3
--- src/sys/dev/usb/usbdevs_data.h:1.673.2.4.2.2 Wed Jan 18 08:46:43 2017
+++ src/sys/dev/usb/usbdevs_data.h Thu Jan 19 06:45:33 2017
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.680.2.4.2.1 2016/09/06 20:33:09 skrll Exp
+ * NetBSD: usbdevs,v 1.680.2.4.2.3 2017/01/19 06:45:06 skrll Exp
*/
/*
@@ -4451,6 +4451,10 @@ const struct usb_product usb_products[]
"DWA-131 rev B",
},
{
+ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA125D1,
+ "DWA-125 rev D1",
+ },
+ {
USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
"Wireless DWL122",
},
@@ -10563,4 +10567,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 2091;
+const int usb_nproducts = 2092;
CVS commit: src/share/misc
Module Name:src
Committed By: riastradh
Date: Thu Jan 19 03:39:16 UTC 2017
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add and tweak some cryptography entries.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 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.171 src/share/misc/acronyms.comp:1.172
--- src/share/misc/acronyms.comp:1.171 Thu Jan 19 03:25:34 2017
+++ src/share/misc/acronyms.comp Thu Jan 19 03:39:16 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.171 2017/01/19 03:25:34 riastradh Exp $
+$NetBSD: acronyms.comp,v 1.172 2017/01/19 03:39:16 riastradh Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -186,6 +186,7 @@ CDP Cisco Discovery Protocol
CDRAM cache dynamic random access memory
CER canonical encoding rules
CF compact flash
+CFB cipher feedback
CFG context-free grammar
CFG control-flow graph
CG control gate
@@ -256,6 +257,7 @@ CSRG Computer Systems Research Group
CSS cascading style sheets
CSV comma-separated values
CTM close to metal
+CTR counter [mode]
CTS clear to send
CUA common user access
CUT coordinated universal time
@@ -347,6 +349,7 @@ DPL descriptor privilege level
DPS Display PostScript
DPST display power savings technology
DRAM dynamic random access memory
+DRBG deterministic random bit generator
DRI direct rendering infrastructure
DRM digital rights management
DRRS display refresh rate switching
@@ -384,16 +387,20 @@ EAP Extensible Authentication Protocol
EAPOL EAP over Lan
EBCDIC Extended Binary Coded Decimal Interchange Code
EBR extended boot record
-EC elliptical curve
+EC elliptic curve
+ECC elliptic curve cryptography
ECC error correction code
-ECDL elliptical curve discrete logarithm
-ECDSA elliptical curve digital signature algorithm
+ECDH elliptic curve Diffie-Hellman
+ECDL elliptic curve discrete logarithm
+ECDLP elliptic curve discrete logarithm problem
+ECDSA elliptic curve digital signature algorithm
ECL emitter-coupled logic
ECN explicit congestion notification
ECP enhanced capability port
ECS enhanced chip set
ECS extended configuration space
EDAT enhanced dynamic acceleration technology
+EdDSA Edwards curve digital signature algorithm
EDGE explicit data graph execution
EDID extended display identification data
EDO extended data out
@@ -442,7 +449,9 @@ FDE full disk encryption
FEA finite element analysis
FEC forward error correction
FET field-effect transistor
+FF finite field
FF form feed
+FFDH finite-field Diffie-Hellman
FFH functional fixed hardware
FFI foreign function interface
FFM focus follows mouse
@@ -454,6 +463,7 @@ FHSS frequency hop spread spectrum
FID frequency identifier
FIFO first in, first out
FILO first in, last out
+FIPS Federal Information Processing Standards
FIR fast infrared
FLOPS floating [point] operations per second
FLOSS free/libre/open source software
@@ -483,6 +493,7 @@ FWS folding white space
GAL generic array logic
GAS generic address structure
GC garbage collector
+GCM Galois counter mode
GCR group-coded recording
GDT global descriptor table
GEM graphics environment manager
@@ -828,6 +839,7 @@ NIDS network intrusion detection system
NIP network interface protocol
NIPS network intrusion prevention system
NIS network information service
+NIST National Institute of Standards and Technology
NLS native language support
NMI non-maskable interrupt
NNTP Network News Transfer Protocol
@@ -836,6 +848,8 @@ NOP no operation
NOS network operating system
NP nondeterministic polynomial time
NRZ non-return to zero
+NSA nation-state adversary
+NSA no such agency
NSA National Security Agency
NTM non-deterministic Turing machine
NTP Network Time Protocol
@@ -851,6 +865,7 @@ OCR optical character recognition
ODCM on-demand clock modulation
ODT on-die termination
OEM original equipment manufacturer
+OFB output feedback
OFDM orthogonal frequency division multiplexing
OFET organic field-effect transistor
OLAP online analytical processing
@@ -981,11 +996,14 @@ PPP Point-to-Point Protocol
PPPOA Point-to-Point Protocol over ATM
PPPOE Point-to-Point Protocol over Ethernet
PPU physics processing unit
-PRBS pseudo-random bit sequence
+PRBS pseudorandom bit sequence
+PRG pseudorandom generator
+PRF pseudorandom function [family]
PRML partial response, maximum likelihood
-PRN pseudo random {noise,number}
-PRNG pseudo random number generator
+PRN pseudorandom {noise,number}
+PRNG pseudorandom number generator
PROM programmable read only memory
+PRP pseudorandom permutation
PSD power spectral density
PSE page size extensions
PSK phase shift keying
@@ -1088,6 +1106,7 @@ RTOS real time operating system
RTS request to send
RTT round trip time
RUP rational unified process
+RW Rabin-Williams
RWM read-write
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Thu Jan 19 03:39:16 UTC 2017 Modified Files: src/share/misc: acronyms.comp Log Message: Add and tweak some cryptography entries. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Thu Jan 19 03:25:34 UTC 2017 Modified Files: src/share/misc: acronyms.comp Log Message: NFCIno functional change intended (Not to be taken literally about this commit!) To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 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.170 src/share/misc/acronyms.comp:1.171 --- src/share/misc/acronyms.comp:1.170 Sun Jan 1 22:44:30 2017 +++ src/share/misc/acronyms.comp Thu Jan 19 03:25:34 2017 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.170 2017/01/01 22:44:30 kamil Exp $ +$NetBSD: acronyms.comp,v 1.171 2017/01/19 03:25:34 riastradh Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -819,6 +819,7 @@ NDFA nondeterministic finite automaton NE numeric error NFA nondeterministic finite automaton NFC near-field communication +NFCI no functional change intended NFS network file system NIA next instruction address NIC network information center
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Thu Jan 19 03:25:34 UTC 2017 Modified Files: src/share/misc: acronyms.comp Log Message: NFCIno functional change intended (Not to be taken literally about this commit!) To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/dkwedge
Module Name:src Committed By: maya Date: Thu Jan 19 00:44:40 UTC 2017 Modified Files: src/sys/dev/dkwedge: dk.c dkwedge_apple.c dkwedge_gpt.c dkwedge_mbr.c Log Message: use a bounded copy. NFCI To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/dev/dkwedge/dk.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dkwedge/dkwedge_apple.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dkwedge/dkwedge_gpt.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dkwedge/dkwedge_mbr.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/dkwedge/dk.c diff -u src/sys/dev/dkwedge/dk.c:1.93 src/sys/dev/dkwedge/dk.c:1.94 --- src/sys/dev/dkwedge/dk.c:1.93 Sat Dec 24 16:39:55 2016 +++ src/sys/dev/dkwedge/dk.c Thu Jan 19 00:44:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $ */ +/* $NetBSD: dk.c,v 1.94 2017/01/19 00:44:40 maya Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.93 2016/12/24 16:39:55 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.94 2017/01/19 00:44:40 maya Exp $"); #ifdef _KERNEL_OPT #include "opt_dkwedge.h" @@ -686,7 +686,7 @@ dkwedge_delall1(struct disk *pdk, bool i mutex_exit(>dk_openlock); return; } - strcpy(dkw.dkw_parent, pdk->dk_name); + strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent)); strlcpy(dkw.dkw_devname, device_xname(sc->sc_dev), sizeof(dkw.dkw_devname)); mutex_exit(>dk_openlock); @@ -733,10 +733,11 @@ dkwedge_list(struct disk *pdk, struct dk sizeof(dkw.dkw_devname)); memcpy(dkw.dkw_wname, sc->sc_wname, sizeof(dkw.dkw_wname)); dkw.dkw_wname[sizeof(dkw.dkw_wname) - 1] = '\0'; - strcpy(dkw.dkw_parent, sc->sc_parent->dk_name); + strlcpy(dkw.dkw_parent, sc->sc_parent->dk_name, + sizeof(dkw.dkw_parent)); dkw.dkw_offset = sc->sc_offset; dkw.dkw_size = sc->sc_size; - strcpy(dkw.dkw_ptype, sc->sc_ptype); + strlcpy(dkw.dkw_ptype, sc->sc_ptype, sizeof(dkw.dkw_ptype)); error = uiomove(, sizeof(dkw), ); if (error) @@ -1497,10 +1498,11 @@ dkioctl(dev_t dev, u_long cmd, void *dat sizeof(dkw->dkw_devname)); memcpy(dkw->dkw_wname, sc->sc_wname, sizeof(dkw->dkw_wname)); dkw->dkw_wname[sizeof(dkw->dkw_wname) - 1] = '\0'; - strcpy(dkw->dkw_parent, sc->sc_parent->dk_name); + strlcpy(dkw->dkw_parent, sc->sc_parent->dk_name, + sizeof(dkw->dkw_parent)); dkw->dkw_offset = sc->sc_offset; dkw->dkw_size = sc->sc_size; - strcpy(dkw->dkw_ptype, sc->sc_ptype); + strlcpy(dkw->dkw_ptype, sc->sc_ptype, sizeof(dkw->dkw_ptype)); break; } Index: src/sys/dev/dkwedge/dkwedge_apple.c diff -u src/sys/dev/dkwedge/dkwedge_apple.c:1.2 src/sys/dev/dkwedge/dkwedge_apple.c:1.3 --- src/sys/dev/dkwedge/dkwedge_apple.c:1.2 Sat Jan 24 02:58:56 2015 +++ src/sys/dev/dkwedge/dkwedge_apple.c Thu Jan 19 00:44:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $ */ +/* $NetBSD: dkwedge_apple.c,v 1.3 2017/01/19 00:44:40 maya Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.2 2015/01/24 02:58:56 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dkwedge_apple.c,v 1.3 2017/01/19 00:44:40 maya Exp $"); #include #ifdef _KERNEL @@ -217,8 +217,8 @@ dkwedge_discover_apple(struct disk *pdk, struct dkwedge_info dkw; - strcpy(dkw.dkw_ptype, ptype); - strcpy(dkw.dkw_parent, pdk->dk_name); + strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype)); + strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent)); dkw.dkw_offset = ae->pmPyPartStart; dkw.dkw_size = ae->pmPartBlkCnt; strlcpy(dkw.dkw_wname, ae->pmPartName, sizeof(dkw.dkw_wname)); Index: src/sys/dev/dkwedge/dkwedge_gpt.c diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.17 src/sys/dev/dkwedge/dkwedge_gpt.c:1.18 --- src/sys/dev/dkwedge/dkwedge_gpt.c:1.17 Thu Apr 28 00:35:24 2016 +++ src/sys/dev/dkwedge/dkwedge_gpt.c Thu Jan 19 00:44:40 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $ */ +/* $NetBSD: dkwedge_gpt.c,v 1.18 2017/01/19 00:44:40 maya Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.18 2017/01/19 00:44:40 maya Exp $"); #include #include @@ -239,16 +239,16 @@ dkwedge_discover_gpt(struct disk *pdk, s /* figure out the type */ ptype = gpt_ptype_guid_to_str(_guid); - strcpy(dkw.dkw_ptype, ptype); + strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype)); - strcpy(dkw.dkw_parent, pdk->dk_name); + strlcpy(dkw.dkw_parent, pdk->dk_name, sizeof(dkw.dkw_parent)); dkw.dkw_offset = le64toh(ent->ent_lba_start); dkw.dkw_size =
CVS commit: src/sys/dev/dkwedge
Module Name:src Committed By: maya Date: Thu Jan 19 00:44:40 UTC 2017 Modified Files: src/sys/dev/dkwedge: dk.c dkwedge_apple.c dkwedge_gpt.c dkwedge_mbr.c Log Message: use a bounded copy. NFCI To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/dev/dkwedge/dk.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dkwedge/dkwedge_apple.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dkwedge/dkwedge_gpt.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dkwedge/dkwedge_mbr.c 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
Module Name:src Committed By: abhinav Date: Wed Jan 18 22:38:00 UTC 2017 Modified Files: src/share/man/man4: rnd.4 Log Message: Fix couple of typos: s/intractible/intractable s/contiuously/continuously To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/rnd.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
Module Name:src Committed By: abhinav Date: Wed Jan 18 22:38:00 UTC 2017 Modified Files: src/share/man/man4: rnd.4 Log Message: Fix couple of typos: s/intractible/intractable s/contiuously/continuously To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/rnd.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/rnd.4 diff -u src/share/man/man4/rnd.4:1.23 src/share/man/man4/rnd.4:1.24 --- src/share/man/man4/rnd.4:1.23 Fri May 6 03:04:14 2016 +++ src/share/man/man4/rnd.4 Wed Jan 18 22:38:00 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: rnd.4,v 1.23 2016/05/06 03:04:14 riastradh Exp $ +.\" $NetBSD: rnd.4,v 1.24 2017/01/18 22:38:00 abhinav Exp $ .\" .\" Copyright (c) 2014 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -120,7 +120,7 @@ that any computationally bounded attacke outputs from uniform random cannot do more than negligibly better than uniform random guessing. .Sh ENTROPY -The operating system contiuously makes observations of hardware +The operating system continuously makes observations of hardware devices, such as network packet timings, disk seek delays, and keystrokes. The observations are combined into a seed for a cryptographic @@ -180,7 +180,7 @@ command queries information about entrop and can control which entropy sources the operating system uses or ignores. .Pp -256 bits of entropy is typically considered intractible to guess with +256 bits of entropy is typically considered intractable to guess with classical computers and with current models of the capabilities of quantum computers. .Pp
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: abhinav Date: Wed Jan 18 22:07:26 UTC 2017 Modified Files: src/sbin/ifconfig: ifconfig.8 Log Message: Fix typo: s/forwared/forwarded Also remove full stop from the date. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sbin/ifconfig/ifconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ifconfig/ifconfig.8 diff -u src/sbin/ifconfig/ifconfig.8:1.111 src/sbin/ifconfig/ifconfig.8:1.112 --- src/sbin/ifconfig/ifconfig.8:1.111 Sun Sep 11 22:10:47 2016 +++ src/sbin/ifconfig/ifconfig.8 Wed Jan 18 22:07:25 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: ifconfig.8,v 1.111 2016/09/11 22:10:47 sevan Exp $ +.\" $NetBSD: ifconfig.8,v 1.112 2017/01/18 22:07:25 abhinav Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd January 7, 2016. +.Dd January 7, 2016 .Dt IFCONFIG 8 .Os .Sh NAME @@ -462,7 +462,7 @@ wireless clients directly (default). .It Fl apbridge .Pq IEEE 802.11 devices only When operating as an access point, pass packets through -the system so that they can be forwared using some other mechanism. +the system so that they can be forwarded using some other mechanism. Disabling the internal bridging is useful when traffic is to be processed with packet filtering. .It Cm pass Ar passphrase
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: abhinav Date: Wed Jan 18 22:07:26 UTC 2017 Modified Files: src/sbin/ifconfig: ifconfig.8 Log Message: Fix typo: s/forwared/forwarded Also remove full stop from the date. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sbin/ifconfig/ifconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: macallan Date: Wed Jan 18 21:33:26 UTC 2017 Modified Files: src/sys/arch/sparc/sparc: cpu.c Log Message: be more specific when identifying SuperSPARC CPUs To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/arch/sparc/sparc/cpu.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/sparc/sparc
Module Name:src
Committed By: macallan
Date: Wed Jan 18 21:33:26 UTC 2017
Modified Files:
src/sys/arch/sparc/sparc: cpu.c
Log Message:
be more specific when identifying SuperSPARC CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/sys/arch/sparc/sparc/cpu.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.248 src/sys/arch/sparc/sparc/cpu.c:1.249
--- src/sys/arch/sparc/sparc/cpu.c:1.248 Fri Jul 25 17:21:32 2014
+++ src/sys/arch/sparc/sparc/cpu.c Wed Jan 18 21:33:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.248 2014/07/25 17:21:32 nakayama Exp $ */
+/* $NetBSD: cpu.c,v 1.249 2017/01/18 21:33:25 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.248 2014/07/25 17:21:32 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.249 2017/01/18 21:33:25 macallan Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -1986,6 +1986,12 @@ struct cpu_conf {
{ CPU_SUN4M, 1, 3, 1, ANY, "CY7C611", _cypress },
{ CPU_SUN4M, 1, 0xe, 1, 7, "RT620/625", _hypersparc },
{ CPU_SUN4M, 1, 0xf, 1, 7, "RT620/625", _hypersparc },
+ { CPU_SUN4M, 4, 0, 0, 1, "SuperSPARC v3", _viking },
+ { CPU_SUN4M, 4, 0, 0, 2, "SuperSPARC v4", _viking },
+ { CPU_SUN4M, 4, 0, 0, 3, "SuperSPARC v5", _viking },
+ { CPU_SUN4M, 4, 0, 0, 8, "SuperSPARC II v1", _viking },
+ { CPU_SUN4M, 4, 0, 0, 10, "SuperSPARC II v2", _viking },
+ { CPU_SUN4M, 4, 0, 0, 12, "SuperSPARC II v3", _viking },
{ CPU_SUN4M, 4, 0, 0, ANY, "TMS390Z50 v0 or TMS390Z55", _viking },
{ CPU_SUN4M, 4, 1, 0, ANY, "TMS390Z50 v1", _viking },
{ CPU_SUN4M, 4, 1, 4, ANY, "TMS390S10", _ms1 },
CVS commit: src/doc/roadmaps
Module Name:src Committed By: skrll Date: Wed Jan 18 18:39:56 UTC 2017 Modified Files: src/doc/roadmaps: ports Log Message: Remove xhci... It exists. It works (ymmv). It can be improved, but it doesn't needed an entry here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/doc/roadmaps/ports 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/ports diff -u src/doc/roadmaps/ports:1.3 src/doc/roadmaps/ports:1.4 --- src/doc/roadmaps/ports:1.3 Wed Jan 18 18:22:13 2017 +++ src/doc/roadmaps/ports Wed Jan 18 18:39:56 2017 @@ -1,4 +1,4 @@ -$NetBSD: ports,v 1.3 2017/01/18 18:22:13 dholland Exp $ +NetBSD: ports,v 1.3 2017/01/18 18:22:13 dholland Exp $ NetBSD Ports Roadmap @@ -10,15 +10,14 @@ The following elements, projects, and go priorities for the project: 1. EFI boot for x86 - 2. xhci support - 3. Get arm64/aarch64 working + 2. Get arm64/aarch64 working The following elements, projects, and goals are not strategic priorities but are still important undertakings worth doing: - 4. USER_LDT for amd64 - 5. riscv and/or or1k ports - 6. cheri port + 3. USER_LDT for amd64 + 4. riscv and/or or1k ports + 5. cheri port The following elements, projects, and goals are perhaps less pressing; this doesn't mean one shouldn't work on them but the expected payoff @@ -42,18 +41,7 @@ it done, though it's not yet committed. - Contact agc for further information. - 2. xhci support - -xhci is also critical for new x86 hardware. Enough has been committed -to be able to use USB on xhci machines; but (AIUI) the USB 3.0 -specific features mostly aren't implemented yet. We would like to get -this pulled into -7 - - - As of January 2017 ... who is working on this? XXX - - Contact jakllsch (?) for further information. - - - 3. Get arm64/aarch64 working + 2. Get arm64/aarch64 working We have some arm64 code but apparently it doesn't really work yet. @@ -62,7 +50,7 @@ We have some arm64 code but apparently i - Contact: ? (XXX) - 4. USER_LDT for amd64 + 3. USER_LDT for amd64 The amd64 port is lacking the USER_LDT bits needed to be able to run Wine. Adding these bits does not seem to be a particularly large job @@ -74,7 +62,7 @@ doesn't get done. Money's been offered i - Contact ? (XXX) for further information. - 5. riscv and/or or1k ports + 4. riscv and/or or1k ports We have some riscv code and a bit of or1k code, but neither is done. @@ -83,7 +71,7 @@ We have some riscv code and a bit of or1 - Contact matt@ for further information. - 6. cheri port + 5. cheri port http://cheri-cpu.org There are a number of reasons to tackle this; it will serve as a code
CVS commit: src/doc/roadmaps
Module Name:src Committed By: skrll Date: Wed Jan 18 18:39:56 UTC 2017 Modified Files: src/doc/roadmaps: ports Log Message: Remove xhci... It exists. It works (ymmv). It can be improved, but it doesn't needed an entry here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/doc/roadmaps/ports Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc/roadmaps
Module Name:src Committed By: dholland Date: Wed Jan 18 18:22:13 UTC 2017 Modified Files: src/doc/roadmaps: ports Log Message: Withdraw the 36-bit port item. While there's always interest in it when the idea comes up on the list, there's also a feeling that quixotic and/or crazy projects shouldn't be on roadmaps. Which seems reasonable. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/doc/roadmaps/ports 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/ports diff -u src/doc/roadmaps/ports:1.2 src/doc/roadmaps/ports:1.3 --- src/doc/roadmaps/ports:1.2 Fri Jan 13 13:40:44 2017 +++ src/doc/roadmaps/ports Wed Jan 18 18:22:13 2017 @@ -1,4 +1,4 @@ -$NetBSD: ports,v 1.2 2017/01/13 13:40:44 reinoud Exp $ +$NetBSD: ports,v 1.3 2017/01/18 18:22:13 dholland Exp $ NetBSD Ports Roadmap @@ -24,7 +24,7 @@ The following elements, projects, and go this doesn't mean one shouldn't work on them but the expected payoff is perhaps less than for other things: - 7. pdp10/risc36/odd-bitsize ports + [none presently] Explanations @@ -88,19 +88,3 @@ We have some riscv code and a bit of or1 http://cheri-cpu.org There are a number of reasons to tackle this; it will serve as a code quality lever. Also there's already a FreeBSD port to steal from. - - - 7. pdp10/risc36/odd-bitsize ports - -There's been a fair amount of loose talk over the years about doing a -port to a machine that's got 9-bit bytes, or is word-addressed, or -both. The PDP-10 is one such target; it's also been observed that a -more modern architecture would probably be more likely to allow a -vaguely performant FPGA implementation, and something tentatively -called "risc36" was conceived. - -This is both a quixotic retrocomputing project and also a quixotic -code quality project: making the NetBSD code base work on either -word-addressed machines or 9-bit/36-bit machines or both would be good -for it. However, it's also a rather large undertaking. -
CVS commit: src/doc/roadmaps
Module Name:src Committed By: dholland Date: Wed Jan 18 18:22:13 UTC 2017 Modified Files: src/doc/roadmaps: ports Log Message: Withdraw the 36-bit port item. While there's always interest in it when the idea comes up on the list, there's also a feeling that quixotic and/or crazy projects shouldn't be on roadmaps. Which seems reasonable. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/doc/roadmaps/ports Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: riastradh Date: Wed Jan 18 17:29:52 UTC 2017 Modified Files: src/share/misc: acronyms Log Message: DNFT: do not feed troll To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: riastradh
Date: Wed Jan 18 17:29:52 UTC 2017
Modified Files:
src/share/misc: acronyms
Log Message:
DNFT: do not feed troll
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/share/misc/acronyms
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
diff -u src/share/misc/acronyms:1.250 src/share/misc/acronyms:1.251
--- src/share/misc/acronyms:1.250 Mon Dec 12 20:41:49 2016
+++ src/share/misc/acronyms Wed Jan 18 17:29:52 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.250 2016/12/12 20:41:49 riastradh Exp $
+$NetBSD: acronyms,v 1.251 2017/01/18 17:29:52 riastradh Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -108,6 +108,7 @@ DM dungeon master
DMZ demilitarized zone
DND do not disturb
DNF did not finish
+DNFT do not feed troll
DOA dead on arrival
DRY don't repeat yourself
DSTM don't shoot the messenger
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: kamil Date: Wed Jan 18 12:15:21 UTC 2017 Modified Files: src/sys/arch/x86/x86: dbregs.c Log Message: Fix bug with swapped event type and register that fired in hw watchpoints Swap bits for DR_EVENT_MASK and DR_REGISTER_MASK. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/dbregs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/dbregs.c diff -u src/sys/arch/x86/x86/dbregs.c:1.3 src/sys/arch/x86/x86/dbregs.c:1.4 --- src/sys/arch/x86/x86/dbregs.c:1.3 Wed Jan 18 05:48:16 2017 +++ src/sys/arch/x86/x86/dbregs.c Wed Jan 18 12:15:21 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: dbregs.c,v 1.3 2017/01/18 05:48:16 kamil Exp $ */ +/* $NetBSD: dbregs.c,v 1.4 2017/01/18 12:15:21 kamil Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -144,8 +144,8 @@ clear_x86_hw_watchpoints(void) } /* Local temporary bitfield concept to compose event and register that fired */ -#define DR_EVENT_MASK __BITS(15,8) -#define DR_REGISTER_MASK __BITS(7,0) +#define DR_EVENT_MASK __BITS(7,0) +#define DR_REGISTER_MASK __BITS(15,8) int user_trap_x86_hw_watchpoint(void)
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: kamil Date: Wed Jan 18 12:15:21 UTC 2017 Modified Files: src/sys/arch/x86/x86: dbregs.c Log Message: Fix bug with swapped event type and register that fired in hw watchpoints Swap bits for DR_EVENT_MASK and DR_REGISTER_MASK. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/dbregs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 10:22:09 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_osdep.h ixv.c Log Message: Now we can use multiqueue. It's default on ixg(4). Not yet for ixv(4). To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe_osdep.h cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Jan 18 10:22:09 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_osdep.h ixv.c
Log Message:
Now we can use multiqueue. It's default on ixg(4). Not yet for ixv(4).
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.61 src/sys/dev/pci/ixgbe/ixgbe.c:1.62
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.61 Wed Jan 18 10:18:40 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jan 18 10:22:09 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.61 2017/01/18 10:18:40 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.62 2017/01/18 10:22:09 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -337,7 +337,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix
* number of cpus with a max of 8. This
* can be overriden manually here.
*/
-static int ixgbe_num_queues = 1;
+static int ixgbe_num_queues = 0;
SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, _num_queues, 0,
"Number of queues to configure, 0 indicates autoconfigure");
@@ -2702,19 +2702,19 @@ ixgbe_allocate_msix(struct adapter *adap
aprint_normal_dev(dev, "for TX/RX, interrupting at %s",
intrstr);
if (error == 0) {
-#ifdef IXGBE_DEBUG
+#if 1 /* def IXGBE_DEBUG */
#ifdef RSS
aprintf_normal(
- ", bound RSS bucket %d to CPU %d\n",
+ ", bound RSS bucket %d to CPU %d",
i, cpu_id);
#else
aprint_normal(
- ", bound queue %d to cpu %d\n",
+ ", bound queue %d to cpu %d",
i, cpu_id);
#endif
#endif /* IXGBE_DEBUG */
- } else
- aprint_normal("\n");
+ }
+ aprint_normal("\n");
#ifndef IXGBE_LEGACY_TX
txr->txq_si = softint_establish(SOFTINT_NET,
ixgbe_deferred_mq_start, txr);
@@ -2795,7 +2795,8 @@ ixgbe_setup_msix(struct adapter *adapter
/* First try MSI/X */
msgs = pci_msix_count(adapter->osdep.pc, adapter->osdep.tag);
- if (msgs < IXG_MSIX_NINTR)
+ msgs = MIN(msgs, IXG_MAX_NINTR);
+ if (msgs < 2)
goto msi;
adapter->msix_mem = (void *)1; /* XXX */
Index: src/sys/dev/pci/ixgbe/ixgbe_osdep.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.16 src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.17
--- src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.16 Mon Dec 5 10:05:11 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_osdep.h Wed Jan 18 10:22:09 2017
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_osdep.h 294734 2016-01-25 16:18:53Z smh $*/
-/*$NetBSD: ixgbe_osdep.h,v 1.16 2016/12/05 10:05:11 msaitoh Exp $*/
+/*$NetBSD: ixgbe_osdep.h,v 1.17 2017/01/18 10:22:09 msaitoh Exp $*/
#ifndef _IXGBE_OS_H_
#define _IXGBE_OS_H_
@@ -149,14 +149,8 @@ typedef uint64_t u64;
#define le16_to_cpu
-/*
- * This device driver divides interrupt to TX, RX and link state.
- * Each MSI-X vector indexes are below.
- */
-#define IXG_MSIX_NINTR 2
-#define IXG_MSIX_TXRXINTR_IDX 0
-#define IXG_MSIX_LINKINTR_IDX 1
-#define IXG_MAX_NINTR IXG_MSIX_NINTR
+/* This device driver's max interrupt numbers. */
+#define IXG_MAX_NINTR 64
#if __FreeBSD_version < 80
#if defined(__i386__) || defined(__amd64__)
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.31 src/sys/dev/pci/ixgbe/ixv.c:1.32
--- src/sys/dev/pci/ixgbe/ixv.c:1.31 Thu Jan 5 05:53:23 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Jan 18 10:22:09 2017
@@ -31,7 +31,7 @@
**/
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.31 2017/01/05 05:53:23 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.32 2017/01/18 10:22:09 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1348,7 +1348,7 @@ ixv_allocate_msix(struct adapter *adapte
tag = adapter->osdep.tag;
if (pci_msix_alloc_exact(pa,
- >osdep.intrs, IXG_MSIX_NINTR) != 0)
+ >osdep.intrs, IXG_MAX_NINTR) != 0)
return (ENXIO);
kcpuset_create(, false);
@@ -1457,16 +1457,24 @@ ixv_setup_msix(struct adapter *adapter)
device_t dev = adapter->dev;
int want, msgs;
- /*
- ** Want two vectors: one for a queue,
- ** plus an additional for mailbox.
- */
+ /* Must have at least 2 MSIX vectors */
msgs = pci_msix_count(adapter->osdep.pc, adapter->osdep.tag);
- if (msgs < IXG_MSIX_NINTR) {
+ if (msgs < 2) {
aprint_error_dev(dev,"MSIX config error\n");
return (ENXIO);
}
- want = MIN(msgs, IXG_MSIX_NINTR);
+ msgs = MIN(msgs, IXG_MAX_NINTR);
+
+ /*
+ ** Want vectors for the queues,
+ ** plus an additional for mailbox.
+ */
+ want =
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Jan 18 10:18:40 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h
Log Message:
Fix sysctl stuff. Make the top sysctl node and keep the pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.60 src/sys/dev/pci/ixgbe/ixgbe.c:1.61
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.60 Wed Jan 18 08:23:03 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jan 18 10:18:40 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.60 2017/01/18 08:23:03 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.61 2017/01/18 10:18:40 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -4437,6 +4437,9 @@ ixgbe_sysctl_instance(struct adapter *ad
int rc;
const struct sysctlnode *rnode;
+ if (adapter->sysctltop != NULL)
+ return adapter->sysctltop;
+
log = >sysctllog;
dvname = device_xname(adapter->dev);
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.18 src/sys/dev/pci/ixgbe/ixgbe.h:1.19
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.18 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.h Wed Jan 18 10:18:40 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.h 303890 2016-08-09 19:32:06Z dumbbell $*/
-/*$NetBSD: ixgbe.h,v 1.18 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe.h,v 1.19 2017/01/18 10:18:40 msaitoh Exp $*/
#ifndef _IXGBE_H_
@@ -617,6 +617,7 @@ struct adapter {
u64 noproto;
#endif
struct sysctllog *sysctllog;
+ const struct sysctlnode *sysctltop;
ixgbe_extmem_head_t jcl_head;
};
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 10:18:40 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h Log Message: Fix sysctl stuff. Make the top sysctl node and keep the pointer. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 08:23:03 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Use 64bit DMA tag. If not, a lot of bounce buffer is allocated. Fixes PR#49968 reported by Hauke. XXX pullup-[67]. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 08:23:03 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Use 64bit DMA tag. If not, a lot of bounce buffer is allocated. Fixes PR#49968 reported by Hauke. XXX pullup-[67]. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.59 src/sys/dev/pci/ixgbe/ixgbe.c:1.60 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.59 Thu Jan 5 05:53:23 2017 +++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jan 18 08:23:03 2017 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/ -/*$NetBSD: ixgbe.c,v 1.59 2017/01/05 05:53:23 msaitoh Exp $*/ +/*$NetBSD: ixgbe.c,v 1.60 2017/01/18 08:23:03 msaitoh Exp $*/ #include "opt_inet.h" #include "opt_inet6.h" @@ -466,7 +466,10 @@ ixgbe_attach(device_t parent, device_t d hw = >hw; adapter->osdep.pc = pa->pa_pc; adapter->osdep.tag = pa->pa_tag; - adapter->osdep.dmat = pa->pa_dmat; + if (pci_dma64_available(pa)) + adapter->osdep.dmat = pa->pa_dmat64; + else + adapter->osdep.dmat = pa->pa_dmat; adapter->osdep.attached = false; ent = ixgbe_lookup(pa);
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 08:15:22 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Call ixgbe_free_transmit_buffers instead of ixgbe_free_transmit_structures() in ixgbe_allocate_transmit_buffers()... To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ix_txrx.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/ixgbe/ix_txrx.c diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.14 src/sys/dev/pci/ixgbe/ix_txrx.c:1.15 --- src/sys/dev/pci/ixgbe/ix_txrx.c:1.14 Thu Jan 5 05:53:23 2017 +++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Jan 18 08:15:22 2017 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/ -/*$NetBSD: ix_txrx.c,v 1.14 2017/01/05 05:53:23 msaitoh Exp $*/ +/*$NetBSD: ix_txrx.c,v 1.15 2017/01/18 08:15:22 msaitoh Exp $*/ #include "opt_inet.h" #include "opt_inet6.h" @@ -567,7 +567,11 @@ ixgbe_allocate_transmit_buffers(struct t return 0; fail: /* We free all, it handles case where we are in the middle */ +#if 0 /* XXX was FreeBSD */ ixgbe_free_transmit_structures(adapter); +#else + ixgbe_free_transmit_buffers(txr); +#endif return (error); }
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jan 18 08:15:22 UTC 2017 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Call ixgbe_free_transmit_buffers instead of ixgbe_free_transmit_structures() in ixgbe_allocate_transmit_buffers()... To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ix_txrx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
