From nobody Mon Aug 3 21:44:08 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 4hDVYj2yJLz6n553 for ; Mon, 03 Aug 2026 21:44:09 +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 4hDVYh6vhgz3FWB for ; Mon, 03 Aug 2026 21:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785793449; 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=evzdV/BB6/y4+mpFCijhCLa9XSECg/iwqe+GP9ikT0M=; b=QLKefXRRkNyuKk9QTlV+cdc0rBD2RlRNcnDRWHJyJc+spSg0BfA/eruoytMZzwYihzMI26 tQHP3z75vKNVlNKt4JvBL4/4YjTeESXY0LHSh6+5Z9zo//XlqA3RKUkkZOZi5uhwIL/eMO K+FjniofBqoxmzoYI3nOaVxrdok+b/XP9e+0rvEwPxaV7j+iR7dAgyTIw+HhtRUJsUnN/9 3RKO3sZ/pmDsOT9uWua25/blFdnmMK6kQEdTuKmo4uCbVEtRSBXVlSl0hKNdANYQiKEtU9 f5o8bWmS4p3+i8e8Fc92oSvQAa5+U+MOidQi6KGOjAvcDtB494Gp2Ox/oXbP3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785793449; a=rsa-sha256; cv=none; b=RS7HMU8CkKYDI24tDCm9Qwee0HEDHnRT3d4gHuieZ95TBauazeJm4semzQJZsNVxcZFyX6 T7oJNVDo6LTfF9Wp+nB+pfqNGeNi0CDsX4Y3ELG8qPyf/PiI+SMlTMwM+HEHi4NceGtb41 zturhCSLyFRGKZNCAtyLzp5ZRtif/9aV+/gXfNyufmM0871CVQQiD+iplXSRNVAIeGYGaY ur7kKtuUrUb/HEvxxAl5U1MtwGdfCRXmex4yBFM0bPTWx+VY8llwws1u+T0AzxgDRw7BqI /gwjmQ52mhhQtISqhTDCcQG7DGBkMgATxyKHD1rUCdk+gLDgyWX5W1+SrbC+KA== 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=1785793449; 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=evzdV/BB6/y4+mpFCijhCLa9XSECg/iwqe+GP9ikT0M=; b=rwCBZBU4Z9r+mezZvV0V3m4A0ZUA6Z31wy5v6VpClFe62Z1YUwFa61wdUpnvESWUOYMDXi m/p0V0Pkjq9VZ+MjIKLmZG6tbSzARFnOrN4DKnhOTwFquFKSMFh8FhF4zqqCHA6nlGJCNY 0iTFKrim2s+os6yv09E2bxYBqAj1Y7bP/crDxhLvGYqCNv7RqEhJxW4qs4fPDGwmwXerQ8 gJKravQe2gIBR+/p1RGJnRn8rFi79W2FM2r2kw1mBteGciiB2UwXyuL5RiuIwzQoa49BUY ADQVVTV/2g+ediiKI/ES5hv3lhILUctscg7YB0SOr5oMXQvo28n7InGiUvND3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDVYh4vbhz3h6 for ; Mon, 03 Aug 2026 21:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cbc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 21:44:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7516130eb912 - main - kdump(1): minimally adapt to exterror category sources 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7516130eb91264b2faf0c532b29a8e27c2ddd098 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 21:44:08 +0000 Message-Id: <6a710ba8.3cbc4.64db1ad9@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7516130eb91264b2faf0c532b29a8e27c2ddd098 commit 7516130eb91264b2faf0c532b29a8e27c2ddd098 Author: Brooks Davis AuthorDate: 2026-08-03 16:51:19 +0000 Commit: Brooks Davis CommitDate: 2026-08-03 21:43:23 +0000 kdump(1): minimally adapt to exterror category sources Add some minimal handling of category sources other than static kernel sources. We don't actually look up dynamic sources yet (that would require extended trace records to add the file names to the trace file since we can't assume the trace file is running on a kernel with the same numbers.) Make the decision to append a "src/" prefix to each file name dependent on the category source. Reviewed by: kib Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D58412 --- usr.bin/kdump/kdump.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 398478c2d86c..d7352b28768c 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2447,13 +2447,32 @@ static const char * const cat_to_filenames[] = { #include }; +static const char * +cat_to_file_prefix(int category) +{ + switch (EXTERR_CAT_SRC(category)) { + case EXTERR_CAT_SRC_KERN_STATIC: + return ("sys/"); + default: + return (""); + } +} + static const char * cat_to_filename(int category) { - if (category < 0 || (unsigned)category >= nitems(cat_to_filenames) || - cat_to_filenames[category] == NULL) + switch (EXTERR_CAT_SRC(category)) { + case EXTERR_CAT_SRC_KERN_STATIC: + if (category < 0 || + (unsigned)category >= nitems(cat_to_filenames) || + cat_to_filenames[category] == NULL) + return ("unknown"); + return (cat_to_filenames[category]); + case EXTERR_CAT_SRC_KERN_DYNAMIC: + return ("kern:dynamic"); + default: return ("unknown"); - return (cat_to_filenames[category]); + } } static void @@ -2464,9 +2483,10 @@ ktrexterr(struct ktr_exterr *ke) ue = &ke->ue; asprintf(&msg, ue->msg, (uintmax_t)ue->p1, (uintmax_t)ue->p2); - printf("{ errno %d sys/%s:%u \"%s\" (category %u p1 %#jx p2 %#jx) }\n", - ue->error, cat_to_filename(ue->cat), ue->src_line, msg, - ue->cat, (uintmax_t)ue->p1, (uintmax_t)ue->p2); + printf("{ errno %d %s%s:%u \"%s\" (category %u p1 %#jx p2 %#jx) }\n", + ue->error, cat_to_file_prefix(ue->cat), cat_to_filename(ue->cat), + ue->src_line, msg, ue->cat, + (uintmax_t)ue->p1, (uintmax_t)ue->p2); free(msg); }