CVS commit: src/sys
Module Name:src Committed By: maxv Date: Fri Nov 8 12:36:11 UTC 2019 Modified Files: src/sys/arch/amd64/include: csan.h src/sys/kern: subr_csan.c Log Message: Exclude the PTE space from KCSAN, since there the same VA can point to different PAs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/csan.h cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_csan.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/include/csan.h diff -u src/sys/arch/amd64/include/csan.h:1.2 src/sys/arch/amd64/include/csan.h:1.3 --- src/sys/arch/amd64/include/csan.h:1.2 Wed Nov 6 06:57:22 2019 +++ src/sys/arch/amd64/include/csan.h Fri Nov 8 12:36:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: csan.h,v 1.2 2019/11/06 06:57:22 maxv Exp $ */ +/* $NetBSD: csan.h,v 1.3 2019/11/08 12:36:11 maxv Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,9 +30,18 @@ */ #include +#include +#include #include static inline bool +kcsan_md_unsupported(vaddr_t addr) +{ + return (addr >= (vaddr_t)PTE_BASE && + addr < ((vaddr_t)PTE_BASE + NBPD_L4)); +} + +static inline bool kcsan_md_is_avail(void) { return true; Index: src/sys/kern/subr_csan.c diff -u src/sys/kern/subr_csan.c:1.2 src/sys/kern/subr_csan.c:1.3 --- src/sys/kern/subr_csan.c:1.2 Wed Nov 6 06:57:22 2019 +++ src/sys/kern/subr_csan.c Fri Nov 8 12:36:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_csan.c,v 1.2 2019/11/06 06:57:22 maxv Exp $ */ +/* $NetBSD: subr_csan.c,v 1.3 2019/11/08 12:36:10 maxv Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_csan.c,v 1.2 2019/11/06 06:57:22 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_csan.c,v 1.3 2019/11/08 12:36:10 maxv Exp $"); #include "opt_kcsan.h" @@ -136,6 +136,8 @@ kcsan_access(uintptr_t addr, size_t size if (__predict_false(!kcsan_enabled)) return; + if (__predict_false(kcsan_md_unsupported((vaddr_t)addr))) + return; new.addr = addr; new.size = size;
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Fri Nov 8 12:36:11 UTC 2019 Modified Files: src/sys/arch/amd64/include: csan.h src/sys/kern: subr_csan.c Log Message: Exclude the PTE space from KCSAN, since there the same VA can point to different PAs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/csan.h cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_csan.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/dts
Module Name:src Committed By: jmcneill Date: Fri Nov 8 11:12:09 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64.dtsi Log Message: Fix PMU interrupt numbers on Allwinner A64. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/sun50i-a64.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/dts/sun50i-a64.dtsi diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.12 --- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11 Thu Jun 6 23:19:45 2019 +++ src/sys/arch/arm/dts/sun50i-a64.dtsi Fri Nov 8 11:12:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun50i-a64.dtsi,v 1.11 2019/06/06 23:19:45 jmcneill Exp $ */ +/* $NetBSD: sun50i-a64.dtsi,v 1.12 2019/11/08 11:12:09 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -51,6 +51,14 @@ #thermal-sensor-cells = <0>; }; }; + + /* PMU interrupt numbers are wrong in mainline dts */ + pmu { + interrupts = , + , + , + ; + }; }; &cpu0 {
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Fri Nov 8 11:12:09 UTC 2019 Modified Files: src/sys/arch/arm/dts: sun50i-a64.dtsi Log Message: Fix PMU interrupt numbers on Allwinner A64. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/sun50i-a64.dtsi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: hannken Date: Fri Nov 8 11:06:21 UTC 2019 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c Log Message: dtrace_trap() gets called from alltraps() -> trap() with interrupts enabled so we cannot assert for interrupts disabled here. Should fix PR kern/54603: kernel panic when running dtruss To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.13 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.14 --- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.13 Fri Jul 5 08:29:18 2019 +++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Fri Nov 8 11:06:21 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dtrace_subr.c,v 1.13 2019/07/05 08:29:18 hannken Exp $ */ +/* $NetBSD: dtrace_subr.c,v 1.14 2019/11/08 11:06:21 hannken Exp $ */ /* * CDDL HEADER START @@ -412,7 +412,11 @@ dtrace_trap(struct trapframe *frame, u_i */ nofault = (cpu_core[cpuid].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0; if (nofault) { +#if 0 + This assertion would always fire, we get called from + alltraps() -> trap() with interrupts enabled. KASSERTMSG((x86_read_flags() & PSL_I) == 0, "interrupts enabled"); +#endif /* * There are only a couple of trap types that are expected.
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src Committed By: hannken Date: Fri Nov 8 11:06:21 UTC 2019 Modified Files: src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c Log Message: dtrace_trap() gets called from alltraps() -> trap() with interrupts enabled so we cannot assert for interrupts disabled here. Should fix PR kern/54603: kernel panic when running dtruss To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.