From nobody Fri Aug 8 17:15:34 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 4bz9dz0rvHz64DP3; Fri, 08 Aug 2025 17:15:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bz9dz0DRmz43p3; Fri, 08 Aug 2025 17:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754673335; 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=TPaZZFFi63p2WxNj8Ahk+6w5S1rKQCnVnyl9+b0F/IA=; b=TMSCgfp6fuMRAQ5QN/oA5oabJ4wAdtZAJawaLe4GSXFx35sSCqPYORo8hgf+jOtrsU4hBo wcSg7268h5Tbax6uldVNDcK7Q7ZFU4AHKHm577xjyUtXbg8pbJFeFYXHy0NyG9YLku1caR 2FoVtuk75wuI4dI4lCtcRuEn7BZvXEPJP0CM8C26ifZC1HajD2nfR1Gct/a+dKqLfImxf2 TUcNDuh74z2ySkPeY41H/Bd51slnCHRdQiv/WTxqgcZtVeVT107PsFk5obGlPyG0LzipAb eACi3QEX8Ir2fxQ2s94DhnKRVXxBvAPItEWyf6LOYzBDrWBOD4kfifP95q3aGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754673335; 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=TPaZZFFi63p2WxNj8Ahk+6w5S1rKQCnVnyl9+b0F/IA=; b=ky4mwOUNe1+zSeGMuW8tR+723JAN+GnDn3kOKJEXuaInu7YOfKgEWT8jBn4QaQQAoZc6cT iyUhcQ8j2DbXVkk81ceiO+okBNFX667NFZeraFNKz4Nez2A69KEGW+hf941tLo3VY/ULJ+ KgXzKmJoo9h28j500cbWczTGAjNoySqOZcgQe+V7B8EAbe2MAaqUSpQXntkwZkGSZDSsGW QAVTVL1iBrVPmOWNxENoQGdedQaaqsCYbLDE19JQK5phVrxOSo42rGwbBJN2U5xitJ2GZQ j0QtCg//EOGvUZjrQHPOI9U5jCDsP8rcVJabU1Brr7eCsKz+HpT4Cwh3iwUfmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754673335; a=rsa-sha256; cv=none; b=U5pZdtDa68h6VGNYmdZI2WChLIdwATjacXWxopB3L1lMjUsM3/390zPt1lZ937exmnOuqZ X5zAStJ/B7q9q2o0xwewitYccwIjge8FdMr5e86bs53iv8KI+9ApxSTwH68/mOuiujVY5W vcMPYSkDClFKcVYp1WG8+0zlAhPiemO7ofRTtCWS1XM5psWk030ZKNpGVaXgsDZGE13rmi S0rlVuz7Qqnzk7NQgfsPrU0e1RSibCCZelh52BRZ5creexrC0lBNqxEH1o0HuyQmHOsrwW /HhwNPj8LLbyT4FJ4L7ObsOe6h9Rbs1DrEk6QGw9n+ycAYgyYXoMMYK6AsBGEA== 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 4bz9dy6wLYzlQh; Fri, 08 Aug 2025 17:15:34 +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 578HFYul044405; Fri, 8 Aug 2025 17:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578HFYfN044402; Fri, 8 Aug 2025 17:15:34 GMT (envelope-from git) Date: Fri, 8 Aug 2025 17:15:34 GMT Message-Id: <202508081715.578HFYfN044402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8d26a9da0c94 - main - amd64: assume the kernel supports RDFSBASE and RDGSBASE 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d26a9da0c94f314b7e37a2784b13e2f5fb8052d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8d26a9da0c94f314b7e37a2784b13e2f5fb8052d commit 8d26a9da0c94f314b7e37a2784b13e2f5fb8052d Author: Brooks Davis AuthorDate: 2025-08-08 17:15:21 +0000 Commit: Brooks Davis CommitDate: 2025-08-08 17:15:21 +0000 amd64: assume the kernel supports RDFSBASE and RDGSBASE There is no need to support pre-12.0 (and thus pre-ino64) kernels in a 15.x libc. Continue to check if the CPU supports these features before using them and fall back as required. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50732 --- lib/libsys/amd64/amd64_get_fsbase.c | 7 +------ lib/libsys/amd64/amd64_get_gsbase.c | 7 +------ lib/libsys/amd64/amd64_set_fsbase.c | 7 +------ lib/libsys/amd64/amd64_set_gsbase.c | 7 +------ libexec/rtld-elf/amd64/reloc.c | 3 +-- 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/lib/libsys/amd64/amd64_get_fsbase.c b/lib/libsys/amd64/amd64_get_fsbase.c index 00f16a5e404f..b5e87f8a3ce5 100644 --- a/lib/libsys/amd64/amd64_get_fsbase.c +++ b/lib/libsys/amd64/amd64_get_fsbase.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#define _WANT_P_OSREL #include #include #include @@ -41,7 +40,6 @@ static int amd64_get_fsbase_cpu(void **addr) { - *addr = (void *)rdfsbase(); return (0); } @@ -49,15 +47,12 @@ amd64_get_fsbase_cpu(void **addr) static int amd64_get_fsbase_syscall(void **addr) { - return (sysarch(AMD64_GET_FSBASE, addr)); } DEFINE_UIFUNC(, int, amd64_get_fsbase, (void **)) { - - if (__getosreldate() >= P_OSREL_WRFSBASE && - (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) return (amd64_get_fsbase_cpu); return (amd64_get_fsbase_syscall); } diff --git a/lib/libsys/amd64/amd64_get_gsbase.c b/lib/libsys/amd64/amd64_get_gsbase.c index ef135b1eed7f..51be412ddd7a 100644 --- a/lib/libsys/amd64/amd64_get_gsbase.c +++ b/lib/libsys/amd64/amd64_get_gsbase.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#define _WANT_P_OSREL #include #include #include @@ -41,7 +40,6 @@ static int amd64_get_gsbase_cpu(void **addr) { - *addr = (void *)rdgsbase(); return (0); } @@ -49,15 +47,12 @@ amd64_get_gsbase_cpu(void **addr) static int amd64_get_gsbase_syscall(void **addr) { - return (sysarch(AMD64_GET_GSBASE, addr)); } DEFINE_UIFUNC(, int, amd64_get_gsbase, (void **)) { - - if (__getosreldate() >= P_OSREL_WRFSBASE && - (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) return (amd64_get_gsbase_cpu); return (amd64_get_gsbase_syscall); } diff --git a/lib/libsys/amd64/amd64_set_fsbase.c b/lib/libsys/amd64/amd64_set_fsbase.c index f1690fde6e17..5265bd712f17 100644 --- a/lib/libsys/amd64/amd64_set_fsbase.c +++ b/lib/libsys/amd64/amd64_set_fsbase.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#define _WANT_P_OSREL #include #include #include @@ -41,7 +40,6 @@ static int amd64_set_fsbase_cpu(void *addr) { - wrfsbase((uintptr_t)addr); return (0); } @@ -49,15 +47,12 @@ amd64_set_fsbase_cpu(void *addr) static int amd64_set_fsbase_syscall(void *addr) { - return (sysarch(AMD64_SET_FSBASE, &addr)); } DEFINE_UIFUNC(, int, amd64_set_fsbase, (void *)) { - - if (__getosreldate() >= P_OSREL_WRFSBASE && - (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) return (amd64_set_fsbase_cpu); return (amd64_set_fsbase_syscall); } diff --git a/lib/libsys/amd64/amd64_set_gsbase.c b/lib/libsys/amd64/amd64_set_gsbase.c index 756bbae18844..94f5736ed1ab 100644 --- a/lib/libsys/amd64/amd64_set_gsbase.c +++ b/lib/libsys/amd64/amd64_set_gsbase.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#define _WANT_P_OSREL #include #include #include @@ -41,7 +40,6 @@ static int amd64_set_gsbase_cpu(void *addr) { - wrgsbase((uintptr_t)addr); return (0); } @@ -49,15 +47,12 @@ amd64_set_gsbase_cpu(void *addr) static int amd64_set_gsbase_syscall(void *addr) { - return (sysarch(AMD64_SET_GSBASE, &addr)); } DEFINE_UIFUNC(, int, amd64_set_gsbase, (void *)) { - - if (__getosreldate() >= P_OSREL_WRFSBASE && - (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) return (amd64_set_gsbase_cpu); return (amd64_set_gsbase_syscall); } diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 883e3dcdff88..b1a2069edb2f 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -548,8 +548,7 @@ allocate_initial_tls(Obj_Entry *objs) */ if (__getosreldate() >= P_OSREL_TLSBASE) sysarch(AMD64_SET_TLSBASE, &addr); - else if (__getosreldate() >= P_OSREL_WRFSBASE && - (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + else if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) wrfsbase((uintptr_t)addr); else sysarch(AMD64_SET_FSBASE, &addr);