git: 9bac318a7d7a - stable/14 - amd64: add amd64_set_tlsbase(3)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Jun 2025 18:03:02 UTC
The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9bac318a7d7ad52a0acdf53b28935f749f8c1283 commit 9bac318a7d7ad52a0acdf53b28935f749f8c1283 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-05-22 04:32:03 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <sys/param.h> +#include <machine/cpufunc.h> +#include <machine/specialreg.h> +#include <machine/sysarch.h> +#include <x86/ifunc.h> +#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,