From nobody Thu Apr 23 17:09:35 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 4g1jHz4b3hz6b7p6 for ; Thu, 23 Apr 2026 17:09: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1jHz2jh2z3F0J for ; Thu, 23 Apr 2026 17:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776964175; 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=FawUqTqW0GHjn1/RC/9R7pcQ1Pbn3H6o564kkrRN9eo=; b=RjUZzuFopDShS/lBgL0rvMpOiSpXevx8IVCr7xVQAnXd8dj4QOZk3Lf0o3wdCvNzaEichO YwCddVHAIYJXpJYu4bkVi35VCNdS+ny8FezuwrKr08w8xQFTV0F8ms/FsprJiPOOVW7JNW Fsl4SU4fyTCsdRCKszS/wdH23kUdPQdNG5/EVDuPhNmpc8EydnJWid6+Ji186wWH6l6zQI SDCNnmNFN0KDXyQDUyFn3K2hOzE2/l204CHDjGnH2bVn/5Lhh+hDML+v4SLI40Kx7IEtnC umAMcDfSQ2yIhNx8wrVNJOniWwtAUX8yWaElV7YTYR2LDVoK+LxiXzO9WC3n6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776964175; a=rsa-sha256; cv=none; b=rdvkFmlf4+CEhaRAFPJiB0UDMsVbcZKonctZ3adMc0Obx3pnHLlRK2XzCrwdA9MFKR17cM xMxcYsT8m2cgWn1n2mDA1bcutDt3cXc3wL/BBPCOjsxsVw3DQAen/aml4qs8oGiNdNXQZ3 tGuia4KfW8BGfWAyMwiCOfo8K374HvyGjPww5m+FlVHThb1U4t+RRE6LC9dXVrDlYC2mEE 5r7ijcfyV7XYof56kYl1iDj39OLVbynopFYgPOaEArxICMAvWz3WaPPQ/m/rHOxdyyEk52 cwHQMys3X9wog1OnWitZHp0RfS8RuJCFEtXK442lhDapjWhypIa7+9EsqbuKNA== 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=1776964175; 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=FawUqTqW0GHjn1/RC/9R7pcQ1Pbn3H6o564kkrRN9eo=; b=mMIxxjxQ9S+wgLfPbuuqT9F20teKs3CN3Kx/+nqLqmHNDguuJ24EwuPZpKfViruAULbRrb 2BZFJ9OwnAjbEawPtYZEhg2nMbhiNJbOXQytpJkVAWXUpLrWIErq7uAMXWDyhb5yllu1RP nlscEf+MtvJq7UfD5dwg3RK+IyMm0AqjrTGvluu7bMd42XEb0v6sfY284ogGabVLLR2XZo pno8azX5JPAiLKCi9dVcn3j1uqTxdA6G057iO2jWgwEmONM0/9B4MuxUKY44qmK6x/x4xE m+b8Jb0BW1iknlLWKWKf8UkxoZvD2rEDTSoj4rpDzAYfOtKLo139gsshrSpkrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1jHz24hQz9bC for ; Thu, 23 Apr 2026 17:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 17:09:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f3ca689d176f - stable/15 - kdump: tweaks for the extended errors decoding 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f3ca689d176f6653ddccd22674b9b19755dcc55d Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 17:09:35 +0000 Message-Id: <69ea524f.3e0f3.6b7af7ea@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ca689d176f6653ddccd22674b9b19755dcc55d commit f3ca689d176f6653ddccd22674b9b19755dcc55d Author: Konstantin Belousov AuthorDate: 2026-04-21 06:13:04 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-23 17:09:06 +0000 kdump: tweaks for the extended errors decoding (cherry picked from commit 5c89d661a023c83a2001cf5b354b09c7d3ac91d8) --- usr.bin/kdump/Makefile | 1 + usr.bin/kdump/kdump.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 2c5c456a6de5..cef87f665b46 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -5,6 +5,7 @@ PROG= kdump SRCS= kdump.c subr.c CFLAGS+= -I${SRCTOP}/usr.bin/ktrace +CFLAGS+= -I${SRCTOP}/lib/libc/gen LIBADD= sysdecode .if ${MK_CASPER} != "no" diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index d3f2ac882e61..9ebd18646474 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -2442,15 +2443,31 @@ bad_size: return; } +static const char * const cat_to_filenames[] = { +#include +}; + +static const char * +cat_to_filename(int category) +{ + if (category < 0 || (unsigned)category >= nitems(cat_to_filenames) || + cat_to_filenames[category] == NULL) + return ("unknown"); + return (cat_to_filenames[category]); +} + static void ktrexterr(struct ktr_exterr *ke) { + char *msg; struct uexterror *ue; ue = &ke->ue; - printf("{ errno %d category %u (src line %u) p1 %#jx p2 %#jx %s }\n", - ue->error, ue->cat, ue->src_line, - (uintmax_t)ue->p1, (uintmax_t)ue->p2, ue->msg); + asprintf(&msg, ue->msg, (uintmax_t)ue->p1, (uintmax_t)ue->p2); + printf("{ errno %d %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); + free(msg); } static void