From nobody Wed Apr 22 00:44:21 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 4g0gTk2GCgz6b0X6 for ; Wed, 22 Apr 2026 00:44:26 +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 4g0gTk1f4yz3jNC for ; Wed, 22 Apr 2026 00:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776818666; 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=2WnsJ2tl2Rdk0XTIoJcz6/a/aMiTVpnJ4VAED0SA6lc=; b=cjUR4t1DZ9TY075Tn1+sgYmc90NOc5IILEQlJgEYvpUJqkSaAuqXfcKgbVHsAdjrzStgva 24B3MSjkvPfWLEMjXpvzud1PbC9AV6owQY9MPlBSQjS1exIfYHKO2fEiw1zJrpeVoTl3PN S3GG+sA9FGHChJMSXMZhrjPWtw2LLuoj0vcfOULRy8BSkWj/4vWrvl7JSjML3SYNoXaVOD SONIMN26DlH0anA3w3KeCSX3bvjPLgfzDFomj4u8SsP7IjTijLMySkdZOIdU3rnxKZYBig 93dNV9SsyBkrO8g6BglvQgFYwLqTbiZH+s5XkfpSs6j13HKptqTGrozw05f8jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776818666; a=rsa-sha256; cv=none; b=nsfG26tHYeePUk8Qa7eQEp45w7G7Wj6ADPj9rScPW8gP94QEM9H1aB4sylaUbvk2LfRg0W TXCDwKlzyiEjMH5/QRndAzXOQiKDXyMgPwDEHFu5hb1u+G19GvgcGXP5SF9HKwMTgcVwn0 RbJDHQUwKrg14yVHm0jW4d4wvE2YUIy6CsJucdLgAEyR/JC0HczHALACBaFRmRV0iLIAhh T8OlXAEKXPNwcBacDwvB/eO++CmbLBs2IYxig3mmr91thmexvEMbQ1XKPSXOGVguIgfGRk s2LRF7/BQ6+aqZ2eAjJlUXOO2pNmKaE8Fek8JFk9TrAlxp08+rNAcIy86o83DQ== 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=1776818666; 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=2WnsJ2tl2Rdk0XTIoJcz6/a/aMiTVpnJ4VAED0SA6lc=; b=rFLZrIr43xzzOim7wsOlNbsvTuOGQSIuVAWeStTB6z89lyeN3y6g3KJrhVtOFTuMqIAdpt LA/KD31w3ODFxIaEfJ6pSLRBfI6t/XJHjBGUj6t2czfd9ujtUT/TYbWz/Q98USeifSv4E/ jhXKBE318ckedtal5ZHWSrIVWU0hz9em1eVwmRobTowjNco/ITzbzBrATKpZ0ff3dXzGhp 4WSRm9miWM0+OmIULkvgvCBBvg27SCuUaWPpkRe5+V66NmiE14/J3Hfu8AevdUEYsC3eBx +oPf1gw+yc4kLzC7NkChOLzXZCY3CoClpU83Wz0tT3O1YXsfUnjNrwExGJ5jKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0gTk0XVkz16cg for ; Wed, 22 Apr 2026 00:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f66a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 00:44:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5c89d661a023 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5c89d661a023c83a2001cf5b354b09c7d3ac91d8 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 00:44:21 +0000 Message-Id: <69e819e5.1f66a.6cd4c91a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c89d661a023c83a2001cf5b354b09c7d3ac91d8 commit 5c89d661a023c83a2001cf5b354b09c7d3ac91d8 Author: Konstantin Belousov AuthorDate: 2026-04-21 06:13:04 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-21 22:57:24 +0000 kdump: tweaks for the extended errors decoding Format the message. Convert category to the source name if known. Still print the raw value for the category, and the values of the EXTERROR() optional arguments. Requested and reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56542 --- 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