AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: Fix tst-cpu-features-cpuinfo on Ryzen 9 (BZ #27873)

Browse Source 
AMD define different flags for IRPB, IBRS, and STIPBP [1], so new
x86_64_cpu are added and IBRS_IBPB is only tested for Intel.

The SSDB is also defined and implemented different on AMD [2],
and also a new AMD_SSDB flag is added.  It should map to the
cpuinfo 'ssdb' on recent AMD cpus.

It fixes tst-cpu-features-cpuinfo and tst-cpu-features-cpuinfo-static
on recent AMD cpus.

Checked on x86_64-linux-gnu on AMD Ryzen 9 5900X.

[1] https://developer.amd.com/wp-content/resources/Architecture_Guidelines_Update_Indirect_Branch_Control.pdf
[2] https://bugzilla.kernel.org/show_bug.cgi?id=199889

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
This commit is contained in:
Adhemerval Zanella 2021-06-22 16:41:28 -03:00
parent ea26ff0322
commit e3e3eb0a2e
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manual/platform.texi
View File

@ -177,6 +177,18 @@ The supported processor features are:
@item
@code{AESKLE} -- AES Key Locker instructions are enabled by OS.
@item
@code{AMD_IBPB} -- Indirect branch predictor barrier (IBPB) for AMD cpus.
@item
@code{AMD_IBRS} -- Indirect branch restricted speculation (IBPB) for AMD cpus.
@item
@code{AMD_SSBD} -- Speculative Store Bypass Disable (SSBD) for AMD cpus.
@item
@code{AMD_STIBP} -- Single thread indirect branch predictors (STIBP) for AMD cpus.
@item
@code{AMX_BF16} -- Tile computational operations on bfloat16 numbers.

4
sysdeps/x86/bits/platform/x86.h
View File

@ -278,6 +278,10 @@ enum
+ cpuid_register_index_ebx * 8 * sizeof (unsigned int)),
x86_cpu_WBNOINVD = x86_cpu_index_80000008_ebx + 9,
x86_cpu_AMD_IBPB = x86_cpu_index_80000008_ebx + 12,
x86_cpu_AMD_IBRS = x86_cpu_index_80000008_ebx + 14,
x86_cpu_AMD_STIBP = x86_cpu_index_80000008_ebx + 15,
x86_cpu_AMD_SSBD = x86_cpu_index_80000008_ebx + 24,
x86_cpu_index_7_ecx_1_eax
= (CPUID_INDEX_7_ECX_1 * 8 * 4 * sizeof (unsigned int)

12
sysdeps/x86/include/cpu-features.h
View File

@ -289,6 +289,10 @@ enum
/* EBX. */
#define bit_cpu_WBNOINVD (1u << 9)
#define bit_cpu_AMD_IBPB (1u << 12)
#define bit_cpu_AMD_IBRS (1u << 14)
#define bit_cpu_AMD_STIBP (1u << 15)
#define bit_cpu_AMD_SSBD (1u << 24)
/* CPUID_INDEX_7_ECX_1. */
@ -519,6 +523,10 @@ enum
/* EBX. */
#define index_cpu_WBNOINVD CPUID_INDEX_80000008
#define index_cpu_AMD_IBPB CPUID_INDEX_80000008
#define index_cpu_AMD_IBRS CPUID_INDEX_80000008
#define index_cpu_AMD_STIBP CPUID_INDEX_80000008
#define index_cpu_AMD_SSBD CPUID_INDEX_80000008
/* CPUID_INDEX_7_ECX_1. */
@ -749,6 +757,10 @@ enum
/* EBX. */
#define reg_WBNOINVD ebx
#define reg_AMD_IBPB ebx
#define reg_AMD_IBRS ebx
#define reg_AMD_STIBP ebx
#define reg_AMD_SSBD ebx
/* CPUID_INDEX_7_ECX_1. */

18
sysdeps/x86/tst-cpu-features-cpuinfo.c
View File

@ -16,10 +16,11 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/platform/x86.h>
#include <cpu-features.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
static char *cpu_flags;
@ -99,6 +100,7 @@ static int
do_test (int argc, char **argv)
{
int fails = 0;
const struct cpu_features *cpu_features = __get_cpu_features ();
get_cpuinfo ();
fails += CHECK_PROC (acpi, ACPI);
@ -159,7 +161,17 @@ do_test (int argc, char **argv)
fails += CHECK_PROC (hle, HLE);
fails += CHECK_PROC (ht, HTT);
fails += CHECK_PROC (hybrid, HYBRID);
if (cpu_features->basic.kind == arch_kind_intel)
{
fails += CHECK_PROC (ibrs, IBRS_IBPB);
fails += CHECK_PROC (stibp, STIBP);
}
else if (cpu_features->basic.kind == arch_kind_amd)
{
fails += CHECK_PROC (ibpb, AMD_IBPB);
fails += CHECK_PROC (ibrs, AMD_IBRS);
fails += CHECK_PROC (stibp, AMD_STIBP);
}
fails += CHECK_PROC (ibt, IBT);
fails += CHECK_PROC (invariant_tsc, INVARIANT_TSC);
fails += CHECK_PROC (invpcid, INVPCID);
@ -221,7 +233,10 @@ do_test (int argc, char **argv)
fails += CHECK_PROC (smep, SMEP);
fails += CHECK_PROC (smx, SMX);
fails += CHECK_PROC (ss, SS);
if (cpu_features->basic.kind == arch_kind_intel)
fails += CHECK_PROC (ssbd, SSBD);
else if (cpu_features->basic.kind == arch_kind_amd)
fails += CHECK_PROC (ssbd, AMD_SSBD);
fails += CHECK_PROC (sse, SSE);
fails += CHECK_PROC (sse2, SSE2);
fails += CHECK_PROC (pni, SSE3);
@ -229,7 +244,6 @@ do_test (int argc, char **argv)
fails += CHECK_PROC (sse4_2, SSE4_2);
fails += CHECK_PROC (sse4a, SSE4A);
fails += CHECK_PROC (ssse3, SSSE3);
fails += CHECK_PROC (stibp, STIBP);
fails += CHECK_PROC (svm, SVM);
#ifdef __x86_64__
/* NB: SYSCALL_SYSRET is 64-bit only. */