Module Name: src
Committed By: martin
Date: Mon Jul 31 14:38:25 UTC 2023
Modified Files:
src/sys/kern [netbsd-10]: kern_lock.c kern_mutex.c kern_rwlock.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #265):
sys/kern/kern_rwlock.c: revision 1.67
sys/kern/kern_lock.c: revision 1.182
sys/kern/kern_mutex.c: revision 1.102
Sprinkle __predict_{true,false} for panicstr checks
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.181.2.1 src/sys/kern/kern_lock.c
cvs rdiff -u -r1.101 -r1.101.2.1 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.66 -r1.66.4.1 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_lock.c
diff -u src/sys/kern/kern_lock.c:1.181 src/sys/kern/kern_lock.c:1.181.2.1
--- src/sys/kern/kern_lock.c:1.181 Wed Oct 26 23:28:18 2022
+++ src/sys/kern/kern_lock.c Mon Jul 31 14:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.181 2022/10/26 23:28:18 riastradh Exp $ */
+/* $NetBSD: kern_lock.c,v 1.181.2.1 2023/07/31 14:38:25 martin Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.181 2022/10/26 23:28:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.181.2.1 2023/07/31 14:38:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
@@ -71,7 +71,7 @@ assert_sleepable(void)
uint64_t pctr;
bool idle;
- if (panicstr != NULL) {
+ if (__predict_false(panicstr != NULL)) {
return;
}
Index: src/sys/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.101 src/sys/kern/kern_mutex.c:1.101.2.1
--- src/sys/kern/kern_mutex.c:1.101 Mon Dec 5 07:09:04 2022
+++ src/sys/kern/kern_mutex.c Mon Jul 31 14:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.101 2022/12/05 07:09:04 skrll Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.101.2.1 2023/07/31 14:38:25 martin Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.101 2022/12/05 07:09:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.101.2.1 2023/07/31 14:38:25 martin Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -516,7 +516,7 @@ mutex_vector_enter(kmutex_t *mtx)
MUTEX_ASSERT(mtx, !cpu_intr_p());
MUTEX_WANTLOCK(mtx);
- if (panicstr == NULL) {
+ if (__predict_true(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.66 src/sys/kern/kern_rwlock.c:1.66.4.1
--- src/sys/kern/kern_rwlock.c:1.66 Sat Apr 9 23:46:19 2022
+++ src/sys/kern/kern_rwlock.c Mon Jul 31 14:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.66 2022/04/09 23:46:19 riastradh Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.66.4.1 2023/07/31 14:38:25 martin Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.66 2022/04/09 23:46:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.66.4.1 2023/07/31 14:38:25 martin Exp $");
#include "opt_lockdebug.h"
@@ -197,7 +197,7 @@ static void __noinline
rw_abort(const char *func, size_t line, krwlock_t *rw, const char *msg)
{
- if (panicstr != NULL)
+ if (__predict_false(panicstr != NULL))
return;
LOCKDEBUG_ABORT(func, line, rw, &rwlock_lockops, msg);
@@ -304,7 +304,7 @@ rw_vector_enter(krwlock_t *rw, const krw
RW_ASSERT(rw, curthread != 0);
RW_WANTLOCK(rw, op);
- if (panicstr == NULL) {
+ if (__predict_true(panicstr == NULL)) {
KDASSERT(pserialize_not_in_read_section());
LOCKDEBUG_BARRIER(&kernel_lock, 1);
}
