struct stringtable_entry *path; /* Path to find library. */
int flags; /* Flags to indicate kind of library. */
unsigned int osversion; /* Required OS version. */
+ unsigned int isa_level; /* Required ISA level. */
uint64_t hwcap; /* Important hardware capabilities. */
int bits_hwcap; /* Number of bits set in hwcap. */
free (ext);
}
+/* Compute the hwcap value from ENTRY. */
+static inline uint64_t
+compute_hwcap_value (struct cache_entry *entry)
+{
+ if (entry->isa_level > DL_CACHE_HWCAP_ISA_LEVEL_MASK)
+ error (EXIT_FAILURE, 0, _("%s: ISA level is too high (%d > %d)"),
+ entry->path->string, entry->isa_level,
+ DL_CACHE_HWCAP_ISA_LEVEL_MASK);
+ return (DL_CACHE_HWCAP_EXTENSION
+ | (((uint64_t) entry->isa_level) << 32)
+ | entry->hwcaps->section_index);
+}
+
/* Save the contents of the cache. */
void
save_cache (const char *cache_name)
file_entries_new->libs[idx_new].hwcap = entry->hwcap;
else
file_entries_new->libs[idx_new].hwcap
- = DL_CACHE_HWCAP_EXTENSION | entry->hwcaps->section_index;
+ = compute_hwcap_value (entry);
file_entries_new->libs[idx_new].key
= str_offset + entry->lib->offset;
file_entries_new->libs[idx_new].value
/* Add one library to the cache. */
void
add_to_cache (const char *path, const char *filename, const char *soname,
- int flags, unsigned int osversion, uint64_t hwcap,
+ int flags, unsigned int osversion,
+ unsigned int isa_level, uint64_t hwcap,
struct glibc_hwcaps_subdirectory *hwcaps)
{
struct cache_entry *new_entry = xmalloc (sizeof (*new_entry));
new_entry->path = path_interned;
new_entry->flags = flags;
new_entry->osversion = osversion;
+ new_entry->isa_level = isa_level;
new_entry->hwcap = hwcap;
new_entry->hwcaps = hwcaps;
new_entry->bits_hwcap = 0;
struct aux_cache_entry_id id;
int flags;
unsigned int osversion;
+ unsigned int isa_level;
int used;
char *soname;
struct aux_cache_entry *next;
int32_t flags; /* This is 1 for an ELF library. */
uint32_t soname; /* String table indice. */
uint32_t osversion; /* Required OS version. */
- int32_t pad;
+ uint32_t isa_level; /* Required ISA level. */
};
/* ldconfig maintains an auxiliary cache file that allows
int
search_aux_cache (struct stat64 *stat_buf, int *flags,
- unsigned int *osversion, char **soname)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname)
{
struct aux_cache_entry_id id;
id.ino = (uint64_t) stat_buf->st_ino;
{
*flags = entry->flags;
*osversion = entry->osversion;
+ *isa_level = entry->isa_level;
if (entry->soname != NULL)
*soname = xstrdup (entry->soname);
else
static void
insert_to_aux_cache (struct aux_cache_entry_id *id, int flags,
- unsigned int osversion, const char *soname, int used)
+ unsigned int osversion, unsigned int isa_level,
+ const char *soname, int used)
{
size_t hash = aux_cache_entry_id_hash (id) % aux_hash_size;
struct aux_cache_entry *entry;
entry->id = *id;
entry->flags = flags;
entry->osversion = osversion;
+ entry->isa_level = isa_level;
entry->used = used;
if (soname != NULL)
entry->soname = memcpy ((char *) (entry + 1), soname, len);
void
add_to_aux_cache (struct stat64 *stat_buf, int flags,
- unsigned int osversion, const char *soname)
+ unsigned int osversion, unsigned int isa_level,
+ const char *soname)
{
struct aux_cache_entry_id id;
id.ino = (uint64_t) stat_buf->st_ino;
id.ctime = (uint64_t) stat_buf->st_ctime;
id.size = (uint64_t) stat_buf->st_size;
id.dev = (uint64_t) stat_buf->st_dev;
- insert_to_aux_cache (&id, flags, osversion, soname, 1);
+ insert_to_aux_cache (&id, flags, osversion, isa_level, soname, 1);
}
/* Load auxiliary cache to search for unchanged entries. */
insert_to_aux_cache (&aux_cache->libs[i].id,
aux_cache->libs[i].flags,
aux_cache->libs[i].osversion,
+ aux_cache->libs[i].isa_level,
aux_cache->libs[i].soname == 0
? NULL : aux_cache_data + aux_cache->libs[i].soname,
0);
str_offset += len;
}
file_entries->libs[idx].osversion = entry->osversion;
- file_entries->libs[idx++].pad = 0;
+ file_entries->libs[idx++].isa_level = entry->isa_level;
}
/* Write out auxiliary cache file. */
#include <stdint.h>
#include <_itoa.h>
#include <dl-hwcaps.h>
+#include <dl-isa-level.h>
#ifndef _DL_PLATFORMS_COUNT
# define _DL_PLATFORMS_COUNT 0
#ifdef SHARED
named_hwcap = dl_cache_hwcap_extension (libnew);
+ if (named_hwcap
+ && !dl_cache_hwcap_isa_level_compatible (libnew))
+ continue;
#endif
/* The entries with named/extension hwcaps
struct stat64 stat_buf;
int flag;
unsigned int osversion;
+ unsigned int isa_level;
/* Prepare arguments for create_links call. Split library name in
directory and filename first. Since path is allocated, we've got
}
if (process_file (real_library, library, libname, &flag, &osversion,
- &soname, 0, &stat_buf))
+ &isa_level, &soname, 0, &stat_buf))
{
error (0, 0, _("No link created since soname could not be found for %s"),
library);
int flag;
int is_link;
unsigned int osversion;
+ unsigned int isa_level;
struct dlib_entry *next;
};
library already and it's not changed. */
char *soname;
unsigned int osversion;
- if (!search_aux_cache (&lstat_buf, &flag, &osversion, &soname))
+ unsigned int isa_level;
+ if (!search_aux_cache (&lstat_buf, &flag, &osversion, &isa_level,
+ &soname))
{
if (process_file (real_name, file_name, direntry->d_name, &flag,
- &osversion, &soname, is_link, &lstat_buf))
+ &osversion, &isa_level, &soname, is_link,
+ &lstat_buf))
{
if (real_name != real_file_name)
free (real_name);
continue;
}
else if (opt_build_cache)
- add_to_aux_cache (&lstat_buf, flag, osversion, soname);
+ add_to_aux_cache (&lstat_buf, flag, osversion, isa_level,
+ soname);
}
if (soname == NULL)
dlib_ptr->name = xstrdup (direntry->d_name);
dlib_ptr->is_link = is_link;
dlib_ptr->osversion = osversion;
+ dlib_ptr->isa_level = isa_level;
}
/* Don't add this library, abort loop. */
/* Also free soname, since it's dynamically allocated. */
dlib_ptr->flag = flag;
dlib_ptr->is_link = is_link;
dlib_ptr->osversion = osversion;
+ dlib_ptr->isa_level = isa_level;
/* Add at head of list. */
dlib_ptr->next = dlibs;
dlibs = dlib_ptr;
if (opt_build_cache)
add_to_cache (entry->path, filename, dlib_ptr->soname,
dlib_ptr->flag, dlib_ptr->osversion,
- hwcap, entry->hwcaps);
+ dlib_ptr->isa_level, hwcap, entry->hwcaps);
}
/* Free all resources. */
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <elf-read-prop.h>
+
/* This code is a heavily simplified version of the readelf program
that's part of the current binutils development version. For architectures
which need to handle both 32bit and 64bit ELF libraries, this file is
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
int i;
unsigned int j;
libc5/libc6. */
*flag = FLAG_ELF;
+ /* The default ISA level is 0. */
+ *isa_level = 0;
+
dynamic_addr = 0;
dynamic_size = 0;
program_interpreter = NULL;
}
break;
+ case PT_GNU_PROPERTY:
+ /* The NT_GNU_PROPERTY_TYPE_0 note must be aligned to 4 bytes
+ in 32-bit objects and to 8 bytes in 64-bit objects. Skip
+ notes with incorrect alignment. */
+ if (segment->p_align == (__ELF_NATIVE_CLASS / 8))
+ {
+ const ElfW(Nhdr) *note = (const void *) (file_contents
+ + segment->p_offset);
+ const ElfW(Addr) size = segment->p_filesz;
+ const ElfW(Addr) align = segment->p_align;
+
+ const ElfW(Addr) start = (ElfW(Addr)) (uintptr_t) note;
+ unsigned int last_type = 0;
+
+ while ((ElfW(Addr)) (uintptr_t) (note + 1) - start < size)
+ {
+ /* Find the NT_GNU_PROPERTY_TYPE_0 note. */
+ if (note->n_namesz == 4
+ && note->n_type == NT_GNU_PROPERTY_TYPE_0
+ && memcmp (note + 1, "GNU", 4) == 0)
+ {
+ /* Check for invalid property. */
+ if (note->n_descsz < 8
+ || (note->n_descsz % sizeof (ElfW(Addr))) != 0)
+ goto done;
+
+ /* Start and end of property array. */
+ unsigned char *ptr = (unsigned char *) (note + 1) + 4;
+ unsigned char *ptr_end = ptr + note->n_descsz;
+
+ do
+ {
+ unsigned int type = *(unsigned int *) ptr;
+ unsigned int datasz = *(unsigned int *) (ptr + 4);
+
+ /* Property type must be in ascending order. */
+ if (type < last_type)
+ goto done;
+
+ ptr += 8;
+ if ((ptr + datasz) > ptr_end)
+ goto done;
+
+ last_type = type;
+
+ /* Target specific property processing.
+ Return value:
+ false: Continue processing the properties.
+ true : Stop processing the properties.
+ */
+ if (read_gnu_property (isa_level, type,
+ datasz, ptr))
+ goto done;
+
+ /* Check the next property item. */
+ ptr += ALIGN_UP (datasz, sizeof (ElfW(Addr)));
+ }
+ while ((ptr_end - ptr) >= 8);
+
+ /* Only handle one NT_GNU_PROPERTY_TYPE_0. */
+ goto done;
+ }
+
+ note = ((const void *) note
+ + ELF_NOTE_NEXT_OFFSET (note->n_namesz,
+ note->n_descsz,
+ align));
+ }
+ }
+done:
+ break;
+
default:
break;
}
int
process_file (const char *real_file_name, const char *file_name,
const char *lib, int *flag, unsigned int *osversion,
- char **soname, int is_link, struct stat64 *stat_buf)
+ unsigned int *isa_level, char **soname, int is_link,
+ struct stat64 *stat_buf)
{
FILE *file;
struct stat64 statbuf;
/* Libraries have to be shared object files. */
else if (elf_header->e_type != ET_DYN)
ret = 1;
- else if (process_elf_file (file_name, lib, flag, osversion, soname,
- file_contents, statbuf.st_size))
+ else if (process_elf_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, statbuf.st_size))
ret = 1;
done:
--- /dev/null
+/* Wrapper to invoke tst-glibc-hwcaps-2 in a container to test ldconfig.
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+/* This program is just a wrapper that runs ldconfig followed by
+ tst-glibc-hwcaps-2. The actual test is provided via an
+ implementation in a sysdeps subdirectory. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <support/support.h>
+#include <support/capture_subprocess.h>
+
+int
+main (int argc, char **argv)
+{
+ /* Run ldconfig to populate the cache. */
+ char *command = xasprintf ("%s/ldconfig", support_install_rootsbindir);
+ struct support_capture_subprocess result =
+ support_capture_subprogram (command, &((char *) { NULL }));
+ support_capture_subprocess_check (&result, "ldconfig", 0, sc_allow_none);
+ free (command);
+
+ /* Reuse tst-glibc-hwcaps. Since this code is running in a
+ container, we can launch it directly. */
+ char *path = xasprintf ("%s/elf/tst-glibc-hwcaps-2", support_objdir_root);
+ execv (path, argv);
+ printf ("error: execv of %s failed: %m\n", path);
+ return 1;
+}
--- /dev/null
+# This file was created to suppress a warning from ldconfig:
+# /sbin/ldconfig: Warning: ignoring configuration file that cannot be opened: /etc/ld.so.conf: No such file or directory
--- /dev/null
+# test-container does not support scripts in sysdeps directories, so
+# collect everything in one file.
+
+mkdirp 0770 $L/glibc-hwcaps/x86-64-v2
+mkdirp 0770 $L/glibc-hwcaps/x86-64-v3
+cp $B/elf/libx86-64-isa-level-1.so $L/libx86-64-isa-level.so
+cp $B/elf/libx86-64-isa-level-3.so $L/glibc-hwcaps/x86-64-v2/libx86-64-isa-level.so
+cp $B/elf/libx86-64-isa-level-4.so $L/glibc-hwcaps/x86-64-v3/libx86-64-isa-level.so
entries. */
#define DL_CACHE_HWCAP_EXTENSION (1ULL << 62)
+/* The number of the ISA level bits in the upper 32 bits of the hwcap
+ field. */
+#define DL_CACHE_HWCAP_ISA_LEVEL_COUNT 10
+
+/* The mask of the ISA level bits in the hwcap field. */
+#define DL_CACHE_HWCAP_ISA_LEVEL_MASK \
+ ((1 << DL_CACHE_HWCAP_ISA_LEVEL_COUNT) -1)
+
/* Return true if the ENTRY->hwcap value indicates that
DL_CACHE_HWCAP_EXTENSION is used. */
static inline bool
dl_cache_hwcap_extension (struct file_entry_new *entry)
{
- /* If DL_CACHE_HWCAP_EXTENSION is set, but other bits as well, this
- is a different kind of extension. */
- return (entry->hwcap >> 32) == (DL_CACHE_HWCAP_EXTENSION >> 32);
+ /* This is an hwcap extension if only the DL_CACHE_HWCAP_EXTENSION bit
+ is set, ignoring the lower 32 bits as well as the ISA level bits in
+ the upper 32 bits. */
+ return (((entry->hwcap >> 32) & ~DL_CACHE_HWCAP_ISA_LEVEL_MASK)
+ == (DL_CACHE_HWCAP_EXTENSION >> 32));
}
/* See flags member of struct cache_file_new below. */
--- /dev/null
+/* Support for reading ISA level in /etc/ld.so.cache files written by
+ Linux ldconfig. Generic 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
+ <https://www.gnu.org/licenses/>. */
+
+/* Return true if the ISA level in ENTRY is compatible with CPU. */
+static inline bool
+dl_cache_hwcap_isa_level_compatible (struct file_entry_new *entry)
+{
+ return true;
+}
--- /dev/null
+/* Support for GNU properties in ldconfig. Generic 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _ELF_READ_PROP_H
+#define _ELF_READ_PROP_H
+
+/* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of SEGMENT.
+ Return value:
+ false: Continue processing the properties.
+ true : Stop processing the properties.
+ */
+static inline bool __attribute__ ((always_inline))
+read_gnu_property (unsigned int *isal_level, uint32_t type, uint32_t
+ datasz, void *data)
+{
+ return true;
+}
+
+#endif
(const struct glibc_hwcaps_subdirectory *);
extern void add_to_cache (const char *path, const char *filename,
- const char *soname,
- int flags, unsigned int osversion, uint64_t hwcap,
+ const char *soname, int flags,
+ unsigned int osversion, unsigned int isa_level,
+ uint64_t hwcap,
struct glibc_hwcaps_subdirectory *);
extern void init_aux_cache (void);
extern void load_aux_cache (const char *aux_cache_name);
extern int search_aux_cache (struct stat64 *stat_buf, int *flags,
- unsigned int *osversion, char **soname);
+ unsigned int *osversion,
+ unsigned int *isa_level, char **soname);
extern void add_to_aux_cache (struct stat64 *stat_buf, int flags,
- unsigned int osversion, const char *soname);
+ unsigned int osversion,
+ unsigned int isa_level, const char *soname);
extern void save_aux_cache (const char *aux_cache_name);
/* Declared in readlib.c. */
extern int process_file (const char *real_file_name, const char *file_name,
- const char *lib, int *flag, unsigned int *osversion,
- char **soname, int is_link, struct stat64 *stat_buf);
+ const char *lib, int *flag,
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, int is_link,
+ struct stat64 *stat_buf);
extern char *implicit_soname (const char *lib, int flag);
/* Declared in readelflib.c. */
-extern int process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+extern int process_elf_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Declared in chroot_canon.c. */
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
{
Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header;
- ret = process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
if (!ret && EF_ARM_EABI_VERSION (elf32_header->e_flags) == EF_ARM_EABI_VER5)
{
}
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* AArch64 libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_AARCH64_LIB64|FLAG_ELF_LIBC6;
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
- void *file_contents, size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
- return process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ return process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* Intel 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6;
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
union
{
elf_header.eh = file_contents;
if (elf_header.eh->e_ident [EI_CLASS] == ELFCLASS32)
{
- ret = process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
if (!ret)
{
Elf32_Word flags = elf_header.eh32->e_flags;
}
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* n64 libraries are always libc.so.6+. */
if (!ret)
{
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
- return process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ return process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* PowerPC 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_POWERPC_LIB64|FLAG_ELF_LIBC6;
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* The ELF flags supported by our current glibc port:
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
{
- ret = process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
flags = elf32_header->e_flags;
}
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
flags = elf64_header->e_flags;
}
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
- return process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ return process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* S/390 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_S390_LIB64|FLAG_ELF_LIBC6;
<https://www.gnu.org/licenses/>. */
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
- return process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ return process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
else
{
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
/* Sparc 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_SPARC_LIB64|FLAG_ELF_LIBC6;
--- /dev/null
+/* Support for GNU properties in ldconfig. 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _ELF_READ_PROP_H
+#define _ELF_READ_PROP_H
+
+#include <dl-cache.h>
+
+/* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of SEGMENT.
+ Return value:
+ false: Continue processing the properties.
+ true : Stop processing the properties.
+ */
+static inline bool __attribute__ ((always_inline))
+read_gnu_property (unsigned int *isal_level, uint32_t type,
+ uint32_t datasz, void *data)
+{
+ /* Property type must be in ascending order. */
+ if (type > GNU_PROPERTY_X86_ISA_1_NEEDED)
+ return true;
+
+ if (type == GNU_PROPERTY_X86_ISA_1_NEEDED)
+ {
+ if (datasz == 4)
+ {
+ /* The size of GNU_PROPERTY_X86_ISA_1_NEEDED must be 4 bytes.
+ There is no point to continue if this type is ill-formed. */
+ unsigned int isa_1_needed = *(unsigned int *) data;
+ _Static_assert (((sizeof (isa_1_needed) * 8)
+ <= (1 << DL_CACHE_HWCAP_ISA_LEVEL_COUNT)),
+ "DL_CACHE_HWCAP_ISA_LEVEL_COUNT is too small");
+ if (isa_1_needed != 0)
+ {
+ unsigned int level;
+ asm ("bsr %1, %0" : "=r" (level) : "g" (isa_1_needed));
+ *isal_level = level;
+ }
+ }
+ return true;
+ }
+
+ return false;
+}
+
+#endif
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-
-int process_elf32_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf32_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
-int process_elf64_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname,
+int process_elf64_file (const char *file_name, const char *lib,
+ int *flag, unsigned int *osversion,
+ unsigned int *isa_level, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
- unsigned int *osversion, char **soname, void *file_contents,
- size_t file_length)
+ unsigned int *osversion, unsigned int *isa_level,
+ char **soname, void *file_contents, size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret, file_flag = 0;
}
if (elf_header->e_ident[EI_CLASS] == ELFCLASS32)
- ret = process_elf32_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf32_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
else
- ret = process_elf64_file (file_name, lib, flag, osversion, soname,
- file_contents, file_length);
+ ret = process_elf64_file (file_name, lib, flag, osversion, isa_level,
+ soname, file_contents, file_length);
if (!ret && file_flag)
*flag = file_flag;
ifeq ($(subdir),misc)
gen-as-const-headers += sigaltstack-offsets.sym
endif
+
+ifeq ($(subdir),elf)
+ifeq (yes,$(enable-x86-isa-level))
+tests += \
+ tst-glibc-hwcaps-2
+ifeq (no,$(build-hardcoded-path-in-tests))
+# This is an ld.so.cache test, and RPATH/RUNPATH in the executable
+# interferes with its test objectives.
+tests-container += \
+ tst-glibc-hwcaps-2-cache
+endif
+modules-names += \
+ libx86-64-isa-level-1 \
+ libx86-64-isa-level-2 \
+ libx86-64-isa-level-3 \
+ libx86-64-isa-level-4
+
+$(objpfx)tst-glibc-hwcaps-2: $(objpfx)libx86-64-isa-level.so
+
+$(objpfx)tst-glibc-hwcaps-2.out: \
+ $(objpfx)glibc-hwcaps/x86-64-v2/libx86-64-isa-level.so \
+ $(objpfx)glibc-hwcaps/x86-64-v4/libx86-64-isa-level.so \
+ $(objpfx)glibc-hwcaps/x86-64-v3/libx86-64-isa-level.so
+$(objpfx)glibc-hwcaps/x86-64-v2/libx86-64-isa-level.so: \
+ $(objpfx)libx86-64-isa-level-2.so
+ $(make-target-directory)
+ cp $< $@
+$(objpfx)glibc-hwcaps/x86-64-v3/libx86-64-isa-level.so: \
+ $(objpfx)libx86-64-isa-level-3.so
+ $(make-target-directory)
+ cp $< $@
+$(objpfx)glibc-hwcaps/x86-64-v4/libx86-64-isa-level.so: \
+ $(objpfx)libx86-64-isa-level-4.so
+ $(make-target-directory)
+ cp $< $@
+
+CFLAGS-libx86-64-isa-level-1.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-2.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-3.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-4.os += -march=x86-64
+
+# The test modules are parameterized by preprocessor macros.
+LDFLAGS-libx86-64-isa-level-1.so += -Wl,-soname,libx86-64-isa-level.so
+LDFLAGS-libx86-64-isa-level-4.so += -Wl,-soname,libx86-64-isa-level.so
+$(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c
+ $(compile-command.c) -DVALUE=$(lastword $(subst -, ,$*)) \
+ -DISA_LEVEL="(1 << ($(lastword $(subst -, ,$*)) - 1))"
+$(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so
+ cp $< $@
+endif
+endif # $(subdir) == elf
--- /dev/null
+/* Check ISA level on shared object in glibc-hwcaps subdirectories.
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <elf.h>
+#include <get-isa-level.h>
+#include <support/check.h>
+#include <support/test-driver.h>
+
+extern int dso_isa_level (void);
+
+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)
+ return EXIT_FAILURE;
+
+ int level = dso_isa_level ();
+ int ret;
+ switch (level)
+ {
+ case 1:
+ case 2:
+ /* The default libx86-64-isa-level.so is used. */
+ printf ("The default shared library is used.\n");
+ if (has_isa_v3 || has_isa_v4 || !has_isa_v2)
+ ret = EXIT_FAILURE;
+ else
+ ret = EXIT_SUCCESS;
+ break;
+ case 3:
+ /* libx86-64-isa-level.so marked as x86-64 ISA level 3 needed in
+ x86-64-v2 should be ignored on lesser CPU. */
+ printf ("x86-64 ISA level 3 shared library is used.\n");
+ if (has_isa_v4 || !has_isa_v3)
+ ret = EXIT_FAILURE;
+ else
+ ret = EXIT_SUCCESS;
+ break;
+ case 4:
+ /* libx86-64-isa-level.so marked as x86-64 ISA level 4 needed in
+ x86-64-v3 should be ignored on lesser CPU. */
+ printf ("x86-64 ISA level 4 shared library is used.\n");
+ if (has_isa_v4)
+ ret = EXIT_SUCCESS;
+ else
+ ret = EXIT_FAILURE;
+ break;
+ default:
+ abort ();
+ }
+ return ret;
+}
+
+#include <support/test-driver.c>
--- /dev/null
+#define INCLUDE_X86_ISA_LEVEL
+#define MARKER dso_isa_level
+#include <isa-level.c>
+#include <markermodMARKER-VALUE.c>
--- /dev/null
+/* Support for reading ISA level in /etc/ld.so.cache files written by
+ Linux ldconfig. 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <sys/platform/x86.h>
+
+/* Return true if the ISA level in ENTRY is compatible with CPU. */
+static inline bool
+dl_cache_hwcap_isa_level_compatible (struct file_entry_new *entry)
+{
+ const struct cpu_features *cpu_features = __get_cpu_features ();
+ unsigned int isa_level
+ = 1 << ((entry->hwcap >> 32) & DL_CACHE_HWCAP_ISA_LEVEL_MASK);
+
+ return (isa_level & cpu_features->isa_1) == isa_level;
+}
projects / thirdparty / glibc.git / commitdiff
