CVS commit: src/sys/arch/arm/mainbus
Module Name:src
Committed By: skrll
Date: Tue Jan 28 07:47:26 UTC 2020
Modified Files:
src/sys/arch/arm/mainbus: cpu_mainbus.c
Log Message:
Traiing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/mainbus/cpu_mainbus.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/mainbus/cpu_mainbus.c
diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.16 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.17
--- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.16 Wed Oct 29 14:14:14 2014
+++ src/sys/arch/arm/mainbus/cpu_mainbus.c Tue Jan 28 07:47:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $ */
+/* $NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -45,7 +45,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $");
#include
#include
@@ -60,19 +60,19 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.
*/
static int cpu_mainbus_match(device_t, cfdata_t, void *);
static void cpu_mainbus_attach(device_t, device_t, void *);
-
+
/*
* int cpumatch(device_t parent, cfdata_t cf, void *aux)
*
* Probe for the main cpu. Currently all this does is return 1 to
* indicate that the cpu was found.
- */
+ */
#ifdef MULTIPROCESSOR
extern u_int arm_cpu_max;
#else
#define arm_cpu_max 1
#endif
-
+
static int
cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -113,7 +113,7 @@ cpu_mainbus_match(device_t parent, cfdat
*
* Attach the main cpu
*/
-
+
static void
cpu_mainbus_attach(device_t parent, device_t self, void *aux)
{
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Jan 28 07:43:42 UTC 2020
Modified Files:
src/usr.sbin/sysinst: partitions.c
Log Message:
Too much disklabel magic happening in the kernel - to compensate force
MBR first when trying to identify the existing partitioning scheme of
a disk.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/partitions.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/partitions.c
diff -u src/usr.sbin/sysinst/partitions.c:1.9 src/usr.sbin/sysinst/partitions.c:1.10
--- src/usr.sbin/sysinst/partitions.c:1.9 Mon Jan 27 21:21:22 2020
+++ src/usr.sbin/sysinst/partitions.c Tue Jan 28 07:43:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: partitions.c,v 1.9 2020/01/27 21:21:22 martin Exp $ */
+/* $NetBSD: partitions.c,v 1.10 2020/01/28 07:43:42 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -41,6 +41,8 @@ const struct disk_partitioning_scheme **
*/
size_t num_available_part_schemes;
+extern const struct disk_partitioning_scheme disklabel_parts;
+
/*
* Generic reader - query a disk device and read all partitions from it.
* disk_size is in units of physical sector size, which is passe as
@@ -51,14 +53,23 @@ partitions_read_disk(const char *dev, da
bool no_mbr)
{
const struct disk_partitioning_scheme **ps;
+#ifdef HAVE_MBR
+ bool mbr_done = false, disklabel_done = false;
+#endif
if (!available_part_schemes)
return NULL;
for (ps = available_part_schemes; *ps; ps++) {
#ifdef HAVE_MBR
+ if (!no_mbr && (*ps) == _parts && !mbr_done)
+ continue;
if (no_mbr && (*ps)->name == MSG_parttype_mbr)
continue;
+ if ((*ps)->name == MSG_parttype_mbr)
+ mbr_done = true;
+ if ((*ps)->read_from_disk == disklabel_parts.read_from_disk)
+ disklabel_done = true;
#endif
struct disk_partitions *parts =
(*ps)->read_from_disk(dev, 0, disk_size, bytes_per_sec,
@@ -66,6 +77,11 @@ partitions_read_disk(const char *dev, da
if (parts)
return parts;
}
+#ifdef HAVE_MBR
+ if (!disklabel_done)
+ return disklabel_parts.read_from_disk(dev, 0, disk_size,
+ bytes_per_sec, _parts);
+#endif
return NULL;
}
@@ -117,7 +133,6 @@ extern const struct disk_partitioning_sc
extern const struct disk_partitioning_scheme mbr_parts;
#endif
-extern const struct disk_partitioning_scheme disklabel_parts;
#if RAW_PART != 2
static struct disk_partitioning_scheme only_disklabel_parts;
CVS commit: src/tests/lib/libc/c063
Module Name:src
Committed By: martin
Date: Tue Jan 28 07:12:08 UTC 2020
Modified Files:
src/tests/lib/libc/c063: t_o_search.c
Log Message:
PR 54902: fix octal numbers accidently spelled as decimal.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/c063/t_o_search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/c063/t_o_search.c
diff -u src/tests/lib/libc/c063/t_o_search.c:1.5 src/tests/lib/libc/c063/t_o_search.c:1.6
--- src/tests/lib/libc/c063/t_o_search.c:1.5 Tue Jan 10 22:25:01 2017
+++ src/tests/lib/libc/c063/t_o_search.c Tue Jan 28 07:12:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $ */
+/* $NetBSD: t_o_search.c,v 1.6 2020/01/28 07:12:08 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $");
+__RCSID("$NetBSD: t_o_search.c,v 1.6 2020/01/28 07:12:08 martin Exp $");
#include
@@ -79,7 +79,7 @@ ATF_TC_BODY(o_search_perm1, tc)
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
ATF_REQUIRE(close(fd) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1);
ATF_REQUIRE(errno == EACCES);
@@ -109,12 +109,12 @@ ATF_TC_BODY(o_search_root_flag1, tc)
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
ATF_REQUIRE(close(fd) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
ATF_REQUIRE(close(fd) == 0);
- ATF_REQUIRE(fchmod(dfd, 444) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0444) == 0);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
@@ -141,12 +141,12 @@ ATF_TC_BODY(o_search_unpriv_flag1, tc)
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
ATF_REQUIRE(close(fd) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
ATF_REQUIRE(close(fd) == 0);
- ATF_REQUIRE(fchmod(dfd, 444) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0444) == 0);
ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) != -1);
@@ -173,7 +173,7 @@ ATF_TC_BODY(o_search_perm2, tc)
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == -1);
ATF_REQUIRE(errno == EACCES);
@@ -202,11 +202,11 @@ ATF_TC_BODY(o_search_root_flag2, tc)
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
- ATF_REQUIRE(fchmod(dfd, 444) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0444) == 0);
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
@@ -232,11 +232,11 @@ ATF_TC_BODY(o_search_unpriv_flag2, tc)
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
- ATF_REQUIRE(fchmod(dfd, 644) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0644) == 0);
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
- ATF_REQUIRE(fchmod(dfd, 444) == 0);
+ ATF_REQUIRE(fchmod(dfd, 0444) == 0);
ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) == 0);
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Jan 28 05:08:02 UTC 2020
Modified Files:
src/sys/dev/mii: makphy.c
Log Message:
Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/mii/makphy.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/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.63 src/sys/dev/mii/makphy.c:1.64
--- src/sys/dev/mii/makphy.c:1.63 Thu Dec 12 09:25:37 2019
+++ src/sys/dev/mii/makphy.c Tue Jan 28 05:08:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.63 2019/12/12 09:25:37 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.64 2020/01/28 05:08:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.63 2019/12/12 09:25:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.64 2020/01/28 05:08:02 msaitoh Exp $");
#include
#include
@@ -213,7 +213,7 @@ page0:
!= 0)) {
bool fiberonly = false, copperonly = false;
- /* Both copper and fiber is set. check MODE[] */
+ /* Both copper and fiber are set. check MODE[] */
switch (sc->mii_mpd_model) {
case MII_MODEL_xxMARVELL_E1011:
case MII_MODEL_xxMARVELL_E:
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jan 28 02:27:46 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Remove duplicated entries. To generate a diff of this commit: cvs rdiff -u -r1.1396 -r1.1397 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.1396 src/sys/dev/pci/pcidevs:1.1397 --- src/sys/dev/pci/pcidevs:1.1396 Tue Jan 21 08:49:31 2020 +++ src/sys/dev/pci/pcidevs Tue Jan 28 02:27:46 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1396 2020/01/21 08:49:31 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1397 2020/01/28 02:27:46 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3223,8 +3223,6 @@ product INTEL E5V2_ADDRMAP 0x0e28 E5 v2 product INTEL E5V2_HOTPLUG 0x0e29 E5 v2 Hot-Plug product INTEL E5V2_IIO_RAS 0x0e2a E5 v2 IIO RAS product INTEL E5V2_IOAPIC 0x0e2c E5 v2 I/O APIC -product INTEL E5_IOAT_RAID_1 0x3c2e E5 I/OAT DMA (RAID 5/6) -product INTEL E5_IOAT_RAID_2 0x3c2f E5 I/OAT DMA (RAID 5/6) product INTEL E5V2_HA_2 0x0e30 E5 v2 Home Agent product INTEL E5V2_PCIE_PM_1 0x0e34 E5 v2 PCIe Performance Monitor product INTEL E5V2_QPI_PM_1 0x0e36 E5 v2 QPI Performance Monitor
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Mon Jan 27 23:26:15 UTC 2020
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
Match any node with device_type = "cpu"
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/fdt/cpu_fdt.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/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.32 src/sys/arch/arm/fdt/cpu_fdt.c:1.33
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.32 Sat Jan 25 18:21:37 2020
+++ src/sys/arch/arm/fdt/cpu_fdt.c Mon Jan 27 23:26:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.32 2020/01/25 18:21:37 skrll Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.33 2020/01/27 23:26:15 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.32 2020/01/25 18:21:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.33 2020/01/27 23:26:15 jmcneill Exp $");
#include
#include
@@ -56,38 +56,11 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v
static int cpu_fdt_match(device_t, cfdata_t, void *);
static void cpu_fdt_attach(device_t, device_t, void *);
-enum cpu_fdt_type {
- ARM_CPU_UP = 1,
- ARM_CPU_ARMV7,
- ARM_CPU_ARMV8,
-};
-
struct cpu_fdt_softc {
device_t sc_dev;
int sc_phandle;
};
-static const struct of_compat_data compat_data[] = {
- { "arm,arm1176jzf-s", ARM_CPU_UP },
-
- { "arm,arm-v7", ARM_CPU_ARMV7 },
- { "arm,cortex-a5", ARM_CPU_ARMV7 },
- { "arm,cortex-a7", ARM_CPU_ARMV7 },
- { "arm,cortex-a8", ARM_CPU_ARMV7 },
- { "arm,cortex-a9", ARM_CPU_ARMV7 },
- { "arm,cortex-a12", ARM_CPU_ARMV7 },
- { "arm,cortex-a15", ARM_CPU_ARMV7 },
- { "arm,cortex-a17", ARM_CPU_ARMV7 },
-
- { "arm,armv8", ARM_CPU_ARMV8 },
- { "arm,cortex-a53", ARM_CPU_ARMV8 },
- { "arm,cortex-a57", ARM_CPU_ARMV8 },
- { "arm,cortex-a72", ARM_CPU_ARMV8 },
- { "arm,cortex-a73", ARM_CPU_ARMV8 },
-
- { NULL }
-};
-
CFATTACH_DECL_NEW(cpu_fdt, sizeof(struct cpu_fdt_softc),
cpu_fdt_match, cpu_fdt_attach, NULL, NULL);
@@ -96,25 +69,11 @@ cpu_fdt_match(device_t parent, cfdata_t
{
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- enum cpu_fdt_type type;
- int is_compatible;
- bus_addr_t mpidr;
+ const char *device_type;
- is_compatible = of_match_compat_data(phandle, compat_data);
- if (!is_compatible)
- return 0;
-
- type = of_search_compatible(phandle, compat_data)->data;
- switch (type) {
- case ARM_CPU_ARMV7:
- case ARM_CPU_ARMV8:
- if (fdtbus_get_reg(phandle, 0, , NULL) != 0)
- return 0;
- default:
- break;
- }
+ device_type = fdtbus_get_string(phandle, "device_type");
- return is_compatible;
+ return device_type != NULL && strcmp(device_type, "cpu") == 0;
}
static void
@@ -123,9 +82,7 @@ cpu_fdt_attach(device_t parent, device_t
struct cpu_fdt_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- enum cpu_fdt_type type;
- bus_addr_t mpidr;
- cpuid_t cpuid;
+ bus_addr_t cpuid;
const uint32_t *cap_ptr;
int len;
@@ -141,21 +98,8 @@ cpu_fdt_attach(device_t parent, device_t
capacity_dmips_mhz);
}
- type = of_search_compatible(phandle, compat_data)->data;
-
- switch (type) {
- case ARM_CPU_ARMV7:
- case ARM_CPU_ARMV8:
- if (fdtbus_get_reg(phandle, 0, , NULL) != 0) {
- aprint_error(": missing 'reg' property\n");
- return;
- }
- cpuid = mpidr;
- break;
- default:
+ if (fdtbus_get_reg(phandle, 0, , NULL) != 0)
cpuid = 0;
- break;
- }
/* Attach the CPU */
cpu_attach(self, cpuid);
CVS commit: src/common/lib/libc/string
Module Name:src
Committed By: ad
Date: Mon Jan 27 22:22:03 UTC 2020
Modified Files:
src/common/lib/libc/string: bcmp.c memcmp.c
Log Message:
Drop the alignment check if __NO_STRICT_ALIGNMENT (x86, m68k, vax).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/string/bcmp.c
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/string/memcmp.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/string/bcmp.c
diff -u src/common/lib/libc/string/bcmp.c:1.8 src/common/lib/libc/string/bcmp.c:1.9
--- src/common/lib/libc/string/bcmp.c:1.8 Mon Jan 27 22:13:39 2020
+++ src/common/lib/libc/string/bcmp.c Mon Jan 27 22:22:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.c,v 1.8 2020/01/27 22:13:39 ad Exp $ */
+/* $NetBSD: bcmp.c,v 1.9 2020/01/27 22:22:03 ad Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcmp.c,v 1.8 2020/01/27 22:13:39 ad Exp $");
+__RCSID("$NetBSD: bcmp.c,v 1.9 2020/01/27 22:22:03 ad Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -92,7 +92,10 @@ bcmp(const void *s1, const void *s2, siz
b1 = s1;
b2 = s2;
- if uintptr_t)b1 | (uintptr_t)b2) & (sizeof(uintptr_t) - 1)) == 0) {
+#ifndef __NO_STRICT_ALIGNMENT
+ if uintptr_t)b1 | (uintptr_t)b2) & (sizeof(uintptr_t) - 1)) == 0)
+#endif
+ {
while (n >= sizeof(uintptr_t)) {
if (*b1++ != *b2++)
return 1;
Index: src/common/lib/libc/string/memcmp.c
diff -u src/common/lib/libc/string/memcmp.c:1.6 src/common/lib/libc/string/memcmp.c:1.7
--- src/common/lib/libc/string/memcmp.c:1.6 Mon Jan 27 22:13:39 2020
+++ src/common/lib/libc/string/memcmp.c Mon Jan 27 22:22:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: memcmp.c,v 1.6 2020/01/27 22:13:39 ad Exp $ */
+/* $NetBSD: memcmp.c,v 1.7 2020/01/27 22:22:03 ad Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memcmp.c,v 1.6 2020/01/27 22:13:39 ad Exp $");
+__RCSID("$NetBSD: memcmp.c,v 1.7 2020/01/27 22:22:03 ad Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -92,7 +92,10 @@ memcmp(const void *s1, const void *s2, s
b1 = s1;
b2 = s2;
- if uintptr_t)b1 | (uintptr_t)b2) & (sizeof(uintptr_t) - 1)) == 0) {
+#ifndef __NO_STRICT_ALIGNMENT
+ if uintptr_t)b1 | (uintptr_t)b2) & (sizeof(uintptr_t) - 1)) == 0)
+#endif
+ {
while (n >= sizeof(uintptr_t)) {
if (*b1 != *b2)
break;
CVS commit: src/sys/lib/libkern/arch
Module Name:src Committed By: ad Date: Mon Jan 27 22:06:13 UTC 2020 Modified Files: src/sys/lib/libkern/arch/i386: Makefile.inc src/sys/lib/libkern/arch/x86_64: Makefile.inc Log Message: Make x86 use the C version of memcmp(). To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/lib/libkern/arch/i386/Makefile.inc cvs rdiff -u -r1.6 -r1.7 src/sys/lib/libkern/arch/x86_64/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/i386/Makefile.inc diff -u src/sys/lib/libkern/arch/i386/Makefile.inc:1.31 src/sys/lib/libkern/arch/i386/Makefile.inc:1.32 --- src/sys/lib/libkern/arch/i386/Makefile.inc:1.31 Fri Aug 14 19:23:53 2009 +++ src/sys/lib/libkern/arch/i386/Makefile.inc Mon Jan 27 22:06:13 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.31 2009/08/14 19:23:53 dsl Exp $ +# $NetBSD: Makefile.inc,v 1.32 2020/01/27 22:06:13 ad Exp $ SRCS+= byte_swap_2.S byte_swap_4.S ffs.S -SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S +SRCS+= memchr.S memcpy.S memmove.S memset.S SRCS+= random.S SRCS+= strcat.S strchr.S strcmp.S SRCS+= strcpy.S strlen.S Index: src/sys/lib/libkern/arch/x86_64/Makefile.inc diff -u src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.6 src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.7 --- src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.6 Thu Jan 14 02:09:46 2010 +++ src/sys/lib/libkern/arch/x86_64/Makefile.inc Mon Jan 27 22:06:13 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.6 2010/01/14 02:09:46 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.7 2020/01/27 22:06:13 ad Exp $ SRCS+= byte_swap_2.S byte_swap_4.S byte_swap_8.S SRCS+= ffs.S -SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S +SRCS+= memchr.S memcpy.S memmove.S memset.S SRCS+= strcat.S strchr.S strcmp.S SRCS+= strcpy.S strlen.S SRCS+= strrchr.S
CVS commit: src/common/lib/libc/arch
Module Name:src Committed By: ad Date: Mon Jan 27 22:09:21 UTC 2020 Removed Files: src/common/lib/libc/arch/i386/string: memcmp.S src/common/lib/libc/arch/x86_64/string: bcmp.S memcmp.S Log Message: x86 uses the C versions of bcmp() and memcmp() now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/common/lib/libc/arch/i386/string/memcmp.S cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/x86_64/string/bcmp.S cvs rdiff -u -r1.5 -r0 src/common/lib/libc/arch/x86_64/string/memcmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/string
Module Name:src
Committed By: ad
Date: Mon Jan 27 22:13:39 UTC 2020
Modified Files:
src/common/lib/libc/string: bcmp.c memcmp.c
Log Message:
bcmp() / memcmp(): compare in uintptr_t sized chunks when it's easy to.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/string/bcmp.c
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/string/memcmp.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/string/bcmp.c
diff -u src/common/lib/libc/string/bcmp.c:1.7 src/common/lib/libc/string/bcmp.c:1.8
--- src/common/lib/libc/string/bcmp.c:1.7 Fri Mar 9 15:41:16 2012
+++ src/common/lib/libc/string/bcmp.c Mon Jan 27 22:13:39 2020
@@ -1,4 +1,33 @@
-/* $NetBSD: bcmp.c,v 1.7 2012/03/09 15:41:16 christos Exp $ */
+/* $NetBSD: bcmp.c,v 1.8 2020/01/27 22:13:39 ad Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Doran.
+ *
+ * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
/*
* Copyright (c) 1987, 1993
@@ -34,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcmp.c,v 1.7 2012/03/09 15:41:16 christos Exp $");
+__RCSID("$NetBSD: bcmp.c,v 1.8 2020/01/27 22:13:39 ad Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -45,6 +74,8 @@ __RCSID("$NetBSD: bcmp.c,v 1.7 2012/03/0
#include
#endif
#else
+#include
+
#include
#include
#endif
@@ -53,18 +84,31 @@ __RCSID("$NetBSD: bcmp.c,v 1.7 2012/03/0
* bcmp -- vax cmpc3 instruction
*/
int
-bcmp(const void *b1, const void *b2, size_t length)
+bcmp(const void *s1, const void *s2, size_t n)
{
- const char *p1 = b1, *p2 = b2;
+ const uintptr_t *b1, *b2;
+ const unsigned char *c1, *c2;
+
+ b1 = s1;
+ b2 = s2;
- _DIAGASSERT(b1 != 0);
- _DIAGASSERT(b2 != 0);
+ if uintptr_t)b1 | (uintptr_t)b2) & (sizeof(uintptr_t) - 1)) == 0) {
+ while (n >= sizeof(uintptr_t)) {
+ if (*b1++ != *b2++)
+return 1;
+ n -= sizeof(uintptr_t);
+ }
+ }
+
+ c1 = (const unsigned char *)b1;
+ c2 = (const unsigned char *)b2;
+
+ if (n != 0) {
+ do {
+ if (*c1++ != *c2++)
+return 1;
+ } while (--n != 0);
+ }
- if (length == 0)
- return(0);
- do
- if (*p1++ != *p2++)
- break;
- while (--length);
- return length != 0;
+ return 0;
}
Index: src/common/lib/libc/string/memcmp.c
diff -u src/common/lib/libc/string/memcmp.c:1.5 src/common/lib/libc/string/memcmp.c:1.6
--- src/common/lib/libc/string/memcmp.c:1.5 Sun Feb 4 20:22:17 2018
+++ src/common/lib/libc/string/memcmp.c Mon Jan 27 22:13:39 2020
@@ -1,4 +1,33 @@
-/* $NetBSD: memcmp.c,v 1.5 2018/02/04 20:22:17 mrg Exp $ */
+/* $NetBSD: memcmp.c,v 1.6 2020/01/27 22:13:39 ad Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Andrew Doran.
+ *
+ * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
CVS commit: src/lib/libc/arch
Module Name:src Committed By: ad Date: Mon Jan 27 22:08:08 UTC 2020 Modified Files: src/lib/libc/arch/i386/string: Makefile.inc src/lib/libc/arch/x86_64/string: Makefile.inc Log Message: Make x86 use the C versions of bcmp() and memcmp(). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/i386/string/Makefile.inc cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/x86_64/string/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/i386/string/Makefile.inc diff -u src/lib/libc/arch/i386/string/Makefile.inc:1.5 src/lib/libc/arch/i386/string/Makefile.inc:1.6 --- src/lib/libc/arch/i386/string/Makefile.inc:1.5 Thu Jul 30 20:57:16 2009 +++ src/lib/libc/arch/i386/string/Makefile.inc Mon Jan 27 22:08:08 2020 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $ +# $NetBSD: Makefile.inc,v 1.6 2020/01/27 22:08:08 ad Exp $ # objects built from assembler sources -SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S \ +SRCS+= bcopy.S bzero.S ffs.S memchr.S \ memcpy.S memmove.S memset.S strcat.S strchr.S \ strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S Index: src/lib/libc/arch/x86_64/string/Makefile.inc diff -u src/lib/libc/arch/x86_64/string/Makefile.inc:1.6 src/lib/libc/arch/x86_64/string/Makefile.inc:1.7 --- src/lib/libc/arch/x86_64/string/Makefile.inc:1.6 Sun Nov 24 03:50:17 2013 +++ src/lib/libc/arch/x86_64/string/Makefile.inc Mon Jan 27 22:08:08 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.6 2013/11/24 03:50:17 christos Exp $ +# $NetBSD: Makefile.inc,v 1.7 2020/01/27 22:08:08 ad Exp $ # objects built from assembler sources -SRCS+= bcmp.S bcopy.S ffs.S memchr.S memcmp.S \ +SRCS+= bcopy.S ffs.S memchr.S \ memcpy.S memmove.S memset.S strcat.S strchr.S \ strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S NO_SRCS+= bzero.c
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Mon Jan 27 22:05:10 UTC 2020 Modified Files: src/sys/kern: sys_sched.c Log Message: Remove comment that is out of date and I think hinting at something other than what it says (preemption case for SCHED_FIFO). To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/kern/sys_sched.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_sched.c diff -u src/sys/kern/sys_sched.c:1.46 src/sys/kern/sys_sched.c:1.47 --- src/sys/kern/sys_sched.c:1.46 Sat Jul 30 15:38:17 2016 +++ src/sys/kern/sys_sched.c Mon Jan 27 22:05:10 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_sched.c,v 1.46 2016/07/30 15:38:17 christos Exp $ */ +/* $NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $ */ /* * Copyright (c) 2008, 2011 Mindaugas Rasiukevicius @@ -38,11 +38,10 @@ * * TODO: * - Handle pthread_setschedprio() as defined by POSIX; - * - Handle sched_yield() case for SCHED_FIFO as defined by POSIX; */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.46 2016/07/30 15:38:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $"); #include
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Mon Jan 27 21:58:16 UTC 2020
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
- lwp_wait(): if the process is exiting and no progress is being made, wake
every clock tick and kick all the LWPs again.
- lwp_create(): copy the LW_WEXIT etc flags while holding the parent's
p_lock. Copy only LW_WREBOOT in the case of fork(), since a pending
coredump or exit() in the parent process isn't for the child.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/kern/kern_lwp.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.221 src/sys/kern/kern_lwp.c:1.222
--- src/sys/kern/kern_lwp.c:1.221 Sun Jan 26 19:06:24 2020
+++ src/sys/kern/kern_lwp.c Mon Jan 27 21:58:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.221 2020/01/26 19:06:24 ad Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.222 2020/01/27 21:58:16 ad Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -211,7 +211,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.221 2020/01/26 19:06:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.222 2020/01/27 21:58:16 ad Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -653,8 +653,7 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
*/
if (exiting) {
KASSERT(p->p_nlwps > 1);
- cv_wait(>p_lwpcv, p->p_lock);
- error = EAGAIN;
+ error = cv_timedwait(>p_lwpcv, p->p_lock, 1);
break;
}
@@ -662,9 +661,6 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
* If all other LWPs are waiting for exits or suspends
* and the supply of zombies and potential zombies is
* exhausted, then we are about to deadlock.
- *
- * If the process is exiting (and this LWP is not the one
- * that is coordinating the exit) then bail out now.
*/
if ((p->p_sflag & PS_WEXIT) != 0 ||
p->p_nrlwps + p->p_nzlwps - p->p_ndlwps <= p->p_nlwpwait) {
@@ -839,7 +835,7 @@ lwp_create(lwp_t *l1, proc_t *p2, vaddr_
l2->l_inheritedprio = -1;
l2->l_protectprio = -1;
l2->l_auxprio = -1;
- l2->l_flag = (l1->l_flag & (LW_WEXIT | LW_WREBOOT | LW_WCORE));
+ l2->l_flag = 0;
l2->l_pflag = LP_MPSAFE;
TAILQ_INIT(>l_ld_locks);
l2->l_psrefs = 0;
@@ -921,6 +917,11 @@ lwp_create(lwp_t *l1, proc_t *p2, vaddr_
} else
l2->l_prflag = 0;
+ if (l1->l_proc == p2)
+ l2->l_flag |= (l1->l_flag & (LW_WEXIT | LW_WREBOOT | LW_WCORE));
+ else
+ l2->l_flag |= (l1->l_flag & LW_WREBOOT);
+
l2->l_sigstk = *sigstk;
l2->l_sigmask = *sigmask;
TAILQ_INIT(>l_sigpend.sp_info);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Jan 27 21:30:18 UTC 2020 Modified Files: src/usr.sbin/sysinst: net.c Log Message: Use a few strlcpy() instead of strncpy() for network ioctl structs. We seem to have no formal documentation stating the various char if*_name[IFNAMSIZ]; /* if name, e.g. "en0" */ elements in ioctls are nul terminated, but the peanut gallery claims it is so - and at least half of the code in-tree touching them agrees. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/net.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/net.c diff -u src/usr.sbin/sysinst/net.c:1.34 src/usr.sbin/sysinst/net.c:1.35 --- src/usr.sbin/sysinst/net.c:1.34 Sat Nov 16 20:26:59 2019 +++ src/usr.sbin/sysinst/net.c Mon Jan 27 21:30:17 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.34 2019/11/16 20:26:59 martin Exp $ */ +/* $NetBSD: net.c,v 1.35 2020/01/27 21:30:17 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -279,7 +279,7 @@ do_ifreq(struct ifreq *ifr, unsigned lon return -1; memset(ifr, 0, sizeof *ifr); - strncpy(ifr->ifr_name, net_dev, sizeof ifr->ifr_name); + strlcpy(ifr->ifr_name, net_dev, sizeof ifr->ifr_name); rval = ioctl(sock, cmd, ifr); close(sock); @@ -297,7 +297,7 @@ do_ifmreq(struct ifmediareq *ifmr, unsig return -1; memset(ifmr, 0, sizeof *ifmr); - strncpy(ifmr->ifm_name, net_dev, sizeof ifmr->ifm_name); + strlcpy(ifmr->ifm_name, net_dev, sizeof ifmr->ifm_name); rval = ioctl(sock, cmd, ifmr); close(sock); @@ -539,7 +539,7 @@ again: network_up = 1; dhcp_config = 0; - strncpy(net_dev, net_devs[selected_net].if_dev, STRSIZE); + strlcpy(net_dev, net_devs[selected_net].if_dev, sizeof net_dev); if (!handle_license(net_dev)) goto done;
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Jan 27 21:21:23 UTC 2020
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c defs.h disklabel.c disks.c gpt.c
label.c mbr.c menus.mi part_edit.c partitions.c partitions.h
partman.c sizemultname.c
src/usr.sbin/sysinst/arch/arc: md.c
src/usr.sbin/sysinst/arch/bebox: md.c
src/usr.sbin/sysinst/arch/cobalt: md.c
src/usr.sbin/sysinst/arch/evbarm: md.c
src/usr.sbin/sysinst/arch/evbmips: md.c
src/usr.sbin/sysinst/arch/evbppc: md.c
src/usr.sbin/sysinst/arch/hpcarm: md.c
src/usr.sbin/sysinst/arch/hpcmips: md.c
src/usr.sbin/sysinst/arch/hpcsh: md.c
src/usr.sbin/sysinst/arch/i386: md.c
src/usr.sbin/sysinst/arch/landisk: md.c
src/usr.sbin/sysinst/arch/ofppc: md.c
src/usr.sbin/sysinst/arch/playstation2: md.c
src/usr.sbin/sysinst/arch/prep: md.c
src/usr.sbin/sysinst/arch/sandpoint: md.c
src/usr.sbin/sysinst/arch/zaurus: md.c
Log Message:
Fix support for non-512-byte/sector disks again after I broke it when
introducing the abstract partition backends.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/gpt.c \
src/usr.sbin/sysinst/part_edit.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sysinst/label.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/mbr.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/partitions.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/partitions.h
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/sizemultname.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/playstation2/md.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/zaurus/md.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/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.37 src/usr.sbin/sysinst/bsddisklabel.c:1.38
--- src/usr.sbin/sysinst/bsddisklabel.c:1.37 Fri Jan 24 07:31:15 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c Mon Jan 27 21:21:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.37 2020/01/24 07:31:15 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.38 2020/01/27 21:21:21 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -622,7 +622,7 @@ set_ptn_size(menudesc *m, void *arg)
break;
}
mult = sizemult;
- new_size_val = parse_disk_pos(answer, ,
+ new_size_val = parse_disk_pos(answer, , pm->sectorsize,
pm->dlcylsize, );
if (strcmp(answer, dflt) == 0)
@@ -1634,7 +1634,7 @@ make_bsd_partitions(struct install_parti
if (pscheme == NULL)
return false;
parts = pscheme->create_new_for_disk(pm->diskdev,
- 0, pm->dlsize, pm->dlsize, true, NULL);
+ 0, pm->dlsize, true, NULL);
if (parts == NULL)
return false;
pm->parts = parts;
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.53 src/usr.sbin/sysinst/defs.h:1.54
--- src/usr.sbin/sysinst/defs.h:1.53 Fri Jan 24 07:31:15 2020
+++ src/usr.sbin/sysinst/defs.h Mon Jan 27 21:21:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.53 2020/01/24 07:31:15 martin Exp $ */
+/* $NetBSD: defs.h,v 1.54 2020/01/27 21:21:22 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -368,7 +368,7 @@ char machine[SSTRSIZE];
int ignorerror;
int ttysig_ignore;
pid_t ttysig_forward;
-int sizemult;
+uint sizemult;
extern const char *multname;
extern const char *err_outofmem;
int partman_go; /* run extended partition manager */
@@ -421,12 +421,16 @@ struct pm_devs {
*/
bool cur_system;
- /* Actual values for current disk - set by find_disks() or
- md_get_info() */
- int sectorsize, dlcyl,
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jan 27 21:14:17 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of openresolv-3.10.0 To generate a diff of this commit: cvs rdiff -u -r1.1688 -r1.1689 src/doc/3RDPARTY cvs rdiff -u -r1.2644 -r1.2645 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1688 src/doc/3RDPARTY:1.1689 --- src/doc/3RDPARTY:1.1688 Mon Jan 27 20:44:02 2020 +++ src/doc/3RDPARTY Mon Jan 27 21:14:17 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1688 2020/01/27 20:44:02 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1689 2020/01/27 21:14:17 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1017,12 +1017,12 @@ Location: external/bsd/openpam/dist Notes: Package: openresolv -Version: 3.9.2 -Current Vers: 3.9.2 +Version: 3.10.0 +Current Vers: 3.10.0 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/openresolv/ Home Page: http://roy.marples.name/projects/openresolv/ -Date: 2019-09-08 +Date: 2020-01-27 Mailing List: openresolv-disc...@marples.name License: BSD (2-clause) Location: external/bsd/openresolv/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2644 src/doc/CHANGES:1.2645 --- src/doc/CHANGES:1.2644 Mon Jan 27 20:44:02 2020 +++ src/doc/CHANGES Mon Jan 27 21:14:17 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2644 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2645 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -137,3 +137,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: fddi, fpa(4), fta(4), fea(4): Removed from the tree. [20200120] OpenSSL: Imported 1.1.1d. [christos 20200122] dhcpcd(8): Import dhcpcd-8.1.6 [roy 20200127] + openresolv(8): Import openresolv-3.10.0 [roy 20200127]
CVS commit: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Jan 27 21:13:05 UTC 2020 Modified Files: src/external/bsd/openresolv/dist: dnsmasq.in libc.in named.in pdnsd.in resolvconf.8.in resolvconf.conf.5.in resolvconf.in unbound.in Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openresolv/dist/dnsmasq.in cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openresolv/dist/libc.in cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openresolv/dist/named.in \ src/external/bsd/openresolv/dist/pdnsd.in cvs rdiff -u -r1.9 -r1.10 src/external/bsd/openresolv/dist/resolvconf.8.in cvs rdiff -u -r1.19 -r1.20 \ src/external/bsd/openresolv/dist/resolvconf.conf.5.in cvs rdiff -u -r1.6 -r1.7 src/external/bsd/openresolv/dist/resolvconf.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openresolv/dist/unbound.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openresolv/dist/dnsmasq.in diff -u src/external/bsd/openresolv/dist/dnsmasq.in:1.5 src/external/bsd/openresolv/dist/dnsmasq.in:1.6 --- src/external/bsd/openresolv/dist/dnsmasq.in:1.5 Sun Sep 8 20:48:50 2019 +++ src/external/bsd/openresolv/dist/dnsmasq.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # dnsmasq subscriber for resolvconf Index: src/external/bsd/openresolv/dist/libc.in diff -u src/external/bsd/openresolv/dist/libc.in:1.4 src/external/bsd/openresolv/dist/libc.in:1.5 --- src/external/bsd/openresolv/dist/libc.in:1.4 Wed Jul 17 18:31:43 2019 +++ src/external/bsd/openresolv/dist/libc.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2019 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # libc subscriber for resolvconf Index: src/external/bsd/openresolv/dist/named.in diff -u src/external/bsd/openresolv/dist/named.in:1.3 src/external/bsd/openresolv/dist/named.in:1.4 --- src/external/bsd/openresolv/dist/named.in:1.3 Tue Oct 9 01:28:35 2018 +++ src/external/bsd/openresolv/dist/named.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2007-2016 Roy Marples +# Copyright (c) 2007-2020 Roy Marples # All rights reserved # named subscriber for resolvconf Index: src/external/bsd/openresolv/dist/pdnsd.in diff -u src/external/bsd/openresolv/dist/pdnsd.in:1.3 src/external/bsd/openresolv/dist/pdnsd.in:1.4 --- src/external/bsd/openresolv/dist/pdnsd.in:1.3 Wed Jul 17 18:31:43 2019 +++ src/external/bsd/openresolv/dist/pdnsd.in Mon Jan 27 21:13:05 2020 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2010-2018 Roy Marples +# Copyright (c) 2010-2020 Roy Marples # All rights reserved # pdnsd subscriber for resolvconf Index: src/external/bsd/openresolv/dist/resolvconf.8.in diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 src/external/bsd/openresolv/dist/resolvconf.8.in:1.10 --- src/external/bsd/openresolv/dist/resolvconf.8.in:1.9 Fri Dec 30 19:43:36 2016 +++ src/external/bsd/openresolv/dist/resolvconf.8.in Mon Jan 27 21:13:05 2020 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007-2016 Roy Marples +.\" Copyright (c) 2007-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.20 --- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.19 Sun Sep 8 20:48:50 2019 +++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Mon Jan 27 21:13:05 2020 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2016 Roy Marples +.\" Copyright (c) 2009-2020 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -61,6 +61,10 @@ Set to NO to disable .Nm resolvconf from running any subscribers. Defaults to YES. +.It Sy allow_interfaces +If set, only these interfaces will be processed. +.It Sy deny_interfaces +If set, these interfaces will not be processed. .It Sy interface_order These interfaces will always be processed first. If unset, defaults to the following:- @@ -71,7 +75,7 @@ lo lo[0-9]* These interfaces will be processed next, unless they have a metric. If unset, defaults to the following:- .Bd -compact -literal -offset indent -tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]* +tap[0-9]* tun[0-9]* vpn vpn[0-9]* wg[0-9]* ppp[0-9]* ippp[0-9]* .Ed .It Sy inclusive_interfaces Ignore any exclusive marking for these interfaces. @@ -212,7 +216,7 @@ openresolv ships with subscribers for th .Xr dnsmasq 8 , .Xr named 8 , .Xr pdnsd 8 , -.Xr pdns_recursor 8 , +.Xr pdns_recursor 1 , and .Xr unbound 8 . Each subscriber can create configuration files which should be included in Index: src/external/bsd/openresolv/dist/resolvconf.in diff -u
CVS import: src/external/bsd/openresolv/dist
Module Name:src Committed By: roy Date: Mon Jan 27 21:11:13 UTC 2020 Update of /cvsroot/src/external/bsd/openresolv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22585 Log Message: Update to openresolv-3.10.0 with the following change: Add allow_interfaces and deny_interfaces configuration knobs Status: Vendor Tag: ROY Release Tags: openresolv-3_10_0 U src/external/bsd/openresolv/dist/LICENSE U src/external/bsd/openresolv/dist/README.md C src/external/bsd/openresolv/dist/resolvconf.in C src/external/bsd/openresolv/dist/resolvconf.8.in C src/external/bsd/openresolv/dist/resolvconf.conf.5.in C src/external/bsd/openresolv/dist/libc.in C src/external/bsd/openresolv/dist/dnsmasq.in C src/external/bsd/openresolv/dist/named.in C src/external/bsd/openresolv/dist/pdnsd.in U src/external/bsd/openresolv/dist/pdns_recursor.in C src/external/bsd/openresolv/dist/unbound.in U src/external/bsd/openresolv/dist/resolvconf.conf 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/openresolv/dist
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Mon Jan 27 21:09:33 UTC 2020 Modified Files: src/sys/kern: kern_exit.c Log Message: - exit1(): for DIAGNOSTIC, call kernel_lock_plug_leak() (temporary). - exit_lwps(): call lwp_need_userret() or LWP might never notice. To generate a diff of this commit: cvs rdiff -u -r1.280 -r1.281 src/sys/kern/kern_exit.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_exit.c diff -u src/sys/kern/kern_exit.c:1.280 src/sys/kern/kern_exit.c:1.281 --- src/sys/kern/kern_exit.c:1.280 Wed Jan 22 12:23:04 2020 +++ src/sys/kern/kern_exit.c Mon Jan 27 21:09:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exit.c,v 1.280 2020/01/22 12:23:04 ad Exp $ */ +/* $NetBSD: kern_exit.c,v 1.281 2020/01/27 21:09:33 ad Exp $ */ /*- * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.280 2020/01/22 12:23:04 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.281 2020/01/27 21:09:33 ad Exp $"); #include "opt_ktrace.h" #include "opt_dtrace.h" @@ -99,6 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exit.c, #include #include #include +#include #include #include #include @@ -204,6 +205,9 @@ exit1(struct lwp *l, int exitcode, int s p = l->l_proc; + /* XXX Temporary. */ + kernel_lock_plug_leak(); + /* Verify that we hold no locks other than p->p_lock. */ LOCKDEBUG_BARRIER(p->p_lock, 0); KASSERTMSG(curcpu()->ci_biglock_count == 0, "kernel_lock leaked"); @@ -617,6 +621,7 @@ retry: setrunnable(l2); continue; } + lwp_need_userret(l2); lwp_unlock(l2); }
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Mon Jan 27 21:05:43 UTC 2020
Modified Files:
src/sys/kern: kern_lock.c
src/sys/sys: lock.h
Log Message:
Add a kernel_lock_plug_leak() that drops any holds and tries to identify
the baddy.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/kern/kern_lock.c
cvs rdiff -u -r1.87 -r1.88 src/sys/sys/lock.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/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.167 src/sys/kern/kern_lock.c:1.168
--- src/sys/kern/kern_lock.c:1.167 Fri Jan 24 20:05:15 2020
+++ src/sys/kern/kern_lock.c Mon Jan 27 21:05:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.167 2020/01/24 20:05:15 ad Exp $ */
+/* $NetBSD: kern_lock.c,v 1.168 2020/01/27 21:05:43 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.167 2020/01/24 20:05:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.168 2020/01/27 21:05:43 ad Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_lockdebug.h"
+#endif
#include
#include
@@ -45,6 +49,10 @@ __KERNEL_RCSID(0, "$NetBSD: kern_lock.c,
#include
#include
+#if defined(DIAGNOSTIC) && !defined(LOCKDEBUG)
+#include
+#endif
+
#include
#include
@@ -215,6 +223,9 @@ _kernel_lock(int nlocks)
membar_producer();
owant = ci->ci_biglock_wanted;
ci->ci_biglock_wanted = l;
+#if defined(DIAGNOSTIC) && !defined(LOCKDEBUG)
+ l->l_ld_wanted = __builtin_return_address(0);
+#endif
/*
* Spin until we acquire the lock. Once we have it, record the
@@ -330,3 +341,23 @@ _kernel_locked_p(void)
{
return __SIMPLELOCK_LOCKED_P(kernel_lock);
}
+
+void
+kernel_lock_plug_leak(void)
+{
+#ifndef LOCKDEBUG
+# ifdef DIAGNOSTIC
+ int biglocks = 0;
+ KERNEL_UNLOCK_ALL(curlwp, );
+ if (biglocks != 0) {
+ const char *sym = "(unknown)";
+ ksyms_getname(NULL, , (vaddr_t)curlwp->l_ld_wanted,
+ KSYMS_CLOSEST|KSYMS_PROC|KSYMS_ANY);
+ printf("kernel_lock leak detected. last acquired: %s / %p\n",
+ sym, curlwp->l_ld_wanted);
+ }
+# else
+ KERNEL_UNLOCK_ALL(curlwp, NULL);
+# endif
+#endif
+}
Index: src/sys/sys/lock.h
diff -u src/sys/sys/lock.h:1.87 src/sys/sys/lock.h:1.88
--- src/sys/sys/lock.h:1.87 Tue Jul 10 19:55:05 2018
+++ src/sys/sys/lock.h Mon Jan 27 21:05:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.87 2018/07/10 19:55:05 maya Exp $ */
+/* $NetBSD: lock.h,v 1.88 2020/01/27 21:05:43 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -109,6 +109,8 @@ do {\
extern __cpu_simple_lock_t kernel_lock[];
+void kernel_lock_plug_leak(void);
+
#endif /* _KERNEL */
#endif /* _SYS_LOCK_H_ */
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Mon Jan 27 20:54:59 UTC 2020 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: add & enable uatp driver, now that it works on ppc-era hardware leave pbms in but commented out for now To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.363 src/sys/arch/macppc/conf/GENERIC:1.364 --- src/sys/arch/macppc/conf/GENERIC:1.363 Sat Jan 25 18:38:36 2020 +++ src/sys/arch/macppc/conf/GENERIC Mon Jan 27 20:54:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.363 2020/01/25 18:38:36 thorpej Exp $ +# $NetBSD: GENERIC,v 1.364 2020/01/27 20:54:59 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.363 $" +#ident "GENERIC-$Revision: 1.364 $" maxusers 32 @@ -445,7 +445,8 @@ usb* at slhci? # USB bus support include "dev/usb/usbdevices.config" -pbms* at uhidev? reportid ?# PowerBook 15" mouse +uatp* at uhidev? reportid ? # Apple multi-touchpads found in late *Books +#pbms* at uhidev? reportid ? # older driver for touchpads # Bluetooth Controller and Device support
CVS commit: src/lib/libpthread
Module Name:src
Committed By: ad
Date: Mon Jan 27 20:50:05 UTC 2020
Modified Files:
src/lib/libpthread: pthread.c pthread_int.h
Log Message:
pthread_detach(), pthread_join(): go back to using _lwp_detach() and
_lwp_wait(), rather than doing it all in userspace. There's less to go
wrong. Doesn't seem to be a performance penalty.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.98 -r1.99 src/lib/libpthread/pthread_int.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.156 src/lib/libpthread/pthread.c:1.157
--- src/lib/libpthread/pthread.c:1.156 Sat Jan 25 18:01:28 2020
+++ src/lib/libpthread/pthread.c Mon Jan 27 20:50:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.156 2020/01/25 18:01:28 ad Exp $ */
+/* $NetBSD: pthread.c,v 1.157 2020/01/27 20:50:05 ad Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.156 2020/01/25 18:01:28 ad Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.157 2020/01/27 20:50:05 ad Exp $");
#define __EXPOSE_STACK 1
@@ -320,12 +320,10 @@ pthread__initthread(pthread_t t)
t->pt_havespecific = 0;
t->pt_early = NULL;
t->pt_lwpctl = __dummy_lwpctl;
- t->pt_droplock = NULL;
memcpy(>pt_lockops, pthread__lock_ops, sizeof(t->pt_lockops));
pthread_mutex_init(>pt_lock, NULL);
PTQ_INIT(>pt_cleanup_stack);
- pthread_cond_init(>pt_joiners, NULL);
}
static void
@@ -457,11 +455,9 @@ pthread_create(pthread_t *thread, const
if (!PTQ_EMPTY(__deadqueue)) {
pthread_mutex_lock(__deadqueue_lock);
PTQ_FOREACH(newthread, __deadqueue, pt_deadq) {
- /* Still running? */
+ /* Still busily exiting, or finished? */
if (newthread->pt_lwpctl->lc_curcpu ==
- LWPCTL_CPU_EXITED ||
- (_lwp_kill(newthread->pt_lid, 0) == -1 &&
- errno == ESRCH))
+ LWPCTL_CPU_EXITED)
break;
}
if (newthread)
@@ -527,10 +523,12 @@ pthread_create(pthread_t *thread, const
private_area = newthread;
#endif
- flag = LWP_DETACHED;
+ flag = 0;
if ((newthread->pt_flags & PT_FLAG_SUSPENDED) != 0 ||
(nattr.pta_flags & PT_FLAG_EXPLICIT_SCHED) != 0)
flag |= LWP_SUSPENDED;
+ if ((newthread->pt_flags & PT_FLAG_DETACHED) != 0)
+ flag |= LWP_DETACHED;
ret = pthread__makelwp(pthread__create_tramp, newthread, private_area,
newthread->pt_stack.ss_sp, newthread->pt_stack.ss_size,
@@ -643,7 +641,6 @@ pthread_exit(void *retval)
{
pthread_t self;
struct pt_clean_t *cleanup;
- char *name;
if (__predict_false(__uselibcstub)) {
__libc_thr_exit_stub(retval);
@@ -681,20 +678,12 @@ pthread_exit(void *retval)
*/
self->pt_exitval = retval;
if (self->pt_flags & PT_FLAG_DETACHED) {
- self->pt_state = PT_STATE_DEAD;
- name = self->pt_name;
- self->pt_name = NULL;
- pthread_mutex_unlock(>pt_lock);
- if (name != NULL)
- free(name);
- pthread_mutex_lock(__deadqueue_lock);
- PTQ_INSERT_TAIL(__deadqueue, self, pt_deadq);
- pthread_mutex_unlock(__deadqueue_lock);
+ /* pthread__reap() will drop the lock. */
+ pthread__reap(self);
pthread__clear_waiters(self);
_lwp_exit();
} else {
self->pt_state = PT_STATE_ZOMBIE;
- pthread_cond_broadcast(>pt_joiners);
pthread_mutex_unlock(>pt_lock);
pthread__clear_waiters(self);
/* Note: name will be freed by the joiner. */
@@ -712,7 +701,6 @@ int
pthread_join(pthread_t thread, void **valptr)
{
pthread_t self;
- int error;
self = pthread__self();
@@ -725,36 +713,29 @@ pthread_join(pthread_t thread, void **va
if (thread == self)
return EDEADLK;
- self->pt_droplock = >pt_lock;
- pthread_mutex_lock(>pt_lock);
+ /* IEEE Std 1003.1 says pthread_join() never returns EINTR. */
for (;;) {
- if (thread->pt_state == PT_STATE_ZOMBIE)
+ pthread__testcancel(self);
+ if (_lwp_wait(thread->pt_lid, NULL) == 0)
break;
- if (thread->pt_state == PT_STATE_DEAD) {
- pthread_mutex_unlock(>pt_lock);
- self->pt_droplock = NULL;
- return ESRCH;
- }
- if ((thread->pt_flags & PT_FLAG_DETACHED) != 0) {
- pthread_mutex_unlock(>pt_lock);
- self->pt_droplock = NULL;
- return EINVAL;
- }
- error = pthread_cond_wait(>pt_joiners,
- >pt_lock);
- if (error != 0) {
- pthread__errorfunc(__FILE__, __LINE__,
- __func__, "unexpected return from cond_wait()");
- }
-
+ if (errno != EINTR)
+ return errno;
}
- pthread__testcancel(self);
+
+ /*
+ * Don't test for cancellation again. The spec is that if
+ * cancelled, pthread_join() must not have succeeded.
+ */
+ pthread_mutex_lock(>pt_lock);
+ if (thread->pt_state != PT_STATE_ZOMBIE) {
+ pthread__errorfunc(__FILE__, __LINE__, __func__,
+ "not a zombie");
+ }
if (valptr != NULL)
*valptr = thread->pt_exitval;
+
/* pthread__reap() will drop the lock. */
pthread__reap(thread);
-
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jan 27 20:44:03 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note dhcpcd-8.1.6 To generate a diff of this commit: cvs rdiff -u -r1.1687 -r1.1688 src/doc/3RDPARTY cvs rdiff -u -r1.2643 -r1.2644 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1687 src/doc/3RDPARTY:1.1688 --- src/doc/3RDPARTY:1.1687 Sun Jan 26 02:55:47 2020 +++ src/doc/3RDPARTY Mon Jan 27 20:44:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1687 2020/01/26 02:55:47 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1688 2020/01/27 20:44:02 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -327,12 +327,12 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 8.1.5 -Current Vers: 8.1.5 +Version: 8.1.6 +Current Vers: 8.1.6 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ -Date: 2020-01-03 +Date: 2020-01-27 Mailing List: dhcpcd-disc...@marples.name License: BSD (2-clause) Location: external/bsd/dhcpcd/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2643 src/doc/CHANGES:1.2644 --- src/doc/CHANGES:1.2643 Fri Jan 24 10:15:40 2020 +++ src/doc/CHANGES Mon Jan 27 20:44:02 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2643 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2644 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -136,3 +136,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: token ring and tr(4): Removed from the tree. [20200119] fddi, fpa(4), fta(4), fea(4): Removed from the tree. [20200120] OpenSSL: Imported 1.1.1d. [christos 20200122] + dhcpcd(8): Import dhcpcd-8.1.6 [roy 20200127]
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Mon Jan 27 20:42:57 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c if-bsd.c ipv6.c ipv6.h
ipv6nd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/src/if-bsd.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/src/ipv6.c \
src/external/bsd/dhcpcd/dist/src/ipv6.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.31 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.32
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.31 Fri Dec 20 12:01:35 2019
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Mon Jan 27 20:42:56 2020
@@ -2335,9 +2335,10 @@ dhcp_message_new(struct bootp **bootp,
static void
dhcp_arp_defend_failed(struct arp_state *astate)
{
+ struct interface *ifp = astate->iface;
- dhcp_drop(astate->iface, "EXPIRED");
- dhcp_start1(astate->iface);
+ dhcp_drop(ifp, "EXPIRED");
+ dhcp_start1(ifp);
}
#endif
Index: src/external/bsd/dhcpcd/dist/src/if-bsd.c
diff -u src/external/bsd/dhcpcd/dist/src/if-bsd.c:1.15 src/external/bsd/dhcpcd/dist/src/if-bsd.c:1.16
--- src/external/bsd/dhcpcd/dist/src/if-bsd.c:1.15 Wed Nov 13 10:50:22 2019
+++ src/external/bsd/dhcpcd/dist/src/if-bsd.c Mon Jan 27 20:42:56 2020
@@ -860,8 +860,6 @@ if_address(unsigned char cmd, const stru
return r;
}
-
-
#if !(defined(HAVE_IFADDRS_ADDRFLAGS) && defined(HAVE_IFAM_ADDRFLAGS))
int
if_addrflags(const struct interface *ifp, const struct in_addr *addr,
@@ -1194,7 +1192,7 @@ if_ifa(struct dhcpcd_ctx *ctx, const str
{
struct interface *ifp;
const struct sockaddr *rti_info[RTAX_MAX];
- int addrflags;
+ int flags;
pid_t pid;
if (ifam->ifam_msglen < sizeof(*ifam)) {
@@ -1216,9 +1214,6 @@ if_ifa(struct dhcpcd_ctx *ctx, const str
pid = 0;
#endif
-#ifdef HAVE_IFAM_ADDRFLAGS
- addrflags = ifam->ifam_addrflags;
-#endif
switch (rti_info[RTAX_IFA]->sa_family) {
case AF_LINK:
{
@@ -1252,78 +1247,70 @@ if_ifa(struct dhcpcd_ctx *ctx, const str
bcast.s_addr = sin != NULL && sin->sin_family == AF_INET ?
sin->sin_addr.s_addr : INADDR_ANY;
-#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 8
/*
* NetBSD-7 and older send an invalid broadcast address.
* So we need to query the actual address to get
* the right one.
+ * We can also use this to test if the address
+ * has really been added or deleted.
*/
- {
-#else
- /*
- * If the address was deleted, lets check if it's
- * a late message and it still exists (maybe modified).
- * If so, ignore it as deleting an address causes
- * dhcpcd to drop any lease to which it belongs.
- */
- if (ifam->ifam_type == RTM_DELADDR) {
-#endif
#ifdef SIOCGIFALIAS
- struct in_aliasreq ifra;
+ struct in_aliasreq ifra;
- memset(, 0, sizeof(ifra));
- strlcpy(ifra.ifra_name, ifp->name,
- sizeof(ifra.ifra_name));
- ifra.ifra_addr.sin_family = AF_INET;
- ifra.ifra_addr.sin_len = sizeof(ifra.ifra_addr);
- ifra.ifra_addr.sin_addr = addr;
- if (ioctl(ctx->pf_inet_fd, SIOCGIFALIAS, ) == -1) {
-if (errno != ENXIO && errno != EADDRNOTAVAIL)
- logerr("%s: SIOCGIFALIAS", __func__);
-if (ifam->ifam_type != RTM_DELADDR)
- break;
- }
+ memset(, 0, sizeof(ifra));
+ strlcpy(ifra.ifra_name, ifp->name, sizeof(ifra.ifra_name));
+ ifra.ifra_addr.sin_family = AF_INET;
+ ifra.ifra_addr.sin_len = sizeof(ifra.ifra_addr);
+ ifra.ifra_addr.sin_addr = addr;
+ if (ioctl(ctx->pf_inet_fd, SIOCGIFALIAS, ) == -1) {
+ if (errno != ENXIO && errno != EADDRNOTAVAIL)
+logerr("%s: SIOCGIFALIAS", __func__);
+ if (ifam->ifam_type != RTM_DELADDR)
+break;
+ } else {
+ if (ifam->ifam_type == RTM_DELADDR)
+break;
#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 8
- else
-bcast = ifra.ifra_broadaddr.sin_addr;
+ bcast = ifra.ifra_broadaddr.sin_addr;
#endif
+ }
#else
#warning No SIOCGIFALIAS support
- /*
- * No SIOCGIFALIAS? That sucks!
- * This makes this call very heavy weight, but we
- * really need to know if the message is late or not.
- */
- const struct sockaddr *sa;
- struct ifaddrs *ifaddrs = NULL, *ifa;
-
- sa = rti_info[RTAX_IFA];
- getifaddrs();
- for (ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
-if (ifa->ifa_addr == NULL)
- continue;
-if (sa_cmp(ifa->ifa_addr, sa) == 0 &&
-strcmp(ifa->ifa_name, ifp->name) == 0)
- break;
- }
- freeifaddrs(ifaddrs);
+ /*
+ * No SIOCGIFALIAS? That sucks!
+ * This makes this call very heavy weight, but we
+ * really need to know if the message is late or not.
+ */
+ const struct sockaddr *sa;
+ struct ifaddrs *ifaddrs = NULL, *ifa;
+
+ sa =
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jan 27 20:42:00 UTC 2020 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7915 Log Message: Update to dhcpcd-8.1.6 with the following changes: * INET6: Support a /128 prefix advertised via RA * BSD: More address validation from route(4) messages * DHCP: Fix a potential segfault on DaD failure * IPv4LL: Fix a potential segfault when dropping IPv4LL addresses Status: Vendor Tag: ROY Release Tags: dhcpcd-8_1_6 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c U src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c U src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c C src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c C src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c U src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h C src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/02-dump U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/30-hostname U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in 6 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/sys/opencrypto
Module Name:src Committed By: pgoyette Date: Mon Jan 27 17:11:27 UTC 2020 Modified Files: src/sys/opencrypto: compat_crypto_50.c Log Message: Remove left-over #includes To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/opencrypto/compat_crypto_50.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/opencrypto/compat_crypto_50.c diff -u src/sys/opencrypto/compat_crypto_50.c:1.1 src/sys/opencrypto/compat_crypto_50.c:1.2 --- src/sys/opencrypto/compat_crypto_50.c:1.1 Mon Jan 27 17:09:17 2020 +++ src/sys/opencrypto/compat_crypto_50.c Mon Jan 27 17:11:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_crypto_50.c,v 1.1 2020/01/27 17:09:17 pgoyette Exp $ */ +/* $NetBSD: compat_crypto_50.c,v 1.2 2020/01/27 17:11:27 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,28 +30,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_crypto_50.c,v 1.1 2020/01/27 17:09:17 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_crypto_50.c,v 1.2 2020/01/27 17:11:27 pgoyette Exp $"); #include #include -/* XXX PRG -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -XXX PRG */ #include #include
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src Committed By: pgoyette Date: Mon Jan 27 17:10:23 UTC 2020 Modified Files: src/sys/rump/dev/lib/libopencrypto: opencrypto_component.c Log Message: Update comment to reflect recent change to the error message in question. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.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/rump/dev/lib/libopencrypto/opencrypto_component.c diff -u src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.5 src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.6 --- src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.5 Thu Jun 29 08:51:27 2017 +++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Mon Jan 27 17:10:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $ */ +/* $NetBSD: opencrypto_component.c,v 1.6 2020/01/27 17:10:23 pgoyette Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.6 2020/01/27 17:10:23 pgoyette Exp $"); #include #include @@ -75,8 +75,8 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) * only. * * TODO: - * There is still "crypto: unable to register devsw" message. it should - * be suppressed. + * There is still "crypto: unable to register devsw, error 17" message. + * it should be suppressed. */ rump_pdev_add(swcryptoattach, 0); #endif
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Mon Jan 27 17:09:17 UTC 2020
Modified Files:
src/sys/compat/common: Makefile.sysio
src/sys/modules/compat_crypto_50: Makefile
src/sys/opencrypto: files.opencrypto ocryptodev.c
Added Files:
src/sys/opencrypto: compat_crypto_50.c
Log Message:
Split the module glue out from the rest of opencrypto/ocryptodev to
make rump happy.
Rump doesn't have compat modules (the compat code is included in the
relevant librump*.so), so there's no module compat_50 listed in
link_set_modules, and thus ocryptodev's MODULE(...) can't "require"
it.
This fixes the problem of "built-in module compat_50 not found" when
starting up rump_allserver (or rump_server with -l rumpdev_opencrypto).
XXX This does not resolve the long-standing "crypto: unable to
XXX register devsw, error 17" message noted at line 78 of
XXX sys/rump/dev/lib/libopencrypto/opencrypto_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/opencrypto/compat_crypto_50.c
cvs rdiff -u -r1.27 -r1.28 src/sys/opencrypto/files.opencrypto
cvs rdiff -u -r1.15 -r1.16 src/sys/opencrypto/ocryptodev.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/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.12 src/sys/compat/common/Makefile.sysio:1.13
--- src/sys/compat/common/Makefile.sysio:1.12 Fri May 17 07:37:11 2019
+++ src/sys/compat/common/Makefile.sysio Mon Jan 27 17:09:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sysio,v 1.12 2019/05/17 07:37:11 msaitoh Exp $
+# $NetBSD: Makefile.sysio,v 1.13 2020/01/27 17:09:17 pgoyette Exp $
# Sources for syscall and ioctl compatibility across the versions.
@@ -51,7 +51,7 @@ SRCS+= kern_mod_80.c if_media_80.c
# More compatibility code for NetBSD 5.0
.PATH: ${S}/opencrypto
-SRCS+= ocryptodev.c
+SRCS+= ocryptodev.c compat_crypto_50.c
# Raidframe compatibility code for NetBSD 5.0 and 8.0
.PATH: ${S}/dev/raidframe
Index: src/sys/modules/compat_crypto_50/Makefile
diff -u src/sys/modules/compat_crypto_50/Makefile:1.2 src/sys/modules/compat_crypto_50/Makefile:1.3
--- src/sys/modules/compat_crypto_50/Makefile:1.2 Sun Jan 27 02:08:45 2019
+++ src/sys/modules/compat_crypto_50/Makefile Mon Jan 27 17:09:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/27 17:09:17 pgoyette Exp $
.include "../Makefile.inc"
@@ -7,6 +7,6 @@ CPPFLAGS+= -DCOMPAT_50
.PATH: ${S}/opencrypto
KMOD= compat_crypto_50
-SRCS= ocryptodev.c
+SRCS= ocryptodev.c compat_crypto_50.c
.include
Index: src/sys/opencrypto/files.opencrypto
diff -u src/sys/opencrypto/files.opencrypto:1.27 src/sys/opencrypto/files.opencrypto:1.28
--- src/sys/opencrypto/files.opencrypto:1.27 Sun Jan 27 02:08:48 2019
+++ src/sys/opencrypto/files.opencrypto Mon Jan 27 17:09:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.opencrypto,v 1.27 2019/01/27 02:08:48 pgoyette Exp $
+# $NetBSD: files.opencrypto,v 1.28 2020/01/27 17:09:17 pgoyette Exp $
#
#
@@ -26,6 +26,7 @@ file opencrypto/gmac.c swcrypto
defpseudo crypto: opencrypto
file opencrypto/cryptodev.c crypto
file opencrypto/ocryptodev.c compat_50 & crypto
+file opencrypto/compat_crypto_50.c compat_50 & crypto
defflag opt_ocf.h CRYPTO_DEBUG CRYPTO_TIMING
defparam opt_ocf.h CRYPTO_RET_Q_MAXLEN CRYPTO_RET_KQ_MAXLEN
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.15 src/sys/opencrypto/ocryptodev.c:1.16
--- src/sys/opencrypto/ocryptodev.c:1.15 Thu Jan 16 15:29:24 2020
+++ src/sys/opencrypto/ocryptodev.c Mon Jan 27 17:09:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.15 2020/01/16 15:29:24 christos Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.16 2020/01/27 17:09:17 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.15 2020/01/16 15:29:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.16 2020/01/27 17:09:17 pgoyette Exp $");
#include
#include
@@ -287,36 +287,3 @@ ocryptodev_msession(struct fcrypt *fcr,
return 0;
}
-
-static void
-crypto_50_init(void)
-{
-
- MODULE_HOOK_SET(ocryptof_50_hook, ocryptof_ioctl);
-}
-
-static void
-crypto_50_fini(void)
-{
-
- MODULE_HOOK_UNSET(ocryptof_50_hook);
-}
-
-MODULE(MODULE_CLASS_EXEC, compat_crypto_50, "crypto,compat_50");
-
-static int
-compat_crypto_50_modcmd(modcmd_t cmd, void *arg)
-{
-
- switch (cmd) {
- case MODULE_CMD_INIT:
- crypto_50_init();
- return 0;
- case MODULE_CMD_FINI:
- crypto_50_fini();
- return 0;
- default:
- return ENOTTY;
- }
-}
-
Added files:
Index:
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Jan 27 16:25:09 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
Log Message:
NVIDIA's breakaway marketing dept have been in touch.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/aarch64/aarch64/cpu.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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.37 src/sys/arch/aarch64/aarch64/cpu.c:1.38
--- src/sys/arch/aarch64/aarch64/cpu.c:1.37 Mon Jan 27 12:56:44 2020
+++ src/sys/arch/aarch64/aarch64/cpu.c Mon Jan 27 16:25:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.37 2020/01/27 12:56:44 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.38 2020/01/27 16:25:08 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.37 2020/01/27 12:56:44 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.38 2020/01/27 16:25:08 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -190,7 +190,7 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_CORTEXA76R3 & CPU_PARTMASK, "Cortex-A76", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA76AER1 & CPU_PARTMASK, "Cortex-A76AE", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA77R0 & CPU_PARTMASK, "Cortex-A77", "Cortex", "V8.2-A+" },
- { CPU_ID_NVIDIADENVER2 & CPU_PARTMASK, "Nvidia", "Denver2", "V8-A" },
+ { CPU_ID_NVIDIADENVER2 & CPU_PARTMASK, "NVIDIA", "Denver2", "V8-A" },
{ CPU_ID_EMAG8180 & CPU_PARTMASK, "Ampere eMAG", "Skylark", "V8-A" },
{ CPU_ID_NEOVERSEE1R1 & CPU_PARTMASK, "Neoverse E1", "Neoverse", "V8.2-A+" },
{ CPU_ID_NEOVERSEN1R3 & CPU_PARTMASK, "Neoverse N1", "Neoverse", "V8.2-A+" },
CVS commit: src/doc
Module Name:src Committed By: jdolecek Date: Mon Jan 27 15:31:03 UTC 2020 Modified Files: src/doc: RESPONSIBLE Log Message: remove asterisk from my name, got back for a while already To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.123 src/doc/RESPONSIBLE:1.124 --- src/doc/RESPONSIBLE:1.123 Wed May 8 22:01:47 2019 +++ src/doc/RESPONSIBLE Mon Jan 27 15:31:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.123 2019/05/08 22:01:47 nat Exp $ +# $NetBSD: RESPONSIBLE,v 1.124 2020/01/27 15:31:03 jdolecek Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -15,7 +15,7 @@ amd christos atf jmmv audioplay mrg audiorecord mrg -awk jdolecek* +awk jdolecek bc phil*, simonb config cube* csh christos @@ -24,7 +24,7 @@ dhcp mellon* edquota dholland error christos etcupdate [nobody] -expr jdolecek* +expr jdolecek file christos, pooka gpioctl mbalmer grep simonb, wiz @@ -61,7 +61,7 @@ ppp(sync) martin? racoon manu routed christos sh christos, dsl, kre -sort jdolecek* +sort jdolecek sysctl atatat* talk/talkd dholland tcpdump core @@ -81,7 +81,7 @@ Userland Libraries: atf jmmv citrus core curses blymn, jdc -edit christos, jdolecek* +edit christos, jdolecek kerberos lha*, joda* openssl thorpej*, christos pcap core @@ -125,7 +125,7 @@ gpio mbalmer ide/atapi bouyer irda augustss*, kenh keylock mbalmer -mca jdolecek* +mca jdolecek nand ahoka net80211 dyoung onewire riz @@ -198,16 +198,16 @@ hfs dillo* kernfs ? lfs dholland, perseant mfs [nobody in particular] -msdosfs jdolecek* +msdosfs jdolecek nilfs reinoud nfs fvdl* -ntfs jdolecek* +ntfs jdolecek nullfs/layerfs dholland, pooka overlay [nobody] procfs ? ptyfs christos puffs pooka -smbfs jdolecek* +smbfs jdolecek sysvbfs ? tmpfs rmind udf reinoud @@ -230,20 +230,20 @@ misc dholland, pooka kern/general: ddb jhawk, mrg -emulation christos, fvdl*, manu, jdolecek*, mrg -kevents jdolecek* +emulation christos, fvdl*, manu, jdolecek, mrg +kevents jdolecek ksyms ragge* modules jnemeth, pgoyette lwp/pthread nathanw* ntp simonb, jonathan* -pipes jdolecek* +pipes jdolecek splash jmcneill uvm chuck, chs, mrg, atatat* kern/compat: linux-alpha erh -linux-i386 fvdl*, jdolecek* +linux-i386 fvdl*, jdolecek linux-m68k itohy* linux-mips manu linux-powerpc manu
CVS commit: src/sys/modules/opencrypto
Module Name:src Committed By: pgoyette Date: Mon Jan 27 15:12:48 UTC 2020 Modified Files: src/sys/modules/opencrypto: opencrypto.ioconf Log Message: Use correct pseudo-device for opencrypto module To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/opencrypto/opencrypto.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/opencrypto/opencrypto.ioconf diff -u src/sys/modules/opencrypto/opencrypto.ioconf:1.1 src/sys/modules/opencrypto/opencrypto.ioconf:1.2 --- src/sys/modules/opencrypto/opencrypto.ioconf:1.1 Thu Aug 20 11:05:01 2015 +++ src/sys/modules/opencrypto/opencrypto.ioconf Mon Jan 27 15:12:48 2020 @@ -1,7 +1,7 @@ -# $NetBSD: opencrypto.ioconf,v 1.1 2015/08/20 11:05:01 christos Exp $ +# $NetBSD: opencrypto.ioconf,v 1.2 2020/01/27 15:12:48 pgoyette Exp $ ioconf opencrypto include "conf/files" -pseudo-device opencrypto +pseudo-device crypto
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Mon Jan 27 12:56:44 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/include: cputypes.h
Log Message:
Identify the Denver2 CPU in the Nvidia TX2
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/cputypes.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/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.36 src/sys/arch/aarch64/aarch64/cpu.c:1.37
--- src/sys/arch/aarch64/aarch64/cpu.c:1.36 Sat Jan 25 18:18:31 2020
+++ src/sys/arch/aarch64/aarch64/cpu.c Mon Jan 27 12:56:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.36 2020/01/25 18:18:31 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.37 2020/01/27 12:56:44 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.36 2020/01/25 18:18:31 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.37 2020/01/27 12:56:44 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -190,6 +190,7 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_CORTEXA76R3 & CPU_PARTMASK, "Cortex-A76", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA76AER1 & CPU_PARTMASK, "Cortex-A76AE", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA77R0 & CPU_PARTMASK, "Cortex-A77", "Cortex", "V8.2-A+" },
+ { CPU_ID_NVIDIADENVER2 & CPU_PARTMASK, "Nvidia", "Denver2", "V8-A" },
{ CPU_ID_EMAG8180 & CPU_PARTMASK, "Ampere eMAG", "Skylark", "V8-A" },
{ CPU_ID_NEOVERSEE1R1 & CPU_PARTMASK, "Neoverse E1", "Neoverse", "V8.2-A+" },
{ CPU_ID_NEOVERSEN1R3 & CPU_PARTMASK, "Neoverse N1", "Neoverse", "V8.2-A+" },
Index: src/sys/arch/arm/include/cputypes.h
diff -u src/sys/arch/arm/include/cputypes.h:1.11 src/sys/arch/arm/include/cputypes.h:1.12
--- src/sys/arch/arm/include/cputypes.h:1.11 Sat Dec 28 19:18:31 2019
+++ src/sys/arch/arm/include/cputypes.h Mon Jan 27 12:56:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.11 2019/12/28 19:18:31 jmcneill Exp $ */
+/* $NetBSD: cputypes.h,v 1.12 2020/01/27 12:56:44 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -208,6 +208,7 @@
#define CPU_ID_SA110 0x4401a100
#define CPU_ID_SA1100 0x4401a110
+#define CPU_ID_NVIDIADENVER2 0x4e0f0030
#define CPU_ID_EMAG8180 0x503f0002
#define CPU_ID_TI925T 0x54029250
#define CPU_ID_MV88FR571_VD 0x56155710
CVS commit: src/share/misc
Module Name:src
Committed By: nia
Date: Mon Jan 27 10:56:29 UTC 2020
Modified Files:
src/share/misc: acronyms acronyms.comp
Log Message:
move some more to comp
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/share/misc/acronyms
cvs rdiff -u -r1.296 -r1.297 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
diff -u src/share/misc/acronyms:1.294 src/share/misc/acronyms:1.295
--- src/share/misc/acronyms:1.294 Mon Jan 27 10:35:20 2020
+++ src/share/misc/acronyms Mon Jan 27 10:56:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.294 2020/01/27 10:35:20 nia Exp $
+$NetBSD: acronyms,v 1.295 2020/01/27 10:56:29 nia Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -90,7 +90,6 @@ BTTH boot to the head
BTW by the way
BYOB bring your own {beer,booze}
CC credit card
-CCC Chaos Computer Club
CEO chief executive officer
CFV call for votes
CFY calling for you
@@ -101,7 +100,6 @@ CMIIW correct me if I'm wrong
CNP continued [in my] next post
COB close of business [day]
COTS commercial off-the-shelf
-CPA chosen-plaintext attack
CPA cyproterone acetate
CPC cost per click
CPE customer premises equipment
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.296 src/share/misc/acronyms.comp:1.297
--- src/share/misc/acronyms.comp:1.296 Sat Dec 14 13:36:14 2019
+++ src/share/misc/acronyms.comp Mon Jan 27 10:56:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.296 2019/12/14 13:36:14 sevan Exp $
+$NetBSD: acronyms.comp,v 1.297 2020/01/27 10:56:29 nia Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -214,6 +214,7 @@ CAV constant angular velocity
CBC cipher block chaining
CBR constant bit rate
CC carbon copy
+CCC Chaos Computer Club
CCD charge coupled device
CCI co-channel interferer
CCNUMA cache-coherent non-uniform memory access
@@ -282,6 +283,7 @@ CORBA common object request broker archi
COS class of service
COW copy-on-write
CP continuous pilot
+CPA chosen-plaintext attack
CPB core performance boost
CPC central processor complex
CPC cpu performance counters
CVS commit: src/share/misc
Module Name:src
Committed By: nia
Date: Mon Jan 27 10:35:20 UTC 2020
Modified Files:
src/share/misc: acronyms
Log Message:
SEO - already in comp
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/share/misc/acronyms
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
diff -u src/share/misc/acronyms:1.293 src/share/misc/acronyms:1.294
--- src/share/misc/acronyms:1.293 Mon Jan 27 10:25:16 2020
+++ src/share/misc/acronyms Mon Jan 27 10:35:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.293 2020/01/27 10:25:16 nia Exp $
+$NetBSD: acronyms,v 1.294 2020/01/27 10:35:20 nia Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -492,7 +492,6 @@ S/T self titled
SAR search and rescue
SAR some assembly required
SCNR sorry, could not resist
-SEO search engine optimization
SEP someone else's problem
SERP search engine results page
SFAICT so far as I can tell
CVS commit: src/share/misc
Module Name:src
Committed By: nia
Date: Mon Jan 27 10:25:16 UTC 2020
Modified Files:
src/share/misc: acronyms
Log Message:
CCC, CPA, MDMA, SEO, WLW
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/share/misc/acronyms
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
diff -u src/share/misc/acronyms:1.292 src/share/misc/acronyms:1.293
--- src/share/misc/acronyms:1.292 Fri Jan 10 16:18:21 2020
+++ src/share/misc/acronyms Mon Jan 27 10:25:16 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.292 2020/01/10 16:18:21 leot Exp $
+$NetBSD: acronyms,v 1.293 2020/01/27 10:25:16 nia Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -90,6 +90,7 @@ BTTH boot to the head
BTW by the way
BYOB bring your own {beer,booze}
CC credit card
+CCC Chaos Computer Club
CEO chief executive officer
CFV call for votes
CFY calling for you
@@ -100,6 +101,8 @@ CMIIW correct me if I'm wrong
CNP continued [in my] next post
COB close of business [day]
COTS commercial off-the-shelf
+CPA chosen-plaintext attack
+CPA cyproterone acetate
CPC cost per click
CPE customer premises equipment
CPR car plate recognition
@@ -346,6 +349,7 @@ M management & operations
M8 mate
MAD mutually assured destruction
MBA master of business administration
+MDMA methylenedioxy methamphetamine
MFW my face when
MIA missing in action
MLPR mobile license plate reader
@@ -488,6 +492,7 @@ S/T self titled
SAR search and rescue
SAR some assembly required
SCNR sorry, could not resist
+SEO search engine optimization
SEP someone else's problem
SERP search engine results page
SFAICT so far as I can tell
@@ -599,6 +604,7 @@ WFH working from home
WFM works for me
WIBNI wouldn't it be nice if
WIP work in progress
+WLW women-loving women
WMNC watch me not care
WOMBAT waste of money, brain, and time
WP well played
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Mon Jan 27 09:40:43 UTC 2020
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
Add TX checksum offload supports for ixl(4)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_ixl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.27 src/sys/dev/pci/if_ixl.c:1.28
--- src/sys/dev/pci/if_ixl.c:1.27 Mon Jan 27 08:40:46 2020
+++ src/sys/dev/pci/if_ixl.c Mon Jan 27 09:40:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.27 2020/01/27 08:40:46 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.28 2020/01/27 09:40:43 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -104,6 +104,9 @@
#include
#include
+#include /* for struct tcphdr */
+#include /* for struct udphdr */
+
#include
#include
@@ -704,11 +707,19 @@ struct ixl_softc {
#define IXL_TX_INTR_PROCESS_LIMIT 256
#define IXL_RX_INTR_PROCESS_LIMIT 0U
-#define IXL_IFCAP_RXCSUM (IFCAP_CSUM_IPv4_Rx| \
- IFCAP_CSUM_TCPv4_Rx| \
- IFCAP_CSUM_UDPv4_Rx| \
- IFCAP_CSUM_TCPv6_Rx| \
+#define IXL_IFCAP_RXCSUM (IFCAP_CSUM_IPv4_Rx | \
+ IFCAP_CSUM_TCPv4_Rx | \
+ IFCAP_CSUM_UDPv4_Rx | \
+ IFCAP_CSUM_TCPv6_Rx | \
IFCAP_CSUM_UDPv6_Rx)
+#define IXL_IFCAP_TXCSUM (IFCAP_CSUM_IPv4_Tx | \
+ IFCAP_CSUM_TCPv4_Tx | \
+ IFCAP_CSUM_UDPv4_Tx | \
+ IFCAP_CSUM_TCPv6_Tx | \
+ IFCAP_CSUM_UDPv6_Tx)
+#define IXL_CSUM_ALL_OFFLOAD (M_CSUM_IPv4 | \
+ M_CSUM_TCPv4 | M_CSUM_TCPv6 | \
+ M_CSUM_UDPv4 | M_CSUM_UDPv6)
#define delaymsec(_x) DELAY(1000 * (_x))
#ifdef IXL_DEBUG
@@ -1340,8 +1351,9 @@ ixl_attach(device_t parent, device_t sel
IFQ_SET_MAXLEN(>if_snd, sc->sc_tx_ring_ndescs);
IFQ_SET_READY(>if_snd);
ifp->if_capabilities |= IXL_IFCAP_RXCSUM;
+ ifp->if_capabilities |= IXL_IFCAP_TXCSUM;
#if 0
- ifp->if_capabilities |= IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx;
+ ifp->if_capabilities |= IFCAP_TSOv4 | IFCAP_TSOv6;
#endif
ether_set_vlan_cb(>sc_ec, ixl_vlan_cb);
sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
@@ -2548,6 +2560,71 @@ ixl_load_mbuf(bus_dma_tag_t dmat, bus_dm
return error;
}
+static inline int
+ixl_tx_setup_offloads(struct mbuf *m, uint64_t *cmd_txd)
+{
+ struct ether_header *eh;
+ size_t len;
+ uint64_t cmd;
+
+ cmd = 0;
+
+ eh = mtod(m, struct ether_header *);
+ switch (htons(eh->ether_type)) {
+ case ETHERTYPE_IP:
+ case ETHERTYPE_IPV6:
+ len = ETHER_HDR_LEN;
+ break;
+ case ETHERTYPE_VLAN:
+ len = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
+ break;
+ default:
+ len = 0;
+ }
+ cmd |= ((len >> 1) << IXL_TX_DESC_MACLEN_SHIFT);
+
+ if (m->m_pkthdr.csum_flags &
+ (M_CSUM_TSOv4 | M_CSUM_TCPv4 | M_CSUM_UDPv4)) {
+ cmd |= IXL_TX_DESC_CMD_IIPT_IPV4;
+ }
+ if (m->m_pkthdr.csum_flags & M_CSUM_IPv4) {
+ cmd |= IXL_TX_DESC_CMD_IIPT_IPV4_CSUM;
+ }
+
+ if (m->m_pkthdr.csum_flags &
+ (M_CSUM_TSOv6 | M_CSUM_TCPv6 | M_CSUM_UDPv6)) {
+ cmd |= IXL_TX_DESC_CMD_IIPT_IPV6;
+ }
+
+ switch (cmd & IXL_TX_DESC_CMD_IIPT_MASK) {
+ case IXL_TX_DESC_CMD_IIPT_IPV4:
+ case IXL_TX_DESC_CMD_IIPT_IPV4_CSUM:
+ len = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
+ break;
+ case IXL_TX_DESC_CMD_IIPT_IPV6:
+ len = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
+ break;
+ default:
+ len = 0;
+ }
+ cmd |= ((len >> 2) << IXL_TX_DESC_IPLEN_SHIFT);
+
+ if (m->m_pkthdr.csum_flags &
+ (M_CSUM_TSOv4 | M_CSUM_TSOv6 | M_CSUM_TCPv4 | M_CSUM_TCPv6)) {
+ len = sizeof(struct tcphdr);
+ cmd |= IXL_TX_DESC_CMD_L4T_EOFT_TCP;
+ } else if (m->m_pkthdr.csum_flags & (M_CSUM_UDPv4 | M_CSUM_UDPv6)) {
+ len = sizeof(struct udphdr);
+ cmd |= IXL_TX_DESC_CMD_L4T_EOFT_UDP;
+ } else {
+ len = 0;
+ }
+ cmd |= ((len >> 2) << IXL_TX_DESC_L4LEN_SHIFT);
+
+ *cmd_txd |= cmd;
+ return 0;
+}
+
static void
ixl_tx_common_locked(struct ifnet *ifp, struct ixl_tx_ring *txr,
bool is_transmit)
@@ -2557,7 +2634,7 @@ ixl_tx_common_locked(struct ifnet *ifp,
struct ixl_tx_map *txm;
bus_dmamap_t map;
struct mbuf *m;
- uint64_t cmd, cmd_vlan;
+ uint64_t cmd, cmd_txd;
unsigned int prod, free, last, i;
unsigned int mask;
int post = 0;
@@ -2611,12 +2688,15 @@ ixl_tx_common_locked(struct ifnet *ifp,
continue;
}
+ cmd_txd = 0;
+ if (m->m_pkthdr.csum_flags & IXL_CSUM_ALL_OFFLOAD) {
+ ixl_tx_setup_offloads(m, _txd);
+ }
+
if (vlan_has_tag(m)) {
- cmd_vlan = (uint64_t)vlan_get_tag(m) <<
+ cmd_txd |= (uint64_t)vlan_get_tag(m) <<
IXL_TX_DESC_L2TAG1_SHIFT;
- cmd_vlan |= IXL_TX_DESC_CMD_IL2TAG1;
- } else {
- cmd_vlan = 0;
+ cmd_txd |= IXL_TX_DESC_CMD_IL2TAG1;
}
bus_dmamap_sync(sc->sc_dmat, map, 0,
@@ -2628,7 +2708,7 @@ ixl_tx_common_locked(struct ifnet *ifp,
cmd = (uint64_t)map->dm_segs[i].ds_len <<
IXL_TX_DESC_BSIZE_SHIFT;
cmd |= IXL_TX_DESC_DTYPE_DATA | IXL_TX_DESC_CMD_ICRC;
- cmd |= cmd_vlan;
+ cmd |= cmd_txd;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Mon Jan 27 08:40:46 UTC 2020
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
Fix missing PCI_INTR_MPSAFE settings in ixl(4)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_ixl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.26 src/sys/dev/pci/if_ixl.c:1.27
--- src/sys/dev/pci/if_ixl.c:1.26 Fri Jan 17 09:42:05 2020
+++ src/sys/dev/pci/if_ixl.c Mon Jan 27 08:40:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.26 2020/01/17 09:42:05 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.27 2020/01/27 08:40:46 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -5549,15 +5549,16 @@ ixl_setup_interrupts(struct ixl_softc *s
"couldn't map interrupt\n");
break;
}
- for (i = 0; i < sc->sc_nintrs; i++) {
- pci_intr_setattr(pa->pa_pc, >sc_ihp[i],
- PCI_INTR_MPSAFE, true);
- }
intr_type = pci_intr_type(pa->pa_pc, sc->sc_ihp[0]);
sc->sc_nintrs = counts[intr_type];
KASSERT(sc->sc_nintrs > 0);
+ for (i = 0; i < sc->sc_nintrs; i++) {
+ pci_intr_setattr(pa->pa_pc, >sc_ihp[i],
+ PCI_INTR_MPSAFE, true);
+ }
+
sc->sc_ihs = kmem_alloc(sizeof(sc->sc_ihs[0]) * sc->sc_nintrs,
KM_SLEEP);
CVS commit: src/etc/rc.d
Module Name:src Committed By: kim Date: Mon Jan 27 08:33:24 UTC 2020 Modified Files: src/etc/rc.d: autounmountd ip6addrctl Log Message: Add NetBSD ID To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/autounmountd cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/ip6addrctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/autounmountd diff -u src/etc/rc.d/autounmountd:1.2 src/etc/rc.d/autounmountd:1.3 --- src/etc/rc.d/autounmountd:1.2 Wed Aug 7 19:30:00 2019 +++ src/etc/rc.d/autounmountd Mon Jan 27 08:33:24 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $NetBSD: autounmountd,v 1.3 2020/01/27 08:33:24 kim Exp $ # # PROVIDE: autounmountd Index: src/etc/rc.d/ip6addrctl diff -u src/etc/rc.d/ip6addrctl:1.3 src/etc/rc.d/ip6addrctl:1.4 --- src/etc/rc.d/ip6addrctl:1.3 Wed Aug 7 19:30:00 2019 +++ src/etc/rc.d/ip6addrctl Mon Jan 27 08:33:24 2020 @@ -1,6 +1,7 @@ #!/bin/sh # -# $FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs $ +# $NetBSD: ip6addrctl,v 1.4 2020/01/27 08:33:24 kim Exp $ +# FreeBSD: head/etc/rc.d/ip6addrctl 270836 2014-08-30 07:08:10Z hrs # # PROVIDE: ip6addrctl
CVS commit: src/etc/rc.d
Module Name:src
Committed By: kim
Date: Mon Jan 27 08:28:33 UTC 2020
Modified Files:
src/etc/rc.d: ipsec
Log Message:
Skip inet6 addresses that begin with fe80: (not just exact match).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/rc.d/ipsec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ipsec
diff -u src/etc/rc.d/ipsec:1.15 src/etc/rc.d/ipsec:1.16
--- src/etc/rc.d/ipsec:1.15 Mon Aug 13 09:16:06 2018
+++ src/etc/rc.d/ipsec Mon Jan 27 08:28:33 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipsec,v 1.15 2018/08/13 09:16:06 christos Exp $
+# $NetBSD: ipsec,v 1.16 2020/01/27 08:28:33 kim Exp $
#
# PROVIDE: ipsec
@@ -34,7 +34,7 @@ ipsec_getip() {
case "$what" in
inet) echo "local v4_addr=$address;";;
inet6) case "$address" in
- fe80:) ;;
+ fe80:*) ;;
*) echo "local v6_addr=$address;";;
esac;;
esac
