From nobody Wed Jun 4 18:09:30 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 4bCFwC10HVz5xQCj; Wed, 04 Jun 2025 18:09:31 +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 4bCFwB6zCCz3hrD; Wed, 04 Jun 2025 18:09:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749060571; 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=0YDetj5ofBWnG3013SGeUykWBqaUrMzEjH5rT/kY93s=; b=j806HR9PV0RSFPHQefyKmRmrUP/btaF44EosKEKUizjjRBDXBMPHy7LfwH5F5CHoeltzXN iSeET1c+zDHhTkmNRfhqJpfNAlBMSft32Puz8xIFJFQWIP+7iS/YbFzSKYbTw2gOWf2Woi 2W9JclySZZu7SfSGBcopGcEfL4Kp+5Rlidx3pkQEtwEl1kyUmeP1xZNrUFGpMXjtn4+OVM lG7pjEkgiSszipza/kXr+JqqJYBk3oiMouE8brxsXEj0Bv49KEs4VQWY294CQdA4r78EZF J2IT/UDHlTyJbQFPSxRYD9Imay7Snwb2mo0TYsj7cDyMVymKwlhy6LC7qYA+aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749060571; 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=0YDetj5ofBWnG3013SGeUykWBqaUrMzEjH5rT/kY93s=; b=U/ib7NY7NSw9gwnQ1wPnrqmsLT+6xt9WMub0o04IrPHD7bIOTeAw7pzBkrf/SY0ajVfQhV CXMHhjWleHwOkKcjFSARToVvLzlkodDWK0JWamDtk2BlSikXyBDwyBHr1ubsNXeiNszI9p y2PMqA4WjVj7xknLKSlvCIb2Zmoi6FX9SU2xVGmYpGlT5DVWo8iNOzt6VS6G7mLeKCXKtZ MirJjODSL7qre8mMmhJbsfEhrQ9MTDdYK/MwBj0Dj/dqebsnm8aK5WqqExcjIyoqGyxQXw p3h7ESEk7VAe1TCimIeEV5sO4HNLA+V/Irq0NXrHKt+2JuYpKo62dY129+H5Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749060571; a=rsa-sha256; cv=none; b=Hzs847ow66j9PTfQRypg4HTG/rnWJurNDOuE3HLRTdsJ/gFqUj435QshRhdti2dFSPxdx7 zkjb+KI5/5fumxpOhfVGgdGvamYvx8e6uHWNpEcJViZVvi+glGP+PMRYfyZ1ub/cmahy8k IorGVAWP9+3Gu2zIHfvMKeMtyNffwISgMReyOBJlhEUWU2cp/4z7j3B4zZP0iRHLRDTw7G T8BcT7rRIqPcnLkjCLnoHMMKCBv7Efc84xm/UJz/2vouyjKGo4ZFtm8ixk3ETK3ewZSg1d mnj6Du2VA3P591HATF9ITDFmMUbgDlFWIgzHL7BI9cr1iwNKvAKJoQL4lCdWOQ== 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 4bCFwB6WmGzbZV; Wed, 04 Jun 2025 18:09:30 +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 554I9UZv050132; Wed, 4 Jun 2025 18:09:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554I9UKN050129; Wed, 4 Jun 2025 18:09:30 GMT (envelope-from git) Date: Wed, 4 Jun 2025 18:09:30 GMT Message-Id: <202506041809.554I9UKN050129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a5b0b2a7d421 - main - C runtime: add kernel version guards on exterrctl 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5b0b2a7d4219ae86f152433b6fcecd9e8c767d6 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b0b2a7d4219ae86f152433b6fcecd9e8c767d6 commit a5b0b2a7d4219ae86f152433b6fcecd9e8c767d6 Author: Brooks Davis AuthorDate: 2025-06-04 17:58:03 +0000 Commit: Brooks Davis CommitDate: 2025-06-04 18:09:19 +0000 C runtime: add kernel version guards on exterrctl This allows userspace to run on a (somewhat) out of date kernel. Avoid a __FreeBSD_version bump and use the bump from a02180cf60a6 which has occured since exterrctl was added. Reviewed by: kevans Fixes: b9c8a07d4dd9 ("C runtime: enable extended error reporting from kernel") Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50687 --- lib/libc/gen/uexterr_gettext.c | 8 ++++++-- lib/libthr/thread/thr_create.c | 6 +++++- lib/libthr/thread/thr_init.c | 5 ++++- sys/sys/param.h | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/uexterr_gettext.c b/lib/libc/gen/uexterr_gettext.c index b4bb93cfdb50..5b8a5cd17a48 100644 --- a/lib/libc/gen/uexterr_gettext.c +++ b/lib/libc/gen/uexterr_gettext.c @@ -8,7 +8,8 @@ * under sponsorship from the FreeBSD Foundation. */ -#include +#define _WANT_P_OSREL +#include #include #include #include @@ -18,11 +19,14 @@ static struct uexterror uexterr = { .ver = UEXTERROR_VER, }; +int __getosreldate(void); + static void uexterr_ctr(void) __attribute__((constructor)); static void uexterr_ctr(void) { - exterrctl(EXTERRCTL_ENABLE, 0, &uexterr); + if (__getosreldate() >= P_OSREL_EXTERRCTL) + exterrctl(EXTERRCTL_ENABLE, 0, &uexterr); } int diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c index ba2575d461e5..c66a5bb3bd21 100644 --- a/lib/libthr/thread/thr_create.c +++ b/lib/libthr/thread/thr_create.c @@ -27,6 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define _WANT_P_OSREL #include "namespace.h" #include #include @@ -44,6 +45,8 @@ #include "libc_private.h" #include "thr_private.h" +int __getosreldate(void); + static int create_stack(struct pthread_attr *pattr); static void thread_start(struct pthread *curthread); @@ -287,7 +290,8 @@ thread_start(struct pthread *curthread) #endif curthread->uexterr.ver = UEXTERROR_VER; - exterrctl(EXTERRCTL_ENABLE, 0, &curthread->uexterr); + if (__getosreldate() >= P_OSREL_EXTERRCTL) + exterrctl(EXTERRCTL_ENABLE, 0, &curthread->uexterr); /* Run the current thread's start routine with argument: */ _pthread_exit(curthread->start_routine(curthread->arg)); diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index aef2281c5f22..bd1474a7c6e8 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#define _WANT_P_OSREL #include "namespace.h" #include #include @@ -59,6 +60,7 @@ #include "libc_private.h" #include "thr_private.h" +int __getosreldate(void); char *_usrstack; struct pthread *_thr_initial; int _libthr_debug; @@ -434,7 +436,8 @@ init_main_thread(struct pthread *thread) #endif thread->uexterr.ver = UEXTERROR_VER; - exterrctl(EXTERRCTL_ENABLE, EXTERRCTLF_FORCE, &thread->uexterr); + if (__getosreldate() >= P_OSREL_EXTERRCTL) + exterrctl(EXTERRCTL_ENABLE, EXTERRCTLF_FORCE, &thread->uexterr); /* Others cleared to zero by thr_alloc() */ } diff --git a/sys/sys/param.h b/sys/sys/param.h index 98fb0aeacef0..da2089918323 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -107,6 +107,7 @@ #define P_OSREL_TIDPID 1400079 #define P_OSREL_ARM64_SPSR 1400084 #define P_OSREL_TLSBASE 1500044 +#define P_OSREL_EXTERRCTL 1500045 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif