CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Oct 23 01:43:56 UTC 2023 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC Log Message: eqos(4): Disable eqos(4) by default because it's not stable on x86. To generate a diff of this commit: cvs rdiff -u -r1.607 -r1.608 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1251 -r1.1252 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Mon Oct 23 01:43:56 UTC 2023 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC Log Message: eqos(4): Disable eqos(4) by default because it's not stable on x86. To generate a diff of this commit: cvs rdiff -u -r1.607 -r1.608 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1251 -r1.1252 src/sys/arch/i386/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.607 src/sys/arch/amd64/conf/GENERIC:1.608 --- src/sys/arch/amd64/conf/GENERIC:1.607 Fri Oct 20 10:09:43 2023 +++ src/sys/arch/amd64/conf/GENERIC Mon Oct 23 01:43:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.607 2023/10/20 10:09:43 msaitoh Exp $ +# $NetBSD: GENERIC,v 1.608 2023/10/23 01:43:56 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.607 $" +#ident "GENERIC-$Revision: 1.608 $" maxusers 64 # estimated number of users @@ -827,7 +827,7 @@ dge* at pci? dev ? function ? # Intel 82 ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet -eqos* at pci? dev ? function ? # DesignWare Ethernet QoS +#eqos* at pci? dev ? function ? # DesignWare Ethernet QoS et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit ex* at pci? dev ? function ? # 3Com 90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1251 src/sys/arch/i386/conf/GENERIC:1.1252 --- src/sys/arch/i386/conf/GENERIC:1.1251 Fri Oct 20 10:09:44 2023 +++ src/sys/arch/i386/conf/GENERIC Mon Oct 23 01:43:55 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1251 2023/10/20 10:09:44 msaitoh Exp $ +# $NetBSD: GENERIC,v 1.1252 2023/10/23 01:43:55 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1251 $" +#ident "GENERIC-$Revision: 1.1252 $" maxusers 64 # estimated number of users @@ -982,7 +982,7 @@ bwfm* at pci? dev ? function ? # Broadco dge* at pci? dev ? function ? # Intel 82597 10GbE LR ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet -eqos* at pci? dev ? function ? # DesignWare Ethernet QoS +#eqos* at pci? dev ? function ? # DesignWare Ethernet QoS et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit ex* at pci? dev ? function ? # 3Com 3c90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Oct 22 21:30:32 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_direct_abstract.c
Log Message:
tests/lint: test GCC attributes after abstract function type
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c
diff -u src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c:1.10 src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c:1.11
--- src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c:1.10 Wed Aug 2 21:11:35 2023
+++ src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c Sun Oct 22 21:30:32 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_direct_abstract.c,v 1.10 2023/08/02 21:11:35 rillig Exp $ */
+/* $NetBSD: decl_direct_abstract.c,v 1.11 2023/10/22 21:30:32 rillig Exp $ */
# 3 "decl_direct_abstract.c"
/*
@@ -215,3 +215,12 @@ int prototype_named_32_return_04[-1000 -
/* expect+2: error: cannot take size/alignment of function type 'function(struct typedef a32) returning struct typedef a08' [144] */
/* expect+1: error: negative array dimension (-1000) [20] */
int prototype_named_32_return_08[-1000 - (int)sizeof(a08(a32 arg))];
+
+void
+abstract_decl_param_list_with_attributes(void)
+{
+ typedef int unspecified_parameters(void (*)() __attribute__(()));
+ typedef int no_parameters(void (*)(void) __attribute__(()));
+ typedef int single_parameter(void (*)(int) __attribute__(()));
+ typedef int several_parameters(void (*)(int, int) __attribute__(()));
+}
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Oct 22 21:30:32 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: decl_direct_abstract.c Log Message: tests/lint: test GCC attributes after abstract function type To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 22 21:03:08 UTC 2023 Modified Files: src/tests/usr.bin/indent: lsym_unary_op.c opt_bad.c Log Message: tests/indent: clean up comments To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/indent/lsym_unary_op.c \ src/tests/usr.bin/indent/opt_bad.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/indent
Module Name:src Committed By: rillig Date: Sun Oct 22 21:03:08 UTC 2023 Modified Files: src/tests/usr.bin/indent: lsym_unary_op.c opt_bad.c Log Message: tests/indent: clean up comments To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/indent/lsym_unary_op.c \ src/tests/usr.bin/indent/opt_bad.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/indent/lsym_unary_op.c diff -u src/tests/usr.bin/indent/lsym_unary_op.c:1.12 src/tests/usr.bin/indent/lsym_unary_op.c:1.13 --- src/tests/usr.bin/indent/lsym_unary_op.c:1.12 Sat Jun 17 22:09:24 2023 +++ src/tests/usr.bin/indent/lsym_unary_op.c Sun Oct 22 21:03:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: lsym_unary_op.c,v 1.12 2023/06/17 22:09:24 rillig Exp $ */ +/* $NetBSD: lsym_unary_op.c,v 1.13 2023/10/22 21:03:08 rillig Exp $ */ /* * Tests for the token lsym_unary_op, which represents a unary operator. @@ -50,8 +50,8 @@ int same = + + + + +- - - - -3; /* - * A special kind of unary operator is '->', which additionally suppresses the - * next space. + * The operator '->' is special as it additionally suppresses the space between + * the operator and its right operand. */ //indent input int var = p -> member; Index: src/tests/usr.bin/indent/opt_bad.c diff -u src/tests/usr.bin/indent/opt_bad.c:1.12 src/tests/usr.bin/indent/opt_bad.c:1.13 --- src/tests/usr.bin/indent/opt_bad.c:1.12 Mon Jun 26 14:54:40 2023 +++ src/tests/usr.bin/indent/opt_bad.c Sun Oct 22 21:03:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: opt_bad.c,v 1.12 2023/06/26 14:54:40 rillig Exp $ */ +/* $NetBSD: opt_bad.c,v 1.13 2023/10/22 21:03:08 rillig Exp $ */ /* * Tests for the options '-bad' and '-nbad'. @@ -174,7 +174,7 @@ initializer_with_blank(void) /* comment */ int decl2; // $ If the declaration is followed by a '}' that terminates the block - // $ statement, * there is no need for a blank line before the '}'. + // $ statement, there is no need for a blank line before the '}'. } //indent end
CVS commit: src/external/bsd/top/dist/machine
Module Name:src Committed By: simonb Date: Sun Oct 22 14:44:09 UTC 2023 Modified Files: src/external/bsd/top/dist/machine: m_netbsd.c Log Message: Remove extraneous comma after pool info To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/bsd/top/dist/machine/m_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/top/dist/machine
Module Name:src
Committed By: simonb
Date: Sun Oct 22 14:44:09 UTC 2023
Modified Files:
src/external/bsd/top/dist/machine: m_netbsd.c
Log Message:
Remove extraneous comma after pool info
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/top/dist/machine/m_netbsd.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/bsd/top/dist/machine/m_netbsd.c
diff -u src/external/bsd/top/dist/machine/m_netbsd.c:1.27 src/external/bsd/top/dist/machine/m_netbsd.c:1.28
--- src/external/bsd/top/dist/machine/m_netbsd.c:1.27 Sat Oct 21 06:30:23 2023
+++ src/external/bsd/top/dist/machine/m_netbsd.c Sun Oct 22 14:44:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: m_netbsd.c,v 1.27 2023/10/21 06:30:23 mrg Exp $ */
+/* $NetBSD: m_netbsd.c,v 1.28 2023/10/22 14:44:09 simonb Exp $ */
/*
* top - a top users display for Unix
@@ -45,12 +45,12 @@
* Andrew Doran
*
*
- * $Id: m_netbsd.c,v 1.27 2023/10/21 06:30:23 mrg Exp $
+ * $Id: m_netbsd.c,v 1.28 2023/10/22 14:44:09 simonb Exp $
*/
#include
#ifndef lint
-__RCSID("$NetBSD: m_netbsd.c,v 1.27 2023/10/21 06:30:23 mrg Exp $");
+__RCSID("$NetBSD: m_netbsd.c,v 1.28 2023/10/22 14:44:09 simonb Exp $");
#endif
#include
@@ -179,7 +179,7 @@ const char *memorynames[] = {
long swap_stats[9];
const char *swapnames[] = {
- "K Total, ", "K Used, ", "K Free ", " Pools: ", "K Used, ",
+ "K Total, ", "K Used, ", "K Free ", " Pools: ", "K Used ",
" Network: ", "K In, ", "K Out, ",
NULL
};
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 22 06:26:19 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #434 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.145 src/doc/CHANGES-10.0:1.1.2.146 --- src/doc/CHANGES-10.0:1.1.2.145 Sat Oct 21 13:01:00 2023 +++ src/doc/CHANGES-10.0 Sun Oct 22 06:26:19 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.145 2023/10/21 13:01:00 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.146 2023/10/22 06:26:19 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12646,3 +12646,8 @@ sys/arch/x86/x86/genfb_machdep.c (apply Fixes fallout from ticket #432. [bouyer, ticket #433] +sys/dev/pci/if_rge.c1.26,1.28 + + rge(4): properly handle allocation failures in rx interrupts. + [mrg, ticket #434] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 22 06:26:19 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #434 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 22 06:25:32 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: if_rge.c Log Message: Pull up following revision(s) (requested by mrg in ticket #434): sys/dev/pci/if_rge.c: revision 1.26 sys/dev/pci/if_rge.c: revision 1.28 rge(4): check for all errors in rx buffer allocation should fix a crash seen by by Chavdar Ivanov reported on current-users. move the rx and tx list clean up into their own functions, and call the rx clean up function from the init function if something fails. this should fix a potential leak in this case, and generally frees up memory that won't be used without a successful init phase again. slight application of 'static', much more could be done. rge: properly handle mbuf allocation failures in rx interrupts several changes that should fix crashes seen after an mbuf allocation failure: - create RX ring dma maps with BUS_DMA_ALLOCNOW, so that any future bus_dmamap_load*() call will succeed. this avoids one error case in rge_newbuf(), that similar cases in eg wm(4) actually call panic for now (i think this idea can be copied into wm(4) as well.) - extract the RX descriptor set into a common function that both rge_newbuf() and rge_rxeof() can both use. it's almost identical to the old rge_discard_rxbuf() except it also sets the rge_addr (this is needed for the newbuf case.) - move the bus_dmamap_unload() into rge_newbuf(), so that the existing mbuf will remain mapped until a new mbuf is allocated. (this part is what should fix crashes seen by wiz and Chavdar, as the unload follow by sync is what triggers the assert in x86 bus_dma. without the assert, it will would have shortly triggered a page fault.) remove the assignment to NULL for the rxq mbuf pointer, it is required for reload. - add a couple of missing if_statinc() calls. tested on amd64 and arm64. To generate a diff of this commit: cvs rdiff -u -r1.24.4.2 -r1.24.4.3 src/sys/dev/pci/if_rge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Oct 22 06:25:32 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: if_rge.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #434):
sys/dev/pci/if_rge.c: revision 1.26
sys/dev/pci/if_rge.c: revision 1.28
rge(4): check for all errors in rx buffer allocation
should fix a crash seen by by Chavdar Ivanov reported on current-users.
move the rx and tx list clean up into their own functions, and call the
rx clean up function from the init function if something fails. this
should fix a potential leak in this case, and generally frees up memory
that won't be used without a successful init phase again.
slight application of 'static', much more could be done.
rge: properly handle mbuf allocation failures in rx interrupts
several changes that should fix crashes seen after an mbuf
allocation failure:
- create RX ring dma maps with BUS_DMA_ALLOCNOW, so that any
future bus_dmamap_load*() call will succeed. this avoids one
error case in rge_newbuf(), that similar cases in eg wm(4)
actually call panic for now (i think this idea can be copied
into wm(4) as well.)
- extract the RX descriptor set into a common function that
both rge_newbuf() and rge_rxeof() can both use. it's almost
identical to the old rge_discard_rxbuf() except it also sets
the rge_addr (this is needed for the newbuf case.)
- move the bus_dmamap_unload() into rge_newbuf(), so that the
existing mbuf will remain mapped until a new mbuf is allocated.
(this part is what should fix crashes seen by wiz and Chavdar,
as the unload follow by sync is what triggers the assert in
x86 bus_dma. without the assert, it will would have shortly
triggered a page fault.) remove the assignment to NULL for
the rxq mbuf pointer, it is required for reload.
- add a couple of missing if_statinc() calls.
tested on amd64 and arm64.
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.2 -r1.24.4.3 src/sys/dev/pci/if_rge.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/if_rge.c
diff -u src/sys/dev/pci/if_rge.c:1.24.4.2 src/sys/dev/pci/if_rge.c:1.24.4.3
--- src/sys/dev/pci/if_rge.c:1.24.4.2 Sat Oct 14 06:59:43 2023
+++ src/sys/dev/pci/if_rge.c Sun Oct 22 06:25:32 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rge.c,v 1.24.4.2 2023/10/14 06:59:43 martin Exp $ */
+/* $NetBSD: if_rge.c,v 1.24.4.3 2023/10/22 06:25:32 martin Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.24.4.2 2023/10/14 06:59:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.24.4.3 2023/10/22 06:25:32 martin Exp $");
#include
@@ -106,9 +106,10 @@ int rge_ifmedia_upd(struct ifnet *);
void rge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
int rge_allocmem(struct rge_softc *);
int rge_newbuf(struct rge_softc *, int);
-void rge_discard_rxbuf(struct rge_softc *, int);
-int rge_rx_list_init(struct rge_softc *);
-void rge_tx_list_init(struct rge_softc *);
+static int rge_rx_list_init(struct rge_softc *);
+static void rge_rx_list_fini(struct rge_softc *);
+static void rge_tx_list_init(struct rge_softc *);
+static void rge_tx_list_fini(struct rge_softc *);
int rge_rxeof(struct rge_softc *);
int rge_txeof(struct rge_softc *);
void rge_reset(struct rge_softc *);
@@ -650,7 +651,7 @@ rge_init(struct ifnet *ifp)
{
struct rge_softc *sc = ifp->if_softc;
uint32_t val;
- int i;
+ unsigned i;
rge_stop(ifp, 0);
@@ -661,11 +662,12 @@ rge_init(struct ifnet *ifp)
RGE_WRITE_2(sc, RGE_RXMAXSIZE, RGE_JUMBO_FRAMELEN);
/* Initialize RX descriptors list. */
- if (rge_rx_list_init(sc) == ENOBUFS) {
+ int error = rge_rx_list_init(sc);
+ if (error != 0) {
device_printf(sc->sc_dev,
"init failed: no memory for RX buffers\n");
rge_stop(ifp, 1);
- return (ENOBUFS);
+ return error;
}
/* Initialize TX descriptors. */
@@ -836,7 +838,6 @@ void
rge_stop(struct ifnet *ifp, int disable)
{
struct rge_softc *sc = ifp->if_softc;
- int i;
callout_halt(>sc_timeout, NULL);
@@ -867,25 +868,8 @@ rge_stop(struct ifnet *ifp, int disable)
sc->rge_head = sc->rge_tail = NULL;
}
- /* Free the TX list buffers. */
- for (i = 0; i < RGE_TX_LIST_CNT; i++) {
- if (sc->rge_ldata.rge_txq[i].txq_mbuf != NULL) {
- bus_dmamap_unload(sc->sc_dmat,
- sc->rge_ldata.rge_txq[i].txq_dmamap);
- m_freem(sc->rge_ldata.rge_txq[i].txq_mbuf);
- sc->rge_ldata.rge_txq[i].txq_mbuf = NULL;
- }
- }
-
- /* Free the RX list buffers. */
- for (i = 0; i < RGE_RX_LIST_CNT; i++) {
- if (sc->rge_ldata.rge_rxq[i].rxq_mbuf != NULL) {
- bus_dmamap_unload(sc->sc_dmat,
- sc->rge_ldata.rge_rxq[i].rxq_dmamap);
- m_freem(sc->rge_ldata.rge_rxq[i].rxq_mbuf);
- sc->rge_ldata.rge_rxq[i].rxq_mbuf = NULL;
- }
- }
+ rge_tx_list_fini(sc);
+
