CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: knakahara
Date: Wed Jun 5 04:31:37 UTC 2019
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
Add TODO comments to support MSI multiple vectors on x86 systems.
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/x86/x86/intr.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/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.144 src/sys/arch/x86/x86/intr.c:1.145
--- src/sys/arch/x86/x86/intr.c:1.144 Fri Feb 15 08:54:01 2019
+++ src/sys/arch/x86/x86/intr.c Wed Jun 5 04:31:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.144 2019/02/15 08:54:01 nonaka Exp $ */
+/* $NetBSD: intr.c,v 1.145 2019/06/05 04:31:37 knakahara Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.144 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.145 2019/06/05 04:31:37 knakahara Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -661,6 +661,19 @@ intr_allocate_slot(struct pic *pic, int
if (pic == _pic) {
idtvec = ICU_OFFSET + pin;
} else {
+ /*
+ * TODO to support MSI (not MSI-X) multiple vectors
+ *
+ * PCI Local Bus Specification Revision 3.0 says the devices
+ * which use MSI multiple vectors increment the low order bits
+ * of MSI message data.
+ * On the other hand, Intel SDM "10.11.2 Message Data Register
+ * Format" says the 7:0 bits of MSI message data mean Interrupt
+ * Descriptor Table(IDT) vector.
+ * As the result of these two documents, the IDT vectors which
+ * are used by a device using MSI multiple vectors must be
+ * continuous.
+ */
idtvec = idt_vec_alloc(APIC_LEVEL(level), IDT_INTR_HIGH);
}
if (idtvec == 0) {
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: knakahara Date: Wed Jun 5 04:31:37 UTC 2019 Modified Files: src/sys/arch/x86/x86: intr.c Log Message: Add TODO comments to support MSI multiple vectors on x86 systems. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/arch/x86/x86/intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: thorpej Date: Wed Jun 5 03:49:08 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note Banana Pi BPI-P2 Zero support. To generate a diff of this commit: cvs rdiff -u -r1.2544 -r1.2545 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2544 src/doc/CHANGES:1.2545 --- src/doc/CHANGES:1.2544 Wed May 29 01:58:39 2019 +++ src/doc/CHANGES Wed Jun 5 03:49:07 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2544 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2545 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -388,3 +388,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: nsd: Import 4.1.27 [christos 20190525] unbound(8): Import 1.9.1. [christos 20190525] gdb(1): Updated to 8.3. [christos 20190528] + evbarm: Add support for the Banana Pi BPI-P2 Zero. [thorpej 20190604]
CVS commit: src/doc
Module Name:src Committed By: thorpej Date: Wed Jun 5 03:49:08 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note Banana Pi BPI-P2 Zero support. To generate a diff of this commit: cvs rdiff -u -r1.2544 -r1.2545 src/doc/CHANGES 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: thorpej Date: Wed Jun 5 03:38:09 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Added Files: src/sys/arch/arm/dts: sun8i-h2-plus-bananapi-p2-zero.dts Log Message: Add a device tree for the Banana Pi BPI-P2 Zero. This device is based on the BPI-M2 Zero, with a couple of small changes: - On-board Ethernet (with optional PoE support) - On-board eMMC. - Card-detect for the SD card slot is wired up a little differently. Kindly tested by Dima Veselov. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/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: thorpej
Date: Wed Jun 5 03:38:09 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf: GENERIC
Added Files:
src/sys/arch/arm/dts: sun8i-h2-plus-bananapi-p2-zero.dts
Log Message:
Add a device tree for the Banana Pi BPI-P2 Zero. This device is
based on the BPI-M2 Zero, with a couple of small changes:
- On-board Ethernet (with optional PoE support)
- On-board eMMC.
- Card-detect for the SD card slot is wired up a little differently.
Kindly tested by Dima Veselov.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/sys/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/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/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.35 src/sys/arch/evbarm/conf/GENERIC:1.36
--- src/sys/arch/evbarm/conf/GENERIC:1.35 Tue May 28 21:56:24 2019
+++ src/sys/arch/evbarm/conf/GENERIC Wed Jun 5 03:38:09 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.35 2019/05/28 21:56:24 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.36 2019/06/05 03:38:09 thorpej Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -113,6 +113,7 @@ makeoptions DTS="
sun8i-a83t-tbs-a711.dts
sun8i-h2-plus-bananapi-m2-zero.dts
+ sun8i-h2-plus-bananapi-p2-zero.dts
sun8i-h2-plus-libretech-all-h3-cc.dts
sun8i-h2-plus-orangepi-r1.dts
sun8i-h2-plus-orangepi-zero.dts
Added files:
Index: src/sys/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts
diff -u /dev/null src/sys/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts:1.1
--- /dev/null Wed Jun 5 03:38:09 2019
+++ src/sys/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts Wed Jun 5 03:38:09 2019
@@ -0,0 +1,89 @@
+/* $NetBSD: sun8i-h2-plus-bananapi-p2-zero.dts,v 1.1 2019/06/05 03:38:09 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2019 Jason R. Thorpe
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Device tree for Banana Pi BPI-P2 Zero. The P2 Zero is essentially an
+ * M2 Zero with the following additions:
+ *
+ * - On-board Ethernet (with PoE capability available as an
+ * optional module).
+ * - On-board eMMC module.
+ */
+
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts"
+
+/ {
+ model = "Banana Pi BPI-P2-Zero";
+ compatible = "sinovoip,bpi-p2-zero", "allwinner,sun8i-h2-plus";
+
+ aliases {
+ /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ ethernet0 =
+ };
+
+ leds {
+ pwr_led {
+ label = "bananapi-p2-zero:red:pwr";
+ };
+ };
+};
+
+ {
+ phy-handle = <_mii_phy>;
+ phy-mode = "mii";
+ allwinner,leds-active-low;
+ status = "okay";
+};
+
+ {
+ /*
+ * There seems to be a discrepancy between how the card-detect
+ * signal is wired up between the P2 Zero and the M2 Zero, on
+ * which the P2 Zero is based.
+ *
+ * The M2 Zero device tree file claims that early samples of
+ * the M2 Zero were wired active-low, but that the production
+ * of the board is wired active-high; as such, the M2 Zero
+ * device tree uses an active-high signal for card-detect.
+ *
+ * However, the P2 Zero has been observed in the wild to have
+ * an active-low card-detect signal. I don't know if this is
+ * an early-vs-late situation like the M2 Zero, but for now we
+ * will configure the card-detect signal to active-low to match
+ * known samples of the board that exist in the wild.
+ */
+ cd-gpios = < 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_8bit_pins>;
+ bus-width = <8>;
+ non-removable;
+ status = "okay";
+};
CVS commit: src/sys/netinet
Module Name:src
Committed By: knakahara
Date: Wed Jun 5 01:31:05 UTC 2019
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
The packets which will be esp-fragmented should not be applied pfil. Pointed
out by ohishi@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.313 src/sys/netinet/ip_output.c:1.314
--- src/sys/netinet/ip_output.c:1.313 Wed Jun 5 01:27:20 2019
+++ src/sys/netinet/ip_output.c Wed Jun 5 01:31:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.313 2019/06/05 01:27:20 knakahara Exp $ */
+/* $NetBSD: ip_output.c,v 1.314 2019/06/05 01:31:04 knakahara Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.313 2019/06/05 01:27:20 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.314 2019/06/05 01:31:04 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -616,15 +616,18 @@ sendit:
if (error || ipsec_done)
goto done;
}
-#endif
- /*
- * Run through list of hooks for output packets.
- */
- error = pfil_run_hooks(inet_pfil_hook, , ifp, PFIL_OUT);
- if (error || m == NULL) {
- IP_STATINC(IP_STAT_PFILDROP_OUT);
- goto done;
+ if (!ipsec_used || !natt_frag)
+#endif
+ {
+ /*
+ * Run through list of hooks for output packets.
+ */
+ error = pfil_run_hooks(inet_pfil_hook, , ifp, PFIL_OUT);
+ if (error || m == NULL) {
+ IP_STATINC(IP_STAT_PFILDROP_OUT);
+ goto done;
+ }
}
ip = mtod(m, struct ip *);
CVS commit: src/sys/netinet
Module Name:src Committed By: knakahara Date: Wed Jun 5 01:31:05 UTC 2019 Modified Files: src/sys/netinet: ip_output.c Log Message: The packets which will be esp-fragmented should not be applied pfil. Pointed out by ohishi@IIJ, thanks. To generate a diff of this commit: cvs rdiff -u -r1.313 -r1.314 src/sys/netinet/ip_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: knakahara Date: Wed Jun 5 01:27:20 UTC 2019 Modified Files: src/sys/netinet: ip_output.c Log Message: Fix rtcache cannot be released once an esp-fragmented packet is sent. Pointed out by ohishi@IIJ, thanks. To generate a diff of this commit: cvs rdiff -u -r1.312 -r1.313 src/sys/netinet/ip_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: knakahara
Date: Wed Jun 5 01:27:20 UTC 2019
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
Fix rtcache cannot be released once an esp-fragmented packet is sent. Pointed
out by ohishi@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.312 src/sys/netinet/ip_output.c:1.313
--- src/sys/netinet/ip_output.c:1.312 Wed May 15 02:59:18 2019
+++ src/sys/netinet/ip_output.c Wed Jun 5 01:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.312 2019/05/15 02:59:18 ozaki-r Exp $ */
+/* $NetBSD: ip_output.c,v 1.313 2019/06/05 01:27:20 knakahara Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.312 2019/05/15 02:59:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.313 2019/06/05 01:27:20 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -777,7 +777,7 @@ sendit:
* processing can occur.
*/
if (natt_frag) {
- error = ip_output(m, opt, ro,
+ error = ip_output(m, opt, NULL,
flags | IP_RAWOUTPUT | IP_NOIPNEWID,
imo, inp);
} else {
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: tnn Date: Tue Jun 4 19:49:43 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_gpio.c Log Message: sunxi_gpio: set interrupt debounce filter to HOSC instead of LOSC This improves gpio ISR response time from ~1.5ms to ~5us. The hardware debounce filter is of limited value anyway because if we at some point want to support interrupts from mechanical switches in gpiobutton(4) it will still need a software debounce filter to be portable to devices without hardware debouncing capability. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/sunxi/sunxi_gpio.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/arm/sunxi
Module Name:src Committed By: tnn Date: Tue Jun 4 19:49:43 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_gpio.c Log Message: sunxi_gpio: set interrupt debounce filter to HOSC instead of LOSC This improves gpio ISR response time from ~1.5ms to ~5us. The hardware debounce filter is of limited value anyway because if we at some point want to support interrupts from mechanical switches in gpiobutton(4) it will still need a software debounce filter to be portable to devices without hardware debouncing capability. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/sunxi/sunxi_gpio.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/arm/sunxi/sunxi_gpio.c diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.25 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.26 --- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.25 Thu May 30 18:19:36 2019 +++ src/sys/arch/arm/sunxi/sunxi_gpio.c Tue Jun 4 19:49:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_gpio.c,v 1.25 2019/05/30 18:19:36 tnn Exp $ */ +/* $NetBSD: sunxi_gpio.c,v 1.26 2019/06/04 19:49:43 tnn Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -29,7 +29,7 @@ #include "opt_soc.h" #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.25 2019/05/30 18:19:36 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.26 2019/06/04 19:49:43 tnn Exp $"); #include #include @@ -72,6 +72,9 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c #define SUNXI_GPIO_INT_MODE_DOUBLE_EDGE 0x4 #define SUNXI_GPIO_INT_CTL(bank) (0x210 + 0x20 * (bank)) #define SUNXI_GPIO_INT_STATUS(bank) (0x214 + 0x20 * (bank)) +#define SUNXI_GPIO_INT_DEBOUNCE(bank) (0x218 + 0x20 * (bank)) +#define SUNXI_GPIO_INT_DEBOUNCE_CLK_PRESCALE __BITS(6,4) +#define SUNXI_GPIO_INT_DEBOUNCE_CLK_SEL __BIT(0) #define SUNXI_GPIO_GRP_CONFIG(bank) (0x300 + 0x4 * (bank)) #define SUNXI_GPIO_GRP_IO_BIAS_CONFIGMASK 0xf @@ -480,6 +483,9 @@ sunxi_intr_enable(struct sunxi_gpio_soft val |= __SHIFTIN(mode, SUNXI_GPIO_INT_MODEMASK(eint->eint_num)); GPIO_WRITE(sc, SUNXI_GPIO_INT_CFG(eint->eint_bank, eint->eint_num), val); + val = SUNXI_GPIO_INT_DEBOUNCE_CLK_SEL; + GPIO_WRITE(sc, SUNXI_GPIO_INT_DEBOUNCE(eint->eint_bank), val); + /* Enable eint */ val = GPIO_READ(sc, SUNXI_GPIO_INT_CTL(eint->eint_bank)); val |= __BIT(eint->eint_num);
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 4 18:01:18 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: ISE To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 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.258 src/share/misc/acronyms.comp:1.259 --- src/share/misc/acronyms.comp:1.258 Tue Jun 4 17:46:28 2019 +++ src/share/misc/acronyms.comp Tue Jun 4 18:01:18 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.258 2019/06/04 17:46:28 sevan Exp $ +$NetBSD: acronyms.comp,v 1.259 2019/06/04 18:01:18 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -722,6 +722,7 @@ IRTF Internet Research Task Force IS information system ISA industry standard architecture ISA instruction set architecture +ISE instant secure erase ISDN integrated services digital network ISI inter-symbol interference ISL initial system load
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 4 18:01:18 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: ISE To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 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: sevan Date: Tue Jun 4 17:46:28 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: SED To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 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.257 src/share/misc/acronyms.comp:1.258 --- src/share/misc/acronyms.comp:1.257 Tue Jun 4 17:43:23 2019 +++ src/share/misc/acronyms.comp Tue Jun 4 17:46:28 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.257 2019/06/04 17:43:23 sevan Exp $ +$NetBSD: acronyms.comp,v 1.258 2019/06/04 17:46:28 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1339,6 +1339,8 @@ SDS software defined storage SDT syntax-directed translation SEA synchronous external abort SEGV segmentation violation +SED self-encrypting drive +SED stream editor SEO search engine optimization SES SCSI enclosure services SFC sequential function chart
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 4 17:46:28 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: SED To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 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: sevan Date: Tue Jun 4 17:43:23 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: Add another SMP from the world of storage and SES To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 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.256 src/share/misc/acronyms.comp:1.257 --- src/share/misc/acronyms.comp:1.256 Tue Jun 4 17:36:02 2019 +++ src/share/misc/acronyms.comp Tue Jun 4 17:43:23 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.256 2019/06/04 17:36:02 sevan Exp $ +$NetBSD: acronyms.comp,v 1.257 2019/06/04 17:43:23 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1385,6 +1385,7 @@ SMF single mode fiber SMI structure of management information SMI system management interrupt SMM system management mode +SMP serial management protocol SMP symmetric multiprocessing SMT simultaneous multithreading SMTP Simple Mail Transfer Protocol
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 4 17:43:23 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: Add another SMP from the world of storage and SES To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 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: sevan Date: Tue Jun 4 17:36:02 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: CCTL ERC TLER To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 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.255 src/share/misc/acronyms.comp:1.256 --- src/share/misc/acronyms.comp:1.255 Sun Jun 2 20:18:23 2019 +++ src/share/misc/acronyms.comp Tue Jun 4 17:36:02 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.255 2019/06/02 20:18:23 alnsn Exp $ +$NetBSD: acronyms.comp,v 1.256 2019/06/04 17:36:02 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -205,6 +205,7 @@ CC carbon copy CCD charge coupled device CCI co-channel interferer CCNUMA cache-coherent non-uniform memory access +CCTL command completion time limit CD cache disable CD compact disc CDDA compact disc digital audio @@ -496,6 +497,7 @@ EPIC explicitly parallel instruction com EPP enhanced parallel port EPRML extended partial response, maximum likelihood EPROM erasable programmable read only memory +ERC error recovery control ERD emergency recovery disk ERD entity relationship diagram ERE extended regular expression @@ -1486,6 +1488,7 @@ TKIP Temporal Key Integrity Protocol TLA top level aggregator TLB translation lookaside buffer TLD top level domain +TLER time-limited error recovery TLI transport layer interface TLS thread local storage TLS transport layer security
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 4 17:36:02 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: CCTL ERC TLER To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 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/ic
Module Name:src Committed By: tnn Date: Tue Jun 4 16:36:18 UTC 2019 Modified Files: src/sys/dev/ic: ssdfb.c Log Message: revert previous as suggested by mrg IPL_SCHED is correct here To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/ssdfb.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/ssdfb.c diff -u src/sys/dev/ic/ssdfb.c:1.4 src/sys/dev/ic/ssdfb.c:1.5 --- src/sys/dev/ic/ssdfb.c:1.4 Thu May 30 07:37:17 2019 +++ src/sys/dev/ic/ssdfb.c Tue Jun 4 16:36:18 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ssdfb.c,v 1.4 2019/05/30 07:37:17 tnn Exp $ */ +/* $NetBSD: ssdfb.c,v 1.5 2019/06/04 16:36:18 tnn Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.4 2019/05/30 07:37:17 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.5 2019/06/04 16:36:18 tnn Exp $"); #include "opt_ddb.h" @@ -301,7 +301,7 @@ ssdfb_attach(struct ssdfb_softc *sc, int if (sc->sc_is_console) ssdfb_set_usepoll(sc, true); - mutex_init(>sc_cond_mtx, MUTEX_DEFAULT, IPL_VM); + mutex_init(>sc_cond_mtx, MUTEX_DEFAULT, IPL_SCHED); cv_init(>sc_cond, "ssdfb"); error = kthread_create(PRI_SOFTCLOCK, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL, ssdfb_thread, sc, >sc_thread, "%s",
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tnn Date: Tue Jun 4 16:36:18 UTC 2019 Modified Files: src/sys/dev/ic: ssdfb.c Log Message: revert previous as suggested by mrg IPL_SCHED is correct here To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/ssdfb.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/amd64/amd64
Module Name:src
Committed By: mgorny
Date: Tue Jun 4 16:30:19 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c
Log Message:
compat32: Implement PT_GETDBREGS and PT_SETDBREGS
Uncomment and improve the implementation of compat32 support for
PT_GETDBREGS and PT_SETDBREGS requests.
The new implementation uses x86_dbregs_read() and x86_dbregs_write()
function instead of accessing pcb directly. While this might be
a little slower, it guarantees that the needed pcb field is allocated
correctly.
Furthermore, the code introduces necessary sanity checks
for PT_SETDBREGS arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amd64/amd64/netbsd32_machdep.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/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.122 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.123
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.122 Tue Jun 4 16:29:53 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Tue Jun 4 16:30:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.122 2019/06/04 16:29:53 mgorny Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.123 2019/06/04 16:30:19 mgorny Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.122 2019/06/04 16:29:53 mgorny Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.123 2019/06/04 16:30:19 mgorny Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -395,23 +395,19 @@ netbsd32_process_read_fpregs(struct lwp
int
netbsd32_process_read_dbregs(struct lwp *l, struct dbreg32 *regs, size_t *sz)
{
-#if notyet
- struct pcb *pcb;
-
- pcb = lwp_getpcb(l);
+ struct dbreg regs64;
- regs->dr[0] = pcb->pcb_dbregs->dr[0] & 0x;
- regs->dr[1] = pcb->pcb_dbregs->dr[1] & 0x;
- regs->dr[2] = pcb->pcb_dbregs->dr[2] & 0x;
- regs->dr[3] = pcb->pcb_dbregs->dr[3] & 0x;
+ x86_dbregs_read(l, );
+ memset(regs, 0, sizeof(*regs));
+ regs->dr[0] = regs64.dr[0] & 0x;
+ regs->dr[1] = regs64.dr[1] & 0x;
+ regs->dr[2] = regs64.dr[2] & 0x;
+ regs->dr[3] = regs64.dr[3] & 0x;
- regs->dr[6] = pcb->pcb_dbregs->dr[6] & 0x;
- regs->dr[7] = pcb->pcb_dbregs->dr[7] & 0x;
+ regs->dr[6] = regs64.dr[6] & 0x;
+ regs->dr[7] = regs64.dr[7] & 0x;
return 0;
-#else
- return ENOTSUP;
-#endif
}
int
@@ -478,23 +474,29 @@ int
netbsd32_process_write_dbregs(struct lwp *l, const struct dbreg32 *regs,
size_t sz)
{
-#if notyet
- struct pcb *pcb;
+ size_t i;
+ struct dbreg regs64;
- pcb = lwp_getpcb(l);
+ /* Check that DR0-DR3 contain user-space address */
+ for (i = 0; i < X86_DBREGS; i++) {
+ if (regs->dr[i] >= VM_MAXUSER_ADDRESS32)
+ return EINVAL;
+ }
- pcb->pcb_dbregs->dr[0] = regs->dr[0];
- pcb->pcb_dbregs->dr[1] = regs->dr[1];
- pcb->pcb_dbregs->dr[2] = regs->dr[2];
- pcb->pcb_dbregs->dr[3] = regs->dr[3];
+ if (regs->dr[7] & X86_DR7_GENERAL_DETECT_ENABLE) {
+ return EINVAL;
+ }
- pcb->pcb_dbregs->dr[6] = regs->dr[6];
- pcb->pcb_dbregs->dr[7] = regs->dr[7];
+ regs64.dr[0] = regs->dr[0];
+ regs64.dr[1] = regs->dr[1];
+ regs64.dr[2] = regs->dr[2];
+ regs64.dr[3] = regs->dr[3];
+ regs64.dr[6] = regs->dr[6];
+ regs64.dr[7] = regs->dr[7];
+
+ x86_dbregs_write(l, );
return 0;
-#else
- return ENOTSUP;
-#endif
}
int
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: mgorny Date: Tue Jun 4 16:30:19 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: netbsd32_machdep.c Log Message: compat32: Implement PT_GETDBREGS and PT_SETDBREGS Uncomment and improve the implementation of compat32 support for PT_GETDBREGS and PT_SETDBREGS requests. The new implementation uses x86_dbregs_read() and x86_dbregs_write() function instead of accessing pcb directly. While this might be a little slower, it guarantees that the needed pcb field is allocated correctly. Furthermore, the code introduces necessary sanity checks for PT_SETDBREGS arguments. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amd64/amd64/netbsd32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: mgorny Date: Tue Jun 4 16:29:53 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: netbsd32_machdep.c src/sys/arch/amd64/include: netbsd32_machdep.h ptrace.h src/sys/compat/netbsd32: netbsd32_ptrace.c Log Message: compat32: Translate userland PT_* request values into kernel codes Currently, the compat32 passes PT_* request values to kernel functions without translation. This works fine for low PT_* requests that happen to have the same values both on i386 and amd64. However, for requests higher than PT_SETFPREGS, the value passed from userland (matching i386 const) does not match the correct kernel (amd64) request. As a result, e.g. when compat32 process calls PT_GETDBREGS, kernel actually processes it as PT_SETSTEP. To resolve this, introduce support for compat32 PT_* request translation. The interface is based on PTRACE_TRANSLATE_REQUEST32 macro that is defined to a mapping function on architectures needing it. In case of amd64, this function maps userland i386 PT_* values into appropriate amd64 PT_* values. For the time being, the two additional PT_GETXMMREGS and PT_SETXMMREGS requests are unsupported due to lack of matching free amd64 constant. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/include/netbsd32_machdep.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/ptrace.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/netbsd32/netbsd32_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: mgorny
Date: Tue Jun 4 16:29:53 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c
src/sys/arch/amd64/include: netbsd32_machdep.h ptrace.h
src/sys/compat/netbsd32: netbsd32_ptrace.c
Log Message:
compat32: Translate userland PT_* request values into kernel codes
Currently, the compat32 passes PT_* request values to kernel functions
without translation. This works fine for low PT_* requests that happen
to have the same values both on i386 and amd64. However, for requests
higher than PT_SETFPREGS, the value passed from userland (matching i386
const) does not match the correct kernel (amd64) request. As a result,
e.g. when compat32 process calls PT_GETDBREGS, kernel actually processes
it as PT_SETSTEP.
To resolve this, introduce support for compat32 PT_* request
translation. The interface is based on PTRACE_TRANSLATE_REQUEST32 macro
that is defined to a mapping function on architectures needing it.
In case of amd64, this function maps userland i386 PT_* values into
appropriate amd64 PT_* values.
For the time being, the two additional PT_GETXMMREGS and PT_SETXMMREGS
requests are unsupported due to lack of matching free amd64 constant.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/include/netbsd32_machdep.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/ptrace.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/netbsd32/netbsd32_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/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.121 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.122
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.121 Sun May 19 08:46:15 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Tue Jun 4 16:29:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.121 2019/05/19 08:46:15 maxv Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.122 2019/06/04 16:29:53 mgorny Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.121 2019/05/19 08:46:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.122 2019/06/04 16:29:53 mgorny Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -336,6 +336,28 @@ cpu_coredump32(struct lwp *l, struct cor
#endif
int
+netbsd32_ptrace_translate_request(int req)
+{
+
+ switch (req)
+ {
+ case 0 ... PT_FIRSTMACH - 1: return req;
+ case PT32_STEP: return PT_STEP;
+ case PT32_GETREGS: return PT_GETREGS;
+ case PT32_SETREGS: return PT_SETREGS;
+ case PT32_GETFPREGS: return PT_GETFPREGS;
+ case PT32_SETFPREGS: return PT_SETFPREGS;
+ case PT32_GETXMMREGS: return -1;
+ case PT32_SETXMMREGS: return -1;
+ case PT32_GETDBREGS: return PT_GETDBREGS;
+ case PT32_SETDBREGS: return PT_SETDBREGS;
+ case PT32_SETSTEP: return PT_SETSTEP;
+ case PT32_CLEARSTEP: return PT_CLEARSTEP;
+ default: return -1;
+ }
+}
+
+int
netbsd32_process_read_regs(struct lwp *l, struct reg32 *regs)
{
struct trapframe *tf = l->l_md.md_regs;
Index: src/sys/arch/amd64/include/netbsd32_machdep.h
diff -u src/sys/arch/amd64/include/netbsd32_machdep.h:1.22 src/sys/arch/amd64/include/netbsd32_machdep.h:1.23
--- src/sys/arch/amd64/include/netbsd32_machdep.h:1.22 Thu Feb 23 03:34:22 2017
+++ src/sys/arch/amd64/include/netbsd32_machdep.h Tue Jun 4 16:29:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.h,v 1.22 2017/02/23 03:34:22 kamil Exp $ */
+/* $NetBSD: netbsd32_machdep.h,v 1.23 2019/06/04 16:29:53 mgorny Exp $ */
#ifndef _MACHINE_NETBSD32_H_
#define _MACHINE_NETBSD32_H_
@@ -7,6 +7,22 @@
#include
#include
+/*
+ * i386 ptrace constants
+ * Please keep in sync with sys/arch/i386/include/ptrace.h.
+ */
+#define PT32_STEP (PT_FIRSTMACH + 0)
+#define PT32_GETREGS (PT_FIRSTMACH + 1)
+#define PT32_SETREGS (PT_FIRSTMACH + 2)
+#define PT32_GETFPREGS (PT_FIRSTMACH + 3)
+#define PT32_SETFPREGS (PT_FIRSTMACH + 4)
+#define PT32_GETXMMREGS (PT_FIRSTMACH + 5)
+#define PT32_SETXMMREGS (PT_FIRSTMACH + 6)
+#define PT32_GETDBREGS (PT_FIRSTMACH + 7)
+#define PT32_SETDBREGS (PT_FIRSTMACH + 8)
+#define PT32_SETSTEP (PT_FIRSTMACH + 9)
+#define PT32_CLEARSTEP (PT_FIRSTMACH + 10)
+
#define NETBSD32_POINTER_TYPE uint32_t
typedef struct { NETBSD32_POINTER_TYPE i32; } netbsd32_pointer_t;
@@ -151,6 +167,9 @@ struct x86_64_set_mtrr_args32 {
#define NETBSD32_MID_MACHINE MID_I386
+/* Translate ptrace() PT_* request from 32-bit userland to kernel. */
+int netbsd32_ptrace_translate_request(int);
+
int netbsd32_process_read_regs(struct lwp *, struct reg32 *);
int netbsd32_process_read_fpregs(struct lwp *, struct fpreg32 *, size_t *);
int netbsd32_process_read_dbregs(struct lwp *, struct dbreg32 *, size_t *);
Index:
CVS commit: src
Module Name:src Committed By: hannken Date: Tue Jun 4 15:07:55 UTC 2019 Modified Files: src/common/lib/libc: Makefile.inc src/include: Makefile src/include/rpc: Makefile Added Files: src/common/include/rpc: Makefile types.h xdr.h src/common/lib/libc/rpc: xdr.c xdr_array.c xdr_mem.c Removed Files: src/include/rpc: types.h xdr.h src/lib/libc/rpc: xdr.c xdr_array.c xdr_mem.c Log Message: Move the basic part of XDR to common/include/rpc and common/lib/libc/rpc. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/common/include/rpc/Makefile \ src/common/include/rpc/types.h src/common/include/rpc/xdr.h cvs rdiff -u -r1.18 -r1.19 src/common/lib/libc/Makefile.inc cvs rdiff -u -r0 -r1.1 src/common/lib/libc/rpc/xdr.c \ src/common/lib/libc/rpc/xdr_array.c src/common/lib/libc/rpc/xdr_mem.c cvs rdiff -u -r1.145 -r1.146 src/include/Makefile cvs rdiff -u -r1.12 -r1.13 src/include/rpc/Makefile cvs rdiff -u -r1.15 -r0 src/include/rpc/types.h cvs rdiff -u -r1.31 -r0 src/include/rpc/xdr.h cvs rdiff -u -r1.34 -r0 src/lib/libc/rpc/xdr.c cvs rdiff -u -r1.19 -r0 src/lib/libc/rpc/xdr_array.c cvs rdiff -u -r1.20 -r0 src/lib/libc/rpc/xdr_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: hannken
Date: Tue Jun 4 15:07:55 UTC 2019
Modified Files:
src/common/lib/libc: Makefile.inc
src/include: Makefile
src/include/rpc: Makefile
Added Files:
src/common/include/rpc: Makefile types.h xdr.h
src/common/lib/libc/rpc: xdr.c xdr_array.c xdr_mem.c
Removed Files:
src/include/rpc: types.h xdr.h
src/lib/libc/rpc: xdr.c xdr_array.c xdr_mem.c
Log Message:
Move the basic part of XDR to common/include/rpc and common/lib/libc/rpc.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/include/rpc/Makefile \
src/common/include/rpc/types.h src/common/include/rpc/xdr.h
cvs rdiff -u -r1.18 -r1.19 src/common/lib/libc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/rpc/xdr.c \
src/common/lib/libc/rpc/xdr_array.c src/common/lib/libc/rpc/xdr_mem.c
cvs rdiff -u -r1.145 -r1.146 src/include/Makefile
cvs rdiff -u -r1.12 -r1.13 src/include/rpc/Makefile
cvs rdiff -u -r1.15 -r0 src/include/rpc/types.h
cvs rdiff -u -r1.31 -r0 src/include/rpc/xdr.h
cvs rdiff -u -r1.34 -r0 src/lib/libc/rpc/xdr.c
cvs rdiff -u -r1.19 -r0 src/lib/libc/rpc/xdr_array.c
cvs rdiff -u -r1.20 -r0 src/lib/libc/rpc/xdr_mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/Makefile.inc
diff -u src/common/lib/libc/Makefile.inc:1.18 src/common/lib/libc/Makefile.inc:1.19
--- src/common/lib/libc/Makefile.inc:1.18 Fri Aug 3 03:35:17 2018
+++ src/common/lib/libc/Makefile.inc Tue Jun 4 15:07:55 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.18 2018/08/03 03:35:17 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.19 2019/06/04 15:07:55 hannken Exp $
.include
COMMON_DIR:=${.PARSEDIR}
-COMMON_CODEDIRS=atomic gen gmon inet md misc net stdlib string sys
+COMMON_CODEDIRS=atomic gen gmon inet md misc net rpc stdlib string sys
COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/sha3 hash/rmd160 hash/murmurhash
.if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \
Index: src/include/Makefile
diff -u src/include/Makefile:1.145 src/include/Makefile:1.146
--- src/include/Makefile:1.145 Wed Apr 24 10:26:08 2019
+++ src/include/Makefile Tue Jun 4 15:07:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2019/04/24 10:26:08 roy Exp $
+# $NetBSD: Makefile,v 1.146 2019/06/04 15:07:55 hannken Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -47,6 +47,7 @@ INCSDIR= /usr/include
SUBDIR= rpc
SUBDIR+= ../common/include/prop
SUBDIR+= ../common/include/ppath
+SUBDIR+= ../common/include/rpc
.include
.include
Index: src/include/rpc/Makefile
diff -u src/include/rpc/Makefile:1.12 src/include/rpc/Makefile:1.13
--- src/include/rpc/Makefile:1.12 Sat Jan 11 13:28:43 2003
+++ src/include/rpc/Makefile Tue Jun 4 15:07:55 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/01/11 13:28:43 tron Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/04 15:07:55 hannken Exp $
#
INCS= auth.h auth_unix.h clnt.h clnt_soc.h nettype.h \
pmap_clnt.h pmap_prot.h pmap_rmt.h raw.h rpc.h \
rpc_com.h rpc_msg.h rpcb_clnt.h rpcb_prot.h rpcent.h \
- svc.h svc_auth.h svc_soc.h types.h xdr.h
+ svc.h svc_auth.h svc_soc.h
RPC_INCS= rpcb_prot.h
INCSDIR= /usr/include/rpc
Added files:
Index: src/common/include/rpc/Makefile
diff -u /dev/null src/common/include/rpc/Makefile:1.1
--- /dev/null Tue Jun 4 15:07:55 2019
+++ src/common/include/rpc/Makefile Tue Jun 4 15:07:55 2019
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2019/06/04 15:07:55 hannken Exp $
+#
+
+INCS= types.h xdr.h
+
+INCSDIR= /usr/include/rpc
+
+.include
Index: src/common/include/rpc/types.h
diff -u /dev/null src/common/include/rpc/types.h:1.1
--- /dev/null Tue Jun 4 15:07:55 2019
+++ src/common/include/rpc/types.h Tue Jun 4 15:07:55 2019
@@ -0,0 +1,107 @@
+/* $NetBSD: types.h,v 1.1 2019/06/04 15:07:55 hannken Exp $ */
+
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part. Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
+ *
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ *
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
+ *
+ * In no event will
Re: audio2
At Wed, 29 May 2019 10:20:38 +0300,
Andreas Gustafsson wrote:
> > Now, you omit the most critical bit: what would you name the thing? :)
> > From "the proper way to do audio scaling" I infer that AUDIO_SCALEDOWN
> > (or however that was spelled) should be ok, shouldn't it?
>
> I'm not fussy about the naming, just about the math :) AUDIO_SCALEDOWN
> works for me, but I'm open to alternatives.
Thank you, riastradh@ and gson@!
AUDIO_SCALEDOWN is self explaining name and good for me, too.
I also think floor() is good for this purpose and truncate() is
also acceptable for alternate.
How about this one?
--- sys/dev/audio/audio.c
+++ sys/dev/audio/audio.c
@@ -458,6 +458,28 @@ audio_track_bufstat(audio_track_t *track, struct
audio_track_debugbuf *buf)
#define SPECIFIED(x) ((x) != ~0)
#define SPECIFIED_CH(x)((x) != (u_char)~0)
+/*
+ * AUDIO_SCALEDOWN()
+ * This macro should be used for audio wave data only.
+ *
+ * The arithmetic shift right (ASR) (in other words, floor()) is good for
+ * this purpose, and will be faster than division on the most platform.
+ * The division (in other words, truncate()) is not so bad alternate for
+ * this purpose, and will be fast enough.
+ * (Using ASR is 1.9 times faster than division on my amd64, and 1.3 times
+ * faster on my m68k. -- isaki 201801.)
+ *
+ * However, the right shift operator ('>>') for negative integer is
+ * "implementation defined" behavior in C (note that it's not "undefined"
+ * behavior). So only if implementation defines '>>' as ASR, we use it.
+ */
+#if defined(__GNUC__)
+/* gcc defines '>>' as ASR. */
+#define AUDIO_SCALEDOWN(value, bits) ((value) >> (bits))
+#else
+#define AUDIO_SCALEDOWN(value, bits) ((value) / (1 << (bits)))
+#endif
+
/* Device timeout in msec */
#define AUDIO_TIMEOUT (3000)
@@ -3194,11 +3216,7 @@ audio_track_chvol(audio_filter_arg_t *arg)
for (ch = 0; ch < channels; ch++) {
aint2_t val;
val = *s++;
-#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && defined(__GNUC__)
- val = val * ch_volume[ch] >> 8;
-#else
- val = val * ch_volume[ch] / 256;
-#endif
+ val = AUDIO_SCALEDOWN(val * ch_volume[ch], 8);
*d++ = (aint_t)val;
}
}
@@ -3220,11 +3238,7 @@ audio_track_chmix_mixLR(audio_filter_arg_t *arg)
d = arg->dst;
for (i = 0; i < arg->count; i++) {
-#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && defined(__GNUC__)
- *d++ = (s[0] >> 1) + (s[1] >> 1);
-#else
- *d++ = (s[0] / 2) + (s[1] / 2);
-#endif
+ *d++ = AUDIO_SCALEDOWN(s[0], 1) + AUDIO_SCALEDOWN(s[1], 1);
s += arg->srcfmt->channels;
}
}
@@ -5021,11 +5035,7 @@ audio_pmixer_process(struct audio_softc *sc)
if (vol != 256) {
m = mixer->mixsample;
for (i = 0; i < sample_count; i++) {
-#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && defined(__GNUC__)
- *m = *m * vol >> 8;
-#else
- *m = *m * vol / 256;
-#endif
+ *m = AUDIO_SCALEDOWN(*m * vol, 8);
m++;
}
}
@@ -5113,11 +5123,9 @@ audio_pmixer_mix_track(audio_trackmixer_t *mixer,
audio_track_t *track,
#if defined(AUDIO_SUPPORT_TRACK_VOLUME)
if (track->volume != 256) {
for (i = 0; i < sample_count; i++) {
-#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && defined(__GNUC__)
- *d++ = ((aint2_t)*s++) * track->volume >> 8;
-#else
- *d++ = ((aint2_t)*s++) * track->volume / 256;
-#endif
+ aint2_t v;
+ v = *s++;
+ *d++ = AUDIO_SCALEDOWN(v * track->volume, 8)
}
} else
#endif
@@ -5131,11 +5139,9 @@ audio_pmixer_mix_track(audio_trackmixer_t *mixer,
audio_track_t *track,
#if defined(AUDIO_SUPPORT_TRACK_VOLUME)
if (track->volume != 256) {
for (i = 0; i < sample_count; i++) {
-#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && defined(__GNUC__)
- *d++ += ((aint2_t)*s++) * track->volume >> 8;
-#else
- *d++ += ((aint2_t)*s++) * track->volume / 256;
-#endif
+ aint2_t v;
+ v = *s++;
+ *d++ += AUDIO_SCALEDOWN(v * track->volume, 8);
}
} else
#endif
--- sys/dev/audio/audiodef.h
+++ sys/dev/audio/audiodef.h
@@ -63,12 +63,6 @@
*/
/* #define AUDIO_SUPPORT_TRACK_VOLUME */
-/*
- * Whether use C language's "implementation defined" behavior (note that
-
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: mgorny Date: Tue Jun 4 12:17:42 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_x86_wait.h Log Message: Fix alignment of SSE filling data To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libc/sys/t_ptrace_x86_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: mgorny
Date: Tue Jun 4 12:17:42 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_x86_wait.h
Log Message:
Fix alignment of SSE filling data
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libc/sys/t_ptrace_x86_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_x86_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.14 src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.15
--- src/tests/lib/libc/sys/t_ptrace_x86_wait.h:1.14 Tue Jun 4 12:17:05 2019
+++ src/tests/lib/libc/sys/t_ptrace_x86_wait.h Tue Jun 4 12:17:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_x86_wait.h,v 1.14 2019/06/04 12:17:05 mgorny Exp $ */
+/* $NetBSD: t_ptrace_x86_wait.h,v 1.15 2019/06/04 12:17:42 mgorny Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -2600,7 +2600,7 @@ static __inline void get_xmm_regs(void*
{
const struct {
uint64_t a, b;
- } fill = {0x0F0F0F0F0F0F0F0F, 0x0F0F0F0F0F0F0F0F};
+ } fill __aligned(16) = {0x0F0F0F0F0F0F0F0F, 0x0F0F0F0F0F0F0F0F};
__asm__ __volatile__(
/* fill registers with clobber pattern */
CVS commit: src/sbin/dmesg
Module Name:src
Committed By: kre
Date: Tue Jun 4 11:59:05 UTC 2019
Modified Files:
src/sbin/dmesg: dmesg.c
Log Message:
Delete a redundant (useless) assignment. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sbin/dmesg/dmesg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dmesg/dmesg.c
diff -u src/sbin/dmesg/dmesg.c:1.42 src/sbin/dmesg/dmesg.c:1.43
--- src/sbin/dmesg/dmesg.c:1.42 Tue Jun 4 11:37:39 2019
+++ src/sbin/dmesg/dmesg.c Tue Jun 4 11:59:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dmesg.c,v 1.42 2019/06/04 11:37:39 kre Exp $ */
+/* $NetBSD: dmesg.c,v 1.43 2019/06/04 11:59:05 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,7 +38,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93";
#else
-__RCSID("$NetBSD: dmesg.c,v 1.42 2019/06/04 11:37:39 kre Exp $");
+__RCSID("$NetBSD: dmesg.c,v 1.43 2019/06/04 11:59:05 kre Exp $");
#endif
#endif /* not lint */
@@ -391,7 +391,6 @@ main(int argc, char *argv[])
continue;
break;
}
- newl = 0;
}
newl = ch == '\n';
(void)vis(buf, ch, VIS_NOSLASH, 0);
CVS commit: src/sbin/dmesg
Module Name:src Committed By: kre Date: Tue Jun 4 11:59:05 UTC 2019 Modified Files: src/sbin/dmesg: dmesg.c Log Message: Delete a redundant (useless) assignment. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sbin/dmesg/dmesg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Tue Jun 4 11:54:04 UTC 2019
Modified Files:
src/sys/kern: kern_lwp.c kern_sig.c
Log Message:
Stop trying to inform debugger about events from an exiting child
Do not emit signals to parent for if a process is demising:
- fork/vfork/similar
- lwp created/exited
- exec
- syscall entry/exit
With these changes Go applications can be traced without a clash under
a debugger, at least without deadlocking always. The culprit reason was
an attempt to inform a debugger in the middle of exit1() call about
a dying LWP. Go applications perform exit(2) without collecting threads
first. Verified with GDB and picotrace-based utilities like sigtracer.
PR kern/53120
PR port-arm/51677
PR bin/54060
PR bin/49662
PR kern/52548
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.358 -r1.359 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.201 src/sys/kern/kern_lwp.c:1.202
--- src/sys/kern/kern_lwp.c:1.201 Fri May 17 03:34:26 2019
+++ src/sys/kern/kern_lwp.c Tue Jun 4 11:54:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.201 2019/05/17 03:34:26 ozaki-r Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.202 2019/06/04 11:54:03 kamil Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.201 2019/05/17 03:34:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.202 2019/06/04 11:54:03 kamil Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -1084,9 +1084,17 @@ lwp_exit(struct lwp *l)
if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_EXIT)) ==
(PSL_TRACED|PSL_TRACELWP_EXIT)) {
mutex_enter(p->p_lock);
- p->p_lwp_exited = l->l_lid;
- eventswitch(TRAP_LWP);
- mutex_enter(proc_lock);
+ if (ISSET(p->p_sflag, PS_WEXIT)) {
+ mutex_exit(p->p_lock);
+ /*
+ * We are exiting, bail out without informing parent
+ * about a terminating LWP as it would deadlock.
+ */
+ } else {
+ p->p_lwp_exited = l->l_lid;
+ eventswitch(TRAP_LWP);
+ mutex_enter(proc_lock);
+ }
}
LIST_REMOVE(l, l_list);
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.358 src/sys/kern/kern_sig.c:1.359
--- src/sys/kern/kern_sig.c:1.358 Mon May 6 08:05:03 2019
+++ src/sys/kern/kern_sig.c Tue Jun 4 11:54:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.358 2019/05/06 08:05:03 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.359 2019/06/04 11:54:03 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.358 2019/05/06 08:05:03 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.359 2019/06/04 11:54:03 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -913,6 +913,19 @@ trapsignal(struct lwp *l, ksiginfo_t *ks
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
+ /*
+ * If we are exiting, demise now.
+ *
+ * This avoids notifying tracer and deadlocking.
+ */
+ if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
+ mutex_exit(p->p_lock);
+ mutex_exit(proc_lock);
+ lwp_exit(l);
+ panic("trapsignal");
+ /* NOTREACHED */
+ }
+
mask = >l_sigmask;
ps = p->p_sigacts;
action = SIGACTION_PS(ps, signo).sa_handler;
@@ -1569,6 +1582,19 @@ eventswitch(int code)
(code == TRAP_EXEC));
/*
+ * If we are exiting, demise now.
+ *
+ * This avoids notifying tracer and deadlocking.
+ */
+ if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
+ mutex_exit(p->p_lock);
+ mutex_exit(proc_lock);
+ lwp_exit(l);
+ panic("eventswitch");
+ /* NOTREACHED */
+ }
+
+ /*
* If there's a pending SIGKILL process it immediately.
*/
if (p->p_xsig == SIGKILL ||
@@ -1622,6 +1648,21 @@ sigswitch(int ppmask, int signo, bool re
KASSERT(p->p_nrlwps > 0);
/*
+ * If we are exiting, demise now.
+ *
+ * This avoids notifying tracer and deadlocking.
+ */
+ if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
+ mutex_exit(p->p_lock);
+ if (relock) {
+ mutex_exit(proc_lock);
+ }
+ lwp_exit(l);
+ panic("sigswitch");
+ /* NOTREACHED */
+ }
+
+ /*
* On entry we know that the process needs to stop. If it's
* the result of a 'sideways' stop signal that has been sourced
* through issignal(), then stop other LWPs in the process too.
@@ -2395,6 +2436,18 @@ proc_stoptrace(int trapno, int sysnum, c
mutex_enter(p->p_lock);
/*
+ * If we are exiting, demise now.
+ *
+ * This avoids notifying tracer and deadlocking.
+ */
+ if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
+ mutex_exit(p->p_lock);
+ lwp_exit(l);
+ panic("proc_stoptrace");
+ /* NOTREACHED */
+ }
+
+ /*
* If there's a pending SIGKILL process it immediately.
*/
if (p->p_xsig == SIGKILL
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Tue Jun 4 11:54:04 UTC 2019 Modified Files: src/sys/kern: kern_lwp.c kern_sig.c Log Message: Stop trying to inform debugger about events from an exiting child Do not emit signals to parent for if a process is demising: - fork/vfork/similar - lwp created/exited - exec - syscall entry/exit With these changes Go applications can be traced without a clash under a debugger, at least without deadlocking always. The culprit reason was an attempt to inform a debugger in the middle of exit1() call about a dying LWP. Go applications perform exit(2) without collecting threads first. Verified with GDB and picotrace-based utilities like sigtracer. PR kern/53120 PR port-arm/51677 PR bin/54060 PR bin/49662 PR kern/52548 To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/kern/kern_lwp.c cvs rdiff -u -r1.358 -r1.359 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/dmesg
Module Name:src Committed By: kre Date: Tue Jun 4 11:37:39 UTC 2019 Modified Files: src/sbin/dmesg: dmesg.c Log Message: PR toolchain/54269 Make a SMALL dmesg even smaller. When compiled -DSMALL, dmesg does nothing at all with the kernel timestamps (it processes no options to be told what would be the user's desire) so make it truly do (almost) nothing, rather than some botched partial processing of them. The "almost" is that a SMALL dmesg will now ignore spaces at the beginning of each new message line ... those are (vanishingly) unlikely to occur, as the kernel puts the timestamp (which starts with '[' there) - fixing this would have meant even more #ifdef's as the code that ignores that leading space is the only remaining thing that (in a SMALL) dmesg looks at the value of the "tstamp" variable, and if we don't keep some use of it, gcc complains... These changes affect only SMALL dmesg (as installed on boot floppies, etc) and have no intended effect on the version that's installed on a normal (full size) running system. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sbin/dmesg/dmesg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/dmesg
Module Name:src
Committed By: kre
Date: Tue Jun 4 11:37:39 UTC 2019
Modified Files:
src/sbin/dmesg: dmesg.c
Log Message:
PR toolchain/54269
Make a SMALL dmesg even smaller.
When compiled -DSMALL, dmesg does nothing at all with the kernel
timestamps (it processes no options to be told what would be the
user's desire) so make it truly do (almost) nothing, rather than
some botched partial processing of them.
The "almost" is that a SMALL dmesg will now ignore spaces at the
beginning of each new message line ... those are (vanishingly)
unlikely to occur, as the kernel puts the timestamp (which starts
with '[' there) - fixing this would have meant even more #ifdef's
as the code that ignores that leading space is the only remaining
thing that (in a SMALL) dmesg looks at the value of the "tstamp"
variable, and if we don't keep some use of it, gcc complains...
These changes affect only SMALL dmesg (as installed on boot
floppies, etc) and have no intended effect on the version that's
installed on a normal (full size) running system.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sbin/dmesg/dmesg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dmesg/dmesg.c
diff -u src/sbin/dmesg/dmesg.c:1.41 src/sbin/dmesg/dmesg.c:1.42
--- src/sbin/dmesg/dmesg.c:1.41 Tue Oct 30 19:40:36 2018
+++ src/sbin/dmesg/dmesg.c Tue Jun 4 11:37:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dmesg.c,v 1.41 2018/10/30 19:40:36 kre Exp $ */
+/* $NetBSD: dmesg.c,v 1.42 2019/06/04 11:37:39 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,7 +38,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93";
#else
-__RCSID("$NetBSD: dmesg.c,v 1.41 2018/10/30 19:40:36 kre Exp $");
+__RCSID("$NetBSD: dmesg.c,v 1.42 2019/06/04 11:37:39 kre Exp $");
#endif
#endif /* not lint */
@@ -291,27 +291,25 @@ main(int argc, char *argv[])
#endif
switch (ch) {
- case '[':
#ifndef SMALL
+ case '[':
frac = false;
scale = 0;
-#endif
ADDC(ch);
continue;
+#endif
case '<':
log = 1;
continue;
case '>':
log = 0;
continue;
- case ']':
#ifndef SMALL
+ case ']':
frac = false;
-#endif
ADDC(ch);
ADDC('\0');
tstamp = 0;
-#ifndef SMALL
sec = fsec = 0;
switch (sscanf(tbuf, "[%jd.%ld]", , )){
case EOF:
@@ -374,21 +372,21 @@ main(int argc, char *argv[])
}
if (!quiet || deltas)
printf("] ");
-#endif
continue;
+#endif
case ' ':
if (!tstamp)
continue;
/*FALLTHROUGH*/
default:
+#ifndef SMALL
if (tstamp) {
ADDC(ch);
-#ifndef SMALL
if (ch == '.')
frac = true;
-#endif
continue;
}
+#endif
if (log)
continue;
break;
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Tue Jun 4 10:15:22 UTC 2019
Modified Files:
src/sys/dev/ic: aic7xxx.c
src/sys/dev/microcode/aic7xxx: aic79xx.seq aic7xxx.seq
src/sys/dev/usb: umcs.h
src/sys/netinet: dccp_tcplike.c dccp_tcplike.h dccp_tfrc.c dccp_tfrc.h
Log Message:
Fix typo (s/recevie/receive/).
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/aic7xxx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/microcode/aic7xxx/aic79xx.seq
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/microcode/aic7xxx/aic7xxx.seq
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/umcs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/dccp_tcplike.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/dccp_tcplike.h \
src/sys/netinet/dccp_tfrc.h
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/dccp_tfrc.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/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.135 src/sys/dev/ic/aic7xxx.c:1.136
--- src/sys/dev/ic/aic7xxx.c:1.135 Mon Feb 4 10:09:31 2019
+++ src/sys/dev/ic/aic7xxx.c Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $
+ * $Id: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.135 2019/02/04 10:09:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.136 2019/06/04 10:15:22 msaitoh Exp $");
#include
#include
@@ -1107,7 +1107,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc
printf("\tCRC Value Mismatch\n");
if ((sstat2 & CRCENDERR) != 0)
printf("\tNo terminal CRC packet "
- "recevied\n");
+ "received\n");
if ((sstat2 & CRCREQERR) != 0)
printf("\tIllegal CRC packet "
"request\n");
Index: src/sys/dev/microcode/aic7xxx/aic79xx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.11 src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.12
--- src/sys/dev/microcode/aic7xxx/aic79xx.seq:1.11 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/microcode/aic7xxx/aic79xx.seq Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.seq,v 1.11 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: aic79xx.seq,v 1.12 2019/06/04 10:15:22 msaitoh Exp $ */
/*
* Adaptec U320 device driver firmware for Linux and FreeBSD.
@@ -1012,7 +1012,7 @@ mesgin_complete:
test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
/*
- * If we recevied good status but never successfully sent the
+ * If we received good status but never successfully sent the
* cdb, abort the command.
*/
test SCB_SCSI_STATUS,0xff jnz complete_accepted;
Index: src/sys/dev/microcode/aic7xxx/aic7xxx.seq
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.19 src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.20
--- src/sys/dev/microcode/aic7xxx/aic7xxx.seq:1.19 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/microcode/aic7xxx/aic7xxx.seq Tue Jun 4 10:15:22 2019
@@ -40,7 +40,7 @@
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.seq,v 1.123 2003/01/20 20:44:55 gibbs Exp $
*/
-VERSION = "$NetBSD: aic7xxx.seq,v 1.19 2014/10/18 08:33:28 snj Exp $"
+VERSION = "$NetBSD: aic7xxx.seq,v 1.20 2019/06/04 10:15:22 msaitoh Exp $"
PATCH_ARG_LIST = "struct ahc_softc *ahc"
PREFIX = "ahc_"
@@ -1640,7 +1640,7 @@ mesgin_complete:
test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
/*
- * If we recevied good status but never successfully sent the
+ * If we received good status but never successfully sent the
* cdb, abort the command.
*/
test SCB_SCSI_STATUS,0xff jnz complete_accepted;
Index: src/sys/dev/usb/umcs.h
diff -u src/sys/dev/usb/umcs.h:1.1 src/sys/dev/usb/umcs.h:1.2
--- src/sys/dev/usb/umcs.h:1.1 Sun Mar 16 09:34:45 2014
+++ src/sys/dev/usb/umcs.h Tue Jun 4 10:15:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.h,v 1.1 2014/03/16 09:34:45 martin Exp $ */
+/* $NetBSD: umcs.h,v 1.2 2019/06/04 10:15:22 msaitoh Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 252123 2013-06-23 20:19:51Z thomas $ */
/*-
@@ -170,7 +170,7 @@
#define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the
* Bulk-In FIFO, default = 0 */
#define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART,
- * which were recevied with
+ * which were received with
* errors, default = 0 */
#define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */
#define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */
@@ -564,9 +564,9 @@
#define MCS7840_UART_ISR_NOPENDING 0x01 /* No
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Tue Jun 4 10:15:22 UTC 2019 Modified Files: src/sys/dev/ic: aic7xxx.c src/sys/dev/microcode/aic7xxx: aic79xx.seq aic7xxx.seq src/sys/dev/usb: umcs.h src/sys/netinet: dccp_tcplike.c dccp_tcplike.h dccp_tfrc.c dccp_tfrc.h Log Message: Fix typo (s/recevie/receive/). To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/aic7xxx.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/microcode/aic7xxx/aic79xx.seq cvs rdiff -u -r1.19 -r1.20 src/sys/dev/microcode/aic7xxx/aic7xxx.seq cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/umcs.h cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/dccp_tcplike.c cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/dccp_tcplike.h \ src/sys/netinet/dccp_tfrc.h cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/dccp_tfrc.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: Tue Jun 4 09:43:15 UTC 2019 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Match the follwing devices: 82598_BX (0x1508) 82599_KR (0x1517) 82599_SFP_EM (0x1507) X550EM_X_XFI (0x15b0) X550EM_A_QSFP (0x15ca) X550EM_A_QSFP_N(0x15cc) To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 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: Tue Jun 4 09:43:15 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Match the follwing devices:
82598_BX (0x1508)
82599_KR (0x1517)
82599_SFP_EM (0x1507)
X550EM_X_XFI (0x15b0)
X550EM_A_QSFP (0x15ca)
X550EM_A_QSFP_N(0x15cc)
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 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.187 src/sys/dev/pci/ixgbe/ixgbe.c:1.188
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.187 Wed May 29 10:07:30 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Jun 4 09:43:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.187 2019/05/29 10:07:30 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.188 2019/06/04 09:43:15 msaitoh Exp $ */
/**
@@ -100,14 +100,17 @@ static const ixgbe_vendor_info_t ixgbe_v
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AT, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AT2, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598_BX, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598_DA_DUAL_PORT, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598_CX4_DUAL_PORT, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598EB_XF_LR, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598EB_SFP_LOM, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_KR, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_KX4, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_KX4_MEZZ, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_EM, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_XAUI_LOM, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_CX4, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_T3_LOM, 0, 0, 0},
@@ -127,8 +130,11 @@ static const ixgbe_vendor_info_t ixgbe_v
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_X_10G_T, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_X_1G_T, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_X_SFP, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_X_XFI, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_KR, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_KR_L, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_QSFP, 0, 0, 0},
+ {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_QSFP_N, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_SFP, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_SFP_N, 0, 0, 0},
{IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X550EM_A_SGMII, 0, 0, 0},
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jun 4 09:12:08 UTC 2019 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.1362 -r1.1363 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1361 -r1.1362 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: Tue Jun 4 09:09:47 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Update some Intel ixgbe devices: - Add Xeon D XFI. - Add "(Hyper-V)" to 0x15a9's description. - Add C3000 QSFP devices. To generate a diff of this commit: cvs rdiff -u -r1.1374 -r1.1375 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.1374 src/sys/dev/pci/pcidevs:1.1375 --- src/sys/dev/pci/pcidevs:1.1374 Sat Jun 1 08:13:31 2019 +++ src/sys/dev/pci/pcidevs Tue Jun 4 09:09:47 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1374 2019/06/01 08:13:31 jdolecek Exp $ +$NetBSD: pcidevs,v 1.1375 2019/06/04 09:09:47 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3530,12 +3530,13 @@ product INTEL I218_V2 0x15a1 I218-V Eth product INTEL I218_LM3 0x15a2 I218-LM Ethernet Connection product INTEL I218_V3 0x15a3 I218-V Ethernet Connection product INTEL X552_VF 0x15a8 X552 VF -product INTEL X552_VF_HV 0x15a9 X552 VF +product INTEL X552_VF_HV 0x15a9 X552 VF (Hyper-V) product INTEL X552_KX4 0x15aa X552 KX4 product INTEL X552_KR 0x15ab X552 KR product INTEL X552_SFP 0x15ac X552 SFP+ product INTEL X557_AT2 0x15ad X557-AT2 product INTEL X552_1G_T 0x15ae X552 1000Base-T +product INTEL X552_XFI 0x15b0 X552 XFI product INTEL C3K_X553_VF_HYPV 0x15b4 C3000 X553 VF (Hyper-V) product INTEL I219_LM2 0x15b7 I219-LM Ethernet Connection product INTEL I219_V2 0x15b8 I219-V Ethernet Connection @@ -3551,6 +3552,8 @@ product INTEL C3K_X553_VF 0x15c5 C3000 X product INTEL C3K_X553_SGMII_BP 0x15c6 C3000 X553 1GbE SGMII Backplane (10G SKU) product INTEL C3K_X553_SGMII_BP_L 0x15c7 C3000 X553 1GbE SGMII Backplane (non-10G SKU) product INTEL C3K_X553_10G_T 0x15c8 C3000 X553 10GBASE-T (X557) +product INTEL C3K_X553_QSFP 0x15ca C3000 X553 10G QSFP +product INTEL C3K_X553_QSFP_N 0x15cc C3000 X553 10G QSFP product INTEL C3K_X553_KR_SFP 0x15ce C3000 X553 10G SFP+ (KR) product INTEL X550T1 0x15d1 X550 10G Ethernet product INTEL I219_V5 0x15d6 I219-V Ethernet Connection
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jun 4 09:09:47 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Update some Intel ixgbe devices: - Add Xeon D XFI. - Add "(Hyper-V)" to 0x15a9's description. - Add C3000 QSFP devices. To generate a diff of this commit: cvs rdiff -u -r1.1374 -r1.1375 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/external/cddl/osnet
Module Name:src Committed By: hannken Date: Tue Jun 4 08:45:18 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/rpc: xdr.h src/external/cddl/osnet/lib/libnvpair: Makefile Log Message: Use native XDR for libnvpair in userland. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/rpc/xdr.h cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/lib/libnvpair/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: hannken
Date: Tue Jun 4 08:45:18 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/rpc: xdr.h
src/external/cddl/osnet/lib/libnvpair: Makefile
Log Message:
Use native XDR for libnvpair in userland.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/rpc/xdr.h
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/lib/libnvpair/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/rpc/xdr.h
diff -u src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.4 src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.5
--- src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.4 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/rpc/xdr.h Tue Jun 4 08:45:17 2019
@@ -34,6 +34,7 @@
*
*/
+#if defined(_KERNEL) || defined(_STANDALONE)
#ifndef _RPC_XDR_H
#define _RPC_XDR_H
@@ -646,3 +647,6 @@ extern bool_t xdr_replymsg_hdr(XDR *, st
#endif
#endif /* !_RPC_XDR_H */
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+#include_next
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.9 src/external/cddl/osnet/lib/libnvpair/Makefile:1.10
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.9 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/lib/libnvpair/Makefile Tue Jun 4 08:45:17 2019
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2018/05/28 21:05:09 chs Exp $
+# $NetBSD: Makefile,v 1.10 2019/06/04 08:45:17 hannken Exp $
.include
.PATH: ${.CURDIR}/../../dist/lib/libnvpair
.PATH: ${.CURDIR}/../../dist/common/nvpair
-.PATH: ${.CURDIR}/../../dist/uts/common/rpc
CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OPENSOLARIS_USR_DISTDIR}/head \
- -I${OPENSOLARIS_SYS_DISTDIR}/common \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+ -I${OPENSOLARIS_SYS_DISTDIR}/common
CPPFLAGS+= -Wall \
-Wno-unknown-pragmas \
@@ -21,9 +19,6 @@ CPPFLAGS+= -Wall \
LIB= nvpair
SRCS= libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c fnvpair.c nvpair_json.c
-SRCS+= xdr.c
-SRCS+= xdr_array.c
-SRCS+= xdr_mem.c
.include "../../Makefile.zfs"
.include
CVS commit: src
Module Name:src Committed By: hannken Date: Tue Jun 4 08:44:08 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi src/include/rpc: xdr.h src/lib/libc: shlib_version src/lib/libc/rpc: xdr_mem.c Log Message: Implement xdrmem_control(), used as xdr_control(xdr, XDR_GET_BYTES_AVAIL ... and bump libc minor number. Final goal is to remove the unmaintained XDR implementation at external/cddl/osnet/dist/uts/common/rpc. To generate a diff of this commit: cvs rdiff -u -r1.864 -r1.865 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.223 -r1.224 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.30 -r1.31 src/include/rpc/xdr.h cvs rdiff -u -r1.283 -r1.284 src/lib/libc/shlib_version cvs rdiff -u -r1.19 -r1.20 src/lib/libc/rpc/xdr_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: hannken Date: Tue Jun 4 08:44:08 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi src/include/rpc: xdr.h src/lib/libc: shlib_version src/lib/libc/rpc: xdr_mem.c Log Message: Implement xdrmem_control(), used as xdr_control(xdr, XDR_GET_BYTES_AVAIL ... and bump libc minor number. Final goal is to remove the unmaintained XDR implementation at external/cddl/osnet/dist/uts/common/rpc. To generate a diff of this commit: cvs rdiff -u -r1.864 -r1.865 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.223 -r1.224 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.30 -r1.31 src/include/rpc/xdr.h cvs rdiff -u -r1.283 -r1.284 src/lib/libc/shlib_version cvs rdiff -u -r1.19 -r1.20 src/lib/libc/rpc/xdr_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.864 src/distrib/sets/lists/base/shl.mi:1.865 --- src/distrib/sets/lists/base/shl.mi:1.864 Sun Apr 28 00:03:46 2019 +++ src/distrib/sets/lists/base/shl.mi Tue Jun 4 08:44:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.864 2019/04/28 00:03:46 christos Exp $ +# $NetBSD: shl.mi,v 1.865 2019/06/04 08:44:08 hannken Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -18,7 +18,7 @@ ./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot ./lib/libc.so base-sys-shlib dynamicroot ./lib/libc.so.12base-sys-shlib dynamicroot -./lib/libc.so.12.212base-sys-shlib dynamicroot +./lib/libc.so.12.213base-sys-shlib dynamicroot ./lib/libcrypt.sobase-sys-shlib dynamicroot ./lib/libcrypt.so.1base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot @@ -221,7 +221,7 @@ ./usr/lib/libc++.so.1.0base-sys-shlib compatfile,libcxx ./usr/lib/libc.sobase-sys-shlib compatfile ./usr/lib/libc.so.12base-sys-shlib compatfile -./usr/lib/libc.so.12.212 base-sys-shlib compatfile +./usr/lib/libc.so.12.213 base-sys-shlib compatfile ./usr/lib/libcdk.sobase-obsolete compatfile,obsolete ./usr/lib/libcom_err.sobase-krb5-shlib compatfile,kerberos ./usr/lib/libcom_err.so.8 base-krb5-shlib compatfile,kerberos Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.223 src/distrib/sets/lists/debug/shl.mi:1.224 --- src/distrib/sets/lists/debug/shl.mi:1.223 Sun Apr 28 00:03:46 2019 +++ src/distrib/sets/lists/debug/shl.mi Tue Jun 4 08:44:08 2019 @@ -1,8 +1,8 @@ -# $NetBSD: shl.mi,v 1.223 2019/04/28 00:03:46 christos Exp $ +# $NetBSD: shl.mi,v 1.224 2019/06/04 08:44:08 hannken Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libc.so.12.212.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libc.so.12.213.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypto.so.12.0.debug comp-sys-debug debug,dynamicroot,openssl=10 ./usr/libdata/debug/lib/libcrypto.so.14.0.debug comp-sys-debug debug,dynamicroot,openssl=11 @@ -71,7 +71,7 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug comp-sys-debug debug,compatfile,libcxx -./usr/libdata/debug/usr/lib/libc.so.12.212.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libc.so.12.213.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcom_err.so.8.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcrypto.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 Index: src/include/rpc/xdr.h diff -u src/include/rpc/xdr.h:1.30 src/include/rpc/xdr.h:1.31 --- src/include/rpc/xdr.h:1.30 Wed Aug 16 08:35:48 2017 +++ src/include/rpc/xdr.h Tue Jun 4 08:44:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: xdr.h,v 1.30 2017/08/16 08:35:48 christos Exp $ */ +/* $NetBSD: xdr.h,v 1.31 2019/06/04 08:44:08 hannken Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -209,8 +209,8 @@ xdr_putint32(XDR *xdrs, int32_t *ip) (*(xdrs)->x_ops->x_destroy)(xdrs) #define XDR_CONTROL(xdrs, req, op) \ - if ((xdrs)->x_ops->x_control) \ - (*(xdrs)->x_ops->x_control)(xdrs, req, op) + (((xdrs)->x_ops->x_control == NULL) ? (FALSE) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) #define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs,
