From nobody Tue Nov 03 09:02:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jJjJK4Yxzz6yPsW for ; Tue, 03 Nov 2026 09:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjJK3bzrz4KjW for ; Tue, 03 Nov 2026 09:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOx9y0RkJiZ9xZ61fVM78qzVl30XWa+r0oRILI8ePH0=; b=S7QWCga9jCY6Z5O64jHWC8Mw1aGDCMjmKS7s5j7NThWsPUbN0AaV1ijdxW7qOCHOpy5nlr 5RKky4gDUZyGqWHdg0DVHcJJwaU9zJ8uiApnp9FktUCUKrJHx2ZvBOOhGbZIySw4cbkGIp qsf01QTyt8A+opNNecy7zyR0hi1+6+EmCwuZrus+BNckUXl6y2X/mGKYbXsYZ9aD5YeWng 0lsCvpg9JUp0cSIaGyfvU0VQYHZV5l500IlY3NUhdsq1zuAGaGAB0pG0QWofjo9tuNt7Nt eueYTdBEswcnx5ymXvCY1V1Lg5q9RpmCQeH1r6YCC6ZB+LQSWBfMG4gFpo9Ktg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696545; b=RWcVfQhIV8h+UFqmgUcwQzCRLqu39NVOaCukwqH99D2zJ5jCthzuUDNlzzxq8SZQcokF4K 45j9fYBAq/30Pttl9KwQIepKIKfMKV10lcf58oH2gGyfzhOJpyyCNxRFuueW/wUtRL+EDu YvgyMUYWphfitoob0XXSaeo/xTa1aUBaLpKHJOTAyTUn4DmLn/Aca6U70ggzx3h+Cib3q3 wWqBQMir6vI/wrHB20IskALERqDXeQmCVXLZowdkdrAU/1cGPcwMzgHjhlISBuOS+Bgdnd ZMMbMe1VjNQfchxgHBDL3BmnP4ssklLGdwJAfQSXUYI3SA4Mwca5ozBqJeSgkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOx9y0RkJiZ9xZ61fVM78qzVl30XWa+r0oRILI8ePH0=; b=sDdKq0gPbOtjP65kNeV3cfzZyhmToZxNHcEozoA89ceGqmXKA7RZ4h5qiy/f/wVK5S4x5s ymHXp5tq2WPF9T/LWYswBZu2BO8C4KUNz1Fir2ld74SqAWGyRks8rDU110ol8mzKKt4Gv7 SUBNDostA2wLlhpO7LjvJi7Ez6FgOKyQvMFyqteFvsu3PkhRJcjTrjeymOLWL5YyP5W/UB rd4ZURQPIFJXfK6g31OPY5D5DGfrd5fZc/mm82Vd0Mv3502fP20N6gux66L6Y9w9fq0h+K 2l75k0eltcCoDyzOVwKrXuc62n6JFD3sd5zghI78i5KkWirXRBf/ar4hdCkpyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJjJK2kmrz1NjZ for ; Tue, 03 Nov 2026 09:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 446ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4604502157b3 - stable/15 - amd64 FRED: fix dtrace fbt List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4604502157b3e60ff5e8e9d549e2f27a0a9b6194 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:25 +0000 Message-Id: <6ae9a321.446ac.6951ca56@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4604502157b3e60ff5e8e9d549e2f27a0a9b6194 commit 4604502157b3e60ff5e8e9d549e2f27a0a9b6194 Author: Konstantin Belousov AuthorDate: 2026-10-29 03:34:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:19 +0000 amd64 FRED: fix dtrace fbt (cherry picked from commit cf4ff7bd369e42fb0a1c6f5cf2dc4fa7a990158e) --- sys/amd64/amd64/exception.S | 12 ++++++++++++ sys/amd64/amd64/genassym.c | 4 ++++ sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 18 ++++++++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index e7e91cded2fc..d81d942b4b22 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -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 diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index affcf38576ac..96421a90a102 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -192,8 +192,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); @@ -290,6 +293,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); diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S index 217d8c2936eb..3e78d004024f 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -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)