CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 20 22:58:53 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Avoid the risk of being wrong and don't expand meaning of holiday. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.8 src/usr.bin/calendar/calendars/calendar.judaic:1.9 --- src/usr.bin/calendar/calendars/calendar.judaic:1.8 Fri Dec 20 18:37:20 2019 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 20 22:58:53 2019 @@ -24,6 +24,6 @@ sabbatical) 10/09* Hoshanah Rabba (7th day of Sukkot) 10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) -11/16* Sigd (Beta Israel Day of Atonement; 50 days after Yom Kippur) +11/16* Sigd (Beta Israel; 50 days after Yom Kippur) 12/10* First Day of Chanukah 12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Dec 20 22:26:16 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-8.1.4 To generate a diff of this commit: cvs rdiff -u -r1.1679 -r1.1680 src/doc/3RDPARTY cvs rdiff -u -r1.2627 -r1.2628 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.1679 src/doc/3RDPARTY:1.1680 --- src/doc/3RDPARTY:1.1679 Fri Dec 20 12:02:46 2019 +++ src/doc/3RDPARTY Fri Dec 20 22:26:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1679 2019/12/20 12:02:46 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1680 2019/12/20 22:26:16 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -327,8 +327,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 8.1.3 -Current Vers: 8.1.3 +Version: 8.1.4 +Current Vers: 8.1.4 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2627 src/doc/CHANGES:1.2628 --- src/doc/CHANGES:1.2627 Fri Dec 20 12:02:46 2019 +++ src/doc/CHANGES Fri Dec 20 22:26:16 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2627 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2628 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -87,4 +87,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: Rockchip RK3399. [jakllsch 20191219] net80211: Require SSID configuration to associate with an open AP. [jakllsch 20191219] - dhcpcd(8): Import dhcpcd-8.1.3 [roy 20191220] + dhcpcd(8): Import dhcpcd-8.1.4 [roy 20191220]
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Fri Dec 20 22:24:59 UTC 2019
Modified Files:
src/external/bsd/dhcpcd/dist/src: if-options.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/dist/src/if-options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/if-options.c
diff -u src/external/bsd/dhcpcd/dist/src/if-options.c:1.18 src/external/bsd/dhcpcd/dist/src/if-options.c:1.19
--- src/external/bsd/dhcpcd/dist/src/if-options.c:1.18 Fri Oct 11 11:03:59 2019
+++ src/external/bsd/dhcpcd/dist/src/if-options.c Fri Dec 20 22:24:59 2019
@@ -393,8 +393,16 @@ parse_str(char *sbuf, size_t slen, const
str++;
}
}
- if (flags == PARSE_STRING_NULL && sbuf)
- *sbuf = '\0';
+ if (flags == PARSE_STRING_NULL) {
+ l++;
+ if (sbuf != NULL) {
+ if (l > slen) {
+errno = ENOBUFS;
+return -1;
+ }
+ *sbuf = '\0';
+ }
+ }
return (ssize_t)l;
}
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Dec 20 22:23:57 UTC 2019 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3037 Log Message: Update to dhcpcd-8.1.4 with the following change: * options: Fix allocating the script option Status: Vendor Tag: ROY Release Tags: dhcpcd-8_1_4 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 C 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 U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/if-bsd.c U 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 U src/external/bsd/dhcpcd/dist/src/ipv6.c U 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 U 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 1 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/kern
Module Name:src Committed By: ad Date: Fri Dec 20 21:52:52 UTC 2019 Modified Files: src/sys/kern: kern_synch.c Log Message: Use CPU_COUNT() to update nswtch. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.332 -r1.333 src/sys/kern/kern_synch.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_synch.c diff -u src/sys/kern/kern_synch.c:1.332 src/sys/kern/kern_synch.c:1.333 --- src/sys/kern/kern_synch.c:1.332 Mon Dec 16 20:59:39 2019 +++ src/sys/kern/kern_synch.c Fri Dec 20 21:52:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_synch.c,v 1.332 2019/12/16 20:59:39 ad Exp $ */ +/* $NetBSD: kern_synch.c,v 1.333 2019/12/20 21:52:51 ad Exp $ */ /*- * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019 @@ -69,7 +69,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.332 2019/12/16 20:59:39 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.333 2019/12/20 21:52:51 ad Exp $"); #include "opt_kstack.h" #include "opt_dtrace.h" @@ -677,7 +677,7 @@ mi_switch(lwp_t *l) lwp_unlock(l); /* Count the context switch on this CPU. */ - ci->ci_data.cpu_nswtch++; + CPU_COUNT(CPU_COUNT_NSWTCH, 1); /* Update status for lwpctl, if present. */ if (l->l_lwpctl != NULL) @@ -837,7 +837,7 @@ lwp_exit_switchaway(lwp_t *l) spc_unlock(ci); /* Count the context switch on this CPU. */ - ci->ci_data.cpu_nswtch++; + CPU_COUNT(CPU_COUNT_NSWTCH, 1); /* Update status for lwpctl, if present. */ if (l->l_lwpctl != NULL)
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Fri Dec 20 21:20:09 UTC 2019
Modified Files:
src/sys/kern: files.kern kern_cpu.c
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/kern: subr_cpu.c
Log Message:
Split subr_cpu.c out of kern_cpu.c, to contain routines shared with rump.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/files.kern
cvs rdiff -u -r1.87 -r1.88 src/sys/kern/kern_cpu.c
cvs rdiff -u -r0 -r1.1 src/sys/kern/subr_cpu.c
cvs rdiff -u -r1.180 -r1.181 src/sys/rump/librump/rumpkern/Makefile.rumpkern
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/files.kern
diff -u src/sys/kern/files.kern:1.39 src/sys/kern/files.kern:1.40
--- src/sys/kern/files.kern:1.39 Thu Dec 12 22:55:20 2019
+++ src/sys/kern/files.kern Fri Dec 20 21:20:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.kern,v 1.39 2019/12/12 22:55:20 pgoyette Exp $
+# $NetBSD: files.kern,v 1.40 2019/12/20 21:20:09 ad Exp $
#
# kernel sources
@@ -104,6 +104,7 @@ file kern/subr_blist.c vmswap
file kern/subr_bufq.c kern
file kern/subr_callback.c kern
file kern/subr_cprng.c kern
+file kern/subr_cpu.c kern
file kern/subr_cpufreq.c kern
file kern/subr_copy.c kern
file kern/subr_csan.c kcsan
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.87 src/sys/kern/kern_cpu.c:1.88
--- src/sys/kern/kern_cpu.c:1.87 Fri Dec 20 21:05:34 2019
+++ src/sys/kern/kern_cpu.c Fri Dec 20 21:20:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.87 2019/12/20 21:05:34 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.88 2019/12/20 21:20:09 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -55,8 +55,12 @@
* SUCH DAMAGE.
*/
+/*
+ * CPU related routines not shared with rump.
+ */
+
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.87 2019/12/20 21:05:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.88 2019/12/20 21:20:09 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -91,7 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v
* verify that the claim is true. This will prevent them from getting out
* of sync.
*/
-#ifndef _RUMPKERNEL /* XXX temporary */
#ifdef __HAVE_CPU_DATA_FIRST
CTASSERT(offsetof(struct cpu_info, ci_data) == 0);
#else
@@ -117,43 +120,7 @@ const struct cdevsw cpuctl_cdevsw = {
.d_discard = nodiscard,
.d_flag = D_OTHER | D_MPSAFE
};
-#endif /* ifndef _RUMPKERNEL XXX */
-
-kmutex_t cpu_lock __cacheline_aligned;
-int ncpu __read_mostly;
-int ncpuonline __read_mostly;
-bool mp_online __read_mostly;
-static bool cpu_topology_present __read_mostly;
-int64_t cpu_counts[CPU_COUNT_MAX];
-
-/* An array of CPUs. There are ncpu entries. */
-struct cpu_info **cpu_infos __read_mostly;
-
-/* Note: set on mi_cpu_attach() and idle_loop(). */
-kcpuset_t * kcpuset_attached __read_mostly = NULL;
-kcpuset_t * kcpuset_running __read_mostly = NULL;
-
-int (*compat_cpuctl_ioctl)(struct lwp *, u_long, void *) = (void *)enosys;
-
-static char cpu_model[128];
-
-/*
- * mi_cpu_init: early initialisation of MI CPU related structures.
- *
- * Note: may not block and memory allocator is not yet available.
- */
-void
-mi_cpu_init(void)
-{
-
- mutex_init(_lock, MUTEX_DEFAULT, IPL_NONE);
-
- kcpuset_create(_attached, true);
- kcpuset_create(_running, true);
- kcpuset_set(kcpuset_running, 0);
-}
-#ifndef _RUMPKERNEL /* XXX temporary */
int
mi_cpu_attach(struct cpu_info *ci)
{
@@ -475,27 +442,8 @@ cpu_setstate(struct cpu_info *ci, bool o
spc->spc_lastmod = time_second;
return 0;
}
-#endif /* ifndef _RUMPKERNEL XXX */
-int
-cpu_setmodel(const char *fmt, ...)
-{
- int len;
- va_list ap;
-
- va_start(ap, fmt);
- len = vsnprintf(cpu_model, sizeof(cpu_model), fmt, ap);
- va_end(ap);
- return len;
-}
-
-const char *
-cpu_getmodel(void)
-{
- return cpu_model;
-}
-
-#if defined(__HAVE_INTR_CONTROL) && !defined(_RUMPKERNEL) /* XXX */
+#if defined(__HAVE_INTR_CONTROL)
static void
cpu_xc_intr(struct cpu_info *ci, void *unused)
{
@@ -588,245 +536,6 @@ cpu_intr_count(struct cpu_info *ci)
}
#endif /* __HAVE_INTR_CONTROL */
-bool
-cpu_softintr_p(void)
-{
-
- return (curlwp->l_pflag & LP_INTR) != 0;
-}
-
-/*
- * Collect CPU topology information as each CPU is attached. This can be
- * called early during boot, so we need to be careful what we do.
- */
-void
-cpu_topology_set(struct cpu_info *ci, u_int package_id, u_int core_id,
-u_int smt_id, u_int numa_id)
-{
- enum cpu_rel rel;
-
- cpu_topology_present = true;
- ci->ci_package_id = package_id;
- ci->ci_core_id = core_id;
- ci->ci_smt_id = smt_id;
- ci->ci_numa_id = numa_id;
- for (rel = 0; rel < __arraycount(ci->ci_sibling); rel++) {
- ci->ci_sibling[rel] = ci;
- ci->ci_nsibling[rel] = 1;
- }
-}
-
-/*
- * Link a CPU into the given circular list.
- */
-static void
-cpu_topology_link(struct cpu_info *ci, struct cpu_info
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Fri Dec 20 21:13:48 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: NetBSD 9.99.27 - cpu_data changes for topology To generate a diff of this commit: cvs rdiff -u -r1.627 -r1.628 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.627 src/sys/sys/param.h:1.628 --- src/sys/sys/param.h:1.627 Mon Dec 16 22:48:25 2019 +++ src/sys/sys/param.h Fri Dec 20 21:13:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.627 2019/12/16 22:48:25 ad Exp $ */ +/* $NetBSD: param.h,v 1.628 2019/12/20 21:13:48 ad Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 999002600 /* NetBSD 9.99.26 */ +#define __NetBSD_Version__ 999002700 /* NetBSD 9.99.27 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Fri Dec 20 21:05:34 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c cpufunc.c
src/sys/arch/arm/arm32: arm32_boot.c cpu.c
src/sys/arch/macppc/macppc: cpu.c
src/sys/arch/mips/mips: cpu_subr.c
src/sys/arch/x86/x86: cpu.c cpu_topology.c identcpu.c
src/sys/kern: kern_cpu.c
src/sys/sys: cpu.h cpu_data.h sched.h
Log Message:
Some more CPU topology stuff:
- Use cegger@'s ACPI SRAT parsing code to figure out NUMA node ID for each
CPU as it is attached.
- For scheduler experiments with SMT, flag CPUs with the lowest numbered SMT
IDs as "primaries", link back to the primaries from secondaries, and build
a circular list of CPUs in each package with identical SMT IDs.
- No need for package/core/smt/numa IDs to be anything other than a u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/cpufunc.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/x86/cpu_topology.c
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.86 -r1.87 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.45 -r1.46 src/sys/sys/cpu.h
cvs rdiff -u -r1.44 -r1.45 src/sys/sys/cpu_data.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/sched.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.26 src/sys/arch/aarch64/aarch64/cpu.c:1.27
--- src/sys/arch/aarch64/aarch64/cpu.c:1.26 Fri Nov 22 05:21:19 2019
+++ src/sys/arch/aarch64/aarch64/cpu.c Fri Dec 20 21:05:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.26 2019/11/22 05:21:19 mlelstv Exp $ */
+/* $NetBSD: cpu.c,v 1.27 2019/12/20 21:05:33 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.26 2019/11/22 05:21:19 mlelstv Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.27 2019/12/20 21:05:33 ad Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -230,8 +230,7 @@ cpu_identify(device_t self, struct cpu_i
aprint_naive("\n");
aprint_normal(": %s\n", model);
- aprint_normal_dev(ci->ci_dev, "package %lu, core %lu, smt %lu\n",
- ci->ci_package_id, ci->ci_core_id, ci->ci_smt_id);
+ cpu_topology_print(ci);
}
static void
Index: src/sys/arch/aarch64/aarch64/cpufunc.c
diff -u src/sys/arch/aarch64/aarch64/cpufunc.c:1.11 src/sys/arch/aarch64/aarch64/cpufunc.c:1.12
--- src/sys/arch/aarch64/aarch64/cpufunc.c:1.11 Thu Dec 5 05:45:52 2019
+++ src/sys/arch/aarch64/aarch64/cpufunc.c Fri Dec 20 21:05:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.11 2019/12/05 05:45:52 ryo Exp $ */
+/* $NetBSD: cpufunc.c,v 1.12 2019/12/20 21:05:33 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -29,7 +29,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.11 2019/12/05 05:45:52 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.12 2019/12/20 21:05:33 ad Exp $");
#include
#include
@@ -96,11 +96,13 @@ aarch64_gettopology(struct cpu_info * co
cpu_topology_set(ci,
__SHIFTOUT(mpidr, MPIDR_AFF2),
__SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0));
+ __SHIFTOUT(mpidr, MPIDR_AFF0),
+ 0);
} else {
cpu_topology_set(ci,
__SHIFTOUT(mpidr, MPIDR_AFF1),
__SHIFTOUT(mpidr, MPIDR_AFF0),
+ 0,
0);
}
}
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.34 src/sys/arch/arm/arm32/arm32_boot.c:1.35
--- src/sys/arch/arm/arm32/arm32_boot.c:1.34 Mon Dec 2 23:22:43 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Fri Dec 20 21:05:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.34 2019/12/02 23:22:43 ad Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.35 2019/12/20 21:05:33 ad Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.34 2019/12/02 23:22:43 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.35 2019/12/20 21:05:33 ad Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -361,11 +361,13 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
cpu_topology_set(ci,
__SHIFTOUT(mpidr, MPIDR_AFF2),
__SHIFTOUT(mpidr, MPIDR_AFF1),
- __SHIFTOUT(mpidr, MPIDR_AFF0));
+ __SHIFTOUT(mpidr, MPIDR_AFF0),
+ 0);
} else {
cpu_topology_set(ci,
__SHIFTOUT(mpidr, MPIDR_AFF1),
__SHIFTOUT(mpidr, MPIDR_AFF0),
+ 0,
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: ad
Date: Fri Dec 20 20:54:48 UTC 2019
Modified Files:
src/sys/ufs/lfs: lfs_pages.c
Log Message:
Fix lfs_putpages() for bsize < nbpg.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/lfs/lfs_pages.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/ufs/lfs/lfs_pages.c
diff -u src/sys/ufs/lfs/lfs_pages.c:1.17 src/sys/ufs/lfs/lfs_pages.c:1.18
--- src/sys/ufs/lfs/lfs_pages.c:1.17 Sun Dec 15 21:11:35 2019
+++ src/sys/ufs/lfs/lfs_pages.c Fri Dec 20 20:54:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_pages.c,v 1.17 2019/12/15 21:11:35 ad Exp $ */
+/* $NetBSD: lfs_pages.c,v 1.18 2019/12/20 20:54:48 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.17 2019/12/15 21:11:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.18 2019/12/20 20:54:48 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -310,7 +310,8 @@ check_dirty(struct lfs *fs, struct vnode
(pg->flags & PG_CLEAN) == 0);
dirty += tdirty;
}
- if (nonexistent >= pages_per_block) {
+ if ((pages_per_block > 0 && nonexistent >= pages_per_block) ||
+ (pages_per_block == 0 && nonexistent > 0)) {
soff += MAX(PAGE_SIZE, lfs_sb_getbsize(fs));
continue;
}
@@ -755,9 +756,6 @@ retry:
KASSERT(mutex_owned(vp->v_interlock));
if (check_dirty(fs, vp, startoffset, endoffset, blkeof,
ap->a_flags, 0, ) < 0) {
- mutex_exit(vp->v_interlock);
- /* XXX why? --ks */
- mutex_enter(vp->v_interlock);
write_and_wait(fs, vp, busypg, seglocked, NULL);
if (!seglocked) {
mutex_exit(vp->v_interlock);
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Fri Dec 20 19:46:51 UTC 2019
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Do not populate /dev on CD images by default, instead rely on init
doing the tmpfs / MAKEDEV magic.
On images for machines with serious ram shortage (where the additional
tmpfs hurts, like VAX) override this with CDDEV_POPULATE=true.
Should fix PR port-amd64/54776.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.18 -r1.19 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.42 src/distrib/common/Makefile.bootcd:1.43
--- src/distrib/common/Makefile.bootcd:1.42 Mon Sep 23 13:42:31 2019
+++ src/distrib/common/Makefile.bootcd Fri Dec 20 19:46:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.42 2019/09/23 13:42:31 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.43 2019/12/20 19:46:51 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -22,6 +22,8 @@
# stuff to put on CD (use in Makefiles)
# CDEXTRA_SKIP A list of file exclusion paths to exclude when copying
# directories of extra stuff in CDEXTRA AND CDBUILDEXTRA
+# CDDEV_POPULATE Set to 'true' to fully populate /dev on the CD (and
+# safe a tmpfs union mount)
# BOOT Defaults to $DESTDIR/usr/mdec/boot
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
@@ -44,6 +46,7 @@ BOOT?= ${DESTDIR}/usr/mdec/boot
BOOTXX_CD9660?= ${DESTDIR}/usr/mdec/bootxx_cd9660
CDRELEASE?= false
CDSOURCE?= false
+CDDEV_POPULATE?=false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
@@ -269,15 +272,21 @@ copy-releasedir:
fi
.endif
+.if ${CDDEV_POPULATE} != true
+DELDEV=-e '/^\.\/dev\/.*type=char/d'
+.endif
+
image:
@echo Preparing spec files for makefs...
${RM} -f ${WORKSPEC}
if [ -d cdrom/etc/mtree ]; then\
cat cdrom/etc/mtree/* |\
${TOOL_SED} -e 's/ size=[0-9]*//' \
+ ${DELDEV} \
-e '/^\.\/etc\/gettytab/d' > ${WORKSPEC}; \
fi
- if [ -r cdrom/dev/MAKEDEV ]; then \
+ if [ -r cdrom/dev/MAKEDEV ] &&\
+ ${CDDEV_POPULATE} == true; then \
${HOST_SH} cdrom/dev/MAKEDEV -s init | \
${TOOL_SED} -e '/^\. type=dir/d' \
-e 's,^\.,./dev,' >> ${WORKSPEC}; \
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.18 src/distrib/vax/cdroms/installcd/Makefile:1.19
--- src/distrib/vax/cdroms/installcd/Makefile:1.18 Mon Sep 23 13:42:35 2019
+++ src/distrib/vax/cdroms/installcd/Makefile Fri Dec 20 19:46:51 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2019/09/23 13:42:35 christos Exp $
+# $NetBSD: Makefile,v 1.19 2019/12/20 19:46:51 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
+CDDEV_POPULATE= true # populate /dev on the CD
CDRELEASE_NODEBUG= true
CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Fri Dec 20 19:03:18 UTC 2019
Modified Files:
src/sys/uvm: uvm_physseg.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/uvm_physseg.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/uvm/uvm_physseg.c
diff -u src/sys/uvm/uvm_physseg.c:1.11 src/sys/uvm/uvm_physseg.c:1.12
--- src/sys/uvm/uvm_physseg.c:1.11 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_physseg.c Fri Dec 20 19:03:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_physseg.c,v 1.11 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.12 2019/12/20 19:03:17 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -1015,7 +1015,9 @@ uvm_physseg_set_avail_start(uvm_physseg_
ps->avail_start = avail_start;
}
-void uvm_physseg_set_avail_end(uvm_physseg_t upm, paddr_t avail_end)
+
+void
+uvm_physseg_set_avail_end(uvm_physseg_t upm, paddr_t avail_end)
{
struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 20 18:37:20 UTC 2019 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Update to 2020 dates. While here: - Add regional holidays: Sigd (Beta Israel), Mimouna (Morrocan). - Transliterate some things in an Israeli Hebrew accent (Succos -> Sukkot, Atzeres -> Atzeret) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.7 src/usr.bin/calendar/calendars/calendar.judaic:1.8 --- src/usr.bin/calendar/calendars/calendar.judaic:1.7 Sat Jun 2 05:55:47 2018 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 20 18:37:20 2019 @@ -1,27 +1,29 @@ 01/21* Tu B'Shvat (Feast of Trees) -03/19* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/20* Purim (Feast of Lots; 30 days before Pesach) -04/19* Pesach (First Day of Passover; sabbatical) -04/20* Pesach (sabbatical) -04/21* Pesach (sabbatical) -04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -05/09* Yom HaAtzma'ut (Israel Independence Day) -05/23* Lag B'Omer (Commemoration of the Great Rebellion) -06/01* Yom Yerushalayim (Reunification of Jerusalem) -06/08* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/20* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +03/09* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +03/10* Purim (Feast of Lots; 30 days before Pesach) +04/09* Pesach (First Day of Passover; sabbatical) +04/10* Pesach (sabbatical) +04/11* Pesach (sabbatical) +04/16* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +04/17* Mimouna (Morrocan Jewish Celebration of End of Pesach) +04/09* Yom HaAtzma'ut (Israel Independence Day) +05/12* Lag B'Omer (Commemoration of the Great Rebellion) +05/22* Yom Yerushalayim (Reunification of Jerusalem) +05/29* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/21* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/09* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; +07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5781 == 2021; sabbatical) -09/09* Rosh Hashanah (sabbatical) -09/10* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/20* Rosh Hashanah (sabbatical) +09/21* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/18* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/28* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -09/23* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; +10/03* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -09/30* Hoshanah Rabba (7th day of Succos) -10/01* Shmini Atzeres (8th Day of Gathering; 1 day after Succos; sabbatical) -12/02* First Day of Chanukah -12/18* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +10/09* Hoshanah Rabba (7th day of Sukkot) +10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) +11/16* Sigd (Beta Israel Day of Atonement; 50 days after Yom Kippur) +12/10* First Day of Chanukah +12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Fri Dec 20 16:16:36 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_pdev.c dm_target_linear.c dm_target_stripe.c
Log Message:
dm: Fix "table" output format of dm-linear and dm-stripe
The existing "table" output showing device file path of pdev is
not compatible with dm in Linux kernel (and also DragonFlyBSD).
It should be showing "major:minor" instead.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_pdev.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/dm/dm_target_stripe.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/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.48 src/sys/dev/dm/dm.h:1.49
--- src/sys/dev/dm/dm.h:1.48 Mon Dec 16 15:59:04 2019
+++ src/sys/dev/dm/dm.h Fri Dec 20 16:16:36 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.48 2019/12/16 15:59:04 tkusumi Exp $ */
+/*$NetBSD: dm.h,v 1.49 2019/12/20 16:16:36 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -103,6 +103,7 @@ typedef struct dm_table_head {
*/
typedef struct dm_pdev {
char name[MAX_DEV_NAME];
+ char udev_name[MAX_DEV_NAME];
struct vnode *pdev_vnode;
uint64_t pdev_numsec;
Index: src/sys/dev/dm/dm_pdev.c
diff -u src/sys/dev/dm/dm_pdev.c:1.21 src/sys/dev/dm/dm_pdev.c:1.22
--- src/sys/dev/dm/dm_pdev.c:1.21 Sun Dec 15 14:39:42 2019
+++ src/sys/dev/dm/dm_pdev.c Fri Dec 20 16:16:36 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_pdev.c,v 1.21 2019/12/15 14:39:42 tkusumi Exp $ */
+/*$NetBSD: dm_pdev.c,v 1.22 2019/12/20 16:16:36 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.21 2019/12/15 14:39:42 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.22 2019/12/20 16:16:36 tkusumi Exp $");
#include
#include
@@ -127,6 +127,10 @@ dm_pdev_insert(const char *dev_name)
getdisksize(dmp->pdev_vnode, >pdev_numsec, >pdev_secsize);
dmp->ref_cnt = 1;
+ snprintf(dmp->udev_name, sizeof(dmp->udev_name), "%d:%d",
+ major(dmp->pdev_vnode->v_rdev), minor(dmp->pdev_vnode->v_rdev));
+ aprint_debug("%s: %s %s\n", __func__, dev_name, dmp->udev_name);
+
SLIST_INSERT_HEAD(_pdev_list, dmp, next_pdev);
mutex_exit(_pdev_mutex);
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.33 src/sys/dev/dm/dm_target_linear.c:1.34
--- src/sys/dev/dm/dm_target_linear.c:1.33 Wed Dec 18 14:31:35 2019
+++ src/sys/dev/dm/dm_target_linear.c Fri Dec 20 16:16:36 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 tkusumi Exp $ */
+/*$NetBSD: dm_target_linear.c,v 1.34 2019/12/20 16:16:36 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.34 2019/12/20 16:16:36 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -96,7 +96,7 @@ dm_target_linear_table(void *target_conf
params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP);
snprintf(params, DM_MAX_PARAMS_SIZE, "%s %" PRIu64,
- tlc->pdev->name, tlc->offset);
+ tlc->pdev->udev_name, tlc->offset);
return params;
}
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.40 src/sys/dev/dm/dm_target_stripe.c:1.41
--- src/sys/dev/dm/dm_target_stripe.c:1.40 Wed Dec 18 14:31:35 2019
+++ src/sys/dev/dm/dm_target_stripe.c Fri Dec 20 16:16:36 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.41 2019/12/20 16:16:36 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.41 2019/12/20 16:16:36 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -197,7 +197,7 @@ dm_target_stripe_table(void *target_conf
TAILQ_FOREACH(tlc, >stripe_devs, entries) {
snprintf(tmp, DM_MAX_PARAMS_SIZE, " %s %" PRIu64,
- tlc->pdev->name, tlc->offset);
+ tlc->pdev->udev_name, tlc->offset);
strcat(params, tmp);
}
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Dec 20 14:09:23 UTC 2019 Modified Files: src/share/man/man4: ixl.4 Log Message: Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/ixl.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ixl.4 diff -u src/share/man/man4/ixl.4:1.2 src/share/man/man4/ixl.4:1.3 --- src/share/man/man4/ixl.4:1.2 Fri Dec 20 02:24:02 2019 +++ src/share/man/man4/ixl.4 Fri Dec 20 14:09:23 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ixl.4,v 1.2 2019/12/20 02:24:02 yamaguchi Exp $ +.\" $NetBSD: ixl.4,v 1.3 2019/12/20 14:09:23 wiz Exp $ .\" .\" Copyright (c) 2019 Internet Initiative Japan, Inc. .\" All rights reserved. @@ -64,6 +64,7 @@ into by .An Shoichi Yamaguchi Aq Mt yamagu...@netbsd.org . .Sh BUGS -VLAN hardware filter doesn't work while the interface is promiscuous mode. -If a register of VLAN tag is failed due to lack of resources, the interface -don't send and receive packets containing the tag. +The VLAN hardware filter doesn't work while the interface is in +promiscuous mode. +If registering a VLAN tag fails due to lack of resources, the +interface doesn't send and receive packets containing the tag.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Dec 20 12:02:46 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-8.1.3 To generate a diff of this commit: cvs rdiff -u -r1.1678 -r1.1679 src/doc/3RDPARTY cvs rdiff -u -r1.2626 -r1.2627 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.1678 src/doc/3RDPARTY:1.1679 --- src/doc/3RDPARTY:1.1678 Tue Dec 17 02:32:26 2019 +++ src/doc/3RDPARTY Fri Dec 20 12:02:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1678 2019/12/17 02:32:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1679 2019/12/20 12:02:46 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.2 -Current Vers: 8.1.2 +Version: 8.1.3 +Current Vers: 8.1.3 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ -Date: 2019-11-13 +Date: 2019-12-20 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.2626 src/doc/CHANGES:1.2627 --- src/doc/CHANGES:1.2626 Thu Dec 19 15:44:30 2019 +++ src/doc/CHANGES Fri Dec 20 12:02:46 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2626 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2627 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -87,3 +87,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: Rockchip RK3399. [jakllsch 20191219] net80211: Require SSID configuration to associate with an open AP. [jakllsch 20191219] + dhcpcd(8): Import dhcpcd-8.1.3 [roy 20191220]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri Dec 20 12:01:36 UTC 2019
Modified Files:
src/external/bsd/dhcpcd/dist/hooks: dhcpcd-run-hooks.in
src/external/bsd/dhcpcd/dist/src: dhcp.c dhcp6.c dhcpcd.c ipv6.c ipv6.h
ipv6nd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/src/ipv6.c \
src/external/bsd/dhcpcd/dist/src/ipv6.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/dhcpcd/dist/src/ipv6nd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in
diff -u src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in:1.3 src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in:1.4
--- src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in:1.3 Thu Feb 7 21:37:36 2019
+++ src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in Fri Dec 20 12:01:35 2019
@@ -212,7 +212,7 @@ valid_domainname_list()
# With the advent of alternative init systems, it's possible to have
# more than one installed. So we need to try and guess what one we're
-# using unless overriden by configure.
+# using unless overridden by configure.
detect_init()
{
_service_exists="@SERVICEEXISTS@"
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.30 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.31
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.30 Wed Nov 13 10:50:22 2019
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Fri Dec 20 12:01:35 2019
@@ -176,6 +176,11 @@ get_option(struct dhcpcd_ctx *ctx,
const uint8_t *op;
size_t bl;
+ if (bootp == NULL || bootp_len < DHCP_MIN_LEN) {
+ errno = EINVAL;
+ return NULL;
+ }
+
/* Check we have the magic cookie */
if (!IS_DHCP(bootp)) {
errno = ENOTSUP;
@@ -484,7 +489,7 @@ print_rfc3361(FILE *fp, const uint8_t *d
return -1;
break;
case 1:
- if (dl == 0 || dl % 4 != 0) {
+ if (dl % 4 != 0) {
errno = EINVAL;
break;
}
@@ -1179,7 +1184,7 @@ read_lease(struct interface *ifp, struct
* (it should be more, and our read packet enforces this so this
* code should not be needed, but of course people could
* scribble whatever in the stored lease file. */
- if (bytes < offsetof(struct bootp, vend) + 4) {
+ if (bytes < DHCP_MIN_LEN) {
free(lease);
logerrx("%s: %s: truncated lease", ifp->name, __func__);
return 0;
@@ -1540,7 +1545,7 @@ dhcp_close(struct interface *ifp)
}
static int
-dhcp_openudp(struct interface *ifp)
+dhcp_openudp(struct in_addr *ia)
{
int s;
struct sockaddr_in sin;
@@ -1551,29 +1556,25 @@ dhcp_openudp(struct interface *ifp)
n = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, , sizeof(n)) == -1)
- goto eexit;
+ goto errexit;
#ifdef IP_RECVIF
if (setsockopt(s, IPPROTO_IP, IP_RECVIF, , sizeof(n)) == -1)
- goto eexit;
+ goto errexit;
#else
if (setsockopt(s, IPPROTO_IP, IP_RECVPKTINFO, , sizeof(n)) == -1)
- goto eexit;
+ goto errexit;
#endif
memset(, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_port = htons(BOOTPC);
- if (ifp) {
- const struct dhcp_state *state = D_CSTATE(ifp);
-
- if (state->addr)
- sin.sin_addr.s_addr = state->addr->addr.s_addr;
- }
+ if (ia != NULL)
+ sin.sin_addr = *ia;
if (bind(s, (struct sockaddr *), sizeof(sin)) == -1)
- goto eexit;
+ goto errexit;
return s;
-eexit:
+errexit:
close(s);
return -1;
}
@@ -1675,7 +1676,7 @@ dhcp_sendudp(struct interface *ifp, stru
fd = state->udp_fd;
if (fd == -1) {
- fd = dhcp_openudp(ifp);
+ fd = dhcp_openudp(state->addr != NULL ?>addr->addr:NULL);
if (fd == -1)
return -1;
}
@@ -1734,7 +1735,9 @@ send_message(struct interface *ifp, uint
goto fail;
len = (size_t)r;
- if (ipv4_iffindaddr(ifp, >lease.addr, NULL) != NULL)
+ if (!(state->added & STATE_FAKE) &&
+ state->addr != NULL &&
+ ipv4_iffindaddr(ifp, >lease.addr, NULL) != NULL)
from.s_addr = state->lease.addr.s_addr;
else
from.s_addr = INADDR_ANY;
@@ -1751,7 +1754,7 @@ send_message(struct interface *ifp, uint
* even if they are setup to send them.
* Broadcasting from UDP is only an optimisation for rebinding
* and on BSD, at least, is reliant on the subnet route being
- * correctly configured to recieve the unicast reply.
+ * correctly configured to receive the unicast reply.
* As such, we always broadcast and receive the reply to it via BPF.
* This also guarantees we have a DHCP server attached to the
* interface we want to configure because we can't dictate the
@@ -2266,10 +2269,11 @@ dhcp_bind(struct interface *ifp)
return;
dhcp_close(ifp);
+
/* If not in
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Dec 20 12:00:20 UTC 2019 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17859 Log Message: Import dhcpcd-8.1.3 with the following changes: * dhcpcd: Only report SSID when we have a carrier * IPv6ND: Fix reachable test * DHCP6: Work better with infinite addresses * DHCP6: Suboption 3 of NTP Server is a FQDN * DHCP6: Fix deprecating a delegated prefix * DHCP: Ensure we have a lease to extract options from Status: Vendor Tag: ROY Release Tags: dhcpcd-8_1_3 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 C 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 U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c U 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 C 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 C 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 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
