Module Name: src Committed By: ozaki-r Date: Wed Apr 17 02:29:43 UTC 2019
Modified Files: src/sys/kern: kern_mutex.c kern_rwlock.c Log Message: Don't check pserialize_not_in_read_section after panic It can cause a false positive assertion failure. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_mutex.c cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_rwlock.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_mutex.c diff -u src/sys/kern/kern_mutex.c:1.76 src/sys/kern/kern_mutex.c:1.77 --- src/sys/kern/kern_mutex.c:1.76 Sun Mar 10 12:49:48 2019 +++ src/sys/kern/kern_mutex.c Wed Apr 17 02:29:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_mutex.c,v 1.76 2019/03/10 12:49:48 skrll Exp $ */ +/* $NetBSD: kern_mutex.c,v 1.77 2019/04/17 02:29:43 ozaki-r Exp $ */ /*- * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #define __MUTEX_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.76 2019/03/10 12:49:48 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.77 2019/04/17 02:29:43 ozaki-r Exp $"); #include <sys/param.h> #include <sys/atomic.h> @@ -524,9 +524,9 @@ mutex_vector_enter(kmutex_t *mtx) MUTEX_ASSERT(mtx, curthread != 0); MUTEX_ASSERT(mtx, !cpu_intr_p()); MUTEX_WANTLOCK(mtx); - KDASSERT(pserialize_not_in_read_section()); if (panicstr == NULL) { + KDASSERT(pserialize_not_in_read_section()); LOCKDEBUG_BARRIER(&kernel_lock, 1); } Index: src/sys/kern/kern_rwlock.c diff -u src/sys/kern/kern_rwlock.c:1.52 src/sys/kern/kern_rwlock.c:1.53 --- src/sys/kern/kern_rwlock.c:1.52 Fri Aug 31 01:23:57 2018 +++ src/sys/kern/kern_rwlock.c Wed Apr 17 02:29:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_rwlock.c,v 1.52 2018/08/31 01:23:57 ozaki-r Exp $ */ +/* $NetBSD: kern_rwlock.c,v 1.53 2019/04/17 02:29:43 ozaki-r Exp $ */ /*- * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.52 2018/08/31 01:23:57 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.53 2019/04/17 02:29:43 ozaki-r Exp $"); #define __RWLOCK_PRIVATE @@ -290,9 +290,9 @@ rw_vector_enter(krwlock_t *rw, const krw RW_ASSERT(rw, !cpu_intr_p()); RW_ASSERT(rw, curthread != 0); RW_WANTLOCK(rw, op); - KDASSERT(pserialize_not_in_read_section()); if (panicstr == NULL) { + KDASSERT(pserialize_not_in_read_section()); LOCKDEBUG_BARRIER(&kernel_lock, 1); }