From nobody Tue Jun 23 16:28:34 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 4gl9VW1xgLz6hhd0 for ; Tue, 23 Jun 2026 16:28:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VW0jRnz3NPm for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232115; 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=WDPN741aXnM1xM5iUVitjO3czOwiabP8J6oem1P38Ik=; b=NcR28cNhjgOm8HfVqdXTksmQj+2U9paiGWd38lxdWqf3WN6hv40opza1zceq4waD0zrXBR oPLJ9ceI8+2vmfWP/w6Kek8O8M5iM0kkyjAn+ztSl5tVA3yjP7AK3HvroL91fwyza/VT4H OdIaN6EzQxmjGfl8NHbbQIrgXbO7Kv6IJl+YRa/K4C7PFYNwxzZEvz4e62Io4avIjPRZap 0EF8Q2dx9KUgdodFJuVVyRo/vOW6yUz1wSXlrkfEYWJfoCxP7E6j43Kd0ISN9jNbrAIXpD d3BT7LqNc912HSFqFhOK7oD6mfZOi6NjhoBgbprfBpsUFOAljaZz0hFxbIDVjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232115; a=rsa-sha256; cv=none; b=pEzMEZAceLPr8wF50i/WnRCGImr1oa/DuI4pO1wESoxlYjgrmy7Za6mNCHuAsbmNHhNnsT dpNrc4a5x+ZYh5k7TKMniASDtKeytpE2G1uD74mwBZJ4QAb4SmIv5P9j2iF+cRq9gMYGvq yS+qMivRTeZkmCYSwNZtZU93srcKzbeZCjxQ0YkwCP6A0wmyXaRClHCiNuHM57qs4b1GrN 8iVf+FyYJ5eTCc0eYyYcZWuElZc2SLIb6VLjSucdd75OXXwi2w0zVfE5LWqCmHNvRL4pbV 9FRDlPiTpmCluZwv9ubfldp/lc7Xs8Fo+Hz6MGR1cCEqNOFCo68874NHjpspug== 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=1782232115; 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=WDPN741aXnM1xM5iUVitjO3czOwiabP8J6oem1P38Ik=; b=rjJB4/AJncTdz1LTKzD0fhNKJneA1a3QxiYFaZ14wLKMQx1FcE10dSZY36DIhswOCdRp+V p27Axz8RDhO+T+p2aVg9wx2AhPR6Jl4DdXlTXKKzi2EFvxc0wbfRqnn6M5YLrzxoNmngmd m4TR7aBpV2uU7qSiiTd2bKv545GPJP8Cevc0NHwuVRjdPHT+QLFZGVMahTHeTQgazF1kye nlFwNdXlwomXKpvqrzgIh4zE/Se9RNe8qHX9WTcPWLNubBjog/MQ4TZshzd/fBQBcVob4d iY7CAvs/S0kvzRWH56ALmh281Vs29dBzSYYW7/4amP9V4K4XmLumaOFTkmksjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VV4C5TzhJ3 for ; Tue, 23 Jun 2026 16:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a2b0b41910b8 - stable/15 - amd64: Drop segment descriptor details from trap messsages 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a2b0b41910b8bf4fbe5acf4d12be18faff29f50c Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:34 +0000 Message-Id: <6a3ab432.26b1a.601f79d@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b0b41910b8bf4fbe5acf4d12be18faff29f50c commit a2b0b41910b8bf4fbe5acf4d12be18faff29f50c Author: John Baldwin AuthorDate: 2026-05-26 17:27:40 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +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 (cherry picked from commit 00b96a777845d9b558b2303cbef03ba5197b593a) --- 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