mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
This hacks non-power-set processing into _dl_important_hwcaps. Once the legacy hwcaps handling goes away, the subdirectory handling needs to be reworked, but it is premature to do this while both approaches are still supported. ld.so supports two new arguments, --glibc-hwcaps-prepend and --glibc-hwcaps-mask. Each accepts a colon-separated list of glibc-hwcaps subdirectory names. The prepend option adds additional subdirectories that are searched first, in the specified order. The mask option restricts the automatically selected subdirectories to those listed in the option argument. For example, on systems where /usr/lib64 is on the library search path, --glibc-hwcaps-prepend=valgrind:debug causes the dynamic loader to search the directories /usr/lib64/glibc-hwcaps/valgrind and /usr/lib64/glibc-hwcaps/debug just before /usr/lib64 is searched. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>rearnsha/mte-v4.0
Florian Weimer
5 years ago
16 changed files with 784 additions and 33 deletions
@ -0,0 +1,29 @@ |
|||
/* Architecture-specific glibc-hwcaps subdirectories. Generic version.
|
|||
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 <dl-hwcaps.h> |
|||
|
|||
/* In the generic version, there are no subdirectories defined. */ |
|||
|
|||
const char _dl_hwcaps_subdirs[] = ""; |
|||
|
|||
uint32_t |
|||
_dl_hwcaps_subdirs_active (void) |
|||
{ |
|||
return 0; |
|||
} |
|||
@ -0,0 +1,77 @@ |
|||
/* Hardware capability support for run-time dynamic loader. String splitting.
|
|||
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 <dl-hwcaps.h> |
|||
#include <stdbool.h> |
|||
#include <string.h> |
|||
|
|||
_Bool |
|||
_dl_hwcaps_split (struct dl_hwcaps_split *s) |
|||
{ |
|||
if (s->segment == NULL) |
|||
return false; |
|||
|
|||
/* Skip over the previous segment. */ |
|||
s->segment += s->length; |
|||
|
|||
/* Consume delimiters. This also avoids returning an empty
|
|||
segment. */ |
|||
while (*s->segment == ':') |
|||
++s->segment; |
|||
if (*s->segment == '\0') |
|||
return false; |
|||
|
|||
/* This could use strchrnul, but we would have to link the function
|
|||
into ld.so for that. */ |
|||
const char *colon = strchr (s->segment, ':'); |
|||
if (colon == NULL) |
|||
s->length = strlen (s->segment); |
|||
else |
|||
s->length = colon - s->segment; |
|||
return true; |
|||
} |
|||
|
|||
_Bool |
|||
_dl_hwcaps_split_masked (struct dl_hwcaps_split_masked *s) |
|||
{ |
|||
while (true) |
|||
{ |
|||
if (!_dl_hwcaps_split (&s->split)) |
|||
return false; |
|||
bool active = s->bitmask & 1; |
|||
s->bitmask >>= 1; |
|||
if (active && _dl_hwcaps_contains (s->mask, |
|||
s->split.segment, s->split.length)) |
|||
return true; |
|||
} |
|||
} |
|||
|
|||
_Bool |
|||
_dl_hwcaps_contains (const char *hwcaps, const char *name, size_t name_length) |
|||
{ |
|||
if (hwcaps == NULL) |
|||
return true; |
|||
|
|||
struct dl_hwcaps_split split; |
|||
_dl_hwcaps_split_init (&split, hwcaps); |
|||
while (_dl_hwcaps_split (&split)) |
|||
if (split.length == name_length |
|||
&& memcmp (split.segment, name, name_length) == 0) |
|||
return true; |
|||
return false; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
/* Source file template for building shared objects with marker functions.
|
|||
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/>. */
|
|||
|
|||
/* MARKER and VALUE must be set on the compiler command line. */ |
|||
|
|||
#ifndef MARKER |
|||
# error MARKER not defined |
|||
#endif |
|||
|
|||
int |
|||
MARKER (void) |
|||
{ |
|||
return VALUE; |
|||
} |
|||
@ -0,0 +1,148 @@ |
|||
/* Unit tests for dl-hwcaps.c.
|
|||
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 <array_length.h> |
|||
#include <dl-hwcaps.h> |
|||
#include <string.h> |
|||
#include <support/check.h> |
|||
|
|||
static void |
|||
check_split_masked (const char *input, int32_t bitmask, const char *mask, |
|||
const char *expected[], size_t expected_length) |
|||
{ |
|||
struct dl_hwcaps_split_masked split; |
|||
_dl_hwcaps_split_masked_init (&split, input, bitmask, mask); |
|||
size_t index = 0; |
|||
while (_dl_hwcaps_split_masked (&split)) |
|||
{ |
|||
TEST_VERIFY_EXIT (index < expected_length); |
|||
TEST_COMPARE_BLOB (expected[index], strlen (expected[index]), |
|||
split.split.segment, split.split.length); |
|||
++index; |
|||
} |
|||
TEST_COMPARE (index, expected_length); |
|||
} |
|||
|
|||
static void |
|||
check_split (const char *input, |
|||
const char *expected[], size_t expected_length) |
|||
{ |
|||
struct dl_hwcaps_split split; |
|||
_dl_hwcaps_split_init (&split, input); |
|||
size_t index = 0; |
|||
while (_dl_hwcaps_split (&split)) |
|||
{ |
|||
TEST_VERIFY_EXIT (index < expected_length); |
|||
TEST_COMPARE_BLOB (expected[index], strlen (expected[index]), |
|||
split.segment, split.length); |
|||
++index; |
|||
} |
|||
TEST_COMPARE (index, expected_length); |
|||
|
|||
/* Reuse the test cases with masking that does not actually remove
|
|||
anything. */ |
|||
check_split_masked (input, -1, NULL, expected, expected_length); |
|||
check_split_masked (input, -1, input, expected, expected_length); |
|||
} |
|||
|
|||
static int |
|||
do_test (void) |
|||
{ |
|||
/* Splitting tests, without masking. */ |
|||
check_split (NULL, NULL, 0); |
|||
check_split ("", NULL, 0); |
|||
check_split (":", NULL, 0); |
|||
check_split ("::", NULL, 0); |
|||
|
|||
{ |
|||
const char *expected[] = { "first" }; |
|||
check_split ("first", expected, array_length (expected)); |
|||
check_split (":first", expected, array_length (expected)); |
|||
check_split ("first:", expected, array_length (expected)); |
|||
check_split (":first:", expected, array_length (expected)); |
|||
} |
|||
|
|||
{ |
|||
const char *expected[] = { "first", "second" }; |
|||
check_split ("first:second", expected, array_length (expected)); |
|||
check_split ("first::second", expected, array_length (expected)); |
|||
check_split (":first:second", expected, array_length (expected)); |
|||
check_split ("first:second:", expected, array_length (expected)); |
|||
check_split (":first:second:", expected, array_length (expected)); |
|||
} |
|||
|
|||
/* Splitting tests with masking. */ |
|||
{ |
|||
const char *expected[] = { "first" }; |
|||
check_split_masked ("first", 3, "first:second", |
|||
expected, array_length (expected)); |
|||
check_split_masked ("first:second", 3, "first:", |
|||
expected, array_length (expected)); |
|||
check_split_masked ("first:second", 1, NULL, |
|||
expected, array_length (expected)); |
|||
} |
|||
{ |
|||
const char *expected[] = { "second" }; |
|||
check_split_masked ("first:second", 3, "second", |
|||
expected, array_length (expected)); |
|||
check_split_masked ("first:second:third", -1, "second:", |
|||
expected, array_length (expected)); |
|||
check_split_masked ("first:second", 2, NULL, |
|||
expected, array_length (expected)); |
|||
check_split_masked ("first:second:third", 2, "first:second", |
|||
expected, array_length (expected)); |
|||
} |
|||
|
|||
/* Tests for _dl_hwcaps_contains. */ |
|||
TEST_VERIFY (_dl_hwcaps_contains (NULL, "first", strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains (NULL, "", 0)); |
|||
TEST_VERIFY (! _dl_hwcaps_contains ("", "first", strlen ("first"))); |
|||
TEST_VERIFY (! _dl_hwcaps_contains ("firs", "first", strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("firs", "first", strlen ("first") - 1)); |
|||
for (int i = 0; i < strlen ("first"); ++i) |
|||
TEST_VERIFY (! _dl_hwcaps_contains ("first", "first", i)); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first", "first", strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first:", "first", strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first:second", |
|||
"first", strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains (":first:second", "first", |
|||
strlen ("first"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first:second", "second", |
|||
strlen ("second"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first:second:", "second", |
|||
strlen ("second"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first::second:", "second", |
|||
strlen ("second"))); |
|||
TEST_VERIFY (_dl_hwcaps_contains ("first:second::", "second", |
|||
strlen ("second"))); |
|||
for (int i = 0; i < strlen ("second"); ++i) |
|||
{ |
|||
TEST_VERIFY (!_dl_hwcaps_contains ("first:second", "second", i)); |
|||
TEST_VERIFY (!_dl_hwcaps_contains ("first:second:", "second", i)); |
|||
TEST_VERIFY (!_dl_hwcaps_contains ("first:second::", "second", i)); |
|||
TEST_VERIFY (!_dl_hwcaps_contains ("first::second", "second", i)); |
|||
} |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
#include <support/test-driver.c> |
|||
|
|||
/* Rebuild the sources here because the object file is built for
|
|||
inclusion into the dynamic loader. */ |
|||
#include "dl-hwcaps_split.c" |
|||
@ -0,0 +1,31 @@ |
|||
/* Test that --glibc-hwcaps-mask works.
|
|||
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 <support/check.h> |
|||
|
|||
extern int marker1 (void); |
|||
|
|||
static int |
|||
do_test (void) |
|||
{ |
|||
/* The marker1 function in elf/markermod1.so returns 1. */ |
|||
TEST_COMPARE (marker1 (), 1); |
|||
return 0; |
|||
} |
|||
|
|||
#include <support/test-driver.c> |
|||
@ -0,0 +1,32 @@ |
|||
/* Test that --glibc-hwcaps-prepend works.
|
|||
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 <support/check.h> |
|||
|
|||
extern int marker1 (void); |
|||
|
|||
static int |
|||
do_test (void) |
|||
{ |
|||
/* The marker1 function in
|
|||
glibc-hwcaps/prepend-markermod1/markermod1.so returns 2. */ |
|||
TEST_COMPARE (marker1 (), 2); |
|||
return 0; |
|||
} |
|||
|
|||
#include <support/test-driver.c> |
|||
@ -0,0 +1,28 @@ |
|||
/* Stub test for glibc-hwcaps.
|
|||
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 <stdio.h> |
|||
|
|||
static int |
|||
do_test (void) |
|||
{ |
|||
puts ("info: generic tst-glibc-hwcaps (tests nothing)"); |
|||
return 0; |
|||
} |
|||
|
|||
#include <support/test-driver.c> |
|||
Loading…
Reference in new issue