From patchwork Sat Sep 12 13:44:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 40401 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B30153894C07; Sat, 12 Sep 2020 13:44:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B30153894C07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1599918287; bh=Jj+8pBOqEHxL+ruzh6LBof8vxumr0JtM7RVFSX8cvF8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=DkSj/L4z4ONR5u8AOmdmCqOrIfMIxEMibzFlgqK6QoIV9gMBxdrPuODtaTdXBWqjZ bLveFwK4mWXJ9py8Z+Z+U+mzJMoji1mViTz+v/7KlrogiZ1iQge5QzRDgZ0lNh6w6b PuIenbS0mRZBqQGgI+uEu9h1UhMkNRnG8wIfVm1A= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 8ABEC38754AB for ; Sat, 12 Sep 2020 13:44:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8ABEC38754AB Received: by mail-pl1-x62c.google.com with SMTP id j7so2265912plk.11 for ; Sat, 12 Sep 2020 06:44:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jj+8pBOqEHxL+ruzh6LBof8vxumr0JtM7RVFSX8cvF8=; b=XSmDN+xGGeNp83HrEzAVw5PuiF6T1y5cr7BVvblB70f7/W7zlZ79XSd3rm77F5JPsw YyOxoSlfvAn/MlpF1sy5ysZf+LRE9MgbmmUk+PlGDQ73YcrvlbKJZew0UpA+mnI/8BbS mJ3yG6iRdovJ8OM9dn5EMfteNt3xMmhIl2sUUgpY4CPqfz8NgIWviXGlMTmub2C0V7aB UXOY0r9cUUzlspo+9+Ilrfo8j6lwP7J8lcCFlolaLQkYmR2O6e3HbkZQ91IlKuQJrvKy HCi/6aENDjuhyeNTrAciEyC1kl7K3UAVOZxqahCe7+T1A9ytc89qTp7ibyiMSJKQnX3b hJAA== X-Gm-Message-State: AOAM530lLW7+YzmqKV/16FW5TxPJ6FJoGJ96CI3cv+SrwGK8K78ycUX5 ITAHIhi4EADv/CXnoP25TOuBW5xIGoM= X-Google-Smtp-Source: ABdhPJzzUuz1RDx7ioyWorcXujk6zP+8/4e0HvJcIc6deu9wjdVYOvtUyXz7PWyEgutoX2z1Nrpg5g== X-Received: by 2002:a17:902:ac85:: with SMTP id h5mr6264058plr.50.1599918283662; Sat, 12 Sep 2020 06:44:43 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id u71sm5416834pfc.43.2020.09.12.06.44.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 06:44:42 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 137451A06B6; Sat, 12 Sep 2020 06:44:42 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/3] x86: Initialize CPU info via IFUNC relocation [BZ 26203] Date: Sat, 12 Sep 2020 06:44:39 -0700 Message-Id: <20200912134441.2407884-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200912134441.2407884-1-hjl.tools@gmail.com> References: <20200912134441.2407884-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" X86 CPU features in ld.so are initialized by init_cpu_features, which is invoked by DL_PLATFORM_INIT from _dl_sysdep_start. But when ld.so is loaded by static executable, DL_PLATFORM_INIT is never called. Also x86 cache info in libc.o and libc.a is initialized by a constructor which may be called too late. Instead, we should initialize x86 CPU features and cache info by initializing dummy function pointers via IFUNC relocation. Note: _dl_x86_init_cpu_features can be called more than once from DL_PLATFORM_INIT and during relocation in ld.so. --- sysdeps/i386/dl-machine.h | 3 +-- sysdeps/x86/cacheinfo.c | 10 +++++++++- sysdeps/x86/dl-get-cpu-features.c | 25 ++++++++++++++++++++++++- sysdeps/x86/include/cpu-features.h | 1 + sysdeps/x86_64/dl-machine.h | 3 +-- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 0f08079e48..5e22e795cc 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -25,7 +25,6 @@ #include #include #include -#include /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) @@ -250,7 +249,7 @@ dl_platform_init (void) #if IS_IN (rtld) /* init_cpu_features has been called early from __libc_start_main in static executable. */ - init_cpu_features (&GLRO(dl_x86_cpu_features)); + _dl_x86_init_cpu_features (); #else if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0') /* Avoid an empty string which would disturb us. */ diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c index 217c21c34f..7a325ab70e 100644 --- a/sysdeps/x86/cacheinfo.c +++ b/sysdeps/x86/cacheinfo.c @@ -756,7 +756,6 @@ intel_bug_no_cache_info: static void -__attribute__((constructor)) init_cacheinfo (void) { /* Find out what brand of processor. */ @@ -770,6 +769,8 @@ init_cacheinfo (void) unsigned int threads = 0; const struct cpu_features *cpu_features = __get_cpu_features (); + assert (cpu_features->basic.kind != arch_kind_unknown); + if (cpu_features->basic.kind == arch_kind_intel) { data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features); @@ -894,4 +895,11 @@ init_cacheinfo (void) # endif } +/* NB: Call init_cacheinfo by initializing a dummy function pointer via + IFUNC relocation. */ +extern void __x86_cacheinfo (void) attribute_hidden; +const void (*__x86_cacheinfo_p) (void) attribute_hidden + = __x86_cacheinfo; + +__ifunc (__x86_cacheinfo, __x86_cacheinfo, NULL, void, init_cacheinfo); #endif diff --git a/sysdeps/x86/dl-get-cpu-features.c b/sysdeps/x86/dl-get-cpu-features.c index 5f9e46b0c6..da4697b895 100644 --- a/sysdeps/x86/dl-get-cpu-features.c +++ b/sysdeps/x86/dl-get-cpu-features.c @@ -1,4 +1,4 @@ -/* This file is part of the GNU C Library. +/* Initialize CPU feature data via IFUNC relocation. Copyright (C) 2015-2020 Free Software Foundation, Inc. The GNU C Library is free software; you can redistribute it and/or @@ -18,6 +18,29 @@ #include +#ifdef SHARED +# include + +/* NB: Normally, DL_PLATFORM_INIT calls init_cpu_features to initialize + CPU features. But when loading ld.so inside of static executable, + DL_PLATFORM_INIT isn't called. Call init_cpu_features by initializing + a dummy function pointer via IFUNC relocation for ld.so. */ +extern void __x86_cpu_features (void) attribute_hidden; +const void (*__x86_cpu_features_p) (void) attribute_hidden + = __x86_cpu_features; + +void +_dl_x86_init_cpu_features (void) +{ + struct cpu_features *cpu_features = __get_cpu_features (); + if (cpu_features->basic.kind == arch_kind_unknown) + init_cpu_features (cpu_features); +} + +__ifunc (__x86_cpu_features, __x86_cpu_features, NULL, void, + _dl_x86_init_cpu_features); +#endif + #undef __x86_get_cpu_features const struct cpu_features * diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h index dcf29b6fe8..f62be0b9b3 100644 --- a/sysdeps/x86/include/cpu-features.h +++ b/sysdeps/x86/include/cpu-features.h @@ -159,6 +159,7 @@ struct cpu_features /* Unused for x86. */ # define INIT_ARCH() # define __x86_get_cpu_features(max) (&GLRO(dl_x86_cpu_features)) +extern void _dl_x86_init_cpu_features (void) attribute_hidden; # endif # ifdef __x86_64__ diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index ca73d8fef9..773e94c8bb 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -26,7 +26,6 @@ #include #include #include -#include /* Return nonzero iff ELF header is compatible with the running host. */ static inline int __attribute__ ((unused)) @@ -225,7 +224,7 @@ dl_platform_init (void) #if IS_IN (rtld) /* init_cpu_features has been called early from __libc_start_main in static executable. */ - init_cpu_features (&GLRO(dl_x86_cpu_features)); + _dl_x86_init_cpu_features (); #else if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0') /* Avoid an empty string which would disturb us. */