CVS commit: xsrc/external/mit/xterm/dist
Module Name:xsrc
Committed By: mrg
Date: Thu Feb 3 01:59:24 UTC 2022
Modified Files:
xsrc/external/mit/xterm/dist: graphics_sixel.c
Log Message:
apply upstream fix for CVE-2022-24130.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xterm/dist/graphics_sixel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xterm/dist/graphics_sixel.c
diff -u xsrc/external/mit/xterm/dist/graphics_sixel.c:1.1.1.5 xsrc/external/mit/xterm/dist/graphics_sixel.c:1.2
--- xsrc/external/mit/xterm/dist/graphics_sixel.c:1.1.1.5 Sun Jan 9 09:15:26 2022
+++ xsrc/external/mit/xterm/dist/graphics_sixel.c Thu Feb 3 01:59:24 2022
@@ -1,8 +1,8 @@
-/* $XTermId: graphics_sixel.c,v 1.29 2021/08/10 00:39:26 tom Exp $ */
+/* $XTermId: graphics_sixel.c,v 1.31 2022/01/31 08:53:42 tom Exp $ */
/*
- * Copyright 2014-2020,2021 by Ross Combs
- * Copyright 2014-2020,2021 by Thomas E. Dickey
+ * Copyright 2014-2021,2022 by Ross Combs
+ * Copyright 2014-2021,2022 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -149,7 +149,7 @@ init_sixel_background(Graphic *graphic,
graphic->color_registers_used[context->background] = 1;
}
-static void
+static Boolean
set_sixel(Graphic *graphic, SixelContext const *context, int sixel)
{
const int mh = graphic->max_height;
@@ -170,7 +170,10 @@ set_sixel(Graphic *graphic, SixelContext
((color != COLOR_HOLE)
? (unsigned) graphic->color_registers[color].b : 0U)));
for (pix = 0; pix < 6; pix++) {
- if (context->col < mw && context->row + pix < mh) {
+ if (context->col >= 0 &&
+ context->col < mw &&
+ context->row + pix >= 0 &&
+ context->row + pix < mh) {
if (sixel & (1 << pix)) {
if (context->col + 1 > graphic->actual_width) {
graphic->actual_width = context->col + 1;
@@ -183,8 +186,10 @@ set_sixel(Graphic *graphic, SixelContext
}
} else {
TRACE(("sixel pixel %d out of bounds\n", pix));
+ return False;
}
}
+return True;
}
static void
@@ -462,8 +467,12 @@ parse_sixel(XtermWidget xw, ANSI *params
init_sixel_background(graphic, );
graphic->valid = 1;
}
- if (sixel)
- set_sixel(graphic, , sixel);
+ if (sixel) {
+ if (!set_sixel(graphic, , sixel)) {
+ context.col = 0;
+ break;
+ }
+ }
context.col++;
} else if (ch == '$') { /* DECGCR */
/* ignore DECCRNLM in sixel mode */
@@ -531,8 +540,12 @@ parse_sixel(XtermWidget xw, ANSI *params
if (sixel) {
int i;
for (i = 0; i < Pcount; i++) {
- set_sixel(graphic, , sixel);
- context.col++;
+ if (set_sixel(graphic, , sixel)) {
+ context.col++;
+ } else {
+ context.col = 0;
+ break;
+ }
}
} else {
context.col += Pcount;
CVS commit: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Thu Feb 3 01:59:24 UTC 2022 Modified Files: xsrc/external/mit/xterm/dist: graphics_sixel.c Log Message: apply upstream fix for CVE-2022-24130. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xterm/dist/graphics_sixel.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/ic
Module Name:src
Committed By: nakayama
Date: Wed Feb 2 22:43:14 UTC 2022
Modified Files:
src/sys/dev/ic: spdmem.c
Log Message:
Fix misplaced comma.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/spdmem.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/ic/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.37 src/sys/dev/ic/spdmem.c:1.38
--- src/sys/dev/ic/spdmem.c:1.37 Sat Jan 29 08:17:03 2022
+++ src/sys/dev/ic/spdmem.c Wed Feb 2 22:43:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.37 2022/01/29 08:17:03 msaitoh Exp $ */
+/* $NetBSD: spdmem.c,v 1.38 2022/02/02 22:43:14 nakayama Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.37 2022/01/29 08:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.38 2022/02/02 22:43:14 nakayama Exp $");
#include
#include
@@ -81,9 +81,9 @@ static const char* const spdmem_basic_ty
"unknown",
"DDR4E SDRAM",
"LPDDR3 SDRAM",
- "LPDDR4 SDRAM"
+ "LPDDR4 SDRAM",
"LPDDR4X SDRAM",
- "DDR5 SDRAM",
+ "DDR5 SDRAM"
};
static const char* const spdmem_ddr4_module_types[] = {
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nakayama Date: Wed Feb 2 22:43:14 UTC 2022 Modified Files: src/sys/dev/ic: spdmem.c Log Message: Fix misplaced comma. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/spdmem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tests/fs/vfs
Date:Wed, 2 Feb 2022 15:26:21 + From:David Brownlee Message-ID: | So, we just need an optional flag when mounting v7fs to truncate any | looked up filename component to 14 characters That's not, or shouldn't be, necessary - that always happened, the limit was what was stored in the directory, not on the length of the pathname components passed to namei. Further, v7fs (systems of that vintage) had no concept at all of a maximum pathname length (provided there was available ram to store the string). kre
Re: CVS commit: src/tests/fs/vfs
> On Feb 2, 2022, at 6:47 AM, Robert Elz wrote: > >Date:Wed, 2 Feb 2022 07:11:45 + >From:David Holland >Message-ID: > > | v7fs isn't a compat interface for old users, > > That's sad, I could do with something just for me! > > | it's a compat interface for old disk images :-) > > And makefs -t v7fs fits into that purpose how? > > So maybe it is for us truly old fogies (can we have v6fs as well? > Then I'd really feel at home.) Can I have a v7fs as root, and > boot from it? Does sysinst support it? I thought we maybe supported a system whose ROM boots from it? -- thorpej
Re: CVS commit: src/tests/fs/vfs
Hello, On Wed, 02 Feb 2022 21:47:25 +0700 Robert Elz wrote: > So maybe it is for us truly old fogies (can we have v6fs as well? Well, there is this thing... https://github.com/jaylogue/retro-fuse A user-space filesystem (FUSE) for accessing ancient Unix filesystems. retro-fuse provides a way to mount filesystems created by ancient Unix systems on modern OSes. The current version of retro-fuse supports mounting filesystems created by fifth, sixth and seventh-edition research Unix, as well as 2.9BSD and 2.11BSD. It can also initialize such filesystems. have fun Michael
Re: CVS commit: src/tests/fs/vfs
On Wed, 2 Feb 2022 at 14:47, Robert Elz wrote: > > Date:Wed, 2 Feb 2022 07:11:45 + > From:David Holland > Message-ID: > > | v7fs isn't a compat interface for old users, > > That's sad, I could do with something just for me! Sounds like we need a compat_kre(8) - assuming it would be more correct to provide the appropriate trailing slash behaviour for all filesystems in that mode? :-p > | it's a compat interface for old disk images :-) > > And makefs -t v7fs fits into that purpose how? > > So maybe it is for us truly old fogies (can we have v6fs as well? > Then I'd really feel at home.) Can I have a v7fs as root, and > boot from it? Maybe? - Throw together a bootxx_v7fs - Leave /dev with just MAKEDEV so the system will mount a mfs /dev - Convert symlinks to hard links or file copies when setting up - Then it's just the 14 character filename component limit: excluding drm firmware, kernel modules and X config most filename components are 14 characters or less - but there are a few libraries in /lib with longer filenames - lib/libcrypto.so.14 lib/libtermcap.so.0 lib/libterminfo.so.1 and lib/libpthread.so.1 are likely to be problematic So, we just need an optional flag when mounting v7fs to truncate any looked up filename component to 14 characters, then we're good to go. Actually, I'm a little concerned about how close it could be to being possible! :) > Does sysinst support it? It would be under the --spinal-tap option David
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:18:53 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1430 -r1.1431 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:18:53 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1430 -r1.1431 src/sys/dev/pci/pcidevs_data.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
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:18:21 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some devices from AMD BKDG. To generate a diff of this commit: cvs rdiff -u -r1.1447 -r1.1448 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.1447 src/sys/dev/pci/pcidevs:1.1448 --- src/sys/dev/pci/pcidevs:1.1447 Wed Feb 2 15:05:28 2022 +++ src/sys/dev/pci/pcidevs Wed Feb 2 15:18:21 2022 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1447 2022/02/02 15:05:28 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1448 2022/02/02 15:18:21 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1007,6 +1007,22 @@ product AMD F15_30_HB 0x1424 Family15h product AMD F15_30_RP_5 0x1425 Family15h Root Port product AMD F15_30_RP_6 0x1426 Family15h Root Port product AMD F16_GPPB 0x1439 Family16h GPP Bridge +product AMD F17_7X_DF_1 0x1440 17h/7xh Data Fabric +product AMD F17_7X_DF_2 0x1441 17h/7xh Data Fabric +product AMD F17_7X_DF_3 0x1442 17h/7xh Data Fabric +product AMD F17_7X_DF_4 0x1443 17h/7xh Data Fabric +product AMD F17_7X_DF_5 0x1444 17h/7xh Data Fabric +product AMD F17_7X_DF_6 0x1445 17h/7xh Data Fabric +product AMD F17_7X_DF_7 0x1446 17h/7xh Data Fabric +product AMD F17_7X_DF_8 0x1447 17h/7xh Data Fabric +product AMD F17_6X_DF_0 0x1448 17h/6xh Data Fabric +product AMD F17_6X_DF_1 0x1449 17h/6xh Data Fabric +product AMD F17_6X_DF_2 0x144a 17h/6xh Data Fabric +product AMD F17_6X_DF_3 0x144b 17h/6xh Data Fabric +product AMD F17_6X_DF_4 0x144c 17h/6xh Data Fabric +product AMD F17_6X_DF_5 0x144d 17h/6xh Data Fabric +product AMD F17_6X_DF_6 0x144e 17h/6xh Data Fabric +product AMD F17_6X_DF_7 0x144f 17h/6xh Data Fabric product AMD F17_RC 0x1450 Family17h Root Complex product AMD F17_IOMMU 0x1451 Family17h IOMMU product AMD F17_PCIE_1 0x1452 Family17h PCIe @@ -1030,8 +1046,12 @@ product AMD F17_PCIE_4 0x1470 Family17h product AMD F17_PCIE_5 0x1471 Family17h PCIe product AMD F17_7X_RC 0x1480 Family17h/7xh Root Complex product AMD F17_7X_IOMMU 0x1481 Family17h/7xh IOMMU +product AMD F17_7X_HB 0x1482 17h/7xh Host Bridge +product AMD F17_7X_PCIE_1 0x1483 17h/7xh PCIe +product AMD F17_7X_PCIE_2 0x1484 17h/7xh PCIe product AMD F17_7X_RESV_SPP 0x1485 Family17h/7xh Reserved SPP product AMD F17_7X_CCP 0x1486 Family17h/7xh Crypto +product AMD F17_3X_HDA 0x1487 17h/7xh HD Audio product AMD F17_7X_USB3 0x149c Family17h/7xh USB 3.0 Host Controller product AMD F14_RC 0x1510 Family14h Root Complex product AMD F14_PCIE_1 0x1512 Family14h PCIe @@ -1069,6 +1089,12 @@ product AMD F16_30_DRAM 0x1582 Family16 product AMD F16_30_NB 0x1583 Family16h North Bridge Configuration product AMD F16_30_CSTATE 0x1584 Family16h CPU C-state Configuration product AMD F16_30_MISC 0x1585 Family16h Miscellaneous Configuration +product AMD F15_7X_HT 0x15b0 15h/7xh HyperTransport Configuration +product AMD F15_7X_ADDR 0x15b1 15h/7xh Address Map Configuration +product AMD F15_7X_DRAM 0x15b2 15h/7xh DRAM Configuration +product AMD F15_7X_NB 0x15b3 15h/7xh North Bridge Configuration +product AMD F15_7X_CSTATE 0x15b4 15h/7xh CPU C-state Configuration +product AMD F15_7X_MISC 0x15b5 15h/7xh Miscellaneous Configuration product AMD F17_1X_RC 0x15d0 Family17h/1xh Root Complex product AMD F17_1X_IOMMU 0x15d1 Family17h/1xh IOMMU product AMD F17_1X_PCIE_1 0x15d3 Family17h/1xh PCIe @@ -1092,13 +1118,34 @@ product AMD F15_DRAM 0x1602 Family15h D product AMD F15_MISC 0x1603 Family15h Miscellaneous Configuration product AMD F15_LINK 0x1604 Family15h Link Configuration product AMD F15_NB 0x1605 Family15h North Bridge Configuration +product AMD F17_6X_RC 0x1630 17h/6xh Root Complex +product AMD F17_6X_IOMMU 0x1631 17h/6xh IOMMU +product AMD F17_6X_HB 0x1632 17h/6xh Host Bridge +product AMD F17_6X_PCIE_1 0x1633 17h/6xh PCIe +product AMD F17_6X_PCIE_2 0x1634 17h/6xh PCIe +product AMD F17_6X_PCIE_3 0x1635 17h/6xh PCIe +product AMD F17_6X_XHCI 0x1639 17h/6xh xHCI +product AMD F19_5X_DF_0 0x166a 19h/5xh Data Fabric +product AMD F19_5X_DF_1 0x166b 19h/5xh Data Fabric +product AMD F19_5X_DF_2 0x166c 19h/5xh Data Fabric +product AMD F19_5X_DF_3 0x166d 19h/5xh Data Fabric +product AMD F19_5X_DF_4 0x166e 19h/5xh Data Fabric +product AMD F19_5X_DF_5 0x166f 19h/5xh Data Fabric +product AMD F19_5X_DF_6 0x1670 19h/5xh Data Fabric +product AMD F19_5X_DF_7 0x1671 19h/5xh Data Fabric product AMD F14_HT 0x1700 Family12h/14h HyperTransport Configuration product AMD F14_ADDR 0x1701 Family12h/14h Address Map Configuration product AMD F14_DRAM 0x1702 Family12h/14h DRAM Configuration product AMD F14_NB 0x1703 Family12h/14h North Bridge Configuration product AMD F14_CSTATE 0x1704 Family12h/14h CPU C-state Configuration product AMD F12_RC 0x1705 Family12h Root Complex +product AMD
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:18:21 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some devices from AMD BKDG. To generate a diff of this commit: cvs rdiff -u -r1.1447 -r1.1448 src/sys/dev/pci/pcidevs 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
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:05:28 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix AMD F16_HB from 0x1568 to 0x1538. AMD BKDG says the host bridge's device ID is 0x1538. Before pcidevs rev. 1.1261, F16_HB was located next to 0x1537, so I suspect 0x1568 was typo of 0x1538. To generate a diff of this commit: cvs rdiff -u -r1.1446 -r1.1447 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.1446 src/sys/dev/pci/pcidevs:1.1447 --- src/sys/dev/pci/pcidevs:1.1446 Tue Jan 25 16:06:44 2022 +++ src/sys/dev/pci/pcidevs Wed Feb 2 15:05:28 2022 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1446 2022/01/25 16:06:44 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1447 2022/02/02 15:05:28 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1047,9 +1047,9 @@ product AMD F16_CSTATE 0x1534 Family16h product AMD F16_MISC 0x1535 Family16h Miscellaneous Configuration product AMD F16_RC 0x1536 Family16h Root Complex product AMD F16_CCP 0x1537 Family16h Cryptographic Coprocessor +product AMD F16_HB 0x1538 Family16h Host Bridge product AMD F16_30_RC 0x1566 Family16h Root Complex product AMD F16_30_IOMMU 0x1567 Family16h IOMMU -product AMD F16_HB 0x1568 Family16h Host Bridge product AMD F16_30_HB 0x156b Family16h Host Bridge product AMD F15_60_PF_0 0x1570 Family15h Processor Function 0 product AMD F15_60_PF_1 0x1571 Family15h Processor Function 1
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 2 15:05:28 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix AMD F16_HB from 0x1568 to 0x1538. AMD BKDG says the host bridge's device ID is 0x1538. Before pcidevs rev. 1.1261, F16_HB was located next to 0x1537, so I suspect 0x1568 was typo of 0x1538. To generate a diff of this commit: cvs rdiff -u -r1.1446 -r1.1447 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tests/fs/vfs
Date:Wed, 2 Feb 2022 07:11:45 + From:David Holland Message-ID: | v7fs isn't a compat interface for old users, That's sad, I could do with something just for me! | it's a compat interface for old disk images :-) And makefs -t v7fs fits into that purpose how? So maybe it is for us truly old fogies (can we have v6fs as well? Then I'd really feel at home.) Can I have a v7fs as root, and boot from it? Does sysinst support it? kre
CVS commit: [netbsd-9] src/doc
Module Name:src
Committed By: martin
Date: Wed Feb 2 14:27:21 UTC 2022
Modified Files:
src/doc [netbsd-9]: CHANGES-9.3
Log Message:
Tickets #1423 and #1424
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-9.3
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-9.3
diff -u src/doc/CHANGES-9.3:1.1.2.72 src/doc/CHANGES-9.3:1.1.2.73
--- src/doc/CHANGES-9.3:1.1.2.72 Wed Feb 2 04:26:39 2022
+++ src/doc/CHANGES-9.3 Wed Feb 2 14:27:21 2022
@@ -1,4 +1,4 @@
-29~# $NetBSD: CHANGES-9.3,v 1.1.2.72 2022/02/02 04:26:39 msaitoh Exp $
+29~# $NetBSD: CHANGES-9.3,v 1.1.2.73 2022/02/02 14:27:21 martin Exp $
A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3
release:
@@ -1453,3 +1453,17 @@ usr.sbin/sysinst/util.c1.64
Clean up temporary wedges used during extraction/installation.
[martin, ticket #1422]
+build.sh 1.345
+
+ Add "distsets" alias for "distribution sets".
+ [mrg, ticket #1423]
+
+sys/dev/pci/ixgbe/ix_txrx.c 1.95
+sys/dev/pci/ixgbe/ixgbe.c 1.305 via patch
+sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19
+sys/dev/pci/ixgbe/ixgbe_netbsd.h 1.15-1.16
+sys/dev/pci/ixgbe/ixv.c1.178 via patch
+
+ Use atomic_{load,store}_relaxed() for event counters.
+ [msaitoh, ticket #1424]
+
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Feb 2 14:27:21 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1423 and #1424 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Wed Feb 2 14:25:49 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe_mbx.c
ixgbe_netbsd.h ixv.c
Log Message:
Pull up the following revisions (requested by msaitoh in ticket #1424):
sys/dev/pci/ixgbe/ix_txrx.c 1.95
sys/dev/pci/ixgbe/ixgbe.c 1.305 via patch
sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.15-1.16
sys/dev/pci/ixgbe/ixv.c 1.178 via patch
Use atomic_{load,store}_relaxed() for event counters.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.7 -r1.54.2.8 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.19 -r1.199.2.20 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.11.4.2 -r1.11.4.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.125.2.16 -r1.125.2.17 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/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.7 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.8
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.7 Sat Nov 20 15:16:53 2021
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Feb 2 14:25:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.7 2021/11/20 15:16:53 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.8 2022/02/02 14:25:49 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.7 2021/11/20 15:16:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.8 2022/02/02 14:25:49 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -247,7 +247,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
if (__predict_false(!pcq_put(txr->txr_interq, m))) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(>pcq_drops, 1);
return ENOBUFS;
}
if (IXGBE_TX_TRYLOCK(txr)) {
@@ -475,7 +475,7 @@ retry:
/* Make certain there are enough descriptors */
if (txr->tx_avail < (map->dm_nsegs + 2)) {
txr->txr_no_space = true;
- txr->no_desc_avail.ev_count++;
+ IXGBE_EVC_ADD(>no_desc_avail, 1);
ixgbe_dmamap_unload(txr->txtag, txbuf->map);
return EAGAIN;
}
@@ -546,7 +546,7 @@ retry:
* Advance the Transmit Descriptor Tail (Tdt), this tells the
* hardware that this frame is available to transmit.
*/
- ++txr->total_packets.ev_count;
+ IXGBE_EVC_ADD(>total_packets, 1);
IXGBE_WRITE_REG(>hw, txr->tail, i);
/*
@@ -583,7 +583,7 @@ ixgbe_drain(struct ifnet *ifp, struct tx
while ((m = pcq_get(txr->txr_interq)) != NULL) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(>pcq_drops, 1);
}
}
@@ -846,7 +846,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
int rv = ixgbe_tso_setup(txr, mp, cmd_type_len, olinfo_status);
if (rv != 0)
- ++adapter->tso_err.ev_count;
+ IXGBE_EVC_ADD(>tso_err, 1);
return rv;
}
@@ -1088,7 +1088,7 @@ ixgbe_tso_setup(struct tx_ring *txr, str
*cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
*olinfo_status |= IXGBE_TXD_POPTS_TXSM << 8;
*olinfo_status |= paylen << IXGBE_ADVTXD_PAYLEN_SHIFT;
- ++txr->tso_tx.ev_count;
+ IXGBE_EVC_ADD(>tso_tx, 1);
return (0);
} /* ixgbe_tso_setup */
@@ -1360,7 +1360,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
if (__predict_false(rxbuf->buf == NULL)) {
mp = ixgbe_getcl();
if (mp == NULL) {
-rxr->no_mbuf.ev_count++;
+IXGBE_EVC_ADD(>no_mbuf, 1);
goto update;
}
mp->m_pkthdr.len = mp->m_len = rxr->mbuf_sz;
@@ -1549,7 +1549,7 @@ ixgbe_setup_receive_ring(struct rx_ring
rxbuf->flags = 0;
rxbuf->buf = ixgbe_getcl();
if (rxbuf->buf == NULL) {
- rxr->no_mbuf.ev_count++;
+ IXGBE_EVC_ADD(>no_mbuf, 1);
error = ENOBUFS;
goto fail;
}
@@ -1582,11 +1582,11 @@ ixgbe_setup_receive_ring(struct rx_ring
rxr->next_to_refresh = adapter->num_rx_desc - 1; /* Fully allocated */
rxr->lro_enabled = FALSE;
rxr->discard_multidesc = false;
- rxr->rx_copies.ev_count = 0;
+ IXGBE_EVC_STORE(>rx_copies, 0);
#if 0 /* NetBSD */
- rxr->rx_bytes.ev_count = 0;
+ IXGBE_EVC_STORE(>rx_bytes, 0);
#if 1 /* Fix inconsistency */
- rxr->rx_packets.ev_count = 0;
+ IXGBE_EVC_STORE(>rx_packets, 0);
#endif
#endif
rxr->vtag_strip = FALSE;
@@ -1917,7 +1917,7 @@ ixgbe_rxeof(struct ix_queue *que)
if (adapter->feat_en & IXGBE_FEATURE_VF)
if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
#endif
- rxr->rx_discarded.ev_count++;
+ IXGBE_EVC_ADD(>rx_discarded, 1);
ixgbe_rx_discard(rxr, i);
discard_multidesc = false;
goto next_desc;
@@ -1933,14 +1933,14 @@ ixgbe_rxeof(struct ix_queue *que)
/* For short packet. See below. */
sendmp = m_gethdr(M_NOWAIT, MT_DATA);
if
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Wed Feb 2 14:25:49 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe_mbx.c
ixgbe_netbsd.h ixv.c
Log Message:
Pull up the following revisions (requested by msaitoh in ticket #1424):
sys/dev/pci/ixgbe/ix_txrx.c 1.95
sys/dev/pci/ixgbe/ixgbe.c 1.305 via patch
sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.15-1.16
sys/dev/pci/ixgbe/ixv.c 1.178 via patch
Use atomic_{load,store}_relaxed() for event counters.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.7 -r1.54.2.8 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.19 -r1.199.2.20 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.11.4.2 -r1.11.4.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.125.2.16 -r1.125.2.17 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: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Wed Feb 2 14:23:11 UTC 2022
Modified Files:
src [netbsd-9]: build.sh
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1423):
build.sh: revision 1.345
add "distsets" alias for "distribution sets".
To generate a diff of this commit:
cvs rdiff -u -r1.333.2.1 -r1.333.2.2 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.333.2.1 src/build.sh:1.333.2.2
--- src/build.sh:1.333.2.1 Tue Sep 14 02:21:34 2021
+++ src/build.sh Wed Feb 2 14:23:11 2022
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.333.2.1 2021/09/14 02:21:34 msaitoh Exp $
+# $NetBSD: build.sh,v 1.333.2.2 2022/02/02 14:23:11 martin Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1062,6 +1062,7 @@ Usage: ${progname} [-EhnoPRrUuxy] [-a ar
setsCreate binary sets in
RELEASEDIR/RELEASEMACHINEDIR/binary/sets.
DESTDIR should be populated beforehand.
+distsetsSame as "distribution sets".
sourcesets Create source sets in RELEASEDIR/source/sets.
syspkgs Create syspkgs in
RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
@@ -1086,7 +1087,8 @@ Usage: ${progname} [-EhnoPRrUuxy] [-a ar
-C cdextrasAppend cdextras to CDEXTRA variable for inclusion on CD-ROM.
-D destSet DESTDIR to dest. [Default: destdir.MACHINE]
-E Set "expert" mode; disables various safety checks.
- Should not be used without expert knowledge of the build system.
+ Should not be used without expert knowledge of the build
+ system.
-h Print this help message.
-j njobRun up to njob jobs in parallel; see make(1) -j.
-M obj Set obj root directory to obj; sets MAKEOBJDIRPREFIX.
@@ -1098,7 +1100,8 @@ Usage: ${progname} [-EhnoPRrUuxy] [-a ar
-N noisy Set the noisyness (MAKEVERBOSE) level of the build:
0 Minimal output ("quiet")
1 Describe what is occurring
- 2 Describe what is occurring and echo the actual command
+ 2 Describe what is occurring and echo the actual
+ command
3 Ignore the effect of the "@" prefix in make commands
4 Trace shell commands using the shell's -x flag
[Default: 2]
@@ -1383,6 +1386,12 @@ parseoptions()
bomb "Must supply a directory with \`install=...'"
;;
+ distsets)
+ operations="$(echo "$operations" | sed 's/distsets/distribution sets/')"
+ do_sets=true
+ op=distribution
+ ;;
+
build|\
cleandir|\
distribution|\
@@ -1944,7 +1953,7 @@ createmakewrapper()
eval cat <
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Feb 2 14:23:11 UTC 2022 Modified Files: src [netbsd-9]: build.sh Log Message: Pull up following revision(s) (requested by mrg in ticket #1423): build.sh: revision 1.345 add "distsets" alias for "distribution sets". To generate a diff of this commit: cvs rdiff -u -r1.333.2.1 -r1.333.2.2 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
