CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Tue Aug 27 04:22:08 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #119. To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.29 src/doc/CHANGES-9.0:1.1.2.30 --- src/doc/CHANGES-9.0:1.1.2.29 Mon Aug 26 14:16:35 2019 +++ src/doc/CHANGES-9.0 Tue Aug 27 04:22:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.29 2019/08/26 14:16:35 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.30 2019/08/27 04:22:08 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -2232,3 +2232,8 @@ sys/dev/sysmon/sysmon.c1.30 MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. [nakayama, ticket #118] +usr.sbin/sysinst/gpt.c1.11 + + Fix a bug when installing to pre-exising GPT partitions. + Handle GPT labels with spaces. + [martin, ticket #119]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Tue Aug 27 04:22:08 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #119. To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: msaitoh
Date: Tue Aug 27 04:21:01 UTC 2019
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: gpt.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #119):
usr.sbin/sysinst/gpt.c: revision 1.11
Fix a bug when installing to pre-exising GPT partitions.
Handle GPT labels with spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/usr.sbin/sysinst/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.6.2.4 src/usr.sbin/sysinst/gpt.c:1.6.2.5
--- src/usr.sbin/sysinst/gpt.c:1.6.2.4 Sun Aug 18 13:21:40 2019
+++ src/usr.sbin/sysinst/gpt.c Tue Aug 27 04:21:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.6.2.4 2019/08/18 13:21:40 msaitoh Exp $ */
+/* $NetBSD: gpt.c,v 1.6.2.5 2019/08/27 04:21:01 msaitoh Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -1131,7 +1131,7 @@ gpt_modify_part(const char *disk, struct
/* Check label */
if (strcmp(p->gp_label, old.gp_label) != 0) {
if (run_program(RUN_SILENT,
- "gpt label -b %" PRIu64 " -l %s %s",
+ "gpt label -b %" PRIu64 " -l \'%s\' %s",
p->gp_start, p->gp_label, disk) != 0)
return false;
}
@@ -1213,6 +1213,20 @@ gpt_add_wedge(const char *disk, struct g
return true;
}
+static void
+escape_spaces(char *dest, const char *src)
+{
+ unsigned char c;
+
+ while (*src) {
+ c = *src++;
+ if (isspace(c) || c == '\\')
+ *dest++ = '\\';
+ *dest++ = c;
+ }
+ *dest = 0;
+}
+
static bool
gpt_get_part_device(const struct disk_partitions *arg,
part_id id, char *devname, size_t max_devname_len, int *part,
@@ -1221,6 +1235,7 @@ gpt_get_part_device(const struct disk_pa
const struct gpt_disk_partitions *parts =
(const struct gpt_disk_partitions*)arg;
struct gpt_part_entry *p = parts->partitions;
+ char tmpname[GPT_LABEL_LEN*2];
part_id no;
@@ -1239,12 +1254,14 @@ gpt_get_part_device(const struct disk_pa
switch (usage) {
case logical_name:
- if (p->gp_label[0] != 0)
+ if (p->gp_label[0] != 0) {
+ escape_spaces(tmpname, p->gp_label);
snprintf(devname, max_devname_len,
- "NAME=%s", p->gp_label);
- else
+ "NAME=%s", tmpname);
+ } else {
snprintf(devname, max_devname_len,
"NAME=%s", p->gp_id);
+ }
break;
case plain_name:
assert(p->gp_flags & GPEF_WEDGE);
@@ -1275,7 +1292,7 @@ gpt_write_to_disk(struct disk_partitions
{
struct gpt_disk_partitions *parts = (struct gpt_disk_partitions*)arg;
struct gpt_part_entry *p, *n;
- char label_arg[sizeof(p->gp_label) + 4];
+ char label_arg[sizeof(p->gp_label) + 10];
char diskpath[MAXPATHLEN];
int fd, bits = 0;
bool root_is_new = false, efi_is_new = false;
@@ -1295,11 +1312,9 @@ gpt_write_to_disk(struct disk_partitions
close(fd);
/*
- * Mark all partitions as "have no wedge yet". While there,
- * collect first root and efi partition (if available)
+ * Collect first root and efi partition (if available)
*/
for (pno = 0, p = parts->partitions; p != NULL; p = p->gp_next, pno++) {
- p->gp_flags &= ~GPEF_WEDGE;
if (root_id == NO_PART && p->gp_type != NULL) {
if (p->gp_type->gent.generic_ptype == PT_root &&
p->gp_start == pm->ptstart) {
@@ -1373,7 +1388,7 @@ gpt_write_to_disk(struct disk_partitions
if (p->gp_label[0] == 0)
label_arg[0] = 0;
else
- sprintf(label_arg, "-l %s", p->gp_label);
+ sprintf(label_arg, "-l \'%s\'", p->gp_label);
if (p->gp_type != NULL)
run_program(RUN_SILENT,
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Tue Aug 27 04:21:01 UTC 2019 Modified Files: src/usr.sbin/sysinst [netbsd-9]: gpt.c Log Message: Pull up following revision(s) (requested by martin in ticket #119): usr.sbin/sysinst/gpt.c: revision 1.11 Fix a bug when installing to pre-exising GPT partitions. Handle GPT labels with spaces. To generate a diff of this commit: cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/usr.sbin/sysinst/gpt.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/usb
Module Name:src Committed By: rin Date: Mon Aug 26 17:26:33 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c Log Message: PR kern/54486 Revert workaround introduced in rev 1.94: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/usb/if_axe.c#rev1.94 This is a problem specific to ARMv6+, and addressed by arch/arm/conf/Makefile.arm rev 1.50: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/conf/Makefile.arm#rev1.50 XXX pullup netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/dev/usb/if_axe.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/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.119 src/sys/dev/usb/if_axe.c:1.120 --- src/sys/dev/usb/if_axe.c:1.119 Fri Aug 23 04:32:57 2019 +++ src/sys/dev/usb/if_axe.c Mon Aug 26 17:26:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $ */ +/* $NetBSD: if_axe.c,v 1.120 2019/08/26 17:26:33 rin Exp $ */ /* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */ /* @@ -87,7 +87,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.119 2019/08/23 04:32:57 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.120 2019/08/26 17:26:33 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1038,18 +1038,7 @@ axe_rx_loop(struct usbnet * un, struct u break; } -#if !defined(__NO_STRICT_ALIGNMENT) && __GNUC_PREREQ__(6, 1) - /* - * XXX hdr is 2-byte aligned in buf, not 4-byte. - * For some architectures, __builtin_memcpy() of - * GCC 6 attempts to copy sizeof(hdr) = 4 bytes - * at onece, which results in alignment error. - */ - hdr.len = *(uint16_t *)buf; - hdr.ilen = *(uint16_t *)(buf + sizeof(uint16_t)); -#else memcpy(, buf, sizeof(hdr)); -#endif DPRINTFN(20, "total_len %#jx len %jx ilen %#jx", total_len,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: rin Date: Mon Aug 26 17:26:33 UTC 2019 Modified Files: src/sys/dev/usb: if_axe.c Log Message: PR kern/54486 Revert workaround introduced in rev 1.94: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/usb/if_axe.c#rev1.94 This is a problem specific to ARMv6+, and addressed by arch/arm/conf/Makefile.arm rev 1.50: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/conf/Makefile.arm#rev1.50 XXX pullup netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/dev/usb/if_axe.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/conf
Module Name:src Committed By: rin Date: Mon Aug 26 17:18:42 UTC 2019 Modified Files: src/sys/arch/arm/conf: Makefile.arm Log Message: PR kern/54486 Workaround for alignment faults on ARMv6+, at least occur with axe(4) and athn(4) drivers. For ARMv6+, unaligned access is enabled by default. However, it cannot be used for non-cacheable memory, which is used as DMA buffers. This results in alignment faults above. A real fix is to use cacheable memory as DMA buffers. However, it breaks some drivers, awge(4) and vchiq(4) at least. Until we figure out problems and fix them, we choose a fail-safe workaround here; forbid unaligned memory access for whole kernel. Affects on performance is negligibly small as far as we can see. XXX pullup netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/conf/Makefile.arm 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/conf
Module Name:src Committed By: rin Date: Mon Aug 26 17:18:42 UTC 2019 Modified Files: src/sys/arch/arm/conf: Makefile.arm Log Message: PR kern/54486 Workaround for alignment faults on ARMv6+, at least occur with axe(4) and athn(4) drivers. For ARMv6+, unaligned access is enabled by default. However, it cannot be used for non-cacheable memory, which is used as DMA buffers. This results in alignment faults above. A real fix is to use cacheable memory as DMA buffers. However, it breaks some drivers, awge(4) and vchiq(4) at least. Until we figure out problems and fix them, we choose a fail-safe workaround here; forbid unaligned memory access for whole kernel. Affects on performance is negligibly small as far as we can see. XXX pullup netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/conf/Makefile.arm 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/conf/Makefile.arm diff -u src/sys/arch/arm/conf/Makefile.arm:1.49 src/sys/arch/arm/conf/Makefile.arm:1.50 --- src/sys/arch/arm/conf/Makefile.arm:1.49 Sat Sep 22 12:24:01 2018 +++ src/sys/arch/arm/conf/Makefile.arm Mon Aug 26 17:18:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.arm,v 1.49 2018/09/22 12:24:01 rin Exp $ +# $NetBSD: Makefile.arm,v 1.50 2019/08/26 17:18:42 rin Exp $ # Makefile for NetBSD # @@ -53,6 +53,26 @@ CPPFLAGS.cpufunc_asm_armv6.S+= -mcpu=arm CPPFLAGS.cpufunc_asm_arm11.S+= -mcpu=arm1136j-s CPPFLAGS.cpufunc_asm_xscale.S+= -mcpu=xscale +.if !empty(MACHINE_ARCH:Mearmv6*) || !empty(MACHINE_ARCH:Mearmv7*) +# XXX +# +# Workaround for alignment faults on ARMv6+, at least occur with +# axe(4) and athn(4) drivers. +# +# For ARMv6+, unaligned access is enabled by default. However, it +# cannot be used for non-cacheable memory, which is used as DMA +# buffers. This results in alignment faults above. A real fix is +# to use cacheable memory as DMA buffers. However, it breaks some +# drivers, awge(4) and vchiq(4) at least. +# +# Until we figure out problems and fix them, we choose a fail-safe +# workaround here; forbid unaligned memory access for whole kernel. +# Affects on performance is negligibly small as far as we can see. +# +# See PR kern/54486 for more details. +CFLAGS+= -mno-unaligned-access +.endif + ## ## (3) libkern and compat ##
CVS commit: src
Module Name:src Committed By: msaitoh Date: Mon Aug 26 15:35:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/sys/dev/microcode/radeon: Makefile Added Files: src/sys/dev/microcode/radeon: R600_uvd.bin RS780_uvd.bin RV770_uvd.bin TAHITI_vce.bin Log Message: Add missing TAHITI_vce.bin, RV770_uvd.bin, RS780_uvd.bin and R600_uvd.bin. Fix panic on my own HP EliteDesk 705 G1 SFF. It also fixes PR kern/53988 reported by Onno van der Linden. To generate a diff of this commit: cvs rdiff -u -r1.1210 -r1.1211 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r0 -r1.1 src/sys/dev/microcode/radeon/R600_uvd.bin \ src/sys/dev/microcode/radeon/RS780_uvd.bin \ src/sys/dev/microcode/radeon/RV770_uvd.bin \ src/sys/dev/microcode/radeon/TAHITI_vce.bin 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/mi diff -u src/distrib/sets/lists/base/mi:1.1210 src/distrib/sets/lists/base/mi:1.1211 --- src/distrib/sets/lists/base/mi:1.1210 Wed Aug 14 01:42:08 2019 +++ src/distrib/sets/lists/base/mi Mon Aug 26 15:35:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1210 2019/08/14 01:42:08 kamil Exp $ +# $NetBSD: mi,v 1.1211 2019/08/26 15:35:14 msaitoh Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -369,6 +369,7 @@ ./libdata/firmware/radeon/R600_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/R600_pfp.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/R600_rlc.bin base-firmware-usr radeonfirmware +./libdata/firmware/radeon/R600_uvd.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/R700_rlc.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/REDWOOD_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/REDWOOD_pfp.bin base-firmware-usr radeonfirmware @@ -378,6 +379,7 @@ ./libdata/firmware/radeon/RS690_cp.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RS780_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RS780_pfp.bin base-firmware-usr radeonfirmware +./libdata/firmware/radeon/RS780_uvd.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RV610_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RV610_pfp.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RV620_me.bin base-firmware-usr radeonfirmware @@ -399,6 +401,7 @@ ./libdata/firmware/radeon/RV770_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RV770_pfp.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/RV770_smc.bin base-firmware-usr radeonfirmware +./libdata/firmware/radeon/RV770_uvd.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/SUMO2_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/SUMO2_pfp.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/SUMO_me.bin base-firmware-usr radeonfirmware @@ -413,6 +416,7 @@ ./libdata/firmware/radeon/TAHITI_rlc.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/TAHITI_smc.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/TAHITI_uvd.bin base-firmware-usr radeonfirmware +./libdata/firmware/radeon/TAHITI_vce.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/TURKS_mc.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/TURKS_me.bin base-firmware-usr radeonfirmware ./libdata/firmware/radeon/TURKS_pfp.bin base-firmware-usr radeonfirmware Index: src/sys/dev/microcode/radeon/Makefile diff -u src/sys/dev/microcode/radeon/Makefile:1.3 src/sys/dev/microcode/radeon/Makefile:1.4 --- src/sys/dev/microcode/radeon/Makefile:1.3 Sun Apr 26 21:37:22 2015 +++ src/sys/dev/microcode/radeon/Makefile Mon Aug 26 15:35:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/04/26 21:37:22 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2019/08/26 15:35:14 msaitoh Exp $ NOMAN= # defined @@ -14,8 +14,8 @@ FILES= \ R520_cp.bin \ RS600_cp.bin \ RS690_cp.bin \ - R600_me.bin R600_pfp.bin R600_rlc.bin \ - RS780_me.bin RS780_pfp.bin \ + R600_me.bin R600_pfp.bin R600_rlc.bin R600_uvd.bin \ + RS780_me.bin RS780_pfp.bin RS780_uvd.bin \ RV610_me.bin RV610_pfp.bin \ RV620_me.bin RV620_pfp.bin \ RV630_me.bin RV630_pfp.bin \ @@ -24,7 +24,7 @@ FILES= \ RV710_me.bin RV710_pfp.bin RV710_smc.bin RV710_uvd.bin \ RV730_me.bin RV730_pfp.bin RV730_smc.bin \ RV740_smc.bin \ - RV770_me.bin RV770_pfp.bin RV770_smc.bin \ + RV770_me.bin RV770_pfp.bin RV770_smc.bin RV770_uvd.bin \ R700_rlc.bin \ ARUBA_me.bin ARUBA_pfp.bin ARUBA_rlc.bin \ BARTS_mc.bin BARTS_me.bin BARTS_pfp.bin BARTS_smc.bin \ @@ -60,6 +60,7 @@ FILES= \ SUMO2_me.bin SUMO2_pfp.bin \ TAHITI_ce.bin TAHITI_mc.bin TAHITI_mc2.bin TAHITI_me.bin \ TAHITI_pfp.bin TAHITI_rlc.bin TAHITI_smc.bin TAHITI_uvd.bin
CVS commit: src
Module Name:src Committed By: msaitoh Date: Mon Aug 26 15:35:14 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/sys/dev/microcode/radeon: Makefile Added Files: src/sys/dev/microcode/radeon: R600_uvd.bin RS780_uvd.bin RV770_uvd.bin TAHITI_vce.bin Log Message: Add missing TAHITI_vce.bin, RV770_uvd.bin, RS780_uvd.bin and R600_uvd.bin. Fix panic on my own HP EliteDesk 705 G1 SFF. It also fixes PR kern/53988 reported by Onno van der Linden. To generate a diff of this commit: cvs rdiff -u -r1.1210 -r1.1211 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r0 -r1.1 src/sys/dev/microcode/radeon/R600_uvd.bin \ src/sys/dev/microcode/radeon/RS780_uvd.bin \ src/sys/dev/microcode/radeon/RV770_uvd.bin \ src/sys/dev/microcode/radeon/TAHITI_vce.bin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/microcode/radeon
Module Name:src Committed By: msaitoh Date: Mon Aug 26 14:20:01 UTC 2019 Modified Files: src/sys/dev/microcode/radeon: BONAIRE_uvd.bin Log Message: Update BONAIRE_uvd.bin to the latest. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/radeon/BONAIRE_uvd.bin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/microcode/radeon
Module Name:src Committed By: msaitoh Date: Mon Aug 26 14:20:01 UTC 2019 Modified Files: src/sys/dev/microcode/radeon: BONAIRE_uvd.bin Log Message: Update BONAIRE_uvd.bin to the latest. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/radeon/BONAIRE_uvd.bin 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/microcode/radeon/BONAIRE_uvd.bin Binary files are different
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 14:16:35 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #106 - #109, #111 - #115, #117, #118 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.28 src/doc/CHANGES-9.0:1.1.2.29 --- src/doc/CHANGES-9.0:1.1.2.28 Mon Aug 26 13:26:07 2019 +++ src/doc/CHANGES-9.0 Mon Aug 26 14:16:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.28 2019/08/26 13:26:07 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.29 2019/08/26 14:16:35 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -2157,3 +2157,78 @@ sys/sys/event.h backout 1.33 Backout for now, causes build failures and final fix is not yet clear. [kamil, ticket #22] +distrib/sets/lists/base/shl.mi 1.867 + + Remove obsolete entry for libgomp.so.1.2. + [nakayama, ticket #106] + +sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi 1.6 + + Revert to the version in linux mainline. + [rin, ticket #107] + +sbin/route/route.c1.161 + + route(8): print RTM_CHANGE messages. + [roy, ticket #108] + +sys/net/route.h 1.124 +sys/net/rtsock.c1.251 +sys/netinet/if_arp.c1.284 +sys/netinet6/nd6.c1.258,1.259 +sys/netinet6/nd6_nbr.c1.167 + + rtsock: rework rt_clonedmsg to take a message type and lladdr. + nd6: notify userland of neighbour lla updates. + [roy, ticket #109] + +sys/dev/usb/usbdevs1.771-1.773 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + Add + - belkin F5U258 + - national instruments USB host to host adapter + - prolific id 25a1 + - ACTIONTEC KL5KUSB101 USB Ethernet adapter + - ALLIEDTELESYN AT-USB10 USB Ethernet Adapter + - MosChip MCS7730 + - Sitecom Europe LN030 ethernet adapters. + [mrg, ticket #111] + +sys/dev/pci/pcidevs1.1384 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + Add micron/crucial SM2263 nvme. + Add some device found on asus x570-p with ryzen 3200G cpu. + Spell it "PCIe' when using the name. + [mrg, ticket #112] + +external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 1.51 + + Implement poll support. + [hannken, ticket #113] + +external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 1.52 + + Implement kqueue support. + [hannken, ticket #114] + +external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c 1.8 + + Add missing dmu_zfetch_fini() when dnode_create() lost the race. + [hannken, ticket #115] + +tests/net/ndp/t_ndp.sh1.34 + + Make a permanent neighbor cache to avoid sending an NS packet + disturbing the test. + [ozaki-r, ticket #117] + +sys/dev/sysmon/sysmon.c1.30 + + Module class of sysmon_envsys, sysmon_wdog and sysmon_power is + MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. + [nakayama, ticket #118] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 14:16:35 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #106 - #109, #111 - #115, #117, #118 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-9.0 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/sysmon
Module Name:src
Committed By: martin
Date: Mon Aug 26 14:13:42 UTC 2019
Modified Files:
src/sys/dev/sysmon [netbsd-9]: sysmon.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #118):
sys/dev/sysmon/sysmon.c: revision 1.30
Module class of sysmon_envsys, sysmon_wdog and sysmon_power is
MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC.
Fix that invoking envsys without sysmon_envsys kernel module failes with:
WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/dev/sysmon/sysmon.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/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.29 src/sys/dev/sysmon/sysmon.c:1.29.2.1
--- src/sys/dev/sysmon/sysmon.c:1.29 Fri Apr 26 08:38:25 2019
+++ src/sys/dev/sysmon/sysmon.c Mon Aug 26 14:13:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.29.2.1 2019/08/26 14:13:42 martin Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.29.2.1 2019/08/26 14:13:42 martin Exp $");
#include
#include
@@ -151,7 +151,7 @@ sysmonopen(dev_t dev, int flag, int mode
if (sysmon_opvec_table[minor(dev)] == NULL) {
mutex_exit(_minor_mtx);
error = module_autoload(sysmon_mod[minor(dev)],
- MODULE_CLASS_MISC);
+ MODULE_CLASS_DRIVER);
if (error)
return error;
mutex_enter(_minor_mtx);
CVS commit: [netbsd-9] src/sys/dev/sysmon
Module Name:src Committed By: martin Date: Mon Aug 26 14:13:42 UTC 2019 Modified Files: src/sys/dev/sysmon [netbsd-9]: sysmon.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #118): sys/dev/sysmon/sysmon.c: revision 1.30 Module class of sysmon_envsys, sysmon_wdog and sysmon_power is MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. Fix that invoking envsys without sysmon_envsys kernel module failes with: WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/dev/sysmon/sysmon.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/tests/net/ndp
Module Name:src Committed By: martin Date: Mon Aug 26 14:11:04 UTC 2019 Modified Files: src/tests/net/ndp [netbsd-9]: t_ndp.sh Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #117): tests/net/ndp/t_ndp.sh: revision 1.34 Make a permanet neighbor cache to avoid sending an NS packet disturbing the test A receiver of an ICMPv6 request packet creates a stale cache entry and it turns into the delay state on replying the packet. After 5 second, the receiver sends an NS packet as a reachability confirmation, which disturbs the test and causes a unexpected result. Should fix PR misc/54451 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.2.1 src/tests/net/ndp/t_ndp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/tests/net/ndp
Module Name:src
Committed By: martin
Date: Mon Aug 26 14:11:04 UTC 2019
Modified Files:
src/tests/net/ndp [netbsd-9]: t_ndp.sh
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #117):
tests/net/ndp/t_ndp.sh: revision 1.34
Make a permanet neighbor cache to avoid sending an NS packet disturbing the test
A receiver of an ICMPv6 request packet creates a stale cache entry and it turns
into the delay state on replying the packet. After 5 second, the receiver sends
an NS packet as a reachability confirmation, which disturbs the test and causes
a unexpected result.
Should fix PR misc/54451
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/tests/net/ndp/t_ndp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.33 src/tests/net/ndp/t_ndp.sh:1.33.2.1
--- src/tests/net/ndp/t_ndp.sh:1.33 Thu Jul 18 04:00:09 2019
+++ src/tests/net/ndp/t_ndp.sh Mon Aug 26 14:11:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.33 2019/07/18 04:00:09 ozaki-r Exp $
+# $NetBSD: t_ndp.sh,v 1.33.2.1 2019/08/26 14:11:04 martin Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -114,6 +114,7 @@ get_timeout()
ndp_cache_expiration_body()
{
+ local macaddr=
rump_server_start $SOCKSRC netinet6
rump_server_start $SOCKDST netinet6
@@ -121,12 +122,19 @@ ndp_cache_expiration_body()
setup_dst_server
setup_src_server
- export RUMP_SERVER=$SOCKSRC
-
# Shorten the expire time of cache entries
+ export RUMP_SERVER=$SOCKSRC
atf_check -s exit:0 -o match:'basereachable=7s0ms' \
rump.ndp -i shmif0 basereachable=7000
+ # Make a permanent cache entry to avoid sending an NS packet disturbing
+ # the test
+ macaddr=$(get_macaddr $SOCKSRC shmif0)
+ export RUMP_SERVER=$SOCKDST
+ atf_check -s exit:0 -o ignore rump.ndp -s $IP6SRC $macaddr
+
+ export RUMP_SERVER=$SOCKSRC
+
#
# Check if a cache is expired expectedly
#
@@ -710,6 +718,7 @@ wait_until_stalled()
ndp_cache_state_body()
{
+ local macaddr=
rump_server_start $SOCKSRC netinet6
rump_server_start $SOCKDST netinet6
@@ -717,12 +726,19 @@ ndp_cache_state_body()
setup_dst_server
setup_src_server
- export RUMP_SERVER=$SOCKSRC
-
# Shorten the expire time of cache entries
+ export RUMP_SERVER=$SOCKSRC
atf_check -s exit:0 -o match:'basereachable=7s0ms' \
rump.ndp -i shmif0 basereachable=7000
+ # Make a permanent cache entry to avoid sending an NS packet disturbing
+ # the test
+ macaddr=$(get_macaddr $SOCKSRC shmif0)
+ export RUMP_SERVER=$SOCKDST
+ atf_check -s exit:0 -o ignore rump.ndp -s $IP6SRC $macaddr
+
+ export RUMP_SERVER=$SOCKSRC
+
#
# Reachability confirmation (RFC 4861 7.3.3)
#
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Aug 26 14:05:25 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c Log Message: Pull up following revision(s) (requested by hannken in ticket #114): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.52 Implement kqueue support. To generate a diff of this commit: cvs rdiff -u -r1.50.2.1 -r1.50.2.2 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.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/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Mon Aug 26 14:05:25 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #114):
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.52
Implement kqueue support.
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.1 -r1.50.2.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.1 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.1 Mon Aug 26 14:03:33 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Aug 26 14:05:25 2019
@@ -,6 +,16 @@ zfs_rename(vnode_t *sdvp, vnode_t **svpp
if (*tvpp != NULL)
cache_purge(*tvpp);
cache_purge_negative(tdvp);
+#ifdef __NetBSD__
+ if (*svpp == *tvpp) {
+VN_KNOTE(sdvp, NOTE_WRITE);
+VN_KNOTE(*svpp, (szp->z_links == 0 ?
+NOTE_DELETE : NOTE_LINK));
+ } else {
+genfs_rename_knote(sdvp, *svpp, tdvp, *tvpp,
+((tzp != NULL) && (tzp->z_links == 0)));
+ }
+#endif
}
}
@@ -5094,6 +5104,10 @@ zfs_netbsd_write(void *v)
{
struct vop_write_args *ap = v;
vnode_t *vp = ap->a_vp;
+ znode_t *zp = VTOZ(vp);
+ struct uio *uio = ap->a_uio;
+ off_t osize = zp->z_size;
+ int error, resid;
switch (vp->v_type) {
case VBLK:
@@ -5105,7 +5119,13 @@ zfs_netbsd_write(void *v)
return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_write), ap));
}
- return (zfs_write(vp, ap->a_uio, ioflags(ap->a_ioflag), ap->a_cred, NULL));
+ resid = uio->uio_resid;
+ error = zfs_write(vp, uio, ioflags(ap->a_ioflag), ap->a_cred, NULL);
+ if (resid > uio->uio_resid)
+ VN_KNOTE(vp, NOTE_WRITE |
+ (zp->z_size > osize ? NOTE_EXTEND : 0));
+
+ return error;
}
static int
@@ -5296,6 +5316,8 @@ zfs_netbsd_create(void *v)
KASSERT((error == 0) == (*vpp != NULL));
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
+ if (error == 0)
+ VN_KNOTE(dvp, NOTE_WRITE);
VOP_UNLOCK(*vpp, 0);
return (error);
@@ -5334,6 +5356,8 @@ zfs_netbsd_mknod(void *v)
KASSERT((error == 0) == (*vpp != NULL));
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
+ if (error == 0)
+ VN_KNOTE(dvp, NOTE_WRITE);
VOP_UNLOCK(*vpp, 0);
return (error);
@@ -5363,6 +5387,10 @@ zfs_netbsd_remove(void *v)
error = zfs_remove(dvp, vp, nm, cnp->cn_cred);
PNBUF_PUT(nm);
+ if (error == 0) {
+ VN_KNOTE(vp, NOTE_DELETE);
+ VN_KNOTE(dvp, NOTE_WRITE);
+ }
vput(vp);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
return (error);
@@ -5398,6 +5426,8 @@ zfs_netbsd_mkdir(void *v)
KASSERT((error == 0) == (*vpp != NULL));
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
+ if (error == 0)
+ VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
VOP_UNLOCK(*vpp, 0);
return (error);
@@ -5427,6 +5457,10 @@ zfs_netbsd_rmdir(void *v)
error = zfs_rmdir(dvp, vp, nm, cnp->cn_cred);
PNBUF_PUT(nm);
+ if (error == 0) {
+ VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
+ VN_KNOTE(vp, NOTE_DELETE);
+ }
vput(vp);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
return error;
@@ -5571,7 +5605,11 @@ zfs_netbsd_setattr(void *v)
return error;
}
- return (zfs_setattr(vp, (vattr_t *), flags, cred, NULL));
+ error = zfs_setattr(vp, (vattr_t *), flags, cred, NULL);
+ if (error == 0)
+ VN_KNOTE(vp, NOTE_ATTRIB);
+
+ return error;
}
static int
@@ -5675,7 +5713,8 @@ zfs_netbsd_symlink(void *v)
error = zfs_symlink(dvp, vpp, nm, vap, target, cnp->cn_cred, 0);
PNBUF_PUT(nm);
-
+ if (error == 0)
+ VN_KNOTE(ap->a_dvp, NOTE_WRITE);
KASSERT((error == 0) == (*vpp != NULL));
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
VOP_UNLOCK(*vpp, 0);
@@ -5716,6 +5755,10 @@ zfs_netbsd_link(void *v)
NULL, 0);
PNBUF_PUT(nm);
+ if (error == 0) {
+ VN_KNOTE(vp, NOTE_LINK);
+ VN_KNOTE(dvp, NOTE_WRITE);
+ }
VOP_UNLOCK(vp, 0);
return error;
}
@@ -6235,6 +6278,7 @@ const struct vnodeopv_entry_desc zfs_vno
{ _write_desc, zfs_netbsd_write },
{ _ioctl_desc, zfs_netbsd_ioctl },
{ _poll_desc, genfs_poll },
+ { _kqfilter_desc, genfs_kqfilter },
{ _fsync_desc, zfs_netbsd_fsync },
{ _remove_desc, zfs_netbsd_remove },
{ _link_desc, zfs_netbsd_link },
@@ -6278,6 +6322,7 @@ const struct vnodeopv_entry_desc zfs_spe
{ _write_desc, /**/zfs_netbsd_write },
{ _ioctl_desc, spec_ioctl },
{ _poll_desc, spec_poll },
+ { _kqfilter_desc, spec_kqfilter },
{ _fsync_desc, zfs_netbsd_fsync },
{ _remove_desc, spec_remove },
{ _link_desc, spec_link },
@@ -6321,6 +6366,7 @@ const struct vnodeopv_entry_desc zfs_fif
{ _write_desc, /**/zfs_netbsd_write },
{ _ioctl_desc, vn_fifo_bypass },
{
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Aug 26 14:06:56 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: dnode.c Log Message: Pull up following revision(s) (requested by hannken in ticket #115): external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c: revision 1.8 Add missing dmu_zfetch_fini() when dnode_create() lost the race. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.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/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Mon Aug 26 14:03:33 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #113):
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.51
Implement poll support.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50 Mon Jun 17 08:08:21 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Aug 26 14:03:33 2019
@@ -6234,6 +6234,7 @@ const struct vnodeopv_entry_desc zfs_vno
{ _read_desc, zfs_netbsd_read },
{ _write_desc, zfs_netbsd_write },
{ _ioctl_desc, zfs_netbsd_ioctl },
+ { _poll_desc, genfs_poll },
{ _fsync_desc, zfs_netbsd_fsync },
{ _remove_desc, zfs_netbsd_remove },
{ _link_desc, zfs_netbsd_link },
@@ -6276,6 +6277,7 @@ const struct vnodeopv_entry_desc zfs_spe
{ _read_desc, /**/zfs_netbsd_read },
{ _write_desc, /**/zfs_netbsd_write },
{ _ioctl_desc, spec_ioctl },
+ { _poll_desc, spec_poll },
{ _fsync_desc, zfs_netbsd_fsync },
{ _remove_desc, spec_remove },
{ _link_desc, spec_link },
@@ -6318,6 +6320,7 @@ const struct vnodeopv_entry_desc zfs_fif
{ _read_desc, /**/zfs_netbsd_read },
{ _write_desc, /**/zfs_netbsd_write },
{ _ioctl_desc, vn_fifo_bypass },
+ { _poll_desc, vn_fifo_bypass },
{ _fsync_desc, zfs_netbsd_fsync },
{ _remove_desc, vn_fifo_bypass },
{ _link_desc, vn_fifo_bypass },
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Mon Aug 26 14:06:56 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: dnode.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #115):
external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c: revision 1.8
Add missing dmu_zfetch_fini() when dnode_create() lost the race.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7 src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7 Sun May 26 10:21:00 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c Mon Aug 26 14:06:56 2019
@@ -447,6 +447,9 @@ dnode_create(objset_t *os, dnode_phys_t
if (dnh->dnh_dnode != NULL) {
/* Lost the allocation race. */
mutex_exit(>os_lock);
+#ifdef __NetBSD__
+ dmu_zfetch_fini(>dn_zfetch);
+#endif
kmem_cache_free(dnode_cache, dn);
return (dnh->dnh_dnode);
}
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Aug 26 14:03:33 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c Log Message: Pull up following revision(s) (requested by hannken in ticket #113): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.51 Implement poll support. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.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/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:59:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #112 To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1371.2.1 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370 -r1.1370.2.1 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: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:58:19 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by mrg in ticket #112): sys/dev/pci/pcidevs: revision 1.1384 add micron/crucial SM2263 nvme. add some device found on asus x570-p with ryzen 3200G cpu. spell it "PCIe' when using the name. To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1383.2.1 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: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:59:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #112 To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1371.2.1 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370 -r1.1370.2.1 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: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 26 13:58:19 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by mrg in ticket #112): sys/dev/pci/pcidevs: revision 1.1384 add micron/crucial SM2263 nvme. add some device found on asus x570-p with ryzen 3200G cpu. spell it "PCIe' when using the name. To generate a diff of this commit: cvs rdiff -u -r1.1383 -r1.1383.2.1 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.1383 src/sys/dev/pci/pcidevs:1.1383.2.1 --- src/sys/dev/pci/pcidevs:1.1383 Sun Jul 28 15:20:22 2019 +++ src/sys/dev/pci/pcidevs Mon Aug 26 13:58:19 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383 2019/07/28 15:20:22 mlelstv Exp $ +$NetBSD: pcidevs,v 1.1383.2.1 2019/08/26 13:58:19 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -686,6 +686,7 @@ vendor ADP2 0x9005 Adaptec (2nd PCI Ven vendor ATRONICS 0x907f Atronics vendor NETMOS 0x9710 Netmos vendor PARALLELS 0x Parallels +vendor MICRON 0xc0a9 Micron/Crucial Technology vendor CHRYSALIS 0xcafe Chrysalis-ITS vendor MIDDLE_DIGITAL 0xdeaf Middle Digital vendor ARC 0xedd8 ARC Logic @@ -963,10 +964,10 @@ product AMAZON NVME 0x8061 NVMe SSD product AMAZON ENA 0xec20 Elastic Network Adapter /* AMD products */ -product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration -product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration -product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration -product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration +product AMD AMD64_HT 0x1100 K8 AMD64 HyperTransport Configuration +product AMD AMD64_ADDR 0x1101 K8 AMD64 Address Map Configuration +product AMD AMD64_DRAM 0x1102 K8 AMD64 DRAM Configuration +product AMD AMD64_MISC 0x1103 K8 AMD64 Miscellaneous Configuration product AMD AMD64_F10_HT 0x1200 AMD64 Family10h HyperTransport Configuration product AMD AMD64_F10_ADDR 0x1201 AMD64 Family10h Address Map Configuration product AMD AMD64_F10_DRAM 0x1202 AMD64 Family10h DRAM Configuration @@ -977,140 +978,145 @@ product AMD AMD64_F11_ADDR 0x1301 AMD64 product AMD AMD64_F11_DRAM 0x1302 AMD64 Family11h DRAM Configuration product AMD AMD64_F11_MISC 0x1303 AMD64 Family11h Miscellaneous Configuration product AMD AMD64_F11_LINK 0x1304 AMD64 Family11h Link Configuration -product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 -product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 -product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 -product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 -product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 -product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 -product AMD F15_10_RC 0x1410 Family15h Root Complex -product AMD F15_10_RP_2 0x1412 Family15h Root Port -product AMD F15_10_RP_3 0x1413 Family15h Root Port -product AMD F15_10_RP_4 0x1414 Family15h Root Port -product AMD F15_10_RP_5 0x1415 Family15h Root Port -product AMD F15_10_RP_6 0x1416 Family15h Root Port -product AMD F15_10_RP_7 0x1417 Family15h Root Port -product AMD F15_10_RP_8 0x1418 Family15h Root Port +product AMD F15_10_PF_0 0x1400 Family15h Processor Function 0 +product AMD F15_10_PF_1 0x1401 Family15h Processor Function 1 +product AMD F15_10_PF_2 0x1402 Family15h Processor Function 2 +product AMD F15_10_PF_3 0x1403 Family15h Processor Function 3 +product AMD F15_10_PF_4 0x1404 Family15h Processor Function 4 +product AMD F15_10_PF_5 0x1405 Family15h Processor Function 5 +product AMD F15_10_RC 0x1410 Family15h Root Complex +product AMD F15_10_RP_2 0x1412 Family15h Root Port +product AMD F15_10_RP_3 0x1413 Family15h Root Port +product AMD F15_10_RP_4 0x1414 Family15h Root Port +product AMD F15_10_RP_5 0x1415 Family15h Root Port +product AMD F15_10_RP_6 0x1416 Family15h Root Port +product AMD F15_10_RP_7 0x1417 Family15h Root Port +product AMD F15_10_RP_8 0x1418 Family15h Root Port product AMD F15_10_IOMMU 0x1419 Family15h IOMMU -product AMD F15_30_PF_0 0x141a Family15h Processor Function 0 -product AMD F15_30_PF_1 0x141b Family15h Processor Function 1 -product AMD F15_30_PF_2 0x141c Family15h Processor Function 2 -product AMD F15_30_PF_3 0x141d Family15h Processor Function 3 -product AMD F15_30_PF_4 0x141e Family15h Processor Function 4 -product AMD F15_30_PF_5 0x141f Family15h Processor Function 5 -product AMD F15_30_RC 0x1422 Family15h Root Complex +product AMD F15_30_PF_0 0x141a Family15h Processor Function 0 +product AMD F15_30_PF_1 0x141b Family15h Processor Function 1 +product AMD F15_30_PF_2 0x141c Family15h Processor Function 2 +product AMD F15_30_PF_3 0x141d Family15h Processor Function 3 +product AMD F15_30_PF_4 0x141e Family15h Processor Function 4 +product AMD F15_30_PF_5 0x141f Family15h Processor
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 26 13:55:36 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: usbdevs.h usbdevs_data.h Log Message: regen for ticket #111 To generate a diff of this commit: cvs rdiff -u -r1.760 -r1.760.4.1 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 26 13:54:42 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: usbdevs Log Message: Pull up following revision(s) (requested by mrg in ticket #111): sys/dev/usb/usbdevs: revision 1.771 sys/dev/usb/usbdevs: revision 1.772 sys/dev/usb/usbdevs: revision 1.773 add 3 devices for upl(4) host-to-host networking: - belkin F5U258 - national instruments USB host to host adapter - prolific id 25a1 - add two kue(4) adapters: ACTIONTEC KL5KUSB101 USB Ethernet adapter ALLIEDTELESYN AT-USB10 USB Ethernet Adapter - add MosChip MCS7730 and Sitecom Europe LN030 ethernet adapters. To generate a diff of this commit: cvs rdiff -u -r1.770 -r1.770.4.1 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.770 src/sys/dev/usb/usbdevs:1.770.4.1 --- src/sys/dev/usb/usbdevs:1.770 Wed Jan 30 19:51:28 2019 +++ src/sys/dev/usb/usbdevs Mon Aug 26 13:54:41 2019 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.770 2019/01/30 19:51:28 jakllsch Exp $ +$NetBSD: usbdevs,v 1.770.4.1 2019/08/26 13:54:41 martin Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -724,6 +724,7 @@ product ACERW WARPLINK 0x0204 Warplink product ACTIONTEC PRISM_25 0x0408 Prism2.5 WLAN product ACTIONTEC PRISM_25A 0x0421 Prism2.5 WLAN A product ACTIONTEC AR9287 0x1200 AR9287+AR7010 +product ACTIONTEC KL5KUSB101 0x1200 KL5KUSB101 USB Ethernet adapter product ACTIONTEC FREELAN 0x6106 ROPEX FreeLan 802.11b product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet adapter @@ -1066,6 +1067,7 @@ product BELKIN RTL8192CU_2 0x1004 RTL819 product BELKIN RTL8188CU 0x1102 RTL8188CU product BELKIN RTL8188CUS 0x11f2 RTL8188CUS product BELKIN F5U120 0x1203 F5U120-PC Hub +product BELKIN F5U258 0x258a F5U258/F5U279 Host to host adapter product BELKIN RTL8192CU 0x2102 RTL8192CU product BELKIN F7D2102 0x2103 F7D2102 product BELKIN RTL8192CU_1 0x21f2 RTL8192CU @@ -2367,6 +2369,7 @@ product MOBILITY EASIDOCK 0x0304 EasiDoc /* MosChip Semiconductor */ product MOSCHIP MCS7703 0x7703 MCS7703 USB Serial Adapter product MOSCHIP MCS7720 0x7720 MCS7720 USB Serial Adapter +product MOSCHIP MCS7730 0x7730 MCS7730 Ethernet Adapter product MOSCHIP MCS7780 0x7780 MCS7780 Fast IrDA Adapter product MOSCHIP MCS7781 0x7781 MCS7781 Fast IrDA Adapter product MOSCHIP MCS7784 0x7784 MCS7784 Slow IrDA Adapter @@ -2409,6 +2412,7 @@ product MUSTEK DV2000 0xc441 DV2000 dig /* National Instruments */ product NI GPIB_USB_A 0xc920 GPIB-USB-A +product NI HTOH_7825 0x7825 Host to Host Adapter /* National Semiconductor */ product NATIONAL BEARPAW1200 0x1000 BearPaw 1200 @@ -2752,6 +2756,7 @@ product PROLIFIC PL2303 0x2303 PL2303 S product PROLIFIC PL2305 0x2305 Parallel printer adapter product PROLIFIC ATAPI4 0x2307 ATAPI-4 Bridge Controller product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface +product PROLIFIC PL25A1 0x25a1 PL25A1 Host-Host interface product PROLIFIC PL2303X 0xaaa0 PL2303 Serial adapter (Pharos GPS) product PROLIFIC RSAQ3 0xaaa2 PL2303 Serial adapter (IODATA USB-RSAQ3) product PROLIFIC2 PL2303 0x2303 PL2303 Serial adapter (SMART Technologies) @@ -3064,6 +3069,9 @@ product SIGMATEL I_BEAD150 0x8009 i-Bead product SIGMATEL DNSSF7X 0x8020 Datum Networks SSF-7X Multi Players product SIGMATEL MUSICSTICK 0x8134 TrekStor Musicstick +/* Allied Telesyn products */ +product ALLIEDTELESYN AT_USB10 0x07c9 AT-USB10 USB Ethernet Adapter + /* SIIG products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader product SIIG UISDMC2S 0x0200 MULTICARDREADER @@ -3109,6 +3117,7 @@ product SITECOM CN104 0x2068 CN104 seri /* Sitecom Europe products */ product SITECOMEU WL168V1 0x000d WL-168 v1 product SITECOMEU RT2870_1 0x0017 RT2870 +product SITECOMEU LN030 0x0021 LN-030 product SITECOMEU WL168V4 0x0028 WL-168 v4 product SITECOMEU RT2870_2 0x002b RT2870 product SITECOMEU RT2870_3 0x002c RT2870
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 26 13:54:42 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: usbdevs Log Message: Pull up following revision(s) (requested by mrg in ticket #111): sys/dev/usb/usbdevs: revision 1.771 sys/dev/usb/usbdevs: revision 1.772 sys/dev/usb/usbdevs: revision 1.773 add 3 devices for upl(4) host-to-host networking: - belkin F5U258 - national instruments USB host to host adapter - prolific id 25a1 - add two kue(4) adapters: ACTIONTEC KL5KUSB101 USB Ethernet adapter ALLIEDTELESYN AT-USB10 USB Ethernet Adapter - add MosChip MCS7730 and Sitecom Europe LN030 ethernet adapters. To generate a diff of this commit: cvs rdiff -u -r1.770 -r1.770.4.1 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Mon Aug 26 13:42:36 UTC 2019
Modified Files:
src/sys/net [netbsd-9]: route.h rtsock.c
src/sys/netinet [netbsd-9]: if_arp.c
src/sys/netinet6 [netbsd-9]: nd6.c nd6_nbr.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #109):
sys/net/route.h: revision 1.124
sys/netinet6/nd6.c: revision 1.258
sys/netinet6/nd6.c: revision 1.259
sys/net/rtsock.c: revision 1.251
sys/netinet/if_arp.c: revision 1.284
sys/netinet6/nd6_nbr.c: revision 1.167
rtsock: rework rt_clonedmsg to take a message type and lladdr
We will use this in a future patch to notify userland of lladdr
changes.
XXX pullup -8 -9
-
nd6: notify userland of neighbour lla updates once more
XXX pullup -8 -9
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.2.1 src/sys/net/route.h
cvs rdiff -u -r1.250 -r1.250.2.1 src/sys/net/rtsock.c
cvs rdiff -u -r1.282 -r1.282.2.1 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.256.2.1 -r1.256.2.2 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.166 -r1.166.2.1 src/sys/netinet6/nd6_nbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.123 src/sys/net/route.h:1.123.2.1
--- src/sys/net/route.h:1.123 Mon Apr 29 16:12:30 2019
+++ src/sys/net/route.h Mon Aug 26 13:42:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.123 2019/04/29 16:12:30 roy Exp $ */
+/* $NetBSD: route.h,v 1.123.2.1 2019/08/26 13:42:36 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -521,8 +521,8 @@ void rt_addrmsg_rt(int, struct ifaddr *,
void route_enqueue(struct mbuf *, int);
struct llentry;
-void rt_clonedmsg(const struct sockaddr *, const struct ifnet *,
- const struct rtentry *);
+void rt_clonedmsg(int, const struct sockaddr *, const uint8_t *,
+const struct ifnet *);
void rt_setmetrics(void *, struct rtentry *);
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.250 src/sys/net/rtsock.c:1.250.2.1
--- src/sys/net/rtsock.c:1.250 Mon May 27 05:33:48 2019
+++ src/sys/net/rtsock.c Mon Aug 26 13:42:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.250 2019/05/27 05:33:48 ozaki-r Exp $ */
+/* $NetBSD: rtsock.c,v 1.250.2.1 2019/08/26 13:42:36 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.250 2019/05/27 05:33:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.250.2.1 2019/08/26 13:42:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -145,14 +145,14 @@ if_addrflags(struct ifaddr *ifa)
* Send a routing message as mimicing that a cloned route is added.
*/
void
-rt_clonedmsg(const struct sockaddr *dst, const struct ifnet *ifp,
-const struct rtentry *rt)
+rt_clonedmsg(int type, const struct sockaddr *dst, const uint8_t *lladdr,
+const struct ifnet *ifp)
{
struct rt_addrinfo info;
/* Mimic flags exactly */
#define RTF_LLINFO 0x400
#define RTF_CLONED 0x2000
- int flags = RTF_UP | RTF_HOST | RTF_DONE | RTF_LLINFO | RTF_CLONED;
+ int flags = RTF_HOST | RTF_DONE | RTF_LLINFO | RTF_CLONED;
union {
struct sockaddr sa;
struct sockaddr_storage ss;
@@ -161,16 +161,15 @@ rt_clonedmsg(const struct sockaddr *dst,
uint8_t namelen = strlen(ifp->if_xname);
uint8_t addrlen = ifp->if_addrlen;
- if (rt == NULL)
- return; /* XXX */
-
+ if (type != RTM_DELETE)
+ flags |= RTF_UP;
memset(, 0, sizeof(info));
info.rti_info[RTAX_DST] = dst;
sockaddr_dl_init(, sizeof(u.ss), ifp->if_index, ifp->if_type,
- NULL, namelen, NULL, addrlen);
+ NULL, namelen, lladdr, addrlen);
info.rti_info[RTAX_GATEWAY] =
- rt_missmsg(RTM_ADD, , flags, 0);
+ rt_missmsg(type, , flags, 0);
#undef RTF_LLINFO
#undef RTF_CLONED
}
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.282 src/sys/netinet/if_arp.c:1.282.2.1
--- src/sys/netinet/if_arp.c:1.282 Mon Apr 29 16:12:30 2019
+++ src/sys/netinet/if_arp.c Mon Aug 26 13:42:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.282 2019/04/29 16:12:30 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.282.2.1 2019/08/26 13:42:36 martin Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.282 2019/04/29 16:12:30 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.282.2.1 2019/08/26 13:42:36 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -744,7 +744,8 @@ notfound:
arp_init_llentry(ifp, la);
sockaddr_in_init(, >r_l3addr.addr4, 0);
- rt_clonedmsg(sintosa(), ifp, rt);
+ if (rt != NULL)
+rt_clonedmsg(RTM_ADD, sintosa(), NULL, ifp);
}
} else if (LLE_TRY_UPGRADE(la) == 0) {
create_lookup = "lookup";
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.256.2.1
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Mon Aug 26 13:42:36 UTC 2019 Modified Files: src/sys/net [netbsd-9]: route.h rtsock.c src/sys/netinet [netbsd-9]: if_arp.c src/sys/netinet6 [netbsd-9]: nd6.c nd6_nbr.c Log Message: Pull up following revision(s) (requested by roy in ticket #109): sys/net/route.h: revision 1.124 sys/netinet6/nd6.c: revision 1.258 sys/netinet6/nd6.c: revision 1.259 sys/net/rtsock.c: revision 1.251 sys/netinet/if_arp.c: revision 1.284 sys/netinet6/nd6_nbr.c: revision 1.167 rtsock: rework rt_clonedmsg to take a message type and lladdr We will use this in a future patch to notify userland of lladdr changes. XXX pullup -8 -9 - nd6: notify userland of neighbour lla updates once more XXX pullup -8 -9 To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.123.2.1 src/sys/net/route.h cvs rdiff -u -r1.250 -r1.250.2.1 src/sys/net/rtsock.c cvs rdiff -u -r1.282 -r1.282.2.1 src/sys/netinet/if_arp.c cvs rdiff -u -r1.256.2.1 -r1.256.2.2 src/sys/netinet6/nd6.c cvs rdiff -u -r1.166 -r1.166.2.1 src/sys/netinet6/nd6_nbr.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/sbin/route
Module Name:src Committed By: martin Date: Mon Aug 26 13:37:26 UTC 2019 Modified Files: src/sbin/route [netbsd-9]: route.c Log Message: Pull up following revision(s) (requested by roy in ticket #108): sbin/route/route.c: revision 1.161 route(8): print RTM_CHANGE messages XXX Pullup -9 To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.160.2.1 src/sbin/route/route.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/sbin/route
Module Name:src
Committed By: martin
Date: Mon Aug 26 13:37:26 UTC 2019
Modified Files:
src/sbin/route [netbsd-9]: route.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #108):
sbin/route/route.c: revision 1.161
route(8): print RTM_CHANGE messages
XXX Pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.160.2.1 src/sbin/route/route.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/route/route.c
diff -u src/sbin/route/route.c:1.160 src/sbin/route/route.c:1.160.2.1
--- src/sbin/route/route.c:1.160 Tue Aug 14 20:53:07 2018
+++ src/sbin/route/route.c Mon Aug 26 13:37:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.160 2018/08/14 20:53:07 roy Exp $ */
+/* $NetBSD: route.c,v 1.160.2.1 2019/08/26 13:37:26 martin Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.160 2018/08/14 20:53:07 roy Exp $");
+__RCSID("$NetBSD: route.c,v 1.160.2.1 2019/08/26 13:37:26 martin Exp $");
#endif
#endif /* not lint */
@@ -1460,6 +1460,7 @@ print_rtmsg(struct rt_msghdr *rtm, int m
printf("\n");
break;
case RTM_ADD:
+ case RTM_CHANGE:
case RTM_DELETE:
case RTM_GET:
(void)printf("pid %d, seq %d, errno %d, flags: ",
CVS commit: [netbsd-9] src/sys/external/gpl2/dts/dist/arch/arm/boot/dts
Module Name:src Committed By: martin Date: Mon Aug 26 13:36:01 UTC 2019 Modified Files: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts [netbsd-9]: bcm2835-rpi.dtsi Log Message: Pull up following revision(s) (requested by rin in ticket #107): sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi: revision 1.6 Revert a change I made to this file a long time ago so that is now matches linux mainline again. This fixes the rpi0w.. Tested on rpi0 and rpi0w by Jun Ebihara PR/53284 (Support RPI3B+,RPI0W,RPI2-1.2) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 \ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi 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/external/gpl2/dts/dist/arch/arm/boot/dts
Module Name:src
Committed By: martin
Date: Mon Aug 26 13:36:01 UTC 2019
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts [netbsd-9]:
bcm2835-rpi.dtsi
Log Message:
Pull up following revision(s) (requested by rin in ticket #107):
sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi: revision
1.6
Revert a change I made to this file a long time ago so that is now matches
linux mainline again. This fixes the rpi0w..
Tested on rpi0 and rpi0w by Jun Ebihara
PR/53284 (Support RPI3B+,RPI0W,RPI2-1.2)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.5 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.5.2.1
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.5 Sat May 25 11:48:05 2019
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi Mon Aug 26 13:36:00 2019
@@ -71,13 +71,13 @@
{
pinctrl-names = "default";
pinctrl-0 = <_gpio48>;
- status = "okay";
bus-width = <4>;
};
{
pinctrl-names = "default";
pinctrl-0 = <_gpio48>;
+ status = "okay";
bus-width = <4>;
};
CVS commit: [netbsd-9] src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Mon Aug 26 13:33:08 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-9]: shl.mi Log Message: Pull up following revision(s) (requested by nakayama in ticket #106): distrib/sets/lists/base/shl.mi: revision 1.867 Remove obsolete entry for libgomp.so.1.2. Upgrading from netbsd-8 to netbsd-9 removes this library file, but some programs (eg. packages compiled on netbsd-8) still use it. To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.866.2.1 src/distrib/sets/lists/base/shl.mi 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.866 src/distrib/sets/lists/base/shl.mi:1.866.2.1 --- src/distrib/sets/lists/base/shl.mi:1.866 Sun Jun 30 22:15:06 2019 +++ src/distrib/sets/lists/base/shl.mi Mon Aug 26 13:33:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.866 2019/06/30 22:15:06 blymn Exp $ +# $NetBSD: shl.mi,v 1.866.2.1 2019/08/26 13:33:08 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -305,7 +305,6 @@ ./usr/lib/libgnumalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libgomp.sobase-sys-shlib compatfile,gcc ./usr/lib/libgomp.so.1base-sys-shlib compatfile,gcc=6 -./usr/lib/libgomp.so.1.2 base-obsolete obsolete ./usr/lib/libgomp.so.1.3 base-sys-shlib compatfile,gcc=6,!machine_arch=mips64eb,!machine_arch=mips64el ./usr/lib/libgomp.so.1.3 base-sys-shlib gcc=6,machine_arch=mips64eb ./usr/lib/libgomp.so.1.3 base-sys-shlib gcc=6,machine_arch=mips64el
CVS commit: [netbsd-9] src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Mon Aug 26 13:33:08 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-9]: shl.mi Log Message: Pull up following revision(s) (requested by nakayama in ticket #106): distrib/sets/lists/base/shl.mi: revision 1.867 Remove obsolete entry for libgomp.so.1.2. Upgrading from netbsd-8 to netbsd-9 removes this library file, but some programs (eg. packages compiled on netbsd-8) still use it. To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.866.2.1 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 13:26:07 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Note backout of ticket #22 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.27 src/doc/CHANGES-9.0:1.1.2.28 --- src/doc/CHANGES-9.0:1.1.2.27 Fri Aug 23 04:24:00 2019 +++ src/doc/CHANGES-9.0 Mon Aug 26 13:26:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.27 2019/08/23 04:24:00 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.28 2019/08/26 13:26:07 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -2151,3 +2151,9 @@ distrib/evbarm/instkernel/sshramdisk/ssh Update to newer sshd (the host key is the same as before, it already was a rsa key). From Harold Gutch. [martin, ticket #105] + +sys/sys/event.h backout 1.33 + + Backout for now, causes build failures and final fix is not yet clear. + [kamil, ticket #22] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 13:26:07 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Note backout of ticket #22 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-9.0 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/sys
Module Name:src Committed By: martin Date: Mon Aug 26 13:24:19 UTC 2019 Modified Files: src/sys/sys [netbsd-9]: event.h Log Message: Backout pullup of rev.1.33, requested by kamil in ticket #22: this will need further work, there is still on going discussion in -current, and this intermediate state breaks 3rd party code. To generate a diff of this commit: cvs rdiff -u -r1.32.8.1 -r1.32.8.2 src/sys/sys/event.h 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/sys
Module Name:src
Committed By: martin
Date: Mon Aug 26 13:24:19 UTC 2019
Modified Files:
src/sys/sys [netbsd-9]: event.h
Log Message:
Backout pullup of rev.1.33, requested by kamil in ticket #22: this
will need further work, there is still on going discussion in -current,
and this intermediate state breaks 3rd party code.
To generate a diff of this commit:
cvs rdiff -u -r1.32.8.1 -r1.32.8.2 src/sys/sys/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/event.h
diff -u src/sys/sys/event.h:1.32.8.1 src/sys/sys/event.h:1.32.8.2
--- src/sys/sys/event.h:1.32.8.1 Tue Aug 6 16:22:04 2019
+++ src/sys/sys/event.h Mon Aug 26 13:24:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.32.8.1 2019/08/06 16:22:04 martin Exp $ */
+/* $NetBSD: event.h,v 1.32.8.2 2019/08/26 13:24:19 martin Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon
@@ -55,6 +55,10 @@ struct kevent {
intptr_t udata; /* opaque user data identifier */
};
+#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
+_EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
+(fflags), (data), __CAST(intptr_t, (udata)))
+
static __inline void
_EV_SET(struct kevent *_kevp, uintptr_t _ident, uint32_t _filter,
uint32_t _flags, uint32_t _fflags, int64_t _data, intptr_t _udata)
@@ -67,24 +71,6 @@ _EV_SET(struct kevent *_kevp, uintptr_t
_kevp->udata = _udata;
}
-#ifdef __cplusplus
-#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
-_EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
-(fflags), (data), (udata))
-
-static __inline void
-_EV_SET(struct kevent *_kevp, uintptr_t _ident, uint32_t _filter,
-uint32_t _flags, uint32_t _fflags, int64_t _data, void *_udata)
-{
- _EV_SET(_kevp, _ident, _filter, _flags, _fflags, _data,
- reinterpret_cast(_udata));
-}
-#else
-#define EV_SET(kevp, ident, filter, flags, fflags, data, udata) \
-_EV_SET((kevp), __CAST(uintptr_t, (ident)), (filter), (flags), \
-(fflags), (data), __CAST(intptr_t, (udata)))
-#endif
-
/* actions */
#define EV_ADD 0x0001U /* add event to kq (implies ENABLE) */
#define EV_DELETE 0x0002U /* delete event from kq */
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 13:17:02 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1344 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-8.2 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-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.28 src/doc/CHANGES-8.2:1.1.2.29 --- src/doc/CHANGES-8.2:1.1.2.28 Wed Aug 21 14:33:26 2019 +++ src/doc/CHANGES-8.2 Mon Aug 26 13:17:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.28 2019/08/21 14:33:26 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.29 2019/08/26 13:17:02 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -612,3 +612,9 @@ sys/uvm/uvm_aobj.c1.128 Avoid undefined behavior in uao_pagein_page(). [msaitoh, ticket #1342] +sys/dev/sysmon/sysmon.c1.30 + + Module class of sysmon_envsys, sysmon_wdog and sysmon_power is + MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. + [nakayama, ticket #1344] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 26 13:17:02 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1344 To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/sysmon
Module Name:src
Committed By: martin
Date: Mon Aug 26 13:15:38 UTC 2019
Modified Files:
src/sys/dev/sysmon [netbsd-8]: sysmon.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1344):
sys/dev/sysmon/sysmon.c: revision 1.30
Module class of sysmon_envsys, sysmon_wdog and sysmon_power is
MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC.
Fix that invoking envsys without sysmon_envsys kernel module failes with:
WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/dev/sysmon/sysmon.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/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.28 src/sys/dev/sysmon/sysmon.c:1.28.10.1
--- src/sys/dev/sysmon/sysmon.c:1.28 Tue May 5 09:22:33 2015
+++ src/sys/dev/sysmon/sysmon.c Mon Aug 26 13:15:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.28 2015/05/05 09:22:33 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.28.10.1 2019/08/26 13:15:38 martin Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28 2015/05/05 09:22:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.10.1 2019/08/26 13:15:38 martin Exp $");
#include
#include
@@ -151,7 +151,7 @@ sysmonopen(dev_t dev, int flag, int mode
if (sysmon_opvec_table[minor(dev)] == NULL) {
mutex_exit(_minor_mtx);
error = module_autoload(sysmon_mod[minor(dev)],
- MODULE_CLASS_MISC);
+ MODULE_CLASS_DRIVER);
if (error)
return error;
mutex_enter(_minor_mtx);
CVS commit: [netbsd-8] src/sys/dev/sysmon
Module Name:src Committed By: martin Date: Mon Aug 26 13:15:38 UTC 2019 Modified Files: src/sys/dev/sysmon [netbsd-8]: sysmon.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1344): sys/dev/sysmon/sysmon.c: revision 1.30 Module class of sysmon_envsys, sysmon_wdog and sysmon_power is MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. Fix that invoking envsys without sysmon_envsys kernel module failes with: WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/dev/sysmon/sysmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Aug 26 12:14:06 UTC 2019 Modified Files: src/usr.sbin/sysinst: gpt.c Log Message: Fix a bug when installing to pre-exising GPT partitions. Handle GPT labels with spaces. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/gpt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Aug 26 12:14:06 UTC 2019
Modified Files:
src/usr.sbin/sysinst: gpt.c
Log Message:
Fix a bug when installing to pre-exising GPT partitions.
Handle GPT labels with spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.10 src/usr.sbin/sysinst/gpt.c:1.11
--- src/usr.sbin/sysinst/gpt.c:1.10 Wed Aug 14 13:02:23 2019
+++ src/usr.sbin/sysinst/gpt.c Mon Aug 26 12:14:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.10 2019/08/14 13:02:23 martin Exp $ */
+/* $NetBSD: gpt.c,v 1.11 2019/08/26 12:14:06 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -1131,7 +1131,7 @@ gpt_modify_part(const char *disk, struct
/* Check label */
if (strcmp(p->gp_label, old.gp_label) != 0) {
if (run_program(RUN_SILENT,
- "gpt label -b %" PRIu64 " -l %s %s",
+ "gpt label -b %" PRIu64 " -l \'%s\' %s",
p->gp_start, p->gp_label, disk) != 0)
return false;
}
@@ -1213,6 +1213,20 @@ gpt_add_wedge(const char *disk, struct g
return true;
}
+static void
+escape_spaces(char *dest, const char *src)
+{
+ unsigned char c;
+
+ while (*src) {
+ c = *src++;
+ if (isspace(c) || c == '\\')
+ *dest++ = '\\';
+ *dest++ = c;
+ }
+ *dest = 0;
+}
+
static bool
gpt_get_part_device(const struct disk_partitions *arg,
part_id id, char *devname, size_t max_devname_len, int *part,
@@ -1221,6 +1235,7 @@ gpt_get_part_device(const struct disk_pa
const struct gpt_disk_partitions *parts =
(const struct gpt_disk_partitions*)arg;
struct gpt_part_entry *p = parts->partitions;
+ char tmpname[GPT_LABEL_LEN*2];
part_id no;
@@ -1239,12 +1254,14 @@ gpt_get_part_device(const struct disk_pa
switch (usage) {
case logical_name:
- if (p->gp_label[0] != 0)
+ if (p->gp_label[0] != 0) {
+ escape_spaces(tmpname, p->gp_label);
snprintf(devname, max_devname_len,
- "NAME=%s", p->gp_label);
- else
+ "NAME=%s", tmpname);
+ } else {
snprintf(devname, max_devname_len,
"NAME=%s", p->gp_id);
+ }
break;
case plain_name:
assert(p->gp_flags & GPEF_WEDGE);
@@ -1275,7 +1292,7 @@ gpt_write_to_disk(struct disk_partitions
{
struct gpt_disk_partitions *parts = (struct gpt_disk_partitions*)arg;
struct gpt_part_entry *p, *n;
- char label_arg[sizeof(p->gp_label) + 4];
+ char label_arg[sizeof(p->gp_label) + 10];
char diskpath[MAXPATHLEN];
int fd, bits = 0;
bool root_is_new = false, efi_is_new = false;
@@ -1295,11 +1312,9 @@ gpt_write_to_disk(struct disk_partitions
close(fd);
/*
- * Mark all partitions as "have no wedge yet". While there,
- * collect first root and efi partition (if available)
+ * Collect first root and efi partition (if available)
*/
for (pno = 0, p = parts->partitions; p != NULL; p = p->gp_next, pno++) {
- p->gp_flags &= ~GPEF_WEDGE;
if (root_id == NO_PART && p->gp_type != NULL) {
if (p->gp_type->gent.generic_ptype == PT_root &&
p->gp_start == pm->ptstart) {
@@ -1373,7 +1388,7 @@ gpt_write_to_disk(struct disk_partitions
if (p->gp_label[0] == 0)
label_arg[0] = 0;
else
- sprintf(label_arg, "-l %s", p->gp_label);
+ sprintf(label_arg, "-l \'%s\'", p->gp_label);
if (p->gp_type != NULL)
run_program(RUN_SILENT,
Re: CVS commit: src
On Sat, Aug 24, 2019 at 01:20:52PM +, Mindaugas Rasiukevicius wrote: > Module Name: src > Committed By: rmind > Date: Sat Aug 24 13:20:52 UTC 2019 > > Modified Files: > src/lib/libnpf: Makefile > src/lib/npf: mod.mk > src/libexec/identd: Makefile > src/usr.sbin/npf/npfctl: Makefile > src/usr.sbin/npf/npfd: Makefile > > Log Message: > libnpf fix: link the library itself to libnv; libnpf users should not be > expected to assume this dependency. So, this doesn't work for two reasons: fully static builds: - LDADD is just outright ignored, so libnpf.a contains undefined references. non-MKPIE (aarch64, hppa) / toolchain doesn't always do PIC: - libnv.a has non-PIC bits, so creating a shared library from it isn't possible.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Mon Aug 26 10:35:35 UTC 2019 Modified Files: src/sys/kern: subr_pool.c Log Message: Revert r1.254, put back || for KASAN, some destructors like lwp_dtor() caused false positives. Needs more work. To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 src/sys/kern/subr_pool.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: maxv
Date: Mon Aug 26 10:35:35 UTC 2019
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Revert r1.254, put back || for KASAN, some destructors like lwp_dtor()
caused false positives. Needs more work.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/kern/subr_pool.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/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.256 src/sys/kern/subr_pool.c:1.257
--- src/sys/kern/subr_pool.c:1.256 Sat Aug 17 12:37:49 2019
+++ src/sys/kern/subr_pool.c Mon Aug 26 10:35:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.256 2019/08/17 12:37:49 maxv Exp $ */
+/* $NetBSD: subr_pool.c,v 1.257 2019/08/26 10:35:35 maxv Exp $ */
/*
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.256 2019/08/17 12:37:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.257 2019/08/26 10:35:35 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -3104,8 +3104,8 @@ static void
pool_cache_redzone_check(pool_cache_t pc, void *p)
{
#ifdef KASAN
- /* If there is a ctor+dtor, leave the data as valid. */
- if (__predict_false(pc_has_ctor(pc) && pc_has_dtor(pc))) {
+ /* If there is a ctor/dtor, leave the data as valid. */
+ if (__predict_false(pc_has_ctor(pc) || pc_has_dtor(pc))) {
return;
}
#endif
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Aug 26 10:24:39 UTC 2019 Modified Files: src/sys/kern: vfs_bio.c src/sys/sys: buf.h Log Message: Change buf_nbuf()'s return value from int to u_int to avoid undefined behavior in wapbl_start() which extended int to size_t. Error message was: > UBSan: Undefined Behavior in ../../../../kern/vfs_wapbl.c:609:41, signed > integer overflow: 3345138 * 1024 cannot be represented in type 'int' >/* XXX maybe use filesystem fragment size instead of 1024 */ > /* XXX fix actual number of buffers reserved per filesystem. */ > wl->wl_bufcount_max = (buf_nbuf() / 2) * 1024; Need more work? To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/kern/vfs_bio.c cvs rdiff -u -r1.130 -r1.131 src/sys/sys/buf.h 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: msaitoh
Date: Mon Aug 26 10:24:39 UTC 2019
Modified Files:
src/sys/kern: vfs_bio.c
src/sys/sys: buf.h
Log Message:
Change buf_nbuf()'s return value from int to u_int to avoid undefined
behavior in wapbl_start() which extended int to size_t.
Error message was:
> UBSan: Undefined Behavior in ../../../../kern/vfs_wapbl.c:609:41, signed
> integer overflow: 3345138 * 1024 cannot be represented in type 'int'
>/* XXX maybe use filesystem fragment size instead of 1024 */
> /* XXX fix actual number of buffers reserved per filesystem. */
> wl->wl_bufcount_max = (buf_nbuf() / 2) * 1024;
Need more work?
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.130 -r1.131 src/sys/sys/buf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.278 src/sys/kern/vfs_bio.c:1.279
--- src/sys/kern/vfs_bio.c:1.278 Sat Nov 24 17:52:39 2018
+++ src/sys/kern/vfs_bio.c Mon Aug 26 10:24:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.278 2018/11/24 17:52:39 maxv Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.279 2019/08/26 10:24:39 msaitoh Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.278 2018/11/24 17:52:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.279 2019/08/26 10:24:39 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
@@ -2177,7 +2177,7 @@ bbusy(buf_t *bp, bool intr, int timo, km
* Nothing outside this file should really need to know about nbuf,
* but a few things still want to read it, so give them a way to do that.
*/
-int
+u_int
buf_nbuf(void)
{
Index: src/sys/sys/buf.h
diff -u src/sys/sys/buf.h:1.130 src/sys/sys/buf.h:1.131
--- src/sys/sys/buf.h:1.130 Fri Jun 28 14:56:45 2019
+++ src/sys/sys/buf.h Mon Aug 26 10:24:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.130 2019/06/28 14:56:45 jmcneill Exp $ */
+/* $NetBSD: buf.h,v 1.131 2019/08/26 10:24:39 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@@ -311,7 +311,7 @@ void vfs_buf_print(buf_t *, int, void (*
void buf_init(buf_t *);
void buf_destroy(buf_t *);
int bbusy(buf_t *, bool, int, kmutex_t *);
-int buf_nbuf(void);
+u_int buf_nbuf(void);
void biohist_init(void);
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Mon Aug 26 10:19:08 UTC 2019 Modified Files: src/sys/kern: sys_descrip.c Log Message: Reject negative offsets, to prevent panics later in genfs_getpages(). To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sys_descrip.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: maxv
Date: Mon Aug 26 10:19:08 UTC 2019
Modified Files:
src/sys/kern: sys_descrip.c
Log Message:
Reject negative offsets, to prevent panics later in genfs_getpages().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sys_descrip.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/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.33 src/sys/kern/sys_descrip.c:1.34
--- src/sys/kern/sys_descrip.c:1.33 Tue May 21 18:09:31 2019
+++ src/sys/kern/sys_descrip.c Mon Aug 26 10:19:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.33 2019/05/21 18:09:31 christos Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.34 2019/08/26 10:19:08 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.33 2019/05/21 18:09:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.34 2019/08/26 10:19:08 maxv Exp $");
#include
#include
@@ -661,6 +661,9 @@ do_posix_fadvise(int fd, off_t offset, o
CTASSERT(POSIX_FADV_RANDOM == UVM_ADV_RANDOM);
CTASSERT(POSIX_FADV_SEQUENTIAL == UVM_ADV_SEQUENTIAL);
+ if (offset < 0) {
+ return EINVAL;
+ }
if (len == 0) {
endoffset = INT64_MAX;
} else if (len > 0 && (INT64_MAX - offset) >= len) {
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: nakayama Date: Mon Aug 26 10:05:35 UTC 2019 Modified Files: src/sys/dev/sysmon: sysmon.c Log Message: Module class of sysmon_envsys, sysmon_wdog and sysmon_power is MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. Fix that invoking envsys without sysmon_envsys kernel module failes with: WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sysmon/sysmon.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/sysmon
Module Name:src
Committed By: nakayama
Date: Mon Aug 26 10:05:35 UTC 2019
Modified Files:
src/sys/dev/sysmon: sysmon.c
Log Message:
Module class of sysmon_envsys, sysmon_wdog and sysmon_power is
MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC.
Fix that invoking envsys without sysmon_envsys kernel module failes with:
WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sysmon/sysmon.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/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.29 src/sys/dev/sysmon/sysmon.c:1.30
--- src/sys/dev/sysmon/sysmon.c:1.29 Fri Apr 26 08:38:25 2019
+++ src/sys/dev/sysmon/sysmon.c Mon Aug 26 10:05:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.30 2019/08/26 10:05:34 nakayama Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.30 2019/08/26 10:05:34 nakayama Exp $");
#include
#include
@@ -151,7 +151,7 @@ sysmonopen(dev_t dev, int flag, int mode
if (sysmon_opvec_table[minor(dev)] == NULL) {
mutex_exit(_minor_mtx);
error = module_autoload(sysmon_mod[minor(dev)],
- MODULE_CLASS_MISC);
+ MODULE_CLASS_DRIVER);
if (error)
return error;
mutex_enter(_minor_mtx);
CVS commit: src/tests/net/net
Module Name:src Committed By: ozaki-r Date: Mon Aug 26 07:41:51 UTC 2019 Modified Files: src/tests/net/net: t_ipv6address.sh Log Message: tests: add tests for IPv6 link-local addresses with a scope ID Setting an address with a scope ID doesn't work for rump.ifconfig for some reasons and needs $HIJACKING for now. The bug should be fixed someday. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/tests/net/net/t_ipv6address.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/net
Module Name:src
Committed By: ozaki-r
Date: Mon Aug 26 07:41:51 UTC 2019
Modified Files:
src/tests/net/net: t_ipv6address.sh
Log Message:
tests: add tests for IPv6 link-local addresses with a scope ID
Setting an address with a scope ID doesn't work for rump.ifconfig for some
reasons and needs $HIJACKING for now. The bug should be fixed someday.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/net/net/t_ipv6address.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/net/t_ipv6address.sh
diff -u src/tests/net/net/t_ipv6address.sh:1.15 src/tests/net/net/t_ipv6address.sh:1.16
--- src/tests/net/net/t_ipv6address.sh:1.15 Mon May 13 17:55:09 2019
+++ src/tests/net/net/t_ipv6address.sh Mon Aug 26 07:41:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipv6address.sh,v 1.15 2019/05/13 17:55:09 bad Exp $
+# $NetBSD: t_ipv6address.sh,v 1.16 2019/08/26 07:41:50 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -247,6 +247,7 @@ linklocal_body()
local dst_if0_lladdr=`get_linklocal_addr ${SOCKDST} shmif0`
local fwd_if0_lladdr=`get_linklocal_addr ${SOCKFWD} shmif0`
local fwd_if1_lladdr=`get_linklocal_addr ${SOCKFWD} shmif1`
+ local lladdr=fe80::2
export RUMP_SERVER=${SOCKSRC}
$DEBUG && rump.ifconfig
@@ -325,6 +326,19 @@ linklocal_body()
atf_check -s ignore -o not-empty -e ignore \
-x "shmif_dumpbus -p - ${BUS2} | tcpdump -r - -n -p icmp6"
+ # Setting a link-local address with a scope ID
+ # XXX need $HIJACKING for some reasons
+ cleanup_bus
+ export RUMP_SERVER=${SOCKFWD}
+ $DEBUG && rump.ifconfig shmif0
+ atf_check -s exit:0 $HIJACKING rump.ifconfig shmif0 inet6 $lladdr%shmif0/64
+ export RUMP_SERVER=${SOCKSRC}
+ atf_check -s exit:0 -o match:"0.0% packet loss" rump.ping6 -c 1 \
+ -X $TIMEOUT -n $lladdr
+ export RUMP_SERVER=${SOCKDST}
+ atf_check -s not-exit:0 -o match:"100.0% packet loss" rump.ping6 -c 1 \
+ -X $TIMEOUT -n $lladdr
+
unset RUMP_SERVER
}
