From nobody Thu Jun 12 18:03:03 2025 X-Original-To: dev-commits-src-all@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 4bJ9P447sqz5y9wv; Thu, 12 Jun 2025 18:03:04 +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 4bJ9P40QfNz4Pyf; Thu, 12 Jun 2025 18:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751384; 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=GKl0544UDATG3EcYfZZuoc4fvq3NBDXk+x2suGuZYkw=; b=MZm0nzyl/ckwl/hKBCzQZRTBueyZCfrFjdioNdua5cBVW/SRamJqRsPqAC8T/vowNB46Zg 6RMVCwSpUH7OKUvE8aivAGrwznm51XMIOSYPKsmNeNuIxFTHiHsuIpBDgJLn2Du0Miv9W1 rvTfMbVIGO9enCjNUg8byHR7IGzZWI5xmbg9JdjDlrSpPRoBH203wCAiFWQtEctkWlzp4y unUfT36vhOETC+gwI730ID9/wKMp73VWZc+PilcsavMof1bf23dP8hLTieULYmXJdk8LbU iGQV1jacvbYCb0kbY0yVrc+hnFL6PtUz0wu4HDpaQUk8+rqmy0L4D286nGohEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751384; 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=GKl0544UDATG3EcYfZZuoc4fvq3NBDXk+x2suGuZYkw=; b=nyjl13vQT3Z6wYCY9mIU9RczssiZgJm5JnPWwbmBvCvkIoHilyFAppnxNDddDNzxFkVbH+ KUkv4/AoTzAWD+OdjsvtWF8P6eFC3GMbzJUQJqOX9BaFtiZ6klRmelq/pHgJug+sE0wfIJ N9JkdWzN9ZnhdYAz8yxJ/ACxJWZgmalYKxOSo999TdIEpa6y1qj+Cv43hI2gKGLRWavi/g qXmzhqAEaqsgYOiOrirNjo1Qe5AmQnu5ww0ShVvBgFOqaOljhzOcpNttMXzMZtcpQ2d0ho n6TbttI5nCFrQ5Kd9/ps0tD1oMhhRzlgj8ImMPLFybdR9kjSkiWzNxnCI5KHpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749751384; a=rsa-sha256; cv=none; b=Ahze1GAKp2A6OiFdt3fw7IgQDwdbXfXn2vUMnkh8/r/m2yw1v4S7wUU94byhMNYMOhiEAw lpTJKtFh9ceY4d1LoY9CRkHpNlU4mkmo2XSJ3vMlccSLTycN4sbVa2I2lDVx/GygvOszdQ 1YnOnWmaaztxPLDdCDycoTsmun8XbqePjl78/iLea4STpKm0eKYWahSXfQJAnlDb/iRy6p yPUkZ+HBZZ9OcA48q8YkjCyRKLUt/Y6LOqAacOvFkqq3J8sdG/zOy0RBx7HHaHkzs/uzF8 OiPR4scPvvKiJhhfWZe9gnjX5mN6xkiF1g9A8n1HGgb7AhfspZp3W5WpyVS7gQ== 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 4bJ9P36rtSz7X9; Thu, 12 Jun 2025 18:03:03 +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 55CI33NV067194; Thu, 12 Jun 2025 18:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CI33Tf067191; Thu, 12 Jun 2025 18:03:03 GMT (envelope-from git) Date: Thu, 12 Jun 2025 18:03:03 GMT Message-Id: <202506121803.55CI33Tf067191@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: 883596411327 - stable/14 - amd64: switch to amd64_set_tlsbase to set tls base List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 88359641132766cc0a8eed283a7a704595c7c119 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=88359641132766cc0a8eed283a7a704595c7c119 commit 88359641132766cc0a8eed283a7a704595c7c119 Author: Konstantin Belousov AuthorDate: 2025-05-22 04:32:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 18:02:50 +0000 amd64: switch to amd64_set_tlsbase to set tls base (cherry picked from commit aef025fc9b6c8b06677086a93c866ee09622f6fa) --- 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 7e7f01a5d186..74693d35ba1d 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -530,10 +530,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 4b6b58b4a5e3..b431c336122c 100644 --- a/sys/x86/include/tls.h +++ b/sys/x86/include/tls.h @@ -59,7 +59,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