From nobody Thu Mar 5 23:55:36 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 4fRmd9513xz6TsXS for ; Thu, 05 Mar 2026 23:55:41 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRmd9430sz3T6m for ; Thu, 05 Mar 2026 23:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754941; 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=jN6xhYYVBuCfwwYGX41jddmHAvHsmPIeFs7Q1cNe1t4=; b=K9g/Nt66aRp0XWMTJ6y6HTKR5ivsVe+AHW62a9EMCLw0jWEOIdjlTxeHupFudjBkpSqznq Rc3HbLITHFHNEgkofEc0JyKhMY3Vm0UxdhyOu00bMVrF4e6+0eT2c5IuwLkdzUUkW7cwcs tQWM52gG04A32U6Dky56IGcBlSBXDj4sm5EPcgz8R03d4ZSvURwIOX3svyP5W+5Qd06kw1 a0QrOio5yBbORAkcR7XZdxE1C9KkR1v++4IVXczrHCnfo7l2fMlHanWiG+DSQI7r3BTT9o zafY/n4I9YMyKHd2Ie9sNYFJsZ6EwmoREskOuhI1iy9WvGMHTF4rVfybdhl7Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772754941; a=rsa-sha256; cv=none; b=OAWhLead9na5wsjQ/5S2IGnnGyDCkl3mhd0uwEOt9mCBnvUDwzPukDr6d8k3GomkZZUEwn 5AFeGYonQpfcjiajh94fLLdwAK0C6FHrohTR4y3msBtQqnPzRX1IKFrjVbrkH/MAMlvbnj T6/beP5yV3HWZj0G4SdIV75piDpvTFHnPjAjkxK82nKDi/0X/ApD1vXOj4nAKOI8R+m/ui R0+PX0PD87w9eRDDjfQOs867JT7BpIS8pndS4oUeMGohoYPoLooKljepbO0u2wXFMDpQ67 ScNMW5gJZYh6dMcMrBrP+r8TwriXxiI3p1o3l2vgKE0dw8iqUeLpk8Mp1ogngg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754941; 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=jN6xhYYVBuCfwwYGX41jddmHAvHsmPIeFs7Q1cNe1t4=; b=M3e44takcmiUQSs9Yioc9aGKMv3AAaFm8AoGU3GIgTHLOYDZyxhXemyC2mr9LaWSxz92bc 635Tzn6qWTOAR8Xkde8Jr+A1qH/y0CsfjaxVR85W/HoXlF/TWf6Grv6gO6EAslW6xjdwYI MXpRzeeHNpInvb/XRnZ3JzYRMFSk19hRdjYqZ9DUqfxv/VCmnspnQnL1kIyezcQz2ch+4B v645n/sAjcNk3A9vegD3EUN715SkJKmLhvKy+5aqkRhRjJxHdBfg0YhSQYDVMUzJ6S5Y2s EyoS1gM5uQSS1CO9+UIEPxRCtIdLiBaHAP69/AKgZFgUrqMuQ8BGFwxMH4nX0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRmd93PjlzykT for ; Thu, 05 Mar 2026 23:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18217 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 23:55:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3e8a9995e954 - main - amd64: extract uprintf_signal printing into a helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: 3e8a9995e9541a0bdd707f111e51ef46a544ee3e Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 23:55:36 +0000 Message-Id: <69aa17f8.18217.2cae361d@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8a9995e9541a0bdd707f111e51ef46a544ee3e commit 3e8a9995e9541a0bdd707f111e51ef46a544ee3e Author: Konstantin Belousov AuthorDate: 2026-02-18 19:04:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-05 23:53:57 +0000 amd64: extract uprintf_signal printing into a helper --- sys/amd64/amd64/trap.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 84305ca918df..d07fbc223193 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -177,6 +177,30 @@ SYSCTL_INT(_machdep, OID_AUTO, nmi_flush_l1d_sw, CTLFLAG_RWTUN, &nmi_flush_l1d_sw, 0, "Flush L1 Data Cache on NMI exit, software bhyve L1TF mitigation assist"); +static void +trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, + int signo, int ucode) +{ + struct proc *p; + + if (!uprintf_signal) + return; + p = td->td_proc; + uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " + "addr %#lx rsp %#lx rip %#lx rax %#lx " + "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", + p->p_pid, p->p_comm, signo, frame->tf_err, ucode, frame->tf_trapno, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, + fubyte((void *)(frame->tf_rip + 0)), + fubyte((void *)(frame->tf_rip + 1)), + fubyte((void *)(frame->tf_rip + 2)), + fubyte((void *)(frame->tf_rip + 3)), + fubyte((void *)(frame->tf_rip + 4)), + fubyte((void *)(frame->tf_rip + 5)), + fubyte((void *)(frame->tf_rip + 6)), + fubyte((void *)(frame->tf_rip + 7))); +} + /* * Table of handlers for various segment load faults. */ @@ -626,21 +650,7 @@ trap(struct trapframe *frame) ksi.ksi_code = ucode; ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; - if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " - "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", - p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, - addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, - fubyte((void *)(frame->tf_rip + 0)), - fubyte((void *)(frame->tf_rip + 1)), - fubyte((void *)(frame->tf_rip + 2)), - fubyte((void *)(frame->tf_rip + 3)), - fubyte((void *)(frame->tf_rip + 4)), - fubyte((void *)(frame->tf_rip + 5)), - fubyte((void *)(frame->tf_rip + 6)), - fubyte((void *)(frame->tf_rip + 7))); - } + trap_uprintf_signal(td, frame, addr, signo, ucode); KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi);