Re: git: 9a10af53dbf5 - main - Revert "kldload: Improve error handling"

On Tue, Jun 16, 2026 at 03:07:05PM +0000, Ed Maste wrote:
> The branch main has been updated by emaste:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=9a10af53dbf5b1268d6b74e94f2f8054caab9243
> 
> commit 9a10af53dbf5b1268d6b74e94f2f8054caab9243
> Author:     Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2026-06-16 15:06:17 +0000
> Commit:     Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2026-06-16 15:06:30 +0000
> 
>     Revert "kldload: Improve error handling"
>     
>     It broke the test suite, and will be recommitted when fixed.
>     This reverts commit db887713de2bf5c77494220a9e0ddfa7d4290155.
>     
>     Reported by:    markj
> ---
>  lib/libc/gen/exterr_cat_filenames.h |  1 -
>  sbin/kldload/kldload.c              | 17 ++++----
>  sys/kern/kern_linker.c              | 83 +++++++++++++------------------------
>  sys/sys/exterr_cat.h                |  1 -
>  4 files changed, 37 insertions(+), 65 deletions(-)
> 
> diff --git a/lib/libc/gen/exterr_cat_filenames.h b/lib/libc/gen/exterr_cat_filenames.h
> index 90e231879ccd..be65c1990af5 100644
> --- a/lib/libc/gen/exterr_cat_filenames.h
> +++ b/lib/libc/gen/exterr_cat_filenames.h
> @@ -12,7 +12,6 @@
>  	[EXTERR_CAT_FILEDESC] = "kern/kern_descrip.c",
>  	[EXTERR_CAT_PROCEXIT] = "kern/kern_exit.c",
>  	[EXTERR_CAT_FORK] = "kern/kern_fork.c",
> -	[EXTERR_CAT_LINKER] = "kern/kern_linker.c",
This part ...

>  	[EXTERR_CAT_GENIO] = "kern/sys_generic.c",
>  	[EXTERR_CAT_VFSBIO] = "kern/vfs_bio.c",
>  	[EXTERR_CAT_INOTIFY] = "kern/vfs_inotify.c",

> diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h
> index 1c3f894e8aff..edc23d7dfbe6 100644
> --- a/sys/sys/exterr_cat.h
> +++ b/sys/sys/exterr_cat.h
> @@ -41,7 +41,6 @@
>  #define	EXTERR_CAT_PROCEXIT	16
>  #define	EXTERR_CAT_VMM		17
>  #define	EXTERR_CAT_HWPMC_IBS	18
> -#define	EXTERR_CAT_LINKER	19
>  
>  #endif
>  
.. and this, together with the define in kern_linker.c,

should not been removed.  The category indexes are kind of ABI contract
between libc and kernel, since libc hard-codes the translation of indexes
into the source file names.  When reverted, the index appears unused and
could be consumed by something else, which introduces (minor) breakage
for old libc.