From nobody Tue Mar 10 11:43:33 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 4fVX860R3Rz6VVxq for ; Tue, 10 Mar 2026 11:43:34 +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 4fVX854mBmz49fY for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143013; 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=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=GvGNlwJcSf+HAzyEkhjxCL1sjxEgkpF+dkpIVyMDciUlqRy3kZLUeiDZVv9L6W7qM0fKwg HvqCJUeC2oA2XWVbU/rgxEoPckRzfIszx8ALNhbAXR0QJH4UW+Wx/N8w6oamWDuXA+haIO SCJ4AX4yt9udI0yHa9iXmGd6wwY72g1Li5ojgaTGHijsTAsao1yiau1WPiBKPkKxrFd9i/ F79rwh0ZQphvqfhSQChCYbz+s+8S6WoJotQG3ipUMhmgP8JsEVP+i+pUJIni1l2At/7y6t xgge9NmHHU4NDhcbNp0iBfRLJDXm6NTtnNry4E92sQHPtIBLkelfzByRYZBR2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143013; a=rsa-sha256; cv=none; b=HEP8vhvwmnhlmLizo9kbmNOIgjYO1ndB3dYhzKEMr3Re35nJpsV3nTdqPHcBEcrTeut7Xf Deag/vLtUwV7pTxdcxA1YpbmbosuvBmuoJKjOjDkufFuaBrO17BqooCcREfIrfenmHurth mSuiV5lgTjidFu3qa1CvYw/do50Y5ZScOPZuzCxfyndNqJtvqaaVLQwVDuUYKUMX71a2YS rn9VwuK+DIxSCFFvuIm9fbZ6/z9HHU7Kg2AGd4KF0qmjnn/kgRCy2/aJJvg5IkJptU16wE ofOP3j7508qonLQv+z7MGBmrdX21bqMlYfeBEbwe1wxKJqWzr+VY33WHu1PbQw== 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=1773143013; 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=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=C79xSnGEIKA+H1U/RKOOOhGwvTzsbeEdI+pNP1ly5exSSsnbgXFBlig2X3rQj/wO83hJNc VarFQjR78Ev8iTWXiOEUZ1KjQOg8NOLx8BMKAUfgW8Bm62EEgU+8lcKtc5P9bgH/Hc1GlH qH6qpa9nQqha5r1MH12LtTmFHWwiykdQBE4zx1nYBIOrZ60PKSkJgubUmofS/YqrWecEiK nH4w5Qp03BPt8k2hrQgXuTX8+UHVzywVlQNztHQ0cQPCcK+SxJRdK4R0VH+29qZlemBkoi EMhkadsDZ1IStB+UjZ9vfdWSXiE3K6W817EnvLUKiq8XUnpkqtsFrl210H5yGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX854HZCz18vB for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5061709d8f7c - stable/15 - amd64: print userspace fsbase and gsbase for uprintf_signal 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5061709d8f7c42a873e09721509d24aba1316fe2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:33 +0000 Message-Id: <69b003e5.1df33.d00bdc5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5061709d8f7c42a873e09721509d24aba1316fe2 commit 5061709d8f7c42a873e09721509d24aba1316fe2 Author: Konstantin Belousov AuthorDate: 2026-03-04 03:22:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: print userspace fsbase and gsbase for uprintf_signal (cherry picked from commit 272ea451199462dffd55dd580532eb28ddc92174) --- sys/amd64/amd64/trap.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d07fbc223193..d173f57e2e4f 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -182,15 +182,32 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, int signo, int ucode) { struct proc *p; + struct pcb *pcb; + register_t fsbase, gsbase, r; if (!uprintf_signal) return; p = td->td_proc; + pcb = td->td_pcb; + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) { + r = intr_disable(); + if ((pcb->pcb_flags & PCB_FULL_IRET) == 0) { + fsbase = rdfsbase(); + gsbase = rdmsr(MSR_KGSBASE); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } + intr_restore(r); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " + "addr %#lx rsp %#lx rip %#lx rax %#lx fsb %#lx gsb %#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, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, fsbase, gsbase, fubyte((void *)(frame->tf_rip + 0)), fubyte((void *)(frame->tf_rip + 1)), fubyte((void *)(frame->tf_rip + 2)),