From nobody Thu Jun 12 18:03:02 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 4bJ9P31j9nz5yBNv; Thu, 12 Jun 2025 18:03: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 4bJ9P26ZqCz4Pf0; Thu, 12 Jun 2025 18:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751382; 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=q6VKaY/ZxGlB7RHiK4BFZB+Nu5GuUpnghd5kK7dEo8c=; b=KOtDKwyY25ock7XojC2d1nuIueW0r/4t5zYsXPmt16qrJeIe326FpPglYrlopJo88J3IJu dOxV0fCGMqbXlnvs+8Cq8IHK4hgHcuGJtsT3mvMuBXH4RU30g0RWvfPBX3WlsZ/xpN3oI3 TDX5ea7wFDimGAlUz94p2af3pk7+lCAQVIITSZzNY7TDehn+05OQ5wAiZCWBVczmx4aAm5 L/Tr6XFJ+NKk8u7mfYJZNXY0KPe14t8DTzBYjL9kNxP5dAsrdFtF2ugRjIsB5IZdisBaTB yXe4xj44dz/1mN1t9UWyTlJ9ioOIfDP6NBedJzhZW1lhKLyg9yZi+um3rTArmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751382; 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=q6VKaY/ZxGlB7RHiK4BFZB+Nu5GuUpnghd5kK7dEo8c=; b=VzBhmTiGRCndHYaRR8z2vtkBFgw0z+maK1g9b5aW5E9IlokhrzROEcG0In6W1BzrHYbDQO 8mo1v/wXL6XzsziG/rSaWGcfMGsJNVitX9eAgeZiHMV45Oz2xg9XA7boJsdekMX07+k8KS FmG37nQak6ORfzLmRnxS0BQyZhFu2Wv5S/yN8YvGD88qD25914JMqaNur8nWrtY31KseOV wZjLD71b/6B3zLVKW+aZCFnpKUTxp313pfxnh4qHX0mBe16Nl3/1OLBZcHrf94edHddOwL 2pMlhq02uysfwE4ZEPz/bNAcVMMxk/FEJQ8imDUP2UNv7jkvgzKVgxx1ZsWiyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749751382; a=rsa-sha256; cv=none; b=DTPfR2FXOxHqI0BsXC8XfkwBg8wiXteft4/WeHNXWiVjJO1yIb3wzkjzd3DRsEJtVBFVFC EcCb/rn96yz201OkO8lwf0Q0NyTwmPJ21UgVv+DwFsMjCbBJIOV8vBhM4cggF0mplBFeSi usfKCT23C5p4O7SEIPqhw0v/fFq4HCpGrjyxL59d+Ty2wat9YJsjQ2UVhzaexF5YYMTTrZ CBXRnIl8eX82Q+mnjtxruJPDnYsE59W0b4vJBvrog9/TUJ4llRHmNBLSISWRO5DNgvpRqh 90MuQApbUTKpPDtboietjpIAiUQzRNdxQu3v9zZ/R38zWzspiDNLr5WqYBmH5A== 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 4bJ9P25vw3z7WX; Thu, 12 Jun 2025 18:03: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 55CI3283067158; Thu, 12 Jun 2025 18:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CI328j067155; Thu, 12 Jun 2025 18:03:02 GMT (envelope-from git) Date: Thu, 12 Jun 2025 18:03:02 GMT Message-Id: <202506121803.55CI328j067155@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: 9bac318a7d7a - stable/14 - amd64: add amd64_set_tlsbase(3) 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: 9bac318a7d7ad52a0acdf53b28935f749f8c1283 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9bac318a7d7ad52a0acdf53b28935f749f8c1283 commit 9bac318a7d7ad52a0acdf53b28935f749f8c1283 Author: Konstantin Belousov AuthorDate: 2025-05-22 04:32:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 18:02:50 +0000 amd64: add amd64_set_tlsbase(3) (cherry picked from commit 2e7cf772a4114b78eb0ab2687d91d563de89e206) --- lib/libc/amd64/Symbol.map | 4 +++ lib/libc/amd64/sys/Makefile.inc | 3 +- lib/libc/amd64/sys/amd64_set_tlsbase.c | 55 ++++++++++++++++++++++++++++++++++ sys/x86/include/sysarch.h | 1 + 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map index aa2744b15a74..4286d71e908c 100644 --- a/lib/libc/amd64/Symbol.map +++ b/lib/libc/amd64/Symbol.map @@ -29,6 +29,10 @@ FBSD_1.6 { x86_pkru_unprotect_range; }; +FBSD_1.8 { + amd64_set_tlsbase; +}; + /* * * FreeBSD private ABI diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc index d4a767c90a5f..49579788e740 100644 --- a/lib/libc/amd64/sys/Makefile.inc +++ b/lib/libc/amd64/sys/Makefile.inc @@ -2,6 +2,7 @@ SRCS+= \ amd64_get_fsbase.c \ amd64_get_gsbase.c \ amd64_set_fsbase.c \ - amd64_set_gsbase.c + amd64_set_gsbase.c \ + amd64_set_tlsbase.c MDASM= vfork.S cerror.S getcontext.S diff --git a/lib/libc/amd64/sys/amd64_set_tlsbase.c b/lib/libc/amd64/sys/amd64_set_tlsbase.c new file mode 100644 index 000000000000..292c3a2a8bf4 --- /dev/null +++ b/lib/libc/amd64/sys/amd64_set_tlsbase.c @@ -0,0 +1,55 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define _WANT_P_OSREL +#include +#include +#include +#include +#include +#include "libc_private.h" + +static int +amd64_set_tlsbase_syscall(void *addr) +{ + return (sysarch(AMD64_SET_TLSBASE, &addr)); +} + +DEFINE_UIFUNC(, int, amd64_set_tlsbase, (void *)) +{ + int osrel; + + osrel = __getosreldate(); + if (osrel >= P_OSREL_TLSBASE || + (P_OSREL_MAJOR(osrel) == 14 && osrel >= 1403502)) + return (amd64_set_tlsbase_syscall); + return (amd64_set_fsbase); +} diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index 61f559f4bd23..a67e5c2265a3 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -142,6 +142,7 @@ int amd64_get_fsbase(void **); int amd64_get_gsbase(void **); int amd64_set_fsbase(void *); int amd64_set_gsbase(void *); +int amd64_set_tlsbase(void *); int x86_pkru_get_perm(unsigned int keyidx, int *access, int *modify); int x86_pkru_set_perm(unsigned int keyidx, int access, int modify); int x86_pkru_protect_range(void *addr, unsigned long len, unsigned int keyidx,