From nobody Thu Oct 29 05:50:01 2026 X-Original-To: dev-commits-src-all@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 4jFYGd4wmZz6xqPF for ; Thu, 29 Oct 2026 05:50:01 +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 4jFYGd2FWcz4pmj for ; Thu, 29 Oct 2026 05:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253001; 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=g6CUPXpkSaWmBUnRK7J3mVlB7/46EgzxUyWcFL1cn8Y=; b=VztiHpOB7BuMpyVTFeBiZjSsRl+O2Eqy4CM08KimDXlr0h5/ev/HS5p+AQ059oN0bHGbqd jpZYiBLgqRzWEqQTLhyGlMykUMm+amVnBBiUvpzSAoQqDbmsZ6YssbLfPnIUXAq6IS66NO 12dexiHmaN6rdpNBogLmHasWHT9SG7xUwCwEKWrseRpZtbu93R25aN/GRs3l8SwnFBdLhy yUY+/7IGb55hq8ZaF/lw8rBiXKkWs6BzkQHtemRJiQISv6bkbtSg50FYtJtuMhYbZ/0aIo s2Dab2kXUcr+SW5Zu/TwCTQGhinnHVc89IxnKBu9C/8voWzO/2AyAhKv8ReBTA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793253001; b=n2StiZ+76xzlF9FEIQ1z2cgO3aDuzlbGZZ0Ym0oNJCh3dNOElplOxmQbz1Jd1mKCPkcOpW hG35LpRAvLCq8KAApwIKdObz1WgQoNxWAt/Oqbuf39JusL5BgFtpJFTVo7wzVw8i5SKV9X oMlIC3jgxUEdEVxGUBZhlJH6PUTsLZrek8C69Kzptt/+htFKtZhrdAQvimHqeIZKkOvssW OwqczDI6AZKjWoUcLvNHeylmfg/g1tFfvMjgj3K1L5yOVIkiTVuW84v2hGHmoZK3UNDa7J Cu4lJqqQb2MX9s4Ao32PPlWPhWUO1VzBEEEkT7JTkQ8cdCReUMccdjCGqzXi2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253001; 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=g6CUPXpkSaWmBUnRK7J3mVlB7/46EgzxUyWcFL1cn8Y=; b=wJM6fow9OPJcEMLSY5QA6WeqJ4nP8E6ZxKARDApEFV7uFV/BKX+nBRdTWC3FAMHPYZhmcM H9HibDS7qzuI55am3TUbN2cIUIPCQazDh8vCxmAuu7SHxoiJEIdhtM0XTWew81KOU8Io/y 1XcDmgCKGkyXiHGPuAdhPw9Pb9Y4AK46w2LGmO48SZBul6nCWS5MO9PrPhbscJEvkjmv07 e1zQKaDX5/+pcM2lrjaG6mOrY9SrmkpvhqFUoOlYTxxEx+WbymbxFpOupq8rjYQhkXyno7 m7dyYIVC3wudBeaoCcvvcxUO2Xz4dYuGzAt/KGet9/cD8+FRivYdxN2RW18UiA== 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 4jFYGd1vcJzPrj for ; Thu, 29 Oct 2026 05:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38978 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 05:50:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cf4ff7bd369e - main - amd64 FRED: fix dtrace fbt List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/main X-Git-Reftype: branch X-Git-Commit: cf4ff7bd369e42fb0a1c6f5cf2dc4fa7a990158e Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 05:50:01 +0000 Message-Id: <6ae2de89.38978.61bf00a0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf4ff7bd369e42fb0a1c6f5cf2dc4fa7a990158e commit cf4ff7bd369e42fb0a1c6f5cf2dc4fa7a990158e Author: Konstantin Belousov AuthorDate: 2026-10-29 03:34:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-29 05:48:50 +0000 amd64 FRED: fix dtrace fbt - 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 --- 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 b9fc09d7f26f..ba997dd0ab84 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 e9ab1e23c81f..d0331e3bdfd9 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -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); 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)