d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: print trap name in addition of trap number

Browse Source 
for the "trap with interrupts disabled" warning.

Reviewed by:	jhb
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D36302
This commit is contained in:
Konstantin Belousov 2022-08-21 04:46:13 +03:00
parent 0f906b30e6
commit 01a33b2af5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/trap.c
View File

@ -277,8 +277,10 @@ trap(struct trapframe *frame)
*/
if (TRAPF_USERMODE(frame)) {
uprintf(
"pid %ld (%s): trap %d with interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type);
"pid %ld (%s): trap %d (%s) "
"with interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type,
trap_msg[type]);
} else {
switch (type) {
case T_NMI:

6
sys/i386/i386/trap.c
View File

@ -283,8 +283,10 @@ trap(struct trapframe *frame)
*/
if ((frame->tf_eflags & PSL_I) == 0 && TRAPF_USERMODE(frame) &&
(curpcb->pcb_flags & PCB_VM86CALL) == 0)
uprintf("pid %ld (%s): trap %d with interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type);
uprintf("pid %ld (%s): usermode trap %d (%s) with "
"interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type,
trap_data[type].msg);
/*
* Conditionally reenable interrupts. If we hold a spin lock,