From nobody Wed Jan 1 10:38:12 2025 X-Original-To: dev-commits-src-branches@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 4YNRBX6hN9z5jknd; Wed, 01 Jan 2025 10:38:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNRBX66qLz4h6V; Wed, 1 Jan 2025 10:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727892; 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=9SGTpZrWSqybcYLdMHYxY0R54fTpnddsKXswGeXE/Kk=; b=w30YPEFGML4H/cXu5LqIffxqOcI1BpmO4zvvxn9bxp8FFVZ3TObAc1DLxuipnVMTNx/KNA yps7h+VAzWU3mzPaKElTp3D8P+lTE/Dq/TKtL89lbNqvxOUYiPpORJgse2H8QvCY8/I6zV hmsty1biZMMzihOIDg5FHFDZDruPZv+0vrFKWqyfB3pXeGPJIGaEUVn+PxoV9SL5pNQ7JZ nQRDMc07qVK32FX1rr0Xeg61TFcYInnlUt4oYXHfqWB9gljUbtnFY/xRFAcC8hLz6ZpFJy f/CpiUfuOau/+AXhxlv5notUHugG8MEOQSBsMvNIEiVvCFtbKfarl7wiiW9x3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727892; 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=9SGTpZrWSqybcYLdMHYxY0R54fTpnddsKXswGeXE/Kk=; b=bboEpH22Gd+sZQklH90+riJo9ZgNrAdiISkCfwlBjft6e86o2KNFj7zw3hrJzcDga64hEU FFpIZEs8i7Z/YOJrRDugp39umkF5jPetFY4u5JYR8LbrnWRPItFPl4xfD2vp+6td9RygGK 1QTrQ+Kf64Y5Yo+culgxMeMVagnaD77TyaS2lsX66/VsXwAHLvTLpIXtMP8DJnTqgO43/T UXRaaPtoyLnvxOGmwmHGZay1svJ41dDH+qXjbZC1oFMF+J2EoMjaSWvSfwkJrvOTMvdWuk jEqwsLzZuBvxLWWLPl2125yv+nenvL8Ul3fWhhWbNZaXzR5GhlhDwHKrhlGp7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735727892; a=rsa-sha256; cv=none; b=giV80NGA4SDGyH+DL6Iiy74nfkf2nvZCfKDcMdXP3mDRp61OOuuOXoOxdeqVshCWddwIcH L08xloK8RR9nkZiBb+qDxVbYyXjWV2q/NB5FMvQbWYVw3Kmegrh1JOaAINc2aCoE1R0T4V 3NDLGf3GFUysM9bL72KbATbPqcf5ACsk1FYCUaXZK7CAfOw12fZID23kRQpg5C3XOfpFqR nntqzqJkpIyO1Wt94d03+sgTlSjZNfHUaMWes/ykCWEfd7MTj+Ro9qg+pAYh4AlfxfXHbj Ug9WWgX0RCL6pN9XGe/AYTVtRMKZO0fliIHU0uv2nO1sTJjKzh5WFwgakcg5bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YNRBX5BmMzLPr; Wed, 1 Jan 2025 10:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 501AcCC0078757; Wed, 1 Jan 2025 10:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501AcCYD078754; Wed, 1 Jan 2025 10:38:12 GMT (envelope-from git) Date: Wed, 1 Jan 2025 10:38:12 GMT Message-Id: <202501011038.501AcCYD078754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8094b35e5769 - stable/14 - amd64: extract code to print fault details from trap_fatal() into a new helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 8094b35e5769e6f8848ce4fd929f898cacc81bc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8094b35e5769e6f8848ce4fd929f898cacc81bc6 commit 8094b35e5769e6f8848ce4fd929f898cacc81bc6 Author: Konstantin Belousov AuthorDate: 2024-12-24 16:39:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-01 10:30:19 +0000 amd64: extract code to print fault details from trap_fatal() into a new helper (cherry picked from commit 5e3ab1894e1ef0520925038f8d4e4a451e841345) --- sys/amd64/amd64/trap.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d7e365f6874e..396c2abd3f1f 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -109,6 +109,7 @@ void trap_check(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); static int trap_pfault(struct trapframe *, bool, int *, int *); +static void trap_diag(struct trapframe *, vm_offset_t); static void trap_fatal(struct trapframe *, vm_offset_t); #ifdef KDTRACE_HOOKS static bool trap_user_dtrace(struct trapframe *, @@ -152,6 +153,13 @@ static const char *const trap_msg[] = { [T_DTRACE_RET] = "DTrace pid return trap", }; +static const char * +traptype_to_msg(u_int type) +{ + return (type < nitems(trap_msg) ? trap_msg[type] : + "unknown/reserved trap"); +} + static int uprintf_signal; SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN, &uprintf_signal, 0, @@ -883,15 +891,12 @@ after_vmfault: } static void -trap_fatal(struct trapframe *frame, vm_offset_t eva) +trap_diag(struct trapframe *frame, vm_offset_t eva) { int code, ss; u_int type; struct soft_segment_descriptor softseg; struct user_segment_descriptor *gdt; -#ifdef KDB - bool handled; -#endif code = frame->tf_err; type = frame->tf_trapno; @@ -951,8 +956,20 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) 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 +trap_fatal(struct trapframe *frame, vm_offset_t eva) +{ + u_int type; + + type = frame->tf_trapno; + trap_diag(frame, eva); #ifdef KDB if (debugger_on_trap) { + bool handled; + kdb_why = KDB_WHY_TRAP; handled = kdb_trap(type, 0, frame); kdb_why = KDB_WHY_UNSET; @@ -960,9 +977,7 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) return; } #endif - printf("trap number = %d\n", type); - panic("%s", type < nitems(trap_msg) ? trap_msg[type] : - "unknown/reserved trap"); + panic("%s", traptype_to_msg(type)); } #ifdef KDTRACE_HOOKS