From patchwork Thu Jun 1 20:12:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 769941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wdz7k0xgxz9sNJ for ; Fri, 2 Jun 2017 06:13:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="R+on1SFo"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=aY1eUYXsc5Zn5iiXqtLxEWtxcMQjaaj DC8qgwKCMm0AMOYD7y4guV7jmQV2LRUrZB4zqmmBpuY2GGAU9AKRgrSD9sBvxaKf 3Uc1AmMhcsQ5+emGn99G3Pbt3OEFaukh+/PdhjJlFOTotVFmSN6/Swrzfvwhnzap bXvOTJk/p5vQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=JZkwXTSIASURjsgUweTmvNKD+Zg=; b=R+on1 SFoV8J1VCLsGfB9xrWRrT4MpnlADLchvvQT5Ag2TZPtp07cDjuN2nq+87ANLcWxB uosTBnCfDilQAdE+YEz/woImxbv7SaD5Qm2/s5Km0EyQ/4vhRzVtGN/mrpV55uXY go5JEHqPkV3GxPPocVRtmYfgnK5j0ZLirotutw= Received: (qmail 53266 invoked by alias); 1 Jun 2017 20:12:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 52817 invoked by uid 89); 1 Jun 2017 20:12:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=clears, 1818, mrs X-HELO: homiemail-a92.g.dreamhost.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, sellcey@cavium.com Subject: [PATCH 4/6] aarch64: Allow overriding HWCAP_CPUID feature check using HWCAP_MASK Date: Fri, 2 Jun 2017 01:42:06 +0530 Message-Id: <1496347928-19432-5-git-send-email-siddhesh@sourceware.org> In-Reply-To: <1496347928-19432-1-git-send-email-siddhesh@sourceware.org> References: <1496347928-19432-1-git-send-email-siddhesh@sourceware.org> Now that LD_HWCAP_MASK (or glibc.tune.hwcap_mask) is read early enough to influence cpu feature check in aarch64, use it to influence multiarch selection. Setting LD_HWCAP_MASK such that it clears HWCAP_CPUID will now disable multiarch for the binary. HWCAP_CPUID is also now set in HWCAP_IMPORTANT so that it is set by default. With this patch, this feature is only usable with dyanmically linked binaries because LD_HWCAP_MASK is not read for static binaries. A future patch fixes that. * sysdeps/unix/sysv/linux/aarch64/cpu-features.c (init_cpu_features): Use glibc.tune.hwcap_mask. * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h: New file. --- sysdeps/unix/sysv/linux/aarch64/cpu-features.c | 10 +++--- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 44 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c index 7025062..ef6eecd 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c @@ -18,18 +18,20 @@ #include #include +#include static inline void init_cpu_features (struct cpu_features *cpu_features) { - if (GLRO(dl_hwcap) & HWCAP_CPUID) + uint64_t hwcap_mask = GET_HWCAP_MASK(); + uint64_t hwcap = GLRO (dl_hwcap) & hwcap_mask; + + if (hwcap & HWCAP_CPUID) { register uint64_t id = 0; asm volatile ("mrs %0, midr_el1" : "=r"(id)); cpu_features->midr_el1 = id; } else - { - cpu_features->midr_el1 = 0; - } + cpu_features->midr_el1 = 0; } diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h new file mode 100644 index 0000000..7a60d72 --- /dev/null +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -0,0 +1,44 @@ +/* Processor capability information handling macros - aarch64 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _DL_PROCINFO_H +#define _DL_PROCINFO_H 1 + +#include + +/* We cannot provide a general printing function. */ +#define _dl_procinfo(type, word) -1 + +/* There are no hardware capabilities defined. */ +#define _dl_hwcap_string(idx) "" + +/* HWCAP_CPUID should be available by default to influence IFUNC as well as + library search. */ +#define HWCAP_IMPORTANT HWCAP_CPUID + +/* There're no platforms to filter out. */ +#define _DL_HWCAP_PLATFORM 0 + +/* We don't have any hardware capabilities. */ +#define _DL_HWCAP_COUNT 0 + +#define _dl_string_hwcap(str) (-1) + +#define _dl_string_platform(str) (-1) + +#endif /* dl-procinfo.h */