Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When booted with "boot netbsd -1" (disable multiprocessor boot), 

"ddb>continue" didn't work when ddb was started by breakpoint trap.
This commit is contained in:
ryo 2021-10-17 22:44:34 +00:00
parent be917db8d8
commit 3e14ca5b84
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/arch/aarch64/aarch64/db_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.c,v 1.40 2021/04/30 20:07:22 skrll Exp $ */
/* $NetBSD: db_machdep.c,v 1.41 2021/10/17 22:44:34 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.40 2021/04/30 20:07:22 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.41 2021/10/17 22:44:34 ryo Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@ -1145,25 +1145,26 @@ kdb_trap(int type, struct trapframe *tf)
}
#ifdef MULTIPROCESSOR
/*
* Try to take ownership of DDB.
* If we do, tell all other CPUs to enter DDB too.
*/
if ((ncpu > 1) &&
(atomic_cas_ptr(&db_onproc, NULL, ci) == NULL)) {
intr_ipi_send(NULL, IPI_DDB);
db_trigger = ci;
} else {
if (ncpu > 1) {
/*
* If multiple CPUs catch kdb_trap() that is not IPI_DDB derived
* at the same time, only the CPU that was able to get db_onproc
* first will execute db_trap.
* The CPU that could not get db_onproc will be set to type = -1
* once, and kdb_trap will be called again with the correct type
* after kdb_trap returns.
* Try to take ownership of DDB.
* If we do, tell all other CPUs to enter DDB too.
*/
type = -1;
restore_hw_watchpoints = true;
if (atomic_cas_ptr(&db_onproc, NULL, ci) == NULL) {
intr_ipi_send(NULL, IPI_DDB);
db_trigger = ci;
} else {
/*
* If multiple CPUs catch kdb_trap() that is not IPI_DDB
* derived at the same time, only the CPU that was able
* to get db_onproc first will execute db_trap.
* The CPU that could not get db_onproc will be set to
* type = -1 once, and kdb_trap will be called again
* with the correct type after kdb_trap returns.
*/
type = -1;
restore_hw_watchpoints = true;
}
}
db_readytoswitch[ci->ci_index] = tf;
#endif