freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

amd64 FRED: fix dtrace fbt

Browse Source 
- jump to dtrace_invop_jump_addr on kernel #BP
- use ERETS instead of IRETQ when done

Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov committed 2026-10-29 07:48:50 +02:00
1 parent 32b9c967e0
commit cf4ff7bd36
3 files changed
+28 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sys/amd64/amd64/exception.S
+12
View File
@@ -1671,6 +1671,18 @@ fred_events_handlers:
movq %r14,TF_R14(%rsp)
movq %r15,TF_R15(%rsp)
movq %rsp, %rdi
#ifdef KDTRACE_HOOKS
movl TF_FRED_EVINFO2(%rsp),%eax
andl $TF_FRED_EVINFO2_EXCMASK,%eax
cmpl $(TF_FRED_EVINFO2_TYPE_INT3 | IDT_BP),%eax
jne 2f
cmpq $0,dtrace_invop_jump_addr
je 1f
movq $1f,dtrace_invop_calltrap_addr(%rip)
jmpq *dtrace_invop_jump_addr
1: movq %rsp,%rdi
2:
#endif
KMSAN_ENTER
call trap_fred_k
KMSAN_LEAVE
sys/amd64/amd64/genassym.c
+4
View File
@@ -194,8 +194,11 @@ ASSYM(TF_FRED_EVINFO2_VECMASK, TF_FRED_EVINFO2_VECMASK);
ASSYM(TF_FRED_EVINFO2_VEC_SYSCALL, TF_FRED_EVINFO2_VEC_SYSCALL);
ASSYM(TF_FRED_EVINFO2_SYSCALLMASK, TF_FRED_EVINFO2_TYPEMASK |
TF_FRED_EVINFO2_VECMASK | TF_FRED_EVINFO2_LM);
ASSYM(TF_FRED_EVINFO2_EXCMASK, TF_FRED_EVINFO2_TYPEMASK |
TF_FRED_EVINFO2_VECMASK);
ASSYM(TF_FRED_EVINFO2_TYPE_EXC, TF_FRED_EVINFO2_TYPE_EXC);
ASSYM(TF_FRED_EVINFO2_TYPE_SYSCALL, TF_FRED_EVINFO2_TYPE_SYSCALL);
ASSYM(TF_FRED_EVINFO2_TYPE_INT3, TF_FRED_EVINFO2_TYPE_INT3);
ASSYM(TF_FRED_EVINFO2_TYPEMASK, TF_FRED_EVINFO2_TYPEMASK);
ASSYM(TF_FRED_EVINFO2_SYSCALLVAL, TF_FRED_EVINFO2_TYPE_SYSCALL |
TF_FRED_EVINFO2_VEC_SYSCALL | TF_FRED_EVINFO2_LM);
@@ -292,6 +295,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK);
ASSYM(IDT_NP, IDT_NP);
ASSYM(IDT_GP, IDT_GP);
ASSYM(IDT_BP, IDT_BP);
ASSYM(__FreeBSD_version, __FreeBSD_version);
sys/cddl/dev/dtrace/amd64/dtrace_asm.S
+12 -6
View File
@@ -56,7 +56,13 @@
swapgs; \
1: addq $TF_RIP,%rsp;
ENTRY(dtrace_invop_start)
doret: cmpb $0,fred(%rip)
jne 1f
iretq
1: subq $8,%rsp /* fake error code, ignored by ERETS */
erets
ENTRY(dtrace_invop_start)
KMSAN_ENTER
@@ -121,7 +127,7 @@ bp_push:
movq 32(%rsp), %rax /* reload calling RSP */
movq %rbp, (%rax) /* store %rbp there */
popq %rax /* pop off temp */
iretq /* return from interrupt */
jmp doret
/*NOTREACHED*/
bp_call:
@@ -155,7 +161,7 @@ bp_call:
popq %rbx /* pop temp */
popq %rax /* pop temp */
iretq /* return from interrupt */
jmp doret
/*NOTREACHED*/
bp_leave:
@@ -175,13 +181,13 @@ bp_leave:
movq %rbp, 32(%rsp) /* store new %rsp */
movq %rax, %rbp /* set new %rbp */
popq %rax /* pop off temp */
iretq /* return from interrupt */
jmp doret
/*NOTREACHED*/
bp_nop:
/* We must emulate a "nop". */
INTR_POP
iretq
jmp doret
/*NOTREACHED*/
bp_ret:
@@ -192,7 +198,7 @@ bp_ret:
movq %rax, 8(%rsp) /* store calling RIP */
addq $8, 32(%rsp) /* adjust new %rsp */
popq %rax /* pop off temp */
iretq /* return from interrupt */
jmp doret
/*NOTREACHED*/
END(dtrace_invop_start)