Date: Thu, 11 May 2023 17:55:58 GMT From: Chuck Silvers <chs@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 90951695207f - main - fbt/x86: update FBT_AFRAMES to match the trap handlers Message-ID: <202305111755.34BHtwo7004731@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=90951695207fb974ddc3493049812d5bf2131468 commit 90951695207fb974ddc3493049812d5bf2131468 Author: Chuck Silvers <chs@FreeBSD.org> AuthorDate: 2023-05-11 01:22:15 +0000 Commit: Chuck Silvers <chs@FreeBSD.org> CommitDate: 2023-05-11 17:50:15 +0000 fbt/x86: update FBT_AFRAMES to match the trap handlers Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D40054 --- sys/cddl/dev/fbt/x86/fbt_isa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index 8c536335791c..e2f98fa47005 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -57,6 +57,8 @@ #define FBT_PATCHVAL 0xf0 #endif +#define FBT_AFRAMES 2 + int 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->fbtp_name = name; 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_ctl = lf; fbt->fbtp_loadcnt = lf->loadcnt; @@ -328,7 +330,7 @@ again: if (retfbt == NULL) { fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, - name, FBT_RETURN, 3, fbt); + name, FBT_RETURN, FBT_AFRAMES, fbt); } else { retfbt->fbtp_probenext = fbt; fbt->fbtp_id = retfbt->fbtp_id;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305111755.34BHtwo7004731>