From owner-svn-src-stable@freebsd.org Wed Sep 13 11:29:50 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CDAEE1BD88; Wed, 13 Sep 2017 11:29:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EADC78C; Wed, 13 Sep 2017 11:29:49 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8DBTnvR080447; Wed, 13 Sep 2017 11:29:49 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DBTmD8080440; Wed, 13 Sep 2017 11:29:48 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201709131129.v8DBTmD8080440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 13 Sep 2017 11:29:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r323538 - stable/11/lib/libc/amd64/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/lib/libc/amd64/sys X-SVN-Commit-Revision: 323538 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 11:29:50 -0000 Author: kib Date: Wed Sep 13 11:29:48 2017 New Revision: 323538 URL: https://svnweb.freebsd.org/changeset/base/323538 Log: MFC 322763: Optimize libc to get and set TLS using the RDFSBASE and RDGSBASE instructions, if supported both by CPU and kernel. Added: stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c - copied, changed from r322763, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h - copied unchanged from r322763, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h Modified: stable/11/lib/libc/amd64/sys/Makefile.inc stable/11/lib/libc/amd64/sys/amd64_get_fsbase.c stable/11/lib/libc/amd64/sys/amd64_get_gsbase.c stable/11/lib/libc/amd64/sys/amd64_set_fsbase.c stable/11/lib/libc/amd64/sys/amd64_set_gsbase.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- stable/11/lib/libc/amd64/sys/Makefile.inc Wed Sep 13 11:19:04 2017 (r323537) +++ stable/11/lib/libc/amd64/sys/Makefile.inc Wed Sep 13 11:29:48 2017 (r323538) @@ -1,7 +1,11 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD$ -SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \ +SRCS+= \ + amd64_detect_rdfsgsbase.c \ + amd64_get_fsbase.c \ + amd64_get_gsbase.c \ + amd64_set_fsbase.c \ amd64_set_gsbase.c MDASM= vfork.S brk.S cerror.S exect.S getcontext.S \ Copied and modified: stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c (from r322763, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c) ============================================================================== --- head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c Mon Aug 21 17:39:12 2017 (r322763, copy source) +++ stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c Wed Sep 13 11:29:48 2017 (r323538) @@ -48,7 +48,9 @@ amd64_detect_rdfsgsbase(void) if (__predict_true(state != RDFSGS_UNKNOWN)) return (state); - if (__getosreldate() >= P_OSREL_WRFSBASE) { + if (__getosreldate() >= P_OSREL_WRFSBASE || + (P_OSREL_MAJOR(__getosreldate()) == 11 && __getosreldate() >= + P_OSREL_WRFSBASE_11)) { do_cpuid(0x0, p); if (p[0] >= 0x7) { cpuid_count(0x7, 0x0, p); Copied: stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h (from r322763, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h Wed Sep 13 11:29:48 2017 (r323538, copy of r322763, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h) @@ -0,0 +1,43 @@ +/*- + * Copyright (c) 2017 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. + * + * $FreeBSD$ + */ + +#ifndef _AMD64_DETECT_RDFSGSBASE_H_ +#define _AMD64_DETECT_RDFSGSBASE_H_ + +enum { + RDFSGS_UNKNOWN, + RDFSGS_SUPPORTED, + RDFSGS_UNSUPPORTED, +}; + +int amd64_detect_rdfsgsbase(void); + +#endif Modified: stable/11/lib/libc/amd64/sys/amd64_get_fsbase.c ============================================================================== --- stable/11/lib/libc/amd64/sys/amd64_get_fsbase.c Wed Sep 13 11:19:04 2017 (r323537) +++ stable/11/lib/libc/amd64/sys/amd64_get_fsbase.c Wed Sep 13 11:29:48 2017 (r323538) @@ -1,7 +1,11 @@ /*- * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2017 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were 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: @@ -27,11 +31,18 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include +#include "amd64_detect_rdfsgsbase.h" int amd64_get_fsbase(void **addr) { + if (amd64_detect_rdfsgsbase() == RDFSGS_SUPPORTED) { + *addr = (void *)rdfsbase(); + return (0); + } return (sysarch(AMD64_GET_FSBASE, addr)); } Modified: stable/11/lib/libc/amd64/sys/amd64_get_gsbase.c ============================================================================== --- stable/11/lib/libc/amd64/sys/amd64_get_gsbase.c Wed Sep 13 11:19:04 2017 (r323537) +++ stable/11/lib/libc/amd64/sys/amd64_get_gsbase.c Wed Sep 13 11:29:48 2017 (r323538) @@ -1,7 +1,11 @@ /*- * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2017 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were 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: @@ -27,11 +31,18 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include +#include "amd64_detect_rdfsgsbase.h" int amd64_get_gsbase(void **addr) { + if (amd64_detect_rdfsgsbase() == RDFSGS_SUPPORTED) { + *addr = (void *)rdgsbase(); + return (0); + } return (sysarch(AMD64_GET_GSBASE, addr)); } Modified: stable/11/lib/libc/amd64/sys/amd64_set_fsbase.c ============================================================================== --- stable/11/lib/libc/amd64/sys/amd64_set_fsbase.c Wed Sep 13 11:19:04 2017 (r323537) +++ stable/11/lib/libc/amd64/sys/amd64_set_fsbase.c Wed Sep 13 11:29:48 2017 (r323538) @@ -1,7 +1,11 @@ /*- * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2017 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were 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: @@ -27,11 +31,18 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include +#include "amd64_detect_rdfsgsbase.h" int amd64_set_fsbase(void *addr) { + if (amd64_detect_rdfsgsbase() == RDFSGS_SUPPORTED) { + wrfsbase((uintptr_t)addr); + return (0); + } return (sysarch(AMD64_SET_FSBASE, &addr)); } Modified: stable/11/lib/libc/amd64/sys/amd64_set_gsbase.c ============================================================================== --- stable/11/lib/libc/amd64/sys/amd64_set_gsbase.c Wed Sep 13 11:19:04 2017 (r323537) +++ stable/11/lib/libc/amd64/sys/amd64_set_gsbase.c Wed Sep 13 11:29:48 2017 (r323538) @@ -1,7 +1,11 @@ /*- * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2017 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were 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: @@ -27,11 +31,18 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include +#include "amd64_detect_rdfsgsbase.h" int amd64_set_gsbase(void *addr) { + if (amd64_detect_rdfsgsbase() == RDFSGS_SUPPORTED) { + wrgsbase((uintptr_t)addr); + return (0); + } return (sysarch(AMD64_SET_GSBASE, &addr)); }