Module Name: src
Committed By: ad
Date: Sun Jan 26 18:52:55 UTC 2020
Modified Files:
src/sys/kern: kern_softint.c
Log Message:
softint_dispatch(): replace the KASSERT for LW_RUNNING with a big printf()
plus panic() that dumps lots of info.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_softint.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_softint.c
diff -u src/sys/kern/kern_softint.c:1.58 src/sys/kern/kern_softint.c:1.59
--- src/sys/kern/kern_softint.c:1.58 Sat Jan 25 15:12:47 2020
+++ src/sys/kern/kern_softint.c Sun Jan 26 18:52:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.58 2020/01/25 15:12:47 ad Exp $ */
+/* $NetBSD: kern_softint.c,v 1.59 2020/01/26 18:52:55 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.58 2020/01/25 15:12:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.59 2020/01/26 18:52:55 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -841,7 +841,24 @@ softint_dispatch(lwp_t *pinned, int s)
u_int timing;
lwp_t *l;
- KASSERT((pinned->l_flag & LW_RUNNING) != 0);
+#ifdef DIAGNOSTIC
+ if ((pinned->l_flag & LW_RUNNING) == 0 || curlwp->l_stat != LSIDL) {
+ struct lwp *onproc = curcpu()->ci_onproc;
+ int s2 = splhigh();
+ printf("curcpu=%d, spl=%d curspl=%d\n"
+ "onproc=%p => l_stat=%d l_flag=%08x l_cpu=%d\n"
+ "curlwp=%p => l_stat=%d l_flag=%08x l_cpu=%d\n"
+ "pinned=%p => l_stat=%d l_flag=%08x l_cpu=%d\n",
+ cpu_index(curcpu()), s, s2, onproc, onproc->l_stat,
+ onproc->l_flag, cpu_index(onproc->l_cpu), curlwp,
+ curlwp->l_stat, curlwp->l_flag,
+ cpu_index(curlwp->l_cpu), pinned, pinned->l_stat,
+ pinned->l_flag, cpu_index(pinned->l_cpu));
+ splx(s2);
+ panic("softint screwup");
+ }
+#endif
+
l = curlwp;
si = l->l_private;
