fbt/x86: update FBT_AFRAMES to match the trap handlers

Reviewed by:	markj
Sponsored by:	Netflix
Differential Revision:	https://reviews.freebsd.org/D40054
This commit is contained in:
Chuck Silvers 2023-05-10 18:22:15 -07:00
parent 718bdb6a71
commit 9095169520

View File

@ -57,6 +57,8 @@
#define FBT_PATCHVAL 0xf0 #define FBT_PATCHVAL 0xf0
#endif #endif
#define FBT_AFRAMES 2
int int
fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused)
{ {
@ -234,7 +236,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO); fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO);
fbt->fbtp_name = name; fbt->fbtp_name = name;
fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
name, FBT_ENTRY, 3, fbt); name, FBT_ENTRY, FBT_AFRAMES, fbt);
fbt->fbtp_patchpoint = instr; fbt->fbtp_patchpoint = instr;
fbt->fbtp_ctl = lf; fbt->fbtp_ctl = lf;
fbt->fbtp_loadcnt = lf->loadcnt; fbt->fbtp_loadcnt = lf->loadcnt;
@ -328,7 +330,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
if (retfbt == NULL) { if (retfbt == NULL) {
fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
name, FBT_RETURN, 3, fbt); name, FBT_RETURN, FBT_AFRAMES, fbt);
} else { } else {
retfbt->fbtp_probenext = fbt; retfbt->fbtp_probenext = fbt;
fbt->fbtp_id = retfbt->fbtp_id; fbt->fbtp_id = retfbt->fbtp_id;