From nobody Tue May 26 17:27:56 2026 X-Original-To: dev-commits-src-main@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 4gQ07x0pPvz6gBRT for ; Tue, 26 May 2026 17:27:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQ07w72wpz3GHc for ; Tue, 26 May 2026 17:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779816477; 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=vw/G58lCugXOBZkRoAJlPjswH+BWuYqRSf5yn3SipeE=; b=kWCiBkB7SzAWzr02uCK4b0cuECPHCS1VKVU94vyFkW5VLXpoCvOUbOy10AJSrWixRiCbGX a9jrMpq/7gZ726RKw+Co3LHmeezKofkl/5jC1FGTqTu/E4U2JCjur3FL4vbOsCJEB/Fx3I gypTZUpOTgu5Nnlh1qAFrSvzrG7Pr2wHn2vwqkpJ3AhByOSHfpt2WqmCpw6hRMvjMQMfXv WGm7YY5skYP3P97m2J/EDIC8XmVZ7wKsLeXA4Vj9+BsyQkV+axYWp9jgCiOmPUNEelVV4g D78nl49GX0gbsWOz4so/QMdLCTo4gXJ+9lY2QmCGJvVun7w8qYzYNt/DGSrVYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779816477; a=rsa-sha256; cv=none; b=jW6YCKZk2UBWNNCSdhzmptlzEQmfHPRqRV0LpBghlqoZqyGYRKtB26AdAe12Uybzl2jzhd mhOm2cMQhCslS0BSUzR7Q+0fdGvchG97q/RQ46Npt5DJHc7CACABGZxb7I+cgW092MsHfZ 7/4XORKOwJ6HGSMj8ewnLl1oVouPWN2Ty8CRqpCTmuVQ6kyPdIbgjbAIYXcdSOZbgLFQbr y+fb1XoKKzNxD7TK9cwdZZHPILv3hcyFUYTpfwV0O/J29unhHLHoIalahaRx8/cbpSigk/ 4XYvw9Gmjwk2pqtanDEa1RD27vIgp77UVkZupIwOwJl7l8AOKLiP2g+gj1XCLA== 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=1779816477; 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=vw/G58lCugXOBZkRoAJlPjswH+BWuYqRSf5yn3SipeE=; b=RF6XFA9nJWbf58J7elZv0MyYRO8AakD5NDDYSuAywIHoKaN3eVsoK+aIepUxfr+t5vYjoL 3mS7HdfEE8FPLYeXSoNhQfwRq2hDN1r6irQmkXiTiap95ynUUPEW1KEjMECMGvm77rx4M1 NF0KjWGjbXrmknoAQKqx/+4PC8L0Bm0hjrLmVTeoykI1Fbs/7n52YAOzM64SIc2xLqCB0M 5i8fPuGopK/R+i4wfW2YQj9suckrfIBcbY8vxW02SgQps+b/tsQpEmTjWY1fbhwi+rTi33 daFly9W5BTLkrFW3MsTJIypDjCTmACeGR0PBAgvv0aDu2HNqyssjLY8Tb/5zrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ07w5xR2z6Np for ; Tue, 26 May 2026 17:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 26 May 2026 17:27:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 00b96a777845 - main - amd64: Drop segment descriptor details from trap messsages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00b96a777845d9b558b2303cbef03ba5197b593a Auto-Submitted: auto-generated Date: Tue, 26 May 2026 17:27:56 +0000 Message-Id: <6a15d81c.3ba8b.19c785f8@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=00b96a777845d9b558b2303cbef03ba5197b593a commit 00b96a777845d9b558b2303cbef03ba5197b593a Author: John Baldwin AuthorDate: 2026-05-26 17:27:40 +0000 Commit: John Baldwin CommitDate: 2026-05-26 17:27:40 +0000 amd64: Drop segment descriptor details from trap messsages Segment descriptor contents are fixed on amd64 and not very interesting compared to the other values that are displayed. While here, include both the thread and process details of the current thread and drop redundant output of the trap number. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56989 --- sys/amd64/amd64/trap.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index fb18b7d06f9e..df9cc44bcbb2 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -944,13 +944,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) { int code; u_int type; - struct soft_segment_descriptor softseg; - struct user_segment_descriptor *gdt; code = frame->tf_err; type = frame->tf_trapno; - gdt = *PCPU_PTR(gdt); - sdtossd(&gdt[IDXSEL(frame->tf_cs)], &softseg); printf("\n%s trap %d: %s while in %s mode\n", type_str, type, type < nitems(trap_msg) ? trap_msg[type] : UNKNOWN, @@ -975,11 +971,6 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) frame->tf_rsp); printf("frame pointer = %#hx:%#lx\n", frame->tf_ss, frame->tf_rbp); - printf("code segment = base 0x%lx, limit 0x%lx, type 0x%x\n", - softseg.ssd_base, softseg.ssd_limit, softseg.ssd_type); - printf(" = DPL %d, pres %d, long %d, def32 %d, gran %d\n", - softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_long, softseg.ssd_def32, - softseg.ssd_gran); printf("processor eflags = "); if (frame->tf_rflags & PSL_T) printf("trace trap, "); @@ -990,8 +981,9 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) if (frame->tf_rflags & PSL_RF) printf("resume, "); printf("IOPL = %ld\n", (frame->tf_rflags & PSL_IOPL) >> 12); - printf("current process = %d (%s)\n", - curproc->p_pid, curthread->td_name); + printf("current thread = %d/%d (%s/%s)\n", + curproc->p_pid, curthread->td_tid, curproc->p_comm, + curthread->td_name); printf("rdi: %016lx rsi: %016lx rdx: %016lx\n", frame->tf_rdi, frame->tf_rsi, frame->tf_rdx); @@ -1003,8 +995,6 @@ trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) frame->tf_r11, frame->tf_r12); printf("r13: %016lx r14: %016lx r15: %016lx\n", frame->tf_r13, frame->tf_r14, frame->tf_r15); - - printf("trap number = %d\n", type); } static void