From nobody Thu Mar 5 23:55:37 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 4fRmd60DRwz6Tstm for ; Thu, 05 Mar 2026 23:55:38 +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 4fRmd54WkLz3T4D for ; Thu, 05 Mar 2026 23:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754937; 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=HsqrDDlJy3YuZPpCgfI0e1MchUyexgHNsWfyxgHV1K4=; b=toYjSNIIjpvQtvKmXnLJr6lpeaumdZmjmXWWqg5Ds6U6CegkuK/uQ89MEl9wQsX1/UVqvS /99Dr4FX4IvVBk79VETx/I9NYNklh/kv7vHOpVrnyUXPkN2canS3b3VZzsI6N9jeJ1K8t2 OLa8cO2HL1uhnLhfvp+JgVGN3jHjudNqS6pIbPPV5i6API7j9rcTIaADtFGhvoZdZzOTKY nkPYqzey9ZQiF7lAVo7RMSdtv2InUQ7lV6m+5FaA8C1pdy6jFgG87oi6uydHCKXtPmQZIw cnD3DBRPbC+1BywVJ4U4Tg079dj9U1TQWQqJHGjJQo5CIqy+XyCNue0Zgd6n/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772754937; a=rsa-sha256; cv=none; b=L415WHTlocKvCzpm3XQwvP9kY1hqqVVUuviQz+4wMWgFJBBwjLeqpb4jr+Le6938fpFFXg +x8YSjTa3t7KyCX5AaTyrLp6Bm6AHTb1y2/W8pQwhMoAOCMEB4Ci4QUA3UxQLE0ptSbvP/ d9VGHugy4PPSRToRV1pQ8Cuodlk2NwxpYkfw8iunaSDu8gOk1PvS7kHhL7ibBPYVP7u+N7 vgRqKFZVK4/HOEmhDC6b6i2aywdcmta/Tywyd5ywRuXOs8ppXaDEpEYRtUXR/I8NHnLARj j2gqQQio2rrDgZMNHzTxKKM9xdVb6T/cVNW/OsXnUESgemuRa9jog7DXzjqybQ== 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=1772754937; 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=HsqrDDlJy3YuZPpCgfI0e1MchUyexgHNsWfyxgHV1K4=; b=WH1JcUxn2083M3poTQndwldIuooIJ8rLiz09mgeUHSd06IX9yCM9qMAhqHw6FpzaD6avyV DvQT08SqOpNGMRe4EiUdD0OWt6N9VWbMvcDw86KdFSk+lLAjaQQ+ivHcvyC0+lLH906u1g Y8aKHpBoEjJKzBEfHNCOr56IaP4mE2cTfAkHmahSmNRt52/J2Gw3kKY0vpSwMToEfUTKKT x7pfyiZMYUwwm2JKETd97nnhxAU3SyYYLnPyFc6FE7c0IOn9u+qTfCoQjbLkcY5m/mb9Q1 H55kX0lAquVRFYYgVRmx90iMY83M5qJcLc4/msy/kaI6DSkora2Ao3+ICByIpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRmd53Y2FzyQT for ; Thu, 05 Mar 2026 23:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1821b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 23:55:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 272ea4511994 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 272ea451199462dffd55dd580532eb28ddc92174 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 23:55:37 +0000 Message-Id: <69aa17f9.1821b.55252830@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=272ea451199462dffd55dd580532eb28ddc92174 commit 272ea451199462dffd55dd580532eb28ddc92174 Author: Konstantin Belousov AuthorDate: 2026-03-04 03:22:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-05 23:53:57 +0000 amd64: print userspace fsbase and gsbase for uprintf_signal --- 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)),