From nobody Sat May 31 14:56:02 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 4b8jpq5yJgz5x8Fk; Sat, 31 May 2025 14:56:03 +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 4b8jpp5s0Tz3P83; Sat, 31 May 2025 14:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; 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=YU9cZ5HFn9+Ojh8xgCF4IXmEsNNF04KPAwzKVIXWqtk=; b=vaBCP0KDvwJf2CgdMRpn9Ny5QnM0CBVwGgBoEqyY20uGcyLxrEKHdc6IbSQmrFcYKOXbos sZox+UB5LedNpY4L6yNHyAq1T4szdsbGLKctIcXTcyizwnuT7Dwk62kptmmrywZBw1hnkN t6K+vzfqx8l/B62KTQfnIZZ68FyGZ1C3vnMkSqGthdaJ4HwooVXKd+I2c7g0nf3p3oGaC+ opTzql+E9DuC5gL4kWX3m7mQgXYhQQArwKi8m1DLFrIl/+Tnglvlkr2tG+JqAF1IzDWbFS lr35YOmYDKstRL/b6DUtSWFYkGtyAE3dMGSiAe1z/BoKjR0XU6CP8ator0vZrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; 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=YU9cZ5HFn9+Ojh8xgCF4IXmEsNNF04KPAwzKVIXWqtk=; b=R9/AdcnS90A0H6eP4cM0DdF5P/EGhFGs2qMHSgVTc5bx8yMNwyM+B9AKjSNRl+qEM0P1t5 DT1z6vVv8rMuaK5OK39TE5/qYUBaqnuJ30hG9vurPwDGcMy8EPCOUDwcTMO4W6ms27L9Uk SCpynvNZ9kw39qAmFYa4iYVO9qwrvPxTZqnsJRtPZQVNQatS8a3tOL/6pDQCKxTXrlzreg 2fR8Vec3rJrjdTrpTllm9taOzxcr7yHKLTFRXGmOdcu4Yg3KJ9VOAS+w8ZO96DV+f8BpSF lskPQFOmhgPZXAFmqdiWLMJmvt2H/d9uvbvRm+Zkg0wKgjQK8V3J0iALRZRnNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703362; a=rsa-sha256; cv=none; b=g5QWxkDzlchDoOoP498ANJeyY9PY3gzFVzcuhf5bipGTGe3ZuqHe422LTNpNC65cTzgaGR aJBo5xUXTVS6f4pdUmt10yz6x7DoVUMl0mCWR8XBrMb+VSVQj0uTnCU50NH2DR+iPOLhCx ySYtVpLXktEIx+r2OBYaVIax/ygu9cg39zmGWzhjhNZ0za4bz+el/2p1o7IyhpwHRpk4Oz /FOttxZGRl+O4/xZlsEuywu9M9GsN3S68LaaQcjrr+lttMHud/VIz1yGvRsNZW5uvW04rM D0Fm289IlPA7qwgIw7eJB2tbOpioDME+7erudXUxF9Joz8ivEZ8/uOwyNgd0lA== 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 4b8jpp3bgqzjSM; Sat, 31 May 2025 14:56:02 +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 54VEu2ST067311; Sat, 31 May 2025 14:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu2ut067308; Sat, 31 May 2025 14:56:02 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:02 GMT Message-Id: <202505311456.54VEu2ut067308@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: 16ce7f1a3603 - main - amd64: set PCB_TLSBASE pcb flag only for new C runtime threads 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: 16ce7f1a3603fce5262cf0656a01c4177c75fa50 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16ce7f1a3603fce5262cf0656a01c4177c75fa50 commit 16ce7f1a3603fce5262cf0656a01c4177c75fa50 Author: Konstantin Belousov AuthorDate: 2025-05-30 11:25:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 amd64: set PCB_TLSBASE pcb flag only for new C runtime threads where the runtime does want the pcb_tlsbase to be set in fsbase in signal handlers. This way, other runtimes that are not aware of pcb_tlsbase get the old behavior of preserving fsbase on calling signal handler. For instance, this fixes Go runtime that wants to handle fsbase in its own way. Reported by: Herbert J. Skuhra Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 275ab1a54e52..c763ff58680e 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -164,6 +165,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; @@ -663,7 +665,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;