From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 5C307384C007 for ; Tue, 2 Mar 2021 15:56:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C307384C007 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-nu_d5m3WP-2ZeCJbM7ZsqA-1; Tue, 02 Mar 2021 10:55:59 -0500 X-MC-Unique: nu_d5m3WP-2ZeCJbM7ZsqA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05DB379EC0 for ; Tue, 2 Mar 2021 15:55:59 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C38F5D9E4 for ; Tue, 2 Mar 2021 15:55:58 +0000 (UTC) From: Florian Weimer To: libc-stable@sourceware.org Subject: [PATCH 2.33 COMMITTED] x86: Add CPU-specific diagnostics to ld.so --list-diagnostics Date: Tue, 02 Mar 2021 16:56:01 +0100 Message-ID: <87sg5dy2ge.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 15:56:08 -0000 (cherry picked from commit 01a5746b6c8a44dc29d33e056b63485075a6a3cc) Adjusted to not print the rep_movsb_stop_threshold field, which does not exist in glibc 2.33. --- sysdeps/x86/dl-diagnostics-cpu.c | 116 +++++++++++++++++++++++++++++++++++++ sysdeps/x86/include/cpu-features.h | 2 + 2 files changed, 118 insertions(+) diff --git a/sysdeps/x86/dl-diagnostics-cpu.c b/sysdeps/x86/dl-diagnostics-cpu.c new file mode 100644 index 0000000000..55c6f35c7c --- /dev/null +++ b/sysdeps/x86/dl-diagnostics-cpu.c @@ -0,0 +1,116 @@ +/* Print CPU diagnostics data in ld.so. x86 version. + Copyright (C) 2021 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 + . */ + +#include +#include + +static void +print_cpu_features_value (const char *label, uint64_t value) +{ + _dl_printf ("x86.cpu_features."); + _dl_diagnostics_print_labeled_value (label, value); +} + +static void +print_cpu_feature_internal (unsigned int index, const char *kind, + unsigned int reg, uint32_t value) +{ + _dl_printf ("x86.cpu_features.features[0x%x].%s[0x%x]=0x%x\n", + index, kind, reg, value); +} + +static void +print_cpu_feature_preferred (const char *label, unsigned int flag) +{ + _dl_printf("x86.cpu_features.preferred.%s=0x%x\n", label, flag); +} + +void +_dl_diagnostics_cpu (void) +{ + const struct cpu_features *cpu_features = __get_cpu_features (); + + print_cpu_features_value ("basic.kind", cpu_features->basic.kind); + print_cpu_features_value ("basic.max_cpuid", cpu_features->basic.max_cpuid); + print_cpu_features_value ("basic.family", cpu_features->basic.family); + print_cpu_features_value ("basic.model", cpu_features->basic.model); + print_cpu_features_value ("basic.stepping", cpu_features->basic.stepping); + + for (unsigned int index = 0; index < CPUID_INDEX_MAX; ++index) + { + /* The index values are part of the ABI via + , so translating them to strings is not + necessary. */ + for (unsigned int reg = 0; reg < 4; ++reg) + print_cpu_feature_internal + (index, "cpuid", reg, + cpu_features->features[index].cpuid_array[reg]); + for (unsigned int reg = 0; reg < 4; ++reg) + print_cpu_feature_internal + (index, "usable", reg, + cpu_features->features[index].usable_array[reg]); + } + + /* The preferred indicators are not part of the ABI and need to be + translated. */ +#define BIT(x) \ + print_cpu_feature_preferred (#x, CPU_FEATURE_PREFERRED_P (cpu_features, x)); +#include "cpu-features-preferred_feature_index_1.def" +#undef BIT + + print_cpu_features_value ("isa_1", cpu_features->isa_1); + print_cpu_features_value ("xsave_state_size", + cpu_features->xsave_state_size); + print_cpu_features_value ("xsave_state_full_size", + cpu_features->xsave_state_full_size); + print_cpu_features_value ("data_cache_size", cpu_features->data_cache_size); + print_cpu_features_value ("shared_cache_size", + cpu_features->shared_cache_size); + print_cpu_features_value ("non_temporal_threshold", + cpu_features->non_temporal_threshold); + print_cpu_features_value ("rep_movsb_threshold", + cpu_features->rep_movsb_threshold); + print_cpu_features_value ("rep_stosb_threshold", + cpu_features->rep_stosb_threshold); + print_cpu_features_value ("level1_icache_size", + cpu_features->level1_icache_size); + print_cpu_features_value ("level1_dcache_size", + cpu_features->level1_dcache_size); + print_cpu_features_value ("level1_dcache_assoc", + cpu_features->level1_dcache_assoc); + print_cpu_features_value ("level1_dcache_linesize", + cpu_features->level1_dcache_linesize); + print_cpu_features_value ("level2_cache_size", + cpu_features->level2_cache_size); + print_cpu_features_value ("level2_cache_assoc", + cpu_features->level2_cache_assoc); + print_cpu_features_value ("level2_cache_linesize", + cpu_features->level2_cache_linesize); + print_cpu_features_value ("level3_cache_size", + cpu_features->level3_cache_size); + print_cpu_features_value ("level3_cache_assoc", + cpu_features->level3_cache_assoc); + print_cpu_features_value ("level3_cache_linesize", + cpu_features->level3_cache_linesize); + print_cpu_features_value ("level4_cache_size", + cpu_features->level4_cache_size); + _Static_assert (offsetof (struct cpu_features, level4_cache_size) + + sizeof (cpu_features->level4_cache_size) + == sizeof (*cpu_features), + "last cpu_features field has been printed"); +} diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h index e7f314657c..184dc93c69 100644 --- a/sysdeps/x86/include/cpu-features.h +++ b/sysdeps/x86/include/cpu-features.h @@ -824,6 +824,8 @@ struct cpuid_feature_internal }; }; +/* NB: When adding new fields, update sysdeps/x86/dl-diagnostics-cpu.c + to print them. */ struct cpu_features { struct cpu_features_basic basic;