From nobody Sat May 31 19:52:48 2025 X-Original-To: dev-commits-src-main@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 4b8rPF3Hpzz5xV5Z; Sat, 31 May 2025 19:52:49 +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 4b8rPF18Ncz3JDQ; Sat, 31 May 2025 19:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721169; 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=HWgGceWuX9Qt+zSr7K0GNOex5FyXAFWDYny3+nHvdD4=; b=N6nj8IObfhOvSI2Ld9rzqNsSIOvG5HBrVaetBTVvAak06pkEno95ESgvBipOPX31gPQquf EQlBgekGPbnNMqwPNkyg6erLNMwxyo/CsIJzCBR7wV48p3sf4henFIlOLMve2eCzfPlKau tCJGcxh5Exs+NjGv96OnGSZaQee976ZxZLGEL372d9eiwFsn7iZiNRueJjsU1FxXdMTolw aqmXTG/GX68JtYl0eoa6PmKE2jK4vzZWZZJ0/aqrwr2q4Ma9spbvcAXdiA6uWym8l1dCZA 1q+XicU8dOqprP9d5SaWXORKjd0m5rbmwqbEoOQW9owGx3m/LLGmkqUhivfMOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721169; 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=HWgGceWuX9Qt+zSr7K0GNOex5FyXAFWDYny3+nHvdD4=; b=ith6YvzuCJ+ocp8Z7aB/L7L/pIsXwgKhjCMSZN5px0otb7gucLjYJtIM8hz+jFDb56HJWI c7ctpnTu9t19Q6eK2t3jbXZ1elRhvok5uCidTNQbtLT79EDObbtP9beOhXIAeeesPyZFC0 AoIZpO3xKi7FB3busBf7faT3WQKbeicusYGF+2kfze4DON6EjB70liv8mm7CHP6EhHtAwh bCJOeSUGuG1mX1mOEKn7sv8t1D7ygePFqq/PcUJke+eYExBBuJIPmv1DkF2hL9hSIXVpqB fP5JMPVFZ+NTSJWKtPn/e9dnhdLL1ljNnIzO4dLA9HH0/VtVHlVAsoeY3TNrJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721169; a=rsa-sha256; cv=none; b=EXYSPh5oicEIIMJcqkuIrOpU+2HY1hxv6uoEa6cZ44VdMN20MQ88ADWe0UBQ2H4CGlcilF GwqVzodVeQq+Wi6w4CEcyXLAEYBdNjK0ysy/QPuzgTgaGvgHGdpp2xGjFTSokjCKk/Wupq APQk7sPcWkehEk4Zx3T9aYh9izf8nHPHeueAK36AWNQwtqoEd5BnQE0PITickalHYcKz6L cfVS7+ZVHzh95OGTkvzWsYLV0AHvCoskUh0IivCQm07jZ1VRbuEy348oi6xVSk/1uIFQxO SACLMyZlRYQqmExZKrxlVAt4dAba3626WyDfZH32nXaqLEWjY0PnOb3j4PxCjw== 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 4b8rPF0Y4nzsSL; Sat, 31 May 2025 19:52:49 +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 54VJqm3P029622; Sat, 31 May 2025 19:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqmqt029619; Sat, 31 May 2025 19:52:48 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:48 GMT Message-Id: <202505311952.54VJqmqt029619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2761de0832c1 - main - kern: add extended errors support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2761de0832c1c4342e2f8cca60c794815fda01e3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2761de0832c1c4342e2f8cca60c794815fda01e3 commit 2761de0832c1c4342e2f8cca60c794815fda01e3 Author: Konstantin Belousov AuthorDate: 2025-05-23 06:39:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 kern: add extended errors support Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/conf/options | 1 + sys/kern/kern_thread.c | 8 +++---- sys/sys/_exterr.h | 25 ++++++++++++++++++++++ sys/sys/exterr_cat.h | 18 ++++++++++++++++ sys/sys/exterrvar.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/proc.h | 3 +++ 6 files changed, 109 insertions(+), 4 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 48018e3b6adf..b5e8971dfa54 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -53,6 +53,7 @@ DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h DDB_NUMSYM opt_ddb.h EARLY_PRINTF opt_global.h +BLOW_KERNEL_WITH_EXTERR opt_global.h FULL_BUF_TRACKING opt_global.h GDB KDB opt_global.h diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4ccd6b26528e..2dff461e932a 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -86,9 +86,9 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, +_Static_assert(offsetof(struct thread, td_frame) == 0x4e8, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x6f0, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0xb8, "struct proc KBI p_flag"); @@ -106,9 +106,9 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x9c, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0xa8, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x318, +_Static_assert(offsetof(struct thread, td_frame) == 0x33c, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x35c, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x380, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0x6c, "struct proc KBI p_flag"); diff --git a/sys/sys/_exterr.h b/sys/sys/_exterr.h new file mode 100644 index 000000000000..4423d6a34bdb --- /dev/null +++ b/sys/sys/_exterr.h @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS__EXTERR_H_ +#define _SYS__EXTERR_H_ + +#include + +struct kexterr { + int error; + const char *msg; + __uint64_t p1; + __uint64_t p2; + unsigned cat; + unsigned src_line; +}; + +#endif diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h new file mode 100644 index 000000000000..d16faa9cc2e5 --- /dev/null +++ b/sys/sys/exterr_cat.h @@ -0,0 +1,18 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS_EXTERR_CAT_H_ +#define _SYS_EXTERR_CAT_H_ + +#define EXTERR_CAT_MMAP 1 +#define EXTERR_CAT_FILEDESC 2 + +#endif + diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h new file mode 100644 index 000000000000..6e392ff2c18c --- /dev/null +++ b/sys/sys/exterrvar.h @@ -0,0 +1,58 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS_EXTERRVAR_H_ +#define _SYS_EXTERRVAR_H_ + +#include +#include +#include + +struct uexterror { + uint32_t ver; + uint32_t error; + uint32_t cat; + uint32_t src_line; + uint64_t p1; + uint64_t p2; + uint64_t rsrv1[4]; + char msg[128]; +}; + +#ifdef _KERNEL + +#ifndef EXTERR_CATEGORY +#error "Specify error category before including sys/exterrvar.h" +#endif + +#ifdef BLOW_KERNEL_WITH_EXTERR +#define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = mmsg +#else +#define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = NULL +#endif + +#define SET_ERROR2(eerror, mmsg, pp1, pp2) do { \ + struct thread *_Td = curthread; \ + if ((_Td->td_pflags2 & TDP2_UEXTERR) != 0) { \ + _Td->td_pflags2 |= TDP2_EXTERR; \ + _Td->td_kexterr.error = eerror; \ + _Td->td_kexterr.cat = EXTERR_CATEGORY; \ + SET_ERROR_MSG(mmsg); \ + _Td->td_kexterr.p1 = (uintptr_t)pp1; \ + _Td->td_kexterr.p2 = (uintptr_t)pp2; \ + _Td->td_kexterr.src_line = __LINE__; \ + } \ +} while (0) +#define SET_ERROR0(eerror, mmsg) SET_ERROR2(eerror, mmsg, 0, 0) +#define SET_ERROR1(eerror, mmsg, pp1) SET_ERROR2(eerror, mmsg, pp1, 0) + +#endif /* _KERNEL */ + +#endif diff --git a/sys/sys/proc.h b/sys/sys/proc.h index fcacfec4442b..cab487719c31 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -42,6 +42,7 @@ #ifdef _KERNEL #include #endif +#include #include #ifndef _KERNEL #include @@ -322,6 +323,7 @@ struct thread { size_t td_vslock_sz; /* (k) amount of vslock-ed space */ struct kcov_info *td_kcov_info; /* (*) Kernel code coverage data */ long td_ucredref; /* (k) references on td_realucred */ + struct kexterr td_kexterr; #define td_endzero td_sigmask /* Copied during fork1(), thread_create(), or kthread_add(). */ @@ -569,6 +571,7 @@ enum { #define TDP2_COMPAT32RB 0x00000002 /* compat32 ABI for robust lists */ #define TDP2_ACCT 0x00000004 /* Doing accounting */ #define TDP2_SAN_QUIET 0x00000008 /* Disable warnings from K(A|M)SAN */ +#define TDP2_EXTERR 0x00000010 /* Kernel reported ext error */ /* * Reasons that the current thread can not be run yet.