From nobody Wed May 28 11:11:45 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 4b6mzQ4mspz5xKNL; Wed, 28 May 2025 11:11:46 +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 4b6mzQ0vtRz429L; Wed, 28 May 2025 11:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430706; 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=Rrn4Lz6L2frUyXSaoN+eH2opr36ZRKX/wG4S1/PEmP8=; b=S9HJo43we1oh3CLIU6vrArZUdp9oxq8xdVtNy1CrIsQC5oXPmsmEbxgNrJZ9dmwniB9KQz JnfOIore5u+rjEWdAe9DBtBXGkyCmvQZDLrrfkEOgI7ifXIsQOV8smc5Hmn1U5F8j47d7W q9AqTpE1c9qPhVvwjOD3PLH3r48aIhmvnefd3AAK8kbKyNRDuv3JXtP1lTkV3E+7thE2S0 rATdPUq20qLRTWn99zbn2sva7EsqZ6iRaq/kt1GIBtfoKFshsrTKD73Iy6I3DFMUo5MLaK d786p7BApVc1Cl2seplcTlU5M3szsKc7NnXS3xFS8A/W9RFlTyqJc/W0RUd62Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430706; a=rsa-sha256; cv=none; b=g+LHnRp1NxWpNb1qiTeza35NSo0zamI3tekt3CT5kchU7GsKyjbEsZLDcq6PKfNgy9TQe0 LRJEg0PWa8r0i+yY/OBujZffbv6kz/gJAFuHeRXGzbeB5vTt3EimKcWNuGTiry0P+LGXjX 9bpbwj5EmuaLKZByexm2fiF3UZtgmPipakOW8d9PSxSKBgqRi0iJ9oCYBUi/S5MuA62MMU nW2WDgdLkWvsaSFgsFlzH7aJu7O6HgyC03ofKeeOjoljufJi1PYuUTqj0QqHJWNiMp/6eV 1qlQsXyhc+pj6OKTOmLZKBr+10EG+sQHq1vzbpBR9g+6T3O6EPijlpumy1pijw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430706; 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=Rrn4Lz6L2frUyXSaoN+eH2opr36ZRKX/wG4S1/PEmP8=; b=miff0rlatLJ2I752mmsCKlwQlNvVEq2fBvGhqZRhbKo+cJgn/epYRBn/+tn2KH4zGTrtRp HqXhyYiigpz97s7NMRCmmibMal/Uv4WeXgjVZAOPg9YuGTNS2rKaqyuzxe4LisHKAHKql8 e4CuS/80yalX2Ef8q5+aw5eYpJ+IkkZXIolRqbrPFUbRS5W6HtD/tMrvWA4iUT9KoOwEPo FCKi6NqObpLjOZCPL8DDdM39MJnkYlm0SRCz4bN2jtvYqBJDyp/F9GmhNd/SLVoddmd8a0 +JU0R/DPWDlcGQFSFVDHfTYnTp8/PqP/XH8PU0XvPZGRZhyt5Oe7FwB1TTOKcA== 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 4b6mzP5TQfzbhY; Wed, 28 May 2025 11:11:45 +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 54SBBjwK049695; Wed, 28 May 2025 11:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBjUt049692; Wed, 28 May 2025 11:11:45 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:45 GMT Message-Id: <202505281111.54SBBjUt049692@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: aef025fc9b6c - main - amd64: switch to amd64_set_tlsbase to set tls base 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: aef025fc9b6c8b06677086a93c866ee09622f6fa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aef025fc9b6c8b06677086a93c866ee09622f6fa commit aef025fc9b6c8b06677086a93c866ee09622f6fa Author: Konstantin Belousov AuthorDate: 2025-05-22 04:32:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: switch to amd64_set_tlsbase to set tls base Reported and tested: Alex S Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- libexec/rtld-elf/amd64/reloc.c | 6 ++++-- sys/x86/include/tls.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 373a1cdd2d06..95f402995836 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -543,10 +543,12 @@ allocate_initial_tls(Obj_Entry *objs) addr = allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); /* - * This does not use _tcb_set() as it calls amd64_set_fsbase() + * This does not use _tcb_set() as it calls amd64_set_tlsbase() * which is an ifunc and rtld must not use ifuncs. */ - if (__getosreldate() >= P_OSREL_WRFSBASE && + if (__getosreldate() >= P_OSREL_TLSBASE) + sysarch(AMD64_SET_TLSBASE, &addr); + else if (__getosreldate() >= P_OSREL_WRFSBASE && (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) wrfsbase((uintptr_t)addr); else diff --git a/sys/x86/include/tls.h b/sys/x86/include/tls.h index 29d036fd4871..1ed47bf01938 100644 --- a/sys/x86/include/tls.h +++ b/sys/x86/include/tls.h @@ -69,7 +69,7 @@ static __inline void _tcb_set(struct tcb *tcb) { #ifdef __amd64__ - amd64_set_fsbase(tcb); + amd64_set_tlsbase(tcb); #else i386_set_gsbase(tcb); #endif