mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
ecce11aa07
GCC 11 supports -march=x86-64-v[234] to enable x86 micro-architecture ISA levels: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97250 and -mneeded to emit GNU_PROPERTY_X86_ISA_1_NEEDED property with GNU_PROPERTY_X86_ISA_1_V[234] marker: https://gitlab.com/x86-psABIs/x86-64-ABI/-/merge_requests/13 Binutils support for GNU_PROPERTY_X86_ISA_1_V[234] marker were added by commit b0ab06937385e0ae25cebf1991787d64f439bf12 Author: H.J. Lu <hjl.tools@gmail.com> Date: Fri Oct 30 06:49:57 2020 -0700 x86: Support GNU_PROPERTY_X86_ISA_1_BASELINE marker and commit 32930e4edbc06bc6f10c435dbcc63131715df678 Author: H.J. Lu <hjl.tools@gmail.com> Date: Fri Oct 9 05:05:57 2020 -0700 x86: Support GNU_PROPERTY_X86_ISA_1_V[234] marker GNU_PROPERTY_X86_ISA_1_NEEDED property in x86 ELF binaries indicate the micro-architecture ISA level required to execute the binary. The marker must be added by programmers explicitly in one of 3 ways: 1. Pass -mneeded to GCC. 2. Add the marker in the linker inputs as this patch does. 3. Pass -z x86-64-v[234] to the linker. Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] marker support to ld.so if binutils 2.32 or newer is used to build glibc: 1. Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] markers to elf.h. 2. Add GNU_PROPERTY_X86_ISA_1_BASELINE and GNU_PROPERTY_X86_ISA_1_V[234] marker to abi-note.o based on the ISA level used to compile abi-note.o, assuming that the same ISA level is used to compile the whole glibc. 3. Add isa_1 to cpu_features to record the supported x86 ISA level. 4. Rename _dl_process_cet_property_note to _dl_process_property_note and add GNU_PROPERTY_X86_ISA_1_V[234] marker detection. 5. Update _rtld_main_check and _dl_open_check to check loaded objects with the incompatible ISA level. 6. Add a testcase to verify that dlopen an x86-64-v4 shared object fails on lesser platforms. 7. Use <get-isa-level.h> in dl-hwcaps-subdirs.c and tst-glibc-hwcaps.c. Tested under i686, x32 and x86-64 modes on x86-64-v2, x86-64-v3 and x86-64-v4 machines. Marked elf/tst-isa-level-1 with x86-64-v4, ran it on x86-64-v3 machine and got: [hjl@gnu-cfl-2 build-x86_64-linux]$ ./elf/tst-isa-level-1 ./elf/tst-isa-level-1: CPU ISA level is lower than required [hjl@gnu-cfl-2 build-x86_64-linux]$
105 lines
2.9 KiB
C
105 lines
2.9 KiB
C
/* Check ISA level on dlopened shared object.
|
|
Copyright (C) 2020 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdlib.h>
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <elf.h>
|
|
#include <get-isa-level.h>
|
|
#include <support/xdlfcn.h>
|
|
#include <support/check.h>
|
|
#include <support/test-driver.h>
|
|
|
|
static void
|
|
do_test_1 (const char *modname, bool fail)
|
|
{
|
|
int (*fp) (void);
|
|
void *h;
|
|
|
|
h = dlopen (modname, RTLD_LAZY);
|
|
if (h == NULL)
|
|
{
|
|
const char *err = dlerror ();
|
|
if (fail)
|
|
{
|
|
if (strstr (err, "CPU ISA level is lower than required") == NULL)
|
|
FAIL_EXIT1 ("incorrect dlopen '%s' error: %s\n", modname, err);
|
|
|
|
return;
|
|
}
|
|
|
|
FAIL_EXIT1 ("cannot open '%s': %s\n", modname, err);
|
|
}
|
|
|
|
if (fail)
|
|
FAIL_EXIT1 ("dlopen '%s' should have failed\n", modname);
|
|
|
|
fp = xdlsym (h, "test");
|
|
|
|
if (fp () != 0)
|
|
FAIL_EXIT1 ("test () != 0\n");
|
|
|
|
dlclose (h);
|
|
}
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
const struct cpu_features *cpu_features
|
|
= __x86_get_cpu_features (COMMON_CPUID_INDEX_MAX);
|
|
unsigned int isa_level = get_isa_level (cpu_features);
|
|
bool has_isa_baseline = ((isa_level & GNU_PROPERTY_X86_ISA_1_BASELINE)
|
|
== GNU_PROPERTY_X86_ISA_1_BASELINE);
|
|
bool has_isa_v2 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V2)
|
|
== GNU_PROPERTY_X86_ISA_1_V2);
|
|
bool has_isa_v3 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V3)
|
|
== GNU_PROPERTY_X86_ISA_1_V3);
|
|
bool has_isa_v4 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V4)
|
|
== GNU_PROPERTY_X86_ISA_1_V4);
|
|
|
|
if (!has_isa_baseline)
|
|
{
|
|
do_test_1 ("tst-isa-level-mod-1-baseline.so", true);
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
do_test_1 ("tst-isa-level-mod-1-baseline.so", false);
|
|
|
|
/* Skip on x86-64-v4 platforms since dlopen v4 module always works. */
|
|
if (has_isa_v4)
|
|
return EXIT_SUCCESS;
|
|
|
|
do_test_1 ("tst-isa-level-mod-1-v4.so", true);
|
|
|
|
/* Skip on x86-64-v3 platforms since dlopen v3 module always works. */
|
|
if (has_isa_v3)
|
|
return EXIT_SUCCESS;
|
|
|
|
do_test_1 ("tst-isa-level-mod-1-v3.so", true);
|
|
|
|
/* Skip on x86-64-v2 platforms since dlopen v2 module always works. */
|
|
if (has_isa_v2)
|
|
return EXIT_SUCCESS;
|
|
|
|
do_test_1 ("tst-isa-level-mod-1-v2.so", true);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|