CVS commit: src/sys/fs/autofs
Module Name:src
Committed By: tkusumi
Date: Sat Nov 23 07:38:03 UTC 2019
Modified Files:
src/sys/fs/autofs: autofs.h
Log Message:
autofs: Drop unused autofs_mount field which originates from FreeBSD
Taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs.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/fs/autofs/autofs.h
diff -u src/sys/fs/autofs/autofs.h:1.1 src/sys/fs/autofs/autofs.h:1.2
--- src/sys/fs/autofs/autofs.h:1.1 Tue Jan 9 03:31:14 2018
+++ src/sys/fs/autofs/autofs.h Sat Nov 23 07:38:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autofs.h,v 1.1 2018/01/09 03:31:14 christos Exp $ */
+/* $NetBSD: autofs.h,v 1.2 2019/11/23 07:38:03 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -120,7 +120,6 @@ struct autofs_node {
};
struct autofs_mount {
- TAILQ_ENTRY(autofs_mount) am_next;
struct autofs_node *am_root;
struct mount *am_mp;
kmutex_t am_lock;
CVS commit: src/sys/fs/autofs
Module Name:src Committed By: tkusumi Date: Sat Nov 23 07:38:03 UTC 2019 Modified Files: src/sys/fs/autofs: autofs.h Log Message: autofs: Drop unused autofs_mount field which originates from FreeBSD Taken-from: DragonFlyBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/fs/autofs/autofs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Sat Nov 23 05:13:11 UTC 2019
Modified Files:
src/sys/arch/macppc/dev: psoc.c
Log Message:
don't invalidate sensors every time we fail to read fan speeds
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/dev/psoc.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/macppc/dev/psoc.c
diff -u src/sys/arch/macppc/dev/psoc.c:1.2 src/sys/arch/macppc/dev/psoc.c:1.3
--- src/sys/arch/macppc/dev/psoc.c:1.2 Fri Nov 22 05:16:54 2019
+++ src/sys/arch/macppc/dev/psoc.c Sat Nov 23 05:13:11 2019
@@ -1,7 +1,7 @@
- /* $NetBSD: psoc.c,v 1.2 2019/11/22 05:16:54 macallan Exp $ */
+ /* $NetBSD: psoc.c,v 1.3 2019/11/23 05:13:11 macallan Exp $ */
/*-
- * Copyright (c) 2018 Michael Lorenz
+ * Copyright (c) 2019 Michael Lorenz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.2 2019/11/22 05:16:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.3 2019/11/23 05:13:11 macallan Exp $");
#include
#include
@@ -159,7 +159,7 @@ psoc_sensors_refresh(struct sysmon_envsy
{
struct psoc_softc *sc = sme->sme_cookie;
uint8_t cmd = 6;
- uint8_t buf[0x28], *bptr;
+ uint8_t buf[0x28];
int error = 1, data;
if ( edata->private < 0x20) {
@@ -183,26 +183,24 @@ psoc_sensors_refresh(struct sysmon_envsy
psoc_dump(sc);
#endif
} else {
- cmd = 0x20;
+ cmd = edata->private;
iic_acquire_bus(sc->sc_i2c, 0);
error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP,
- sc->sc_addr, , 1, buf, 12, 0);
+ sc->sc_addr, , 1, buf, 3, 0);
iic_release_bus(sc->sc_i2c, 0);
if (error) return;
- if (edata->private >= 0x20) {
- bptr = [edata->private - 0x20];
- switch (bptr[0] & 0xf0) {
-case 0x50:
- data = bptr[edata->private - 0x20];
- edata->value_cur = ((bptr[2] & 0x3f) << 6) | (bptr[1] & 0x3f);
- break;
-case 0x60:
- edata->value_cur = 0;
- break;
-default:
- error = -1;
- }
- }
+ switch (buf[0] & 0xf0) {
+ case 0x50:
+data = buf[edata->private - 0x20];
+edata->value_cur = ((buf[2] & 0x3f) << 6) |
+ (buf[1] & 0x3f);
+break;
+ case 0x60:
+edata->value_cur = 0;
+break;
+ default:
+error = 0;
+ }
}
if (error) {
edata->state = ENVSYS_SINVALID;
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: macallan Date: Sat Nov 23 05:13:11 UTC 2019 Modified Files: src/sys/arch/macppc/dev: psoc.c Log Message: don't invalidate sensors every time we fail to read fan speeds To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/dev/psoc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jakllsch Date: Sat Nov 23 03:59:39 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_ccu.h Log Message: Store the flags passed to SUNXI_CCU_FRACTIONAL macro. Previously the macro dropped the flags argument entirely, and did not initialize the structure with it. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sunxi/sunxi_ccu.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/arm/sunxi/sunxi_ccu.h diff -u src/sys/arch/arm/sunxi/sunxi_ccu.h:1.21 src/sys/arch/arm/sunxi/sunxi_ccu.h:1.22 --- src/sys/arch/arm/sunxi/sunxi_ccu.h:1.21 Wed Jan 30 01:24:00 2019 +++ src/sys/arch/arm/sunxi/sunxi_ccu.h Sat Nov 23 03:59:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_ccu.h,v 1.21 2019/01/30 01:24:00 jmcneill Exp $ */ +/* $NetBSD: sunxi_ccu.h,v 1.22 2019/11/23 03:59:39 jakllsch Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -405,6 +405,7 @@ const char *sunxi_ccu_fractional_get_par .u.fractional.frac[0] = (_frac0), \ .u.fractional.frac[1] = (_frac1), \ .u.fractional.enable = (_enable), \ + .u.fractional.flags = (_flags),\ .enable = sunxi_ccu_fractional_enable, \ .get_rate = sunxi_ccu_fractional_get_rate, \ .set_rate = sunxi_ccu_fractional_set_rate, \
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jakllsch Date: Sat Nov 23 03:59:39 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_ccu.h Log Message: Store the flags passed to SUNXI_CCU_FRACTIONAL macro. Previously the macro dropped the flags argument entirely, and did not initialize the structure with it. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sunxi/sunxi_ccu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Fri Nov 22 23:38:15 UTC 2019 Modified Files: src/sys/sys: userret.h Log Message: Add a comment. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/sys/userret.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/userret.h diff -u src/sys/sys/userret.h:1.29 src/sys/sys/userret.h:1.30 --- src/sys/sys/userret.h:1.29 Thu Nov 21 19:24:02 2019 +++ src/sys/sys/userret.h Fri Nov 22 23:38:15 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.29 2019/11/21 19:24:02 ad Exp $ */ +/* $NetBSD: userret.h,v 1.30 2019/11/22 23:38:15 ad Exp $ */ /*- * Copyright (c) 1998, 2000, 2003, 2006, 2008, 2019 The NetBSD Foundation, Inc. @@ -101,6 +101,12 @@ mi_userret(struct lwp *l) ci = l->l_cpu; } l->l_kpriority = false; + /* + * lwp_eprio() is too involved to use here unlocked. At this point + * it only matters for PTHREAD_PRIO_PROTECT; setting a too low value + * is OK because the scheduler will find out the true value if we + * end up in mi_switch(). + */ ci->ci_schedstate.spc_curpriority = l->l_priority; KPREEMPT_ENABLE(l);
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Fri Nov 22 23:38:15 UTC 2019 Modified Files: src/sys/sys: userret.h Log Message: Add a comment. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/sys/userret.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: ad Date: Fri Nov 22 23:36:25 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/x86/x86: cpu.c Log Message: - On-demand zeroing pages with MOVNTI is crazy. It empties L1/L2/L3. - Disable zeroing in the idle loop. That needs a cache-friendly strategy. Result: 3 to 4% reduction in kernel build time on my test system. Inspired by a discussion with Mateusz Guzik and David Maxwell. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.174 -r1.175 src/sys/arch/x86/x86/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/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.191 src/sys/arch/amd64/amd64/locore.S:1.192 --- src/sys/arch/amd64/amd64/locore.S:1.191 Thu Nov 21 19:27:54 2019 +++ src/sys/arch/amd64/amd64/locore.S Fri Nov 22 23:36:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.191 2019/11/21 19:27:54 ad Exp $ */ +/* $NetBSD: locore.S,v 1.192 2019/11/22 23:36:25 ad Exp $ */ /* * Copyright-o-rama! @@ -1519,24 +1519,16 @@ END(sse2_idlezero_page) /* * void pagezero(vaddr_t va) * - * Zero a page without polluting the cache. + * Zero a page. */ ENTRY(pagezero) - movq $-PAGE_SIZE,%rdx - subq %rdx,%rdi + pushq %rbp + movq %rsp,%rbp + movq $(PAGE_SIZE / 8),%rcx xorq %rax,%rax -1: - movnti %rax,(%rdi,%rdx) - movnti %rax,8(%rdi,%rdx) - movnti %rax,16(%rdi,%rdx) - movnti %rax,24(%rdi,%rdx) - movnti %rax,32(%rdi,%rdx) - movnti %rax,40(%rdi,%rdx) - movnti %rax,48(%rdi,%rdx) - movnti %rax,56(%rdi,%rdx) - addq $64,%rdx - jne 1b - sfence + rep + stosq + leave ret END(pagezero) Index: src/sys/arch/x86/x86/cpu.c diff -u src/sys/arch/x86/x86/cpu.c:1.174 src/sys/arch/x86/x86/cpu.c:1.175 --- src/sys/arch/x86/x86/cpu.c:1.174 Tue Nov 5 20:19:17 2019 +++ src/sys/arch/x86/x86/cpu.c Fri Nov 22 23:36:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.174 2019/11/05 20:19:17 maxv Exp $ */ +/* $NetBSD: cpu.c,v 1.175 2019/11/22 23:36:25 ad Exp $ */ /* * Copyright (c) 2000-2012 NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.174 2019/11/05 20:19:17 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.175 2019/11/22 23:36:25 ad Exp $"); #include "opt_ddb.h" #include "opt_mpbios.h" /* for MPDEBUG */ @@ -723,7 +723,7 @@ cpu_boot_secondary_processors(void) tsc_tc_init(); /* Enable zeroing of pages in the idle loop if we have SSE2. */ - vm_page_zero_enable = ((cpu_feature[0] & CPUID_SSE2) != 0); + vm_page_zero_enable = false; /* ((cpu_feature[0] & CPUID_SSE2) != 0); */ } #endif
CVS commit: src/sys/ddb
Module Name:src
Committed By: ad
Date: Fri Nov 22 23:01:49 UTC 2019
Modified Files:
src/sys/ddb: db_lex.c
Log Message:
Fix crash(8). Will revisit.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/ddb/db_lex.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/ddb/db_lex.c
diff -u src/sys/ddb/db_lex.c:1.24 src/sys/ddb/db_lex.c:1.25
--- src/sys/ddb/db_lex.c:1.24 Wed Oct 2 09:36:30 2019
+++ src/sys/ddb/db_lex.c Fri Nov 22 23:01:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_lex.c,v 1.24 2019/10/02 09:36:30 rin Exp $ */
+/* $NetBSD: db_lex.c,v 1.25 2019/11/22 23:01:49 ad Exp $ */
/*
* Mach Operating System
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.24 2019/10/02 09:36:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.25 2019/11/22 23:01:49 ad Exp $");
#include
#include
@@ -62,11 +62,18 @@ db_read_line(void)
{
int i;
+#ifdef _KERNEL
+ /*
+ * crash(8) prints the prompt using libedit. That's why we used to
+ * print it in db_readline(). But now people are using db_read_line()
+ * for general purpose input, so..
+ */
#ifdef MULTIPROCESSOR
db_printf("db{%ld}> ", (long)cpu_number());
#else
db_printf("db> ");
#endif
+#endif
i = db_readline(db_line, sizeof(db_line));
if (i == 0)
return (0); /* EOI */
CVS commit: src/sys/ddb
Module Name:src Committed By: ad Date: Fri Nov 22 23:01:49 UTC 2019 Modified Files: src/sys/ddb: db_lex.c Log Message: Fix crash(8). Will revisit. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/ddb/db_lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
cpsw build fix (Re: CVS commit: src/sys/arch/evbarm/conf)
Hi,
On 2019/10/27 18:00, Jared D. McNeill wrote:
> Module Name: src
> Committed By: jmcneill
> Date: Sun Oct 27 18:00:46 UTC 2019
>
> Modified Files:
> src/sys/arch/evbarm/conf: GENERIC
>
> Log Message:
> Add support for TI AM335x
This patch should fix if_cpsw.c build when KERNHIST is enabled.
--- src/sys/arch/arm/ti/if_cpsw.c.orig 2019-11-03 11:47:41.761668066 +
+++ src/sys/arch/arm/ti/if_cpsw.c 2019-11-22 20:47:58.241695788 +
@@ -182,7 +182,7 @@ KERNHIST_DEFINE(cpswhist);
#define KERNHIST_CALLED_5(NAME, i, j, k, l) \
do { \
_kernhist_call = atomic_inc_uint_nv(&_kernhist_cnt); \
- KERNHIST_LOG(NAME, "called! %x %x %x %x", i, j, k, l); \
+ KERNHIST_LOG(NAME, "called! %jx %jx %jx %jx", i, j, k, l); \
} while (/*CONSTCOND*/ 0)
#else
#define KERNHIST_CALLED_5(NAME, i, j, k, l)
@@ -219,7 +219,7 @@ cpsw_set_txdesc_next(struct cpsw_softc *
const bus_size_t o = sizeof(struct cpsw_cpdma_bd) * i + 0;
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, n, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, n, 0);
bus_space_write_4(sc->sc_bst, sc->sc_bsh_txdescs, o, n);
}
@@ -230,7 +230,7 @@ cpsw_set_rxdesc_next(struct cpsw_softc *
const bus_size_t o = sizeof(struct cpsw_cpdma_bd) * i + 0;
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, n, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, n, 0);
bus_space_write_4(sc->sc_bst, sc->sc_bsh_rxdescs, o, n);
}
@@ -244,7 +244,7 @@ cpsw_get_txdesc(struct cpsw_softc * cons
const bus_size_t c = __arraycount(bdp->word);
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, bdp, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, (uintptr_t)bdp, 0);
bus_space_read_region_4(sc->sc_bst, sc->sc_bsh_txdescs, o, dp, c);
KERNHIST_LOG(cpswhist, "%08x %08x %08x %08x\n",
@@ -260,7 +260,7 @@ cpsw_set_txdesc(struct cpsw_softc * cons
const bus_size_t c = __arraycount(bdp->word);
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, bdp, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, (uintptr_t)bdp, 0);
KERNHIST_LOG(cpswhist, "%08x %08x %08x %08x\n",
dp[0], dp[1], dp[2], dp[3]);
@@ -276,7 +276,7 @@ cpsw_get_rxdesc(struct cpsw_softc * cons
const bus_size_t c = __arraycount(bdp->word);
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, bdp, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, (uintptr_t)bdp, 0);
bus_space_read_region_4(sc->sc_bst, sc->sc_bsh_rxdescs, o, dp, c);
@@ -293,7 +293,7 @@ cpsw_set_rxdesc(struct cpsw_softc * cons
const bus_size_t c = __arraycount(bdp->word);
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, i, bdp, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, i, (uintptr_t)bdp, 0);
KERNHIST_LOG(cpswhist, "%08x %08x %08x %08x\n",
dp[0], dp[1], dp[2], dp[3]);
@@ -607,7 +607,7 @@ cpsw_start(struct ifnet *ifp)
u_int mlen;
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, 0, 0, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, 0, 0, 0);
if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
IFF_RUNNING)) {
@@ -1140,7 +1140,7 @@ cpsw_rxintr(void *arg)
u_int len, off;
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, 0, 0, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, 0, 0, 0);
for (;;) {
KASSERT(sc->sc_rxhead < CPSW_NRXDESCS);
@@ -1225,7 +1225,7 @@ cpsw_txintr(void *arg)
u_int cpi;
KERNHIST_FUNC(__func__);
- KERNHIST_CALLED_5(cpswhist, sc, 0, 0, 0);
+ KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, 0, 0, 0);
KASSERT(sc->sc_txrun);
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/conf/GENERIC
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Fri Nov 22 20:07:53 UTC 2019
Modified Files:
src/sys/kern: sched_m2.c
Log Message:
sched_tick: examine the correct LWP, and lock it.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sched_m2.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/sched_m2.c
diff -u src/sys/kern/sched_m2.c:1.33 src/sys/kern/sched_m2.c:1.34
--- src/sys/kern/sched_m2.c:1.33 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/sched_m2.c Fri Nov 22 20:07:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sched_m2.c,v 1.33 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: sched_m2.c,v 1.34 2019/11/22 20:07:53 ad Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sched_m2.c,v 1.33 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_m2.c,v 1.34 2019/11/22 20:07:53 ad Exp $");
#include
@@ -282,19 +282,20 @@ sched_oncpu(lwp_t *l)
*/
/*
- * Called once per time-quantum. This routine is CPU-local and runs at
- * IPL_SCHED, thus the locking is not needed.
+ * Called once per time-quantum, with the running LWP lock held (spc_lwplock).
*/
void
sched_tick(struct cpu_info *ci)
{
struct schedstate_percpu *spc = >ci_schedstate;
- struct lwp *l = curlwp;
+ struct lwp *l = ci->ci_data.cpu_onproc;
struct proc *p;
if (__predict_false(CURCPU_IDLE_P()))
return;
+ lwp_lock(l);
+ KASSERT(l->l_mutex != spc->spc_mutex);
switch (l->l_class) {
case SCHED_FIFO:
/*
@@ -303,6 +304,7 @@ sched_tick(struct cpu_info *ci)
*/
KASSERT(l->l_priority > PRI_HIGHEST_TS);
spc->spc_ticks = l->l_sched.timeslice;
+ lwp_unlock(l);
return;
case SCHED_OTHER:
/*
@@ -328,9 +330,10 @@ sched_tick(struct cpu_info *ci)
*/
if (lwp_eprio(l) <= spc->spc_maxpriority || l->l_target_cpu) {
spc->spc_flags |= SPCF_SHOULDYIELD;
- cpu_need_resched(ci, 0);
+ cpu_need_resched(ci, l, RESCHED_UPREEMPT);
} else
- spc->spc_ticks = l->l_sched.timeslice;
+ spc->spc_ticks = l->l_sched.timeslice;
+ lwp_unlock(l);
}
/*
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Fri Nov 22 20:07:53 UTC 2019 Modified Files: src/sys/kern: sched_m2.c Log Message: sched_tick: examine the correct LWP, and lock it. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sched_m2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: ad Date: Fri Nov 22 20:04:03 UTC 2019 Modified Files: src/sys/arch/x86/x86: x86_tlb.c src/sys/kern: sys_select.c Log Message: Minor correction to previous. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/x86_tlb.c cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_select.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Fri Nov 22 20:04:03 UTC 2019
Modified Files:
src/sys/arch/x86/x86: x86_tlb.c
src/sys/kern: sys_select.c
Log Message:
Minor correction to previous.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/x86_tlb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_tlb.c
diff -u src/sys/arch/x86/x86/x86_tlb.c:1.9 src/sys/arch/x86/x86/x86_tlb.c:1.10
--- src/sys/arch/x86/x86/x86_tlb.c:1.9 Thu Nov 21 21:48:33 2019
+++ src/sys/arch/x86/x86/x86_tlb.c Fri Nov 22 20:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_tlb.c,v 1.9 2019/11/21 21:48:33 ad Exp $ */
+/* $NetBSD: x86_tlb.c,v 1.10 2019/11/22 20:04:03 ad Exp $ */
/*-
* Copyright (c) 2008-2019 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.9 2019/11/21 21:48:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_tlb.c,v 1.10 2019/11/22 20:04:03 ad Exp $");
#include
#include
@@ -264,8 +264,7 @@ pmap_tlb_shootdown(struct pmap *pm, vadd
tp = (pmap_tlb_packet_t *)ci->ci_pmap_data;
/* Whole address flush will be needed if PTE_G is set. */
- CTASSERT(PTE_G == (uint16_t)PTE_G);
- tp->tp_global |= ((pte & PTE_G) != 0);;
+ tp->tp_global |= ((pte & PTE_G) != 0);
count = tp->tp_count;
if (count < TP_MAXVA && va != (vaddr_t)-1LL) {
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.49 src/sys/kern/sys_select.c:1.50
--- src/sys/kern/sys_select.c:1.49 Thu Nov 21 21:42:30 2019
+++ src/sys/kern/sys_select.c Fri Nov 22 20:04:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_select.c,v 1.49 2019/11/21 21:42:30 ad Exp $ */
+/* $NetBSD: sys_select.c,v 1.50 2019/11/22 20:04:03 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2019 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.49 2019/11/21 21:42:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.50 2019/11/22 20:04:03 ad Exp $");
#include
#include
@@ -114,9 +114,9 @@ __KERNEL_RCSID(0, "$NetBSD: sys_select.c
/*
* Per-cluster state for select()/poll(). For a system with fewer
- * than 32 CPUs, this gives us per-CPU clusters.
+ * than 64 CPUs, this gives us per-CPU clusters.
*/
-#define SELCLUSTERS 32
+#define SELCLUSTERS 64
#define SELCLUSTERMASK (SELCLUSTERS - 1)
typedef struct selcluster {
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jmcneill
Date: Fri Nov 22 19:48:58 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_dwhdmi.c
Log Message:
Enable TMDS clock
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.4 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_dwhdmi.c:1.4 Sun Nov 17 17:33:34 2019
+++ src/sys/arch/arm/sunxi/sunxi_dwhdmi.c Fri Nov 22 19:48:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_dwhdmi.c,v 1.4 2019/11/17 17:33:34 jmcneill Exp $ */
+/* $NetBSD: sunxi_dwhdmi.c,v 1.5 2019/11/22 19:48:58 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.4 2019/11/17 17:33:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.5 2019/11/22 19:48:58 jmcneill Exp $");
#include
#include
@@ -226,7 +226,7 @@ sunxi_dwhdmi_attach(device_t parent, dev
struct sunxi_dwhdmi_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- struct clk *clk_iahb, *clk_isfr;
+ struct clk *clk_iahb, *clk_isfr, *clk_tmds;
struct fdtbus_reset *rst;
bus_addr_t addr;
bus_size_t size;
@@ -254,6 +254,12 @@ sunxi_dwhdmi_attach(device_t parent, dev
return;
}
+ clk_tmds = fdtbus_clock_get(phandle, "tmds");
+ if (clk_tmds == NULL || clk_enable(clk_tmds) != 0) {
+ aprint_error(": couldn't enable tmds clock\n");
+ return;
+ }
+
sc->sc_base.sc_dev = self;
sc->sc_base.sc_reg_width = 1;
sc->sc_base.sc_bst = faa->faa_bst;
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Fri Nov 22 19:48:58 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_dwhdmi.c Log Message: Enable TMDS clock To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Fri Nov 22 19:46:38 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sun50i_a64_ccu.c Log Message: Fix CLK_BUS_HDMI bit To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/sunxi/sun50i_a64_ccu.c diff -u src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.15 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.16 --- src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.15 Sun Nov 17 19:51:12 2019 +++ src/sys/arch/arm/sunxi/sun50i_a64_ccu.c Fri Nov 22 19:46:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i_a64_ccu.c,v 1.15 2019/11/17 19:51:12 jmcneill Exp $ */ +/* $NetBSD: sun50i_a64_ccu.c,v 1.16 2019/11/22 19:46:38 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.15 2019/11/17 19:51:12 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.16 2019/11/22 19:46:38 jmcneill Exp $"); #include #include @@ -521,7 +521,7 @@ static struct sunxi_ccu_clk sun50i_a64_c SUNXI_CCU_GATE(A64_CLK_BUS_CSI, "bus-csi", "ahb1", BUS_CLK_GATING_REG1, 8), SUNXI_CCU_GATE(A64_CLK_BUS_HDMI, "bus-hdmi", "ahb1", - BUS_CLK_GATING_REG1, 10), + BUS_CLK_GATING_REG1, 11), SUNXI_CCU_GATE(A64_CLK_BUS_DE, "bus-de", "ahb1", BUS_CLK_GATING_REG1, 12), SUNXI_CCU_GATE(A64_CLK_BUS_GPU, "bus-gpu", "ahb1",
Re: CVS commit: src/lib/libc/tls
>>> Joerg Sonnenberger wrote > > On Fri, Nov 22, 2019 at 08:53:25AM +0900, Takeshi Nakayama wrote: > > >>> Takeshi Nakayama wrote > > > > > >>> Joerg Sonnenberger wrote > > > > > > > On Thu, Nov 21, 2019 at 11:06:16PM +, Takeshi Nakayama wrote: > > > > > Module Name: src > > > > > Committed By: nakayama > > > > > Date: Thu Nov 21 23:06:16 UTC 2019 > > > > > > > > > > Modified Files: > > > > > src/lib/libc/tls: tls.c > > > > > > > > > > Log Message: > > > > > Fix PR/54074 and PR/54093 completely. > > > > > > > > > > More similar to the ld.elf_so logic, it is necessary to align with > > > > > p_align first. Also, invert the #ifdef condition for consistency. > > > > > > > > This commit just wastes space without reason. > > > > > > No, without this commit the TLS offset calculation is mismatch if > > > alignof(max_align_t)) != p_align. > > > > Ah, this is wrong. > > Correctly, the TLS offset calculation is mismatch with what ld(1) > > expected if p_memsz is not aligned with p_align. > > For TLS variant I, it literally just adds padding at the end of the > allocation. For TLS variant II, it is redundant, because the rounding is > already done in with max_align_t. We do not support p_align > malloc > alignment and the patch is certainly nowhere near enough to change that. > It is actively harmful in that it can make people believe that it could > ever work. I don't want to do anything about the case of p_align > malloc alignment. I just want to fix an usual 32-bit sparc statically linked binaries not working properly. The new jemalloc now uses TLS, and the 32-bit sparc statically linked binary ELF header looks like this: % readelf -l rescue/sh | egrep 'MemSiz|TLS' Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align TLS0x6dc000 0x0075c000 0x0075c000 0x00b10 0x00b14 R 0x8 The point is when MemSiz (p_memsz) is not aligned with Align (p_align) as above. In tls.c rev 1.13: tls_size = p_memsz --> 0x00b14 tls_allocation = roundup2(tls_size, alignof(max_align_t)) --> 0x00b18 tcb = calloc() + tls_allocation --> calloc() + 0x00b18 p = tcb - tls_size --> calloc() + 4 memcpy(p, tls_initaddr, tls_initsize) So, the TLS initialization image is copied to calloc() + 4. However, ld(1) assumes that the TLS area starts with: tcb - roundup2(p_memsz, p_align) = tcb - 0x00b18 --> calloc() Since this is 4 bytes different, the initial value of the thread local variable is not set correctly. To fix this problem, I added the same thing as this line in ld.elf_so: https://nxr.netbsd.org/xref/src/libexec/ld.elf_so/tls.c#236 * obj->tlssize = p_memsz, obj->tlsalign = p_align -- Takeshi Nakayama
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Fri Nov 22 15:57:49 UTC 2019 Modified Files: src/sys/kern: core_elf32.c Log Message: Use __diagused To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/kern/core_elf32.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Fri Nov 22 15:57:49 UTC 2019 Modified Files: src/sys/kern: core_elf32.c Log Message: Use __diagused To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/kern/core_elf32.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/core_elf32.c diff -u src/sys/kern/core_elf32.c:1.59 src/sys/kern/core_elf32.c:1.60 --- src/sys/kern/core_elf32.c:1.59 Wed Nov 20 19:37:53 2019 +++ src/sys/kern/core_elf32.c Fri Nov 22 15:57:49 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: core_elf32.c,v 1.59 2019/11/20 19:37:53 pgoyette Exp $ */ +/* $NetBSD: core_elf32.c,v 1.60 2019/11/22 15:57:49 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.59 2019/11/20 19:37:53 pgoyette Exp $"); +__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.60 2019/11/22 15:57:49 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd32.h" @@ -113,9 +113,7 @@ ELFNAMEEND(coredump)(struct lwp *l, stru off_t notestart; size_t notesize; int error, i; -#ifdef DIAGNOSTIC - off_t offset; -#endif + off_t offset __diagused; struct note_state ns; struct note_buf *nb;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:30:39 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: tickets 462, 463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.114 src/doc/CHANGES-9.0:1.1.2.115 --- src/doc/CHANGES-9.0:1.1.2.114 Fri Nov 22 08:05:10 2019 +++ src/doc/CHANGES-9.0 Fri Nov 22 15:30:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.114 2019/11/22 08:05:10 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.115 2019/11/22 15:30:39 bouyer Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6185,3 +6185,17 @@ doc/3RDPARTY (manually adjusted) Import dhcpcd-8.1.2. [roy, ticket #461] +etc/Makefile.params1.21 +share/mk/bsd.README1.397 + + Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is + important information when trying to reproduce a build. + [martin, ticket #462] + +sys/arch/arm/omap/obio_mputmr.c 1.9 +sys/arch/evbarm/beagle/beagle_machdep.c 1.79 +sys/arch/xen/xen/xenevt.c 1.54 + + Make these files compilable w/o options DIAGNOSTIC + [martin, ticket #463] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:30:39 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: tickets 462, 463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Fri Nov 22 15:28:18 UTC 2019
Modified Files:
src/sys/arch/arm/omap [netbsd-9]: obio_mputmr.c
src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c
src/sys/arch/xen/xen [netbsd-9]: xenevt.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #463):
sys/arch/xen/xen/xenevt.c: revision 1.54
sys/arch/arm/omap/obio_mputmr.c: revision 1.9
sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.79
Make this files compilable w/o options DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/arm/omap/obio_mputmr.c
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/xen/xen/xenevt.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/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.8 src/sys/arch/arm/omap/obio_mputmr.c:1.8.38.1
--- src/sys/arch/arm/omap/obio_mputmr.c:1.8 Sun Jun 16 17:47:54 2013
+++ src/sys/arch/arm/omap/obio_mputmr.c Fri Nov 22 15:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.8.38.1 2019/11/22 15:28:18 bouyer Exp $ */
/*
* Based on omap_mputmr.c
@@ -101,7 +101,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8.38.1 2019/11/22 15:28:18 bouyer Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -302,9 +302,9 @@ gpt_enable(
#if defined(OMAP_2430) || defined(OMAP_2420)
bus_space_handle_t ioh;
- uint32_t r;
+ uint32_t r, err __diagused;
- int err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
+ err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
OMAP2_CM_SIZE, 0, );
KASSERT(err == 0);
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Nov 22 15:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,6 +1075,7 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
+ int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1180,7 +1181,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port0-gpio", 80);
prop_dictionary_set_bool(dict, "port0-gpioval", true);
#endif
- int rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
+ rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
KASSERT(rv == 0);
uint32_t v = bus_space_read_4(iot, ioh, 0);
v &= 0x;
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.53 src/sys/arch/xen/xen/xenevt.c:1.53.4.1
--- src/sys/arch/xen/xen/xenevt.c:1.53 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/xen/xenevt.c Fri Nov 22 15:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: xenevt.c,v 1.53.4.1 2019/11/22 15:28:17 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53.4.1 2019/11/22 15:28:17 bouyer Exp $");
#include "opt_xen.h"
#include
@@ -161,7 +161,7 @@ static evtchn_port_t xenevt_alloc_event(
void
xenevtattach(int n)
{
- struct intrhand *ih;
+ struct intrhand *ih __diagused;
int level = IPL_HIGH;
bool mpsafe = (level != IPL_VM);
CVS commit: [netbsd-9] src/sys/arch
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:28:18 UTC 2019 Modified Files: src/sys/arch/arm/omap [netbsd-9]: obio_mputmr.c src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c src/sys/arch/xen/xen [netbsd-9]: xenevt.c Log Message: Pull up following revision(s) (requested by martin in ticket #463): sys/arch/xen/xen/xenevt.c: revision 1.54 sys/arch/arm/omap/obio_mputmr.c: revision 1.9 sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.79 Make this files compilable w/o options DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/arm/omap/obio_mputmr.c cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/xen/xen/xenevt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:26:28 UTC 2019 Modified Files: src/etc [netbsd-9]: Makefile.params src/share/mk [netbsd-9]: bsd.README Log Message: Pull up following revision(s) (requested by martin in ticket #462): share/mk/bsd.README: revision 1.397 etc/Makefile.params: revision 1.21 Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/etc/Makefile.params cvs rdiff -u -r1.393 -r1.393.2.1 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile.params diff -u src/etc/Makefile.params:1.20 src/etc/Makefile.params:1.20.2.1 --- src/etc/Makefile.params:1.20 Tue Jul 10 13:22:22 2018 +++ src/etc/Makefile.params Fri Nov 22 15:26:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.params,v 1.20 2018/07/10 13:22:22 martin Exp $ +# $NetBSD: Makefile.params,v 1.20.2.1 2019/11/22 15:26:28 bouyer Exp $ # # Makefile fragment for printing build parameters. # @@ -40,7 +40,7 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \ HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \ MACHINE MACHINE_ARCH \ - NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ + NETBSD_OFFICIAL_RELEASE NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ TOOLCHAIN_MISSING \ USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \ USE_PAM USE_SKEY USE_YP \ Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.393 src/share/mk/bsd.README:1.393.2.1 --- src/share/mk/bsd.README:1.393 Wed Jul 24 09:28:29 2019 +++ src/share/mk/bsd.README Fri Nov 22 15:26:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.393 2019/07/24 09:28:29 roy Exp $ +# $NetBSD: bsd.README,v 1.393.2.1 2019/11/22 15:26:28 bouyer Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -152,6 +152,16 @@ MKCTF If "no", do not build and install during build. Default: no +NETBSD_OFFICIAL_RELEASE + If defined and set to "yes", the build targets an official + NetBSD release which is going to be available from + ftp.NetBSD.org / cdn.NetBSD.org. This modifies a few + default paths in the installer and also creates different + links in the install documentation. + The auto-build cluster uses this variable to distinguish + "daily" builds from real releases. + Default: undefined (no) + NOCTF Don't generate and manipulate CTF data of ELF binaries during build. It is set internally for standalone programs.
CVS commit: [netbsd-9] src
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:26:28 UTC 2019 Modified Files: src/etc [netbsd-9]: Makefile.params src/share/mk [netbsd-9]: bsd.README Log Message: Pull up following revision(s) (requested by martin in ticket #462): share/mk/bsd.README: revision 1.397 etc/Makefile.params: revision 1.21 Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/etc/Makefile.params cvs rdiff -u -r1.393 -r1.393.2.1 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Fri Nov 22 14:57:02 UTC 2019 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/x86_64: bfd_stdint.h targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64: gstdint.h Log Message: more regen stuff. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src
Committed By: christos
Date: Fri Nov 22 14:57:02 UTC 2019
Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/x86_64: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64: gstdint.h
Log Message:
more regen stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.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/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h:1.9 src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h:1.10
--- src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h:1.9 Tue May 28 21:56:33 2019
+++ src/external/gpl3/gdb/lib/libbfd/arch/x86_64/bfd_stdint.h Fri Nov 22 09:57:01 2019
@@ -1,8 +1,8 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
+/* Generated from: NetBSD: mknative-gdb,v 1.8 2019/05/29 01:56:06 christos Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
-/* generated for x86_64--netbsd-gcc (NetBSD nb3 20190319) 7.4.0 */
+/* generated for x86_64--netbsd-gcc (NetBSD nb1 20190930) 8.3.0 */
#ifndef GCC_GENERATED_STDINT_H
#define GCC_GENERATED_STDINT_H 1
Index: src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h:1.10 src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h:1.11
--- src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h:1.10 Tue May 28 21:56:33 2019
+++ src/external/gpl3/gdb/lib/libbfd/arch/x86_64/targmatch.h Fri Nov 22 09:57:01 2019
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
+/* Generated from: NetBSD: mknative-gdb,v 1.8 2019/05/29 01:56:06 christos Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
#ifdef BFD64
@@ -1193,6 +1193,22 @@
#ifdef BFD64
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_ntrad_le_vec)
+
+{ "mips64*el-*-netbsd*",
+_elf32_ntrad_le_vec },
+#endif
+
+
+
+#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_ntrad_be_vec)
+
+{ "mips64*-*-netbsd*",
+_elf32_ntrad_be_vec },
+#endif
+
+
+
#if !defined (SELECT_VECS) || defined (HAVE_mips_elf32_trad_le_vec)
{ "mips*el-*-netbsd*",
Index: src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h
diff -u src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h:1.9 src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h:1.10
--- src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h:1.9 Tue May 28 21:56:33 2019
+++ src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64/gstdint.h Fri Nov 22 09:57:01 2019
@@ -1,8 +1,8 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp */
+/* Generated from: NetBSD: mknative-gdb,v 1.8 2019/05/29 01:56:06 christos Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
-/* generated for x86_64--netbsd-gcc (NetBSD nb3 20190319) 7.4.0 */
+/* generated for x86_64--netbsd-gcc (NetBSD nb1 20190930) 8.3.0 */
#ifndef GCC_GENERATED_STDINT_H
#define GCC_GENERATED_STDINT_H 1
CVS commit: src/sys/arch
Module Name:src Committed By: martin Date: Fri Nov 22 14:30:58 UTC 2019 Modified Files: src/sys/arch/arm/omap: obio_mputmr.c src/sys/arch/evbarm/beagle: beagle_machdep.c src/sys/arch/xen/xen: xenevt.c Log Message: Make this files compilable w/o options DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/obio_mputmr.c cvs rdiff -u -r1.78 -r1.79 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/xen/xen/xenevt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: martin
Date: Fri Nov 22 14:30:58 UTC 2019
Modified Files:
src/sys/arch/arm/omap: obio_mputmr.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/xen/xen: xenevt.c
Log Message:
Make this files compilable w/o options DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/obio_mputmr.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/xen/xen/xenevt.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/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.8 src/sys/arch/arm/omap/obio_mputmr.c:1.9
--- src/sys/arch/arm/omap/obio_mputmr.c:1.8 Sun Jun 16 17:47:54 2013
+++ src/sys/arch/arm/omap/obio_mputmr.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.9 2019/11/22 14:30:58 martin Exp $ */
/*
* Based on omap_mputmr.c
@@ -101,7 +101,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.9 2019/11/22 14:30:58 martin Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -302,9 +302,9 @@ gpt_enable(
#if defined(OMAP_2430) || defined(OMAP_2420)
bus_space_handle_t ioh;
- uint32_t r;
+ uint32_t r, err __diagused;
- int err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
+ err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
OMAP2_CM_SIZE, 0, );
KASSERT(err == 0);
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.79
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.79 2019/11/22 14:30:58 martin Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.79 2019/11/22 14:30:58 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,6 +1075,7 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
+ int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1180,7 +1181,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port0-gpio", 80);
prop_dictionary_set_bool(dict, "port0-gpioval", true);
#endif
- int rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
+ rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
KASSERT(rv == 0);
uint32_t v = bus_space_read_4(iot, ioh, 0);
v &= 0x;
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.53 src/sys/arch/xen/xen/xenevt.c:1.54
--- src/sys/arch/xen/xen/xenevt.c:1.53 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/xen/xenevt.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: xenevt.c,v 1.54 2019/11/22 14:30:58 martin Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.54 2019/11/22 14:30:58 martin Exp $");
#include "opt_xen.h"
#include
@@ -161,7 +161,7 @@ static evtchn_port_t xenevt_alloc_event(
void
xenevtattach(int n)
{
- struct intrhand *ih;
+ struct intrhand *ih __diagused;
int level = IPL_HIGH;
bool mpsafe = (level != IPL_VM);
CVS commit: src/sys
Module Name:src
Committed By: maxv
Date: Fri Nov 22 14:28:46 UTC 2019
Modified Files:
src/sys/kern: subr_msan.c
src/sys/lib/libkern: libkern.h
Log Message:
Ah, strcat/strchr/strrchr are ASM functions, so instrument them.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_msan.c
cvs rdiff -u -r1.134 -r1.135 src/sys/lib/libkern/libkern.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/subr_msan.c
diff -u src/sys/kern/subr_msan.c:1.2 src/sys/kern/subr_msan.c:1.3
--- src/sys/kern/subr_msan.c:1.2 Fri Nov 15 12:18:46 2019
+++ src/sys/kern/subr_msan.c Fri Nov 22 14:28:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_msan.c,v 1.2 2019/11/15 12:18:46 maxv Exp $ */
+/* $NetBSD: subr_msan.c,v 1.3 2019/11/22 14:28:46 maxv Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define KMSAN_NO_INST
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.2 2019/11/15 12:18:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.3 2019/11/22 14:28:46 maxv Exp $");
#include
#include
@@ -187,7 +187,7 @@ kmsan_report_hook(const void *addr, size
var = (char *)ptr + 4;
strlcpy(buf, var, sizeof(buf));
var = buf;
- fn = strchr(buf, '@');
+ fn = __builtin_strchr(buf, '@');
*fn++ = '\0';
REPORT("MSan: Uninitialized %s Memory In %s() At Offset "
"%zu, Variable '%s' From %s()\n", typename, hook, off,
@@ -238,7 +238,7 @@ kmsan_report_inline(msan_orig_t orig, un
var = (char *)ptr + 4;
strlcpy(buf, var, sizeof(buf));
var = buf;
- fn = strchr(buf, '@');
+ fn = __builtin_strchr(buf, '@');
*fn++ = '\0';
REPORT("MSan: Uninitialized Variable '%s' From %s()\n",
var, fn);
@@ -754,6 +754,51 @@ kmsan_strlen(const char *str)
return (s - str);
}
+char *
+kmsan_strcat(char *dst, const char *src)
+{
+ size_t ldst, lsrc;
+ char *ret;
+
+ kmsan_check_arg(sizeof(dst) + sizeof(src), "strcat");
+
+ ldst = __builtin_strlen(dst);
+ lsrc = __builtin_strlen(src);
+ kmsan_shadow_check(dst, ldst + 1, "strcat");
+ kmsan_shadow_check(src, lsrc + 1, "strcat");
+ ret = __builtin_strcat(dst, src);
+ kmsan_shadow_fill(dst, KMSAN_STATE_INITED, ldst + lsrc + 1);
+
+ kmsan_init_ret(sizeof(char *));
+ return ret;
+}
+
+char *
+kmsan_strchr(const char *s, int c)
+{
+ char *ret;
+
+ kmsan_check_arg(sizeof(s) + sizeof(c), "strchr");
+ kmsan_shadow_check(s, __builtin_strlen(s), "strchr");
+ ret = __builtin_strchr(s, c);
+
+ kmsan_init_ret(sizeof(char *));
+ return ret;
+}
+
+char *
+kmsan_strrchr(const char *s, int c)
+{
+ char *ret;
+
+ kmsan_check_arg(sizeof(s) + sizeof(c), "strrchr");
+ kmsan_shadow_check(s, __builtin_strlen(s), "strrchr");
+ ret = __builtin_strrchr(s, c);
+
+ kmsan_init_ret(sizeof(char *));
+ return ret;
+}
+
#undef kcopy
#undef copystr
#undef copyin
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.134 src/sys/lib/libkern/libkern.h:1.135
--- src/sys/lib/libkern/libkern.h:1.134 Thu Nov 14 16:23:53 2019
+++ src/sys/lib/libkern/libkern.h Fri Nov 22 14:28:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.134 2019/11/14 16:23:53 maxv Exp $ */
+/* $NetBSD: libkern.h,v 1.135 2019/11/22 14:28:46 maxv Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -438,13 +438,22 @@ size_t kmsan_strlen(const char *);
#endif
/* These exist in GCC 3.x, but we don't bother. */
+#if defined(_KERNEL) && defined(KMSAN)
+char *kmsan_strcat(char *, const char *);
+char *kmsan_strchr(const char *, int);
+char *kmsan_strrchr(const char *, int);
+#define strcat(d, s) kmsan_strcat(d, s)
+#define strchr(s, c) kmsan_strchr(s, c)
+#define strrchr(s, c) kmsan_strrchr(s, c)
+#else
char *strcat(char *, const char *);
+char *strchr(const char *, int);
+char *strrchr(const char *, int);
+#endif
size_t strcspn(const char *, const char *);
char *strncpy(char *, const char *, size_t);
char *strncat(char *, const char *, size_t);
int strncmp(const char *, const char *, size_t);
-char *strchr(const char *, int);
-char *strrchr(const char *, int);
char *strstr(const char *, const char *);
char *strpbrk(const char *, const char *);
size_t strspn(const char *, const char *);
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Fri Nov 22 14:28:46 UTC 2019 Modified Files: src/sys/kern: subr_msan.c src/sys/lib/libkern: libkern.h Log Message: Ah, strcat/strchr/strrchr are ASM functions, so instrument them. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_msan.c cvs rdiff -u -r1.134 -r1.135 src/sys/lib/libkern/libkern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: martin Date: Fri Nov 22 13:30:19 UTC 2019 Modified Files: src/etc: Makefile.params src/share/mk: bsd.README Log Message: Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/Makefile.params cvs rdiff -u -r1.396 -r1.397 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: martin Date: Fri Nov 22 13:30:19 UTC 2019 Modified Files: src/etc: Makefile.params src/share/mk: bsd.README Log Message: Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/Makefile.params cvs rdiff -u -r1.396 -r1.397 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile.params diff -u src/etc/Makefile.params:1.20 src/etc/Makefile.params:1.21 --- src/etc/Makefile.params:1.20 Tue Jul 10 13:22:22 2018 +++ src/etc/Makefile.params Fri Nov 22 13:30:19 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.params,v 1.20 2018/07/10 13:22:22 martin Exp $ +# $NetBSD: Makefile.params,v 1.21 2019/11/22 13:30:19 martin Exp $ # # Makefile fragment for printing build parameters. # @@ -40,7 +40,7 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \ HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \ MACHINE MACHINE_ARCH \ - NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ + NETBSD_OFFICIAL_RELEASE NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ TOOLCHAIN_MISSING \ USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \ USE_PAM USE_SKEY USE_YP \ Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.396 src/share/mk/bsd.README:1.397 --- src/share/mk/bsd.README:1.396 Mon Nov 18 16:09:21 2019 +++ src/share/mk/bsd.README Fri Nov 22 13:30:19 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.396 2019/11/18 16:09:21 christos Exp $ +# $NetBSD: bsd.README,v 1.397 2019/11/22 13:30:19 martin Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -152,6 +152,16 @@ MKCTF If "no", do not build and install during build. Default: no +NETBSD_OFFICIAL_RELEASE + If defined and set to "yes", the build targets an official + NetBSD release which is going to be available from + ftp.NetBSD.org / cdn.NetBSD.org. This modifies a few + default paths in the installer and also creates different + links in the install documentation. + The auto-build cluster uses this variable to distinguish + "daily" builds from real releases. + Default: undefined (no) + NOCTF Don't generate and manipulate CTF data of ELF binaries during build. It is set internally for standalone programs.
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nonaka Date: Fri Nov 22 12:40:08 UTC 2019 Modified Files: src/sys/dev/hyperv: hvkbd.c if_hvn.c Log Message: hvn(4), hvkbd(4): Only need to poll when cold. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/hyperv/hvkbd.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/hyperv/if_hvn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/hyperv
Module Name:src
Committed By: nonaka
Date: Fri Nov 22 12:40:08 UTC 2019
Modified Files:
src/sys/dev/hyperv: hvkbd.c if_hvn.c
Log Message:
hvn(4), hvkbd(4): Only need to poll when cold.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/hyperv/hvkbd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/hyperv/if_hvn.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/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.5 src/sys/dev/hyperv/hvkbd.c:1.6
--- src/sys/dev/hyperv/hvkbd.c:1.5 Fri Nov 22 12:30:32 2019
+++ src/sys/dev/hyperv/hvkbd.c Fri Nov 22 12:40:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $ */
+/* $NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.6 2019/11/22 12:40:07 nonaka Exp $");
#include
#include
@@ -344,13 +344,13 @@ hvkbd_connect(struct hvkbd_softc *sc)
}
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = spltty();
+ hvkbd_intr(sc);
+ splx(s);
+ } else
tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
- s = spltty();
- hvkbd_intr(sc);
- splx(s);
} while (--timo > 0 && sc->sc_connected == 0);
if (timo == 0 && sc->sc_connected == 0) {
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.8 src/sys/dev/hyperv/if_hvn.c:1.9
--- src/sys/dev/hyperv/if_hvn.c:1.8 Fri Nov 22 12:30:32 2019
+++ src/sys/dev/hyperv/if_hvn.c Fri Nov 22 12:40:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $ */
+/* $NetBSD: if_hvn.c,v 1.9 2019/11/22 12:40:07 nonaka Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.9 2019/11/22 12:40:07 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1081,13 +1081,13 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
return 0;
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1));
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
} while (--timo > 0 && sc->sc_nvsdone != 1);
if (timo == 0 && sc->sc_nvsdone != 1) {
@@ -1404,13 +1404,13 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
BUS_DMASYNC_POSTWRITE);
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
} while (--timo > 0 && rc->rc_done != 1);
bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nonaka Date: Fri Nov 22 12:30:32 UTC 2019 Modified Files: src/sys/dev/hyperv: hvkbd.c if_hvn.c vmbus.c Log Message: vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hyperv/hvkbd.c \ src/sys/dev/hyperv/vmbus.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/hyperv/if_hvn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/hyperv
Module Name:src
Committed By: nonaka
Date: Fri Nov 22 12:30:32 UTC 2019
Modified Files:
src/sys/dev/hyperv: hvkbd.c if_hvn.c vmbus.c
Log Message:
vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hyperv/hvkbd.c \
src/sys/dev/hyperv/vmbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/hyperv/if_hvn.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/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.4 src/sys/dev/hyperv/hvkbd.c:1.5
--- src/sys/dev/hyperv/hvkbd.c:1.4 Fri Nov 15 08:51:27 2019
+++ src/sys/dev/hyperv/hvkbd.c Fri Nov 22 12:30:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.4 2019/11/15 08:51:27 nonaka Exp $ */
+/* $NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.4 2019/11/15 08:51:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $");
#include
#include
@@ -347,7 +347,7 @@ hvkbd_connect(struct hvkbd_softc *sc)
if (cold)
delay(1000);
else
- tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", 1);
+ tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
s = spltty();
hvkbd_intr(sc);
splx(s);
Index: src/sys/dev/hyperv/vmbus.c
diff -u src/sys/dev/hyperv/vmbus.c:1.4 src/sys/dev/hyperv/vmbus.c:1.5
--- src/sys/dev/hyperv/vmbus.c:1.4 Tue Jul 9 10:07:11 2019
+++ src/sys/dev/hyperv/vmbus.c Fri Nov 22 12:30:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $ */
+/* $NetBSD: vmbus.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $ */
/* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.5 2019/11/22 12:30:32 nonaka Exp $");
#include
#include
@@ -604,7 +604,7 @@ vmbus_start(struct vmbus_softc *sc, stru
hyperv_intr();
splx(s);
} else
- tsleep(wchan, PRIBIO, wchan, 1);
+ tsleep(wchan, PRIBIO, wchan, mstohz(delays[i]));
}
if (status != HYPERCALL_STATUS_SUCCESS) {
device_printf(sc->sc_dev,
@@ -666,7 +666,8 @@ vmbus_wait(struct vmbus_softc *sc,
hyperv_intr();
splx(s);
} else
- tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait", 1);
+ tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait",
+ mstohz(1));
}
}
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.7 src/sys/dev/hyperv/if_hvn.c:1.8
--- src/sys/dev/hyperv/if_hvn.c:1.7 Mon Nov 18 04:38:48 2019
+++ src/sys/dev/hyperv/if_hvn.c Fri Nov 22 12:30:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.7 2019/11/18 04:38:48 nonaka Exp $ */
+/* $NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.7 2019/11/18 04:38:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.8 2019/11/22 12:30:32 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1063,7 +1063,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
if (cold)
delay(1000);
else
-tsleep(cmd, PRIBIO, "nvsout", 1);
+tsleep(cmd, PRIBIO, "nvsout", mstohz(1));
} else if (rv) {
DPRINTF("%s: NVSP operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->nvs_type, rv);
@@ -1084,7 +1084,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
if (cold)
delay(1000);
else
- tsleep(sc, PRIBIO | PCATCH, "nvscmd", 1);
+ tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1));
s = splnet();
hvn_nvs_intr(sc);
splx(s);
@@ -1385,7 +1385,7 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
if (cold)
delay(1000);
else
-tsleep(rc, PRIBIO, "rndisout", 1);
+tsleep(rc, PRIBIO, "rndisout", mstohz(1));
} else if (rv) {
DPRINTF("%s: RNDIS operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->rm_type, rv);
@@ -1407,7 +1407,7 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
if (cold)
delay(1000);
else
- tsleep(rc, PRIBIO | PCATCH, "rndiscmd", 1);
+ tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
s = splnet();
hvn_nvs_intr(sc);
splx(s);
Re: CVS commit: src/lib/libc/tls
On Fri, Nov 22, 2019 at 08:53:25AM +0900, Takeshi Nakayama wrote: > >>> Takeshi Nakayama wrote > > > >>> Joerg Sonnenberger wrote > > > > > On Thu, Nov 21, 2019 at 11:06:16PM +, Takeshi Nakayama wrote: > > > > Module Name:src > > > > Committed By: nakayama > > > > Date: Thu Nov 21 23:06:16 UTC 2019 > > > > > > > > Modified Files: > > > > src/lib/libc/tls: tls.c > > > > > > > > Log Message: > > > > Fix PR/54074 and PR/54093 completely. > > > > > > > > More similar to the ld.elf_so logic, it is necessary to align with > > > > p_align first. Also, invert the #ifdef condition for consistency. > > > > > > This commit just wastes space without reason. > > > > No, without this commit the TLS offset calculation is mismatch if > > alignof(max_align_t)) != p_align. > > Ah, this is wrong. > Correctly, the TLS offset calculation is mismatch with what ld(1) > expected if p_memsz is not aligned with p_align. For TLS variant I, it literally just adds padding at the end of the allocation. For TLS variant II, it is redundant, because the rounding is already done in with max_align_t. We do not support p_align > malloc alignment and the patch is certainly nowhere near enough to change that. It is actively harmful in that it can make people believe that it could ever work. Joerg
Re: CVS commit: [netbsd-9] src
On Fri, Nov 22, 2019 at 07:44:58AM +0100, Martin Husemann wrote: > On Fri, Nov 22, 2019 at 06:17:43AM +0100, Kamil Rytarowski wrote: > > Can we use __diagused? > > Yes, please - can you please commit to -current and request pullup? > Should be the same issue on HEAD (just not being noticed in default > compiles). Actually there is more fallout like this - I'll deal with it in one go. Martin
CVS commit: src/tests/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Fri Nov 22 10:26:32 UTC 2019
Modified Files:
src/tests/lib/libnvmm: h_mem_assist.c
Log Message:
Several improvements. In particular, reduce CS.limit, because Intel CPUs
perform strict sanity checks, and the previous (too high) limit caused the
VM entry to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/lib/libnvmm/h_mem_assist.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/libnvmm/h_mem_assist.c
diff -u src/tests/lib/libnvmm/h_mem_assist.c:1.17 src/tests/lib/libnvmm/h_mem_assist.c:1.18
--- src/tests/lib/libnvmm/h_mem_assist.c:1.17 Sun Oct 27 07:08:15 2019
+++ src/tests/lib/libnvmm/h_mem_assist.c Fri Nov 22 10:26:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: h_mem_assist.c,v 1.17 2019/10/27 07:08:15 maxv Exp $ */
+/* $NetBSD: h_mem_assist.c,v 1.18 2019/11/22 10:26:32 maxv Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@ run_machine(struct nvmm_machine *mach, s
return;
default:
- printf("Invalid!\n");
+ printf("Invalid VMEXIT: 0x%lx\n", exit->reason);
return;
}
}
@@ -177,22 +177,22 @@ extern uint8_t test_64bit_15_begin, test
extern uint8_t test_64bit_16_begin, test_64bit_16_end;
static const struct test tests64[] = {
- { "test1 - MOV", _begin, _end, 0x3004, 0 },
- { "test2 - OR", _begin, _end, 0x16FF, 0 },
- { "test3 - AND", _begin, _end, 0x1FC0, 0 },
- { "test4 - XOR", _begin, _end, 0x10CF, 0 },
- { "test5 - Address Sizes", _begin, _end, 0x1F00, 0 },
- { "test6 - DMO", _begin, _end, 0xFFAB, 0 },
- { "test7 - STOS", _begin, _end, 0x00123456, 0 },
- { "test8 - LODS", _begin, _end, 0x12345678, 0 },
- { "test9 - MOVS", _begin, _end, 0x12345678, 0 },
- { "test10 - MOVZXB", _begin, _end, 0x0078, 0 },
- { "test11 - MOVZXW", _begin, _end, 0x5678, 0 },
- { "test12 - CMP", _begin, _end, 0x0001, 0 },
- { "test13 - SUB", _begin, _end, 0x000FA0FF, 0 },
- { "test14 - TEST", _begin, _end, 0x0001, 0 },
- { "test15 - XCHG", _64bit_15_begin, _64bit_15_end, 0x123456, 0 },
- { "test16 - XCHG", _64bit_16_begin, _64bit_16_end,
+ { "64bit test1 - MOV", _begin, _end, 0x3004, 0 },
+ { "64bit test2 - OR", _begin, _end, 0x16FF, 0 },
+ { "64bit test3 - AND", _begin, _end, 0x1FC0, 0 },
+ { "64bit test4 - XOR", _begin, _end, 0x10CF, 0 },
+ { "64bit test5 - Address Sizes", _begin, _end, 0x1F00, 0 },
+ { "64bit test6 - DMO", _begin, _end, 0xFFAB, 0 },
+ { "64bit test7 - STOS", _begin, _end, 0x00123456, 0 },
+ { "64bit test8 - LODS", _begin, _end, 0x12345678, 0 },
+ { "64bit test9 - MOVS", _begin, _end, 0x12345678, 0 },
+ { "64bit test10 - MOVZXB", _begin, _end, 0x0078, 0 },
+ { "64bit test11 - MOVZXW", _begin, _end, 0x5678, 0 },
+ { "64bit test12 - CMP", _begin, _end, 0x0001, 0 },
+ { "64bit test13 - SUB", _begin, _end, 0x000FA0FF, 0 },
+ { "64bit test14 - TEST", _begin, _end, 0x0001, 0 },
+ { "64bit test15 - XCHG", _64bit_15_begin, _64bit_15_end, 0x123456, 0 },
+ { "64bit test16 - XCHG", _64bit_16_begin, _64bit_16_end,
0x123456, 0 },
{ NULL, NULL, NULL, -1, 0 }
};
@@ -218,6 +218,9 @@ reset_machine64(struct nvmm_machine *mac
{
struct nvmm_x64_state *state = vcpu->state;
+ if (nvmm_vcpu_getstate(mach, vcpu, NVMM_X64_STATE_ALL) == -1)
+ err(errno, "nvmm_vcpu_getstate");
+
memset(state, 0, sizeof(*state));
/* Default. */
@@ -365,6 +368,8 @@ test_vm64(void)
run_test(, , [i]);
}
+ if (nvmm_vcpu_destroy(, ) == -1)
+ err(errno, "nvmm_vcpu_destroy");
if (nvmm_machine_destroy() == -1)
err(errno, "nvmm_machine_destroy");
}
@@ -400,10 +405,10 @@ reset_machine16(struct nvmm_machine *mac
struct nvmm_x64_state *state = vcpu->state;
if (nvmm_vcpu_getstate(mach, vcpu, NVMM_X64_STATE_ALL) == -1)
- err(errno, "nvmm_vcpu_setstate");
+ err(errno, "nvmm_vcpu_getstate");
state->segs[NVMM_X64_SEG_CS].base = 0;
- state->segs[NVMM_X64_SEG_CS].limit = 0x;
+ state->segs[NVMM_X64_SEG_CS].limit = 0x2FFF;
state->gprs[NVMM_X64_GPR_RIP] = 0x2000;
if (nvmm_vcpu_setstate(mach, vcpu, NVMM_X64_STATE_ALL) == -1)
@@ -451,6 +456,8 @@ test_vm16(void)
run_test(, , [i]);
}
+ if (nvmm_vcpu_destroy(, ) == -1)
+ err(errno, "nvmm_vcpu_destroy");
if (nvmm_machine_destroy() == -1)
err(errno, "nvmm_machine_destroy");
}
CVS commit: src/tests/lib/libnvmm
Module Name:src Committed By: maxv Date: Fri Nov 22 10:26:32 UTC 2019 Modified Files: src/tests/lib/libnvmm: h_mem_assist.c Log Message: Several improvements. In particular, reduce CS.limit, because Intel CPUs perform strict sanity checks, and the previous (too high) limit caused the VM entry to fail. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/tests/lib/libnvmm/h_mem_assist.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Fri Nov 22 08:09:26 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: RPI_INSTALL Log Message: Bump space for ramdisk image To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/RPI_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: martin Date: Fri Nov 22 08:09:26 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: RPI_INSTALL Log Message: Bump space for ramdisk image To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/RPI_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/RPI_INSTALL diff -u src/sys/arch/evbarm/conf/RPI_INSTALL:1.10 src/sys/arch/evbarm/conf/RPI_INSTALL:1.11 --- src/sys/arch/evbarm/conf/RPI_INSTALL:1.10 Mon Apr 9 17:27:11 2018 +++ src/sys/arch/evbarm/conf/RPI_INSTALL Fri Nov 22 08:09:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: RPI_INSTALL,v 1.10 2018/04/09 17:27:11 christos Exp $ +# $NetBSD: RPI_INSTALL,v 1.11 2019/11/22 08:09:26 martin Exp $ # # RPI_INSTALL -- RPI kernel with installation-sized # ramdisk @@ -8,7 +8,7 @@ include "arch/evbarm/conf/RPI" include "arch/evbarm/conf/INSTALL" no options MEMORY_DISK_ROOT_SIZE -options MEMORY_DISK_ROOT_SIZE=56000 +options MEMORY_DISK_ROOT_SIZE=6 makeoptions RAMDISKNAME=sshramdisk no makeoptions DEBUG
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Nov 22 08:05:10 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #461 To generate a diff of this commit: cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.113 src/doc/CHANGES-9.0:1.1.2.114 --- src/doc/CHANGES-9.0:1.1.2.113 Thu Nov 21 19:29:58 2019 +++ src/doc/CHANGES-9.0 Fri Nov 22 08:05:10 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.113 2019/11/21 19:29:58 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.114 2019/11/22 08:05:10 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6164,3 +6164,24 @@ distrib/notes/x68k/contents 1.20 Pass the set suffix (either .tgz or .tar.xz) from the makefile. Document the rescue set. +external/bsd/dhcpcd/dist/src/arp.c up to 1.1.1.13 +external/bsd/dhcpcd/dist/src/arp.h up to 1.1.1.9 +external/bsd/dhcpcd/dist/src/control.c up to 1.1.1.9 +external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.33 +external/bsd/dhcpcd/dist/src/dhcp.c up to 1.30 +external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.14 +external/bsd/dhcpcd/dist/src/dhcpcd.c up to 1.29 +external/bsd/dhcpcd/dist/src/eloop.cup to 1.1.1.8 +external/bsd/dhcpcd/dist/src/eloop.hup to 1.1.1.6 +external/bsd/dhcpcd/dist/src/if-bsd.c up to 1.15 +external/bsd/dhcpcd/dist/src/if.c up to 1.1.1.18 +external/bsd/dhcpcd/dist/src/if.h up to 1.1.1.13 +external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.19 +external/bsd/dhcpcd/dist/src/ipv6nd.c up to 1.13 +external/bsd/dhcpcd/dist/src/ipv6nd.h up to 1.1.1.14 +external/bsd/dhcpcd/dist/src/script.c up to 1.1.1.12 +doc/3RDPARTY (manually adjusted) + + Import dhcpcd-8.1.2. + [roy, ticket #461] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Nov 22 08:05:10 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #461 To generate a diff of this commit: cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Nov 22 08:01:50 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/bsd/dhcpcd/dist/src [netbsd-9]: arp.c arp.h control.c defs.h dhcp.c dhcp6.c dhcpcd.c eloop.c eloop.h if-bsd.c if.c if.h ipv4.c ipv6nd.c ipv6nd.h script.c Log Message: Pull up the following revisions, requested by roy in ticket #461: external/bsd/dhcpcd/dist/src/arp.c up to 1.1.1.13 external/bsd/dhcpcd/dist/src/arp.h up to 1.1.1.9 external/bsd/dhcpcd/dist/src/control.c up to 1.1.1.9 external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.33 external/bsd/dhcpcd/dist/src/dhcp.c up to 1.30 external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.14 external/bsd/dhcpcd/dist/src/dhcpcd.c up to 1.29 external/bsd/dhcpcd/dist/src/eloop.cup to 1.1.1.8 external/bsd/dhcpcd/dist/src/eloop.hup to 1.1.1.6 external/bsd/dhcpcd/dist/src/if-bsd.c up to 1.15 external/bsd/dhcpcd/dist/src/if.c up to 1.1.1.18 external/bsd/dhcpcd/dist/src/if.h up to 1.1.1.13 external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.19 external/bsd/dhcpcd/dist/src/ipv6nd.c up to 1.13 external/bsd/dhcpcd/dist/src/ipv6nd.h up to 1.1.1.14 external/bsd/dhcpcd/dist/src/script.c up to 1.1.1.12 doc/3RDPARTY(manually adjusted) Import dhcpcd-8.1.2 with the following changes: * hooks: STOPPED is now run on timeout and exit * BSD: Use IP_REVCIF rather than IN_PKTINFO * DHCP: When rebinding, ensure we have a DHCP ARP state * RA: Sort routers when reachability changes * RA: Apply hoplimit, reachable and retrans timer values to kernel * RA: Warn if advertised MTU > interface MTU * dhcpcd: Report SSID connection to when we gain carrier * DHCP: Fix corruption of address flags when renewing To generate a diff of this commit: cvs rdiff -u -r1.1640.2.6 -r1.1640.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.11.2.1 -r1.1.1.11.2.2 \ src/external/bsd/dhcpcd/dist/src/arp.c cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 src/external/bsd/dhcpcd/dist/src/arp.h cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \ src/external/bsd/dhcpcd/dist/src/control.c cvs rdiff -u -r1.1.1.25.2.3 -r1.1.1.25.2.4 \ src/external/bsd/dhcpcd/dist/src/defs.h cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/external/bsd/dhcpcd/dist/src/dhcp.c \ src/external/bsd/dhcpcd/dist/src/dhcpcd.c cvs rdiff -u -r1.11.2.2 -r1.11.2.3 src/external/bsd/dhcpcd/dist/src/dhcp6.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 src/external/bsd/dhcpcd/dist/src/eloop.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 src/external/bsd/dhcpcd/dist/src/eloop.h cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/external/bsd/dhcpcd/dist/src/if-bsd.c \ src/external/bsd/dhcpcd/dist/src/ipv6nd.c cvs rdiff -u -r1.1.1.14.2.2 -r1.1.1.14.2.3 \ src/external/bsd/dhcpcd/dist/src/if.c cvs rdiff -u -r1.1.1.10.2.2 -r1.1.1.10.2.3 \ src/external/bsd/dhcpcd/dist/src/if.h cvs rdiff -u -r1.1.1.16.2.2 -r1.1.1.16.2.3 \ src/external/bsd/dhcpcd/dist/src/ipv4.c cvs rdiff -u -r1.1.1.10.2.1 -r1.1.1.10.2.2 \ src/external/bsd/dhcpcd/dist/src/ipv6nd.h \ src/external/bsd/dhcpcd/dist/src/script.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Fri Nov 22 08:01:50 UTC 2019
Modified Files:
src/doc [netbsd-9]: 3RDPARTY
src/external/bsd/dhcpcd/dist/src [netbsd-9]: arp.c arp.h control.c
defs.h dhcp.c dhcp6.c dhcpcd.c eloop.c eloop.h if-bsd.c if.c if.h
ipv4.c ipv6nd.c ipv6nd.h script.c
Log Message:
Pull up the following revisions, requested by roy in ticket #461:
external/bsd/dhcpcd/dist/src/arp.c up to 1.1.1.13
external/bsd/dhcpcd/dist/src/arp.h up to 1.1.1.9
external/bsd/dhcpcd/dist/src/control.c up to 1.1.1.9
external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.33
external/bsd/dhcpcd/dist/src/dhcp.c up to 1.30
external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.14
external/bsd/dhcpcd/dist/src/dhcpcd.c up to 1.29
external/bsd/dhcpcd/dist/src/eloop.cup to 1.1.1.8
external/bsd/dhcpcd/dist/src/eloop.hup to 1.1.1.6
external/bsd/dhcpcd/dist/src/if-bsd.c up to 1.15
external/bsd/dhcpcd/dist/src/if.c up to 1.1.1.18
external/bsd/dhcpcd/dist/src/if.h up to 1.1.1.13
external/bsd/dhcpcd/dist/src/ipv4.c up to 1.1.1.19
external/bsd/dhcpcd/dist/src/ipv6nd.c up to 1.13
external/bsd/dhcpcd/dist/src/ipv6nd.h up to 1.1.1.14
external/bsd/dhcpcd/dist/src/script.c up to 1.1.1.12
doc/3RDPARTY(manually adjusted)
Import dhcpcd-8.1.2 with the following changes:
* hooks: STOPPED is now run on timeout and exit
* BSD: Use IP_REVCIF rather than IN_PKTINFO
* DHCP: When rebinding, ensure we have a DHCP ARP state
* RA: Sort routers when reachability changes
* RA: Apply hoplimit, reachable and retrans timer values to kernel
* RA: Warn if advertised MTU > interface MTU
* dhcpcd: Report SSID connection to when we gain carrier
* DHCP: Fix corruption of address flags when renewing
To generate a diff of this commit:
cvs rdiff -u -r1.1640.2.6 -r1.1640.2.7 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.11.2.1 -r1.1.1.11.2.2 \
src/external/bsd/dhcpcd/dist/src/arp.c
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 src/external/bsd/dhcpcd/dist/src/arp.h
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
src/external/bsd/dhcpcd/dist/src/control.c
cvs rdiff -u -r1.1.1.25.2.3 -r1.1.1.25.2.4 \
src/external/bsd/dhcpcd/dist/src/defs.h
cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/external/bsd/dhcpcd/dist/src/dhcp.c \
src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.11.2.2 -r1.11.2.3 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 src/external/bsd/dhcpcd/dist/src/eloop.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 src/external/bsd/dhcpcd/dist/src/eloop.h
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/external/bsd/dhcpcd/dist/src/if-bsd.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.1.1.14.2.2 -r1.1.1.14.2.3 \
src/external/bsd/dhcpcd/dist/src/if.c
cvs rdiff -u -r1.1.1.10.2.2 -r1.1.1.10.2.3 \
src/external/bsd/dhcpcd/dist/src/if.h
cvs rdiff -u -r1.1.1.16.2.2 -r1.1.1.16.2.3 \
src/external/bsd/dhcpcd/dist/src/ipv4.c
cvs rdiff -u -r1.1.1.10.2.1 -r1.1.1.10.2.2 \
src/external/bsd/dhcpcd/dist/src/ipv6nd.h \
src/external/bsd/dhcpcd/dist/src/script.c
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.1640.2.6 src/doc/3RDPARTY:1.1640.2.7
--- src/doc/3RDPARTY:1.1640.2.6 Thu Oct 17 19:34:12 2019
+++ src/doc/3RDPARTY Fri Nov 22 08:01:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1640.2.6 2019/10/17 19:34:12 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1640.2.7 2019/11/22 08:01:49 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -341,12 +341,12 @@ Notes:
Use the dhcp2netbsd script.
Package: dhcpcd
-Version: 8.1.1
-Current Vers: 8.1.1
+Version: 8.1.2
+Current Vers: 8.1.2
Maintainer: roy
Archive Site: ftp://roy.marples.name/pub/dhcpcd/
Home Page: http://roy.marples.name/projects/dhcpcd/
-Date: 2019-10-16
+Date: 2019-11-13
Mailing List: dhcpcd-disc...@marples.name
License: BSD (2-clause)
Location: external/bsd/dhcpcd/dist
Index: src/external/bsd/dhcpcd/dist/src/arp.c
diff -u src/external/bsd/dhcpcd/dist/src/arp.c:1.1.1.11.2.1 src/external/bsd/dhcpcd/dist/src/arp.c:1.1.1.11.2.2
--- src/external/bsd/dhcpcd/dist/src/arp.c:1.1.1.11.2.1 Sat Oct 12 14:44:32 2019
+++ src/external/bsd/dhcpcd/dist/src/arp.c Fri Nov 22 08:01:49 2019
@@ -206,7 +206,6 @@ arp_validate(const struct interface *ifp
return true;
}
-
static void
arp_packet(struct interface *ifp, uint8_t *data, size_t len)
{
@@ -280,9 +279,9 @@ arp_close(struct interface *ifp)
}
static void
-arp_tryfree(struct interface *ifp)
