From nobody Thu Jun 12 18:03:10 2025 X-Original-To: dev-commits-src-branches@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 4bJ9PC33Tgz5yBDW; Thu, 12 Jun 2025 18:03:11 +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 4bJ9PB61Xfz4Q2T; Thu, 12 Jun 2025 18:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751390; 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=g/Gejhjmi4xEQQKpg1udaMvpz+7ohg1uHgtXIkBy2dM=; b=bbtUd8jrQshkEcrro0zXlqSc1T5S8KMPsdPSKTL6EPsIdkl/imdi4MT3XB05ovTKpogteW 1X62YXu5jvYo6uw5knZpV9ZbYk0EY02cRU/Ob9gd+sBIS2vyQPkIJ0EUywkZ/NvEYWVEXu kkDonqh3QqR8U9yLlnVpImukF5unmEYGoqvc7XDG/nYw26c8XhX6h2Q9VKODhU/xN2mYRP EtObvbhLvXvirexiibBeeXxfGff2/JZgZCPJWZvDSJmCWnSsmmOgJCphd5EiO9KHV0LYug kW77NSelzIAqYEm6YD3I+i+fG5RfIkbFAmpYdF/dNfmmSSuHuhRu31WtB0Xnbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751390; 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=g/Gejhjmi4xEQQKpg1udaMvpz+7ohg1uHgtXIkBy2dM=; b=veV3Eg6VuuRLMGSdQ2yGFqil5FGZXtoml9wybpKtU42qSzhJ0zZs/XExgoREkvKq10DnW7 G6uyNyNFPsBzK7+TScXMI0e8ovC1j7WRhyhZT2DGyVk0Z2qShS/9WQ2iM6xQq/IM6FYSar bce1EVeYyODQSkv2qNCtQFtuKMSPSezhocrLPa/qNxr0wCpUYZ8XTAPqZPGvpDJwzzsQ+f bYcCwisRGkTGGVWgwe+OlFbO2b7nwz13wXQnfr1yCMeR4hQob3VSokt6vaLrDKhhUVBL3m c9yIqTlLsmmzxUMhKaDiy1DQDgVzs74G4v8PMUXX0QgC344k0ZhaK9gda1YBeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749751390; a=rsa-sha256; cv=none; b=ATuBcanHooMAhDltJbCcUdWIbm/32H4IS3+vxELxr9JDJPt5nRw0U4EZREyf+n65VnlVz5 sw0m7AfCWXan80f7rm/OoE48VLuksMgZBBZpIGCpWKJ2JWBQo1uvpfo6HtgQsDqCHZZut1 PtgB/osUy3VYB4VHfWwddnupspc1kCvcZxx5A3rMnBb+NqCgwio5NdCtXL2Nu1Sc8ss6G+ vNW6U1etgj5/5bx55mdBKendNXIEU4QOoxUQ2N8kLdZkkfoAwPuHaCndXztEiTSGYYoBUn Zkj5Gx9bLMg2+9Gz5X3VObpYdkjncT23GT9Li9agpHDyMWHMerZYdw+RhmWdTw== 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 4bJ9PB5bSrz7XT; Thu, 12 Jun 2025 18:03:10 +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 55CI3AaX067398; Thu, 12 Jun 2025 18:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CI3Avf067395; Thu, 12 Jun 2025 18:03:10 GMT (envelope-from git) Date: Thu, 12 Jun 2025 18:03:10 GMT Message-Id: <202506121803.55CI3Avf067395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c9c7058c319b - stable/14 - amd64: set PCB_TLSBASE pcb flag only for new C runtime threads List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: c9c7058c319beaaef7538833d8d3f464f71885ad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c9c7058c319beaaef7538833d8d3f464f71885ad commit c9c7058c319beaaef7538833d8d3f464f71885ad Author: Konstantin Belousov AuthorDate: 2025-05-30 11:25:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 18:02:51 +0000 amd64: set PCB_TLSBASE pcb flag only for new C runtime threads (cherry picked from commit 16ce7f1a3603fce5262cf0656a01c4177c75fa50) --- sys/amd64/amd64/vm_machdep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index e069df9a375f..1739c2b57afd 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -166,6 +167,7 @@ copy_thread(struct thread *td1, struct thread *td2) MPASS((pcb2->pcb_flags & (PCB_KERNFPU | PCB_KERNFPU_THR)) == 0); bcopy(get_pcb_user_save_td(td1), get_pcb_user_save_pcb(pcb2), cpu_max_ext_state_size); + clear_pcb_flags(pcb2, PCB_TLSBASE); } td2->td_frame = (struct trapframe *)td2->td_md.md_stack_base - 1; @@ -675,7 +677,8 @@ cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags) return (EINVAL); pcb = td->td_pcb; - set_pcb_flags(pcb, PCB_FULL_IRET | PCB_TLSBASE); + set_pcb_flags(pcb, PCB_FULL_IRET | ((thr_flags & + THR_C_RUNTIME) != 0 ? PCB_TLSBASE : 0)); #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { pcb->pcb_gsbase = (register_t)tls_base;