CVS commit: src/sys/dev/pci
Module Name:src Committed By: pgoyette Date: Tue Oct 25 05:43:40 UTC 2016 Modified Files: src/sys/dev/pci: pci_verbose.h Log Message: Increase max string length for PCI Product names. Affects only kernels with PCIVERBOSE (or corresponding module). We currently have a few product names that exceed the old limit, and this is triggering an SSP check in pci_devinfo(). This commit doesn't directly address the SSP issue, but pushes the can down the road... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/pci_verbose.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/pci_verbose.h diff -u src/sys/dev/pci/pci_verbose.h:1.4 src/sys/dev/pci/pci_verbose.h:1.5 --- src/sys/dev/pci/pci_verbose.h:1.4 Sun Sep 21 14:30:22 2014 +++ src/sys/dev/pci/pci_verbose.h Tue Oct 25 05:43:40 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_verbose.h,v 1.4 2014/09/21 14:30:22 christos Exp $ */ +/* $NetBSD: pci_verbose.h,v 1.5 2016/10/25 05:43:40 pgoyette Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ typedef uint32_t pcireg_t; /* configura #endif #define PCI_VENDORSTR_LEN 64 -#define PCI_PRODUCTSTR_LEN 64 +#define PCI_PRODUCTSTR_LEN 128 DEV_VERBOSE_DECLARE(pci);
CVS commit: src/sys
Module Name:src
Committed By: ozaki-r
Date: Tue Oct 25 02:45:10 UTC 2016
Modified Files:
src/sys/net: route.c route.h
src/sys/netinet: ip_icmp.c
src/sys/netinet6: icmp6.c
Log Message:
Remove unnecessary argument
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/net/route.c
cvs rdiff -u -r1.105 -r1.106 src/sys/net/route.h
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.198 -r1.199 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/net/route.c
diff -u src/sys/net/route.c:1.180 src/sys/net/route.c:1.181
--- src/sys/net/route.c:1.180 Mon Oct 24 03:19:07 2016
+++ src/sys/net/route.c Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.180 2016/10/24 03:19:07 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.181 2016/10/25 02:45:09 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.180 2016/10/24 03:19:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.181 2016/10/25 02:45:09 ozaki-r Exp $");
#include
#ifdef RTFLUSH_DEBUG
@@ -142,7 +142,7 @@ static struct workqueue *rt_timer_wq;
static struct work rt_timer_wk;
static void rt_timer_init(void);
-static void rt_timer_queue_remove_all(struct rttimer_queue *, int);
+static void rt_timer_queue_remove_all(struct rttimer_queue *);
static void rt_timer_remove_all(struct rtentry *);
static void rt_timer_timer(void *);
@@ -1289,15 +1289,14 @@ rt_timer_queue_change(struct rttimer_que
}
static void
-rt_timer_queue_remove_all(struct rttimer_queue *rtq, int destroy)
+rt_timer_queue_remove_all(struct rttimer_queue *rtq)
{
struct rttimer *r;
while ((r = TAILQ_FIRST(>rtq_head)) != NULL) {
LIST_REMOVE(r, rtt_link);
TAILQ_REMOVE(>rtq_head, r, rtt_next);
- if (destroy)
- (*r->rtt_func)(r->rtt_rt, r);
+ (*r->rtt_func)(r->rtt_rt, r);
rtfree(r->rtt_rt);
pool_put(_pool, r);
if (rtq->rtq_count > 0)
@@ -1309,10 +1308,10 @@ rt_timer_queue_remove_all(struct rttimer
}
void
-rt_timer_queue_destroy(struct rttimer_queue *rtq, int destroy)
+rt_timer_queue_destroy(struct rttimer_queue *rtq)
{
- rt_timer_queue_remove_all(rtq, destroy);
+ rt_timer_queue_remove_all(rtq);
LIST_REMOVE(rtq, rtq_link);
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.105 src/sys/net/route.h:1.106
--- src/sys/net/route.h:1.105 Fri Oct 21 09:01:44 2016
+++ src/sys/net/route.h Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.105 2016/10/21 09:01:44 ozaki-r Exp $ */
+/* $NetBSD: route.h,v 1.106 2016/10/25 02:45:09 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -374,7 +374,7 @@ unsigned long
void rt_timer_queue_change(struct rttimer_queue *, long);
struct rttimer_queue *
rt_timer_queue_create(u_int);
-void rt_timer_queue_destroy(struct rttimer_queue *, int);
+void rt_timer_queue_destroy(struct rttimer_queue *);
void rt_newmsg(const int, const struct rtentry *);
struct rtentry *
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.152 src/sys/netinet/ip_icmp.c:1.153
--- src/sys/netinet/ip_icmp.c:1.152 Wed Oct 19 01:10:15 2016
+++ src/sys/netinet/ip_icmp.c Tue Oct 25 02:45:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.152 2016/10/19 01:10:15 ozaki-r Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.153 2016/10/25 02:45:09 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.152 2016/10/19 01:10:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.153 2016/10/25 02:45:09 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1018,8 +1018,7 @@ sysctl_net_inet_icmp_redirtimeout(SYSCTL
*/
if (icmp_redirect_timeout_q != NULL) {
if (icmp_redirtimeout == 0) {
- rt_timer_queue_destroy(icmp_redirect_timeout_q,
- true);
+ rt_timer_queue_destroy(icmp_redirect_timeout_q);
icmp_redirect_timeout_q = NULL;
} else {
rt_timer_queue_change(icmp_redirect_timeout_q,
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.198 src/sys/netinet6/icmp6.c:1.199
--- src/sys/netinet6/icmp6.c:1.198 Tue Oct 18 02:46:21 2016
+++ src/sys/netinet6/icmp6.c Tue Oct 25 02:45:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.198 2016/10/18 02:46:21 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.199 2016/10/25 02:45:10 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.198 2016/10/18 02:46:21 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.199 2016/10/25 02:45:10 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2831,8 +2831,7 @@ sysctl_net_inet6_icmp6_redirtimeout(SYSC
if (icmp6_redirect_timeout_q !=
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Mon Oct 24 21:22:33 UTC 2016
Modified Files:
src/external/gpl3/gdb/dist/gdb: inf-ptrace.c
Log Message:
Don't fail silently if we can't set a breakpoint
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/dist/gdb/inf-ptrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/inf-ptrace.c
diff -u src/external/gpl3/gdb/dist/gdb/inf-ptrace.c:1.13 src/external/gpl3/gdb/dist/gdb/inf-ptrace.c:1.14
--- src/external/gpl3/gdb/dist/gdb/inf-ptrace.c:1.13 Wed Oct 12 16:20:33 2016
+++ src/external/gpl3/gdb/dist/gdb/inf-ptrace.c Mon Oct 24 17:22:33 2016
@@ -498,6 +498,14 @@ inf_ptrace_xfer_partial (struct target_o
/* If the PT_IO request is somehow not supported, fallback on
using PT_WRITE_D/PT_READ_D. Otherwise we will return zero
to indicate failure. */
+ if (errno == EACCES)
+ {
+ fprintf_unfiltered (gdb_stderr, "Cannot set breakpoint at %p (%s). "
+"Is PaX MPROTECT active? See security(7), "
+"sysctl(7), paxctl(8)\n", piod.piod_offs,
+strerror(errno));
+ return TARGET_XFER_E_IO; /* Some other error perhaps? */
+ }
if (errno != EINVAL)
return TARGET_XFER_EOF;
}
CVS commit: src/sys/dev
Module Name:src
Committed By: jdolecek
Date: Mon Oct 24 17:14:27 UTC 2016
Modified Files:
src/sys/dev: dksubr.c dkvar.h
Log Message:
revert 1.90 of dksubr.c and change sc_deferred back to simple pointer; the
global sc_busy flag guards against race so it's not actually necessary, and
this place is unlikely to need to be parallelized in near future
discussed with mlelstv@
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/dksubr.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/dkvar.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.90 src/sys/dev/dksubr.c:1.91
--- src/sys/dev/dksubr.c:1.90 Sat Oct 22 22:32:33 2016
+++ src/sys/dev/dksubr.c Mon Oct 24 17:14:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.90 2016/10/22 22:32:33 jdolecek Exp $ */
+/* $NetBSD: dksubr.c,v 1.91 2016/10/24 17:14:27 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.90 2016/10/22 22:32:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.91 2016/10/24 17:14:27 jdolecek Exp $");
#include
#include
@@ -105,8 +105,6 @@ dk_attach(struct dk_softc *dksc)
/* Attach the device into the rnd source list. */
rnd_attach_source(>sc_rnd_source, dksc->sc_xname,
RND_TYPE_DISK, RND_FLAG_DEFAULT);
-
- TAILQ_INIT(>sc_deferred);
}
void
@@ -380,27 +378,25 @@ dk_start(struct dk_softc *dksc, struct b
*
* So when a diskstart fails, the buffer is saved
* and tried again before the next buffer is fetched.
- * dk_drain() handles flushing of a saved buffer(s).
+ * dk_drain() handles flushing of a saved buffer.
*
* This keeps order of I/O operations, unlike bufq_put.
*/
- for(;;) {
- bp = TAILQ_FIRST(>sc_deferred);
- if (__predict_false(bp != NULL))
- TAILQ_REMOVE(>sc_deferred, bp, b_actq);
- else {
- bp = bufq_get(dksc->sc_bufq);
- if (bp == NULL)
-break;
- }
+ bp = dksc->sc_deferred;
+ dksc->sc_deferred = NULL;
+
+ if (bp == NULL)
+ bp = bufq_get(dksc->sc_bufq);
+
+ while (bp != NULL) {
disk_busy(>sc_dkdev);
mutex_exit(>sc_iolock);
error = dkd->d_diskstart(dksc->sc_dev, bp);
mutex_enter(>sc_iolock);
if (error == EAGAIN) {
- TAILQ_INSERT_TAIL(>sc_deferred, bp, b_actq);
+ dksc->sc_deferred = bp;
disk_unbusy(>sc_dkdev, 0, (bp->b_flags & B_READ));
break;
}
@@ -410,6 +406,8 @@ dk_start(struct dk_softc *dksc, struct b
bp->b_resid = bp->b_bcount;
dk_done1(dksc, bp, false);
}
+
+ bp = bufq_get(dksc->sc_bufq);
}
dksc->sc_busy = false;
@@ -453,8 +451,9 @@ dk_drain(struct dk_softc *dksc)
struct buf *bp;
mutex_enter(>sc_iolock);
- while ((bp = TAILQ_FIRST(>sc_deferred)) != NULL) {
- TAILQ_REMOVE(>sc_deferred, bp, b_actq);
+ bp = dksc->sc_deferred;
+ dksc->sc_deferred = NULL;
+ if (bp != NULL) {
bp->b_error = EIO;
bp->b_resid = bp->b_bcount;
biodone(bp);
Index: src/sys/dev/dkvar.h
diff -u src/sys/dev/dkvar.h:1.26 src/sys/dev/dkvar.h:1.27
--- src/sys/dev/dkvar.h:1.26 Sat Oct 22 22:32:33 2016
+++ src/sys/dev/dkvar.h Mon Oct 24 17:14:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.26 2016/10/22 22:32:33 jdolecek Exp $ */
+/* $NetBSD: dkvar.h,v 1.27 2016/10/24 17:14:27 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ struct dk_softc {
kmutex_t sc_iolock; /* protects buffer queue */
struct bufq_state *sc_bufq; /* buffer queue */
int sc_dtype; /* disk type */
- TAILQ_HEAD(, buf) sc_deferred; /* retry after start failed */
+ struct buf *sc_deferred; /* retry after start failed */
bool sc_busy; /* processing buffers */
krndsource_t sc_rnd_source; /* entropy source */
};
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Oct 24 06:03:52 UTC 2016 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Xeon E7 v4 devices from "Intel Xeon Processor E7 v4 Product Famliy Datasheet Volume 2: Registers". To generate a diff of this commit: cvs rdiff -u -r1.1268 -r1.1269 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.1268 src/sys/dev/pci/pcidevs:1.1269 --- src/sys/dev/pci/pcidevs:1.1268 Thu Oct 20 05:52:09 2016 +++ src/sys/dev/pci/pcidevs Mon Oct 24 06:03:52 2016 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1268 2016/10/20 05:52:09 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1269 2016/10/24 06:03:52 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3774,9 +3774,13 @@ product INTEL XE5_V3_QPI_LINK3 0x2f33 Xe product INTEL XE5_V3_R2PCIE_2 0x2f34 Xeon E5 v3/Core i7-6xxxK PCIe Ring Performance Monitoring product INTEL XE5_V3_RQPI_PM_1 0x2f36 Xeon E5 v3/Core i7-6xxxK QPI Ring Performance Monitoring product INTEL XE5_V3_RQPI_PM_2 0x2f37 Xeon E5 v3/Core i7-6xxxK QPI Ring Interface Monitoring +product INTEL XE7_V4_QPI_LINK2 0x2f40 Xeon E7 v4 QPI Link 2 +product INTEL XE7_V4_RQPI_RING 0x2f41 Xeon E7 v4 QPI Ring Interface product INTEL XE5_V3_IMC1_MAIN 0x2f68 Xeon E5 v3 IMC Main product INTEL XE5_V3_IMC1_TADR1 0x2f6a Xeon E5 v3 IMC Ch 0-1 Target Address Decode Registers product INTEL XE5_V3_IMC1_TADR2 0x2f6b Xeon E5 v3 IMC Ch 0-1 Target Address Decode Registers +product INTEL XE7_V4_IMC1_TADR3 0x2f6c Xeon E7 v4 IMC Ch 0-3 Target Address Decoder +product INTEL XE7_V4_IMC1_TADR4 0x2f6d Xeon E7 v4 IMC Ch 0-3 Target Address Decoder product INTEL XE5_V3_IMC0_RAS 0x2f71 Xeon E5 v3 IMC RAS Registers product INTEL XE5_V3_IMC1_RAS 0x2f79 Xeon E5 v3 IMC Ras Registers product INTEL XE5_V3_UBOX_2 0x2f7d Xeon E5 v3 Scratchpad and Semaphores @@ -3810,6 +3814,10 @@ product INTEL XE5_V3_IMC1_DDRIO_6 0x2fbd product INTEL XE5_V3_IMC1_DDRIO_7 0x2fbe Xeon E5 v3 IMC DDRIO Multicast product INTEL XE5_V3_IMC1_DDRIO_8 0x2fbf Xeon E5 v3 IMC DDRIO Multicast product INTEL XE5_V3_PCU_4 0x2fc0 Xeon E5 v3 Power Control Unit +product INTEL XE7_V4_IMC1_REG3 0x2fd0 Xeon E7 v4 IMC Ch 0-3 Registers +product INTEL XE7_V4_IMC1_REG4 0x2fd1 Xeon E7 v4 IMC Ch 0-3 Registers +product INTEL XE7_V4_IMC1_REG5 0x2fd2 Xeon E7 v4 IMC Ch 0-3 Registers +product INTEL XE7_V4_IMC1_REG6 0x2fd3 Xeon E7 v4 IMC Ch 0-3 Registers product INTEL XE5_V3_IMC1_REG5 0x2fd4 Xeon E5 v3 IMC Ch 0-1 Registers product INTEL XE5_V3_IMC1_REG6 0x2fd5 Xeon E5 v3 IMC Ch 0-1 Registers product INTEL XE5_V3_IMC1_REG7 0x2fd6 Xeon E5 v3 IMC Ch 0-1 Registers
