Skip to content
Snippets Groups Projects
Commit 5de88b90 authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import glibc-2.28-225.el8

parent 8ab6245f
No related branches found
Tags imports/r8/glibc-2.28-225.el8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4432 additions and 0 deletions
SOURCES/glibc-rh1159809-1.patch 0 → 100644
+ 2024
− 0
View file @ 5de88b90
commit e6fd79f3795d46dfb583e124be49fc063bc3d58b
Author: Chung-Lin Tang <cltang@codesourcery.com>
Date: Thu Oct 21 21:41:21 2021 +0800
elf: Testing infrastructure for ld.so DSO sorting (BZ #17645)
This is the first of a 2-part patch set that fixes slow DSO sorting behavior in
the dynamic loader, as reported in BZ #17645. In order to facilitate such a
large modification to the dynamic loader, this first patch implements a testing
framework for validating shared object sorting behavior, to enable comparison
between old/new sorting algorithms, and any later enhancements.
This testing infrastructure consists of a Python script
scripts/dso-ordering-test.py' which takes in a description language, consisting
of strings that describe a set of link dependency relations between DSOs, and
generates testcase programs and Makefile fragments to automatically test the
described situation, for example:
a->b->c->d # four objects linked one after another
a->[bc]->d;b->c # a depends on b and c, which both depend on d,
# b depends on c (b,c linked to object a in fixed order)
a->b->c;{+a;%a;-a} # a, b, c serially dependent, main program uses
# dlopen/dlsym/dlclose on object a
a->b->c;{}!->[abc] # a, b, c serially dependent; multiple tests generated
# to test all permutations of a, b, c ordering linked
# to main program
(Above is just a short description of what the script can do, more
documentation is in the script comments.)
Two files containing several new tests, elf/dso-sort-tests-[12].def are added,
including test scenarios for BZ #15311 and Redhat issue #1162810 [1].
Due to the nature of dynamic loader tests, where the sorting behavior and test
output occurs before/after main(), generating testcases to use
support/test-driver.c does not suffice to control meaningful timeout for ld.so.
Therefore a new utility program 'support/test-run-command', based on
test-driver.c/support_test_main.c has been added. This does the same testcase
control, but for a program specified through a command-line rather than at the
source code level. This utility is used to run the dynamic loader testcases
generated by dso-ordering-test.py.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1162810
Signed-off-by: Chung-Lin Tang <cltang@codesourcery.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/elf/Makefile b/elf/Makefile
index 1fdf40cbd49e233e..e92f62f279566684 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -986,6 +986,21 @@ tests-special += \
# tests-special
endif
+# DSO sorting tests:
+# The dso-ordering-test.py script generates testcase source files in $(objpfx),
+# creating a $(objpfx)<testcase-name>-dir for each testcase, and creates a
+# Makefile fragment to be included.
+define include_dsosort_tests
+$(objpfx)$(1).generated-makefile: $(1)
+ $(PYTHON) $(..)scripts/dso-ordering-test.py \
+ --description-file $$< --objpfx $(objpfx) --output-makefile $$@
+include $(objpfx)$(1).generated-makefile
+endef
+
+# Generate from each testcase description file
+$(eval $(call include_dsosort_tests,dso-sort-tests-1.def))
+$(eval $(call include_dsosort_tests,dso-sort-tests-2.def))
+
check-abi: $(objpfx)check-abi-ld.out
tests-special += $(objpfx)check-abi-ld.out
update-abi: update-abi-ld
diff --git a/elf/dso-sort-tests-1.def b/elf/dso-sort-tests-1.def
new file mode 100644
index 0000000000000000..873ddf55d91155c6
--- /dev/null
+++ b/elf/dso-sort-tests-1.def
@@ -0,0 +1,66 @@
+# DSO sorting test descriptions.
+# This file is to be processed by ../scripts/dso-ordering-test.py, see usage
+# in elf/Makefile for how it is executed.
+
+# We test both dynamic loader sorting algorithms
+tunable_option: glibc.rtld.dynamic_sort=1
+tunable_option: glibc.rtld.dynamic_sort=2
+
+# Sequence of single dependencies with no cycles.
+tst-dso-ordering1: a->b->c
+output: c>b>a>{}<a<b<c
+
+# Sequence including 2 dependent DSOs not at the end of the graph.
+tst-dso-ordering2: a->b->[cd]->e
+output: e>d>c>b>a>{}<a<b<c<d<e
+
+# Complex order with 3 "layers" of full dependencies
+tst-dso-ordering3: a->[bc]->[def]->[gh]->i
+output: i>h>g>f>e>d>c>b>a>{}<a<b<c<d<e<f<g<h<i
+
+# Sequence including 2 dependent DSOs at the end of the graph.
+# Additionally the same dependencies appear in two paths.
+tst-dso-ordering4: a->b->[de];a->c->d->e
+output: e>d>c>b>a>{}<a<b<c<d<e
+
+# Test that b->c cross link is respected correctly
+tst-dso-ordering5: a!->[bc]->d;b->c
+output: d>c>b>a>{}<a<b<c<d
+
+# First DSO fully dependent on 4 DSOs, with another DSO at the end of chain.
+tst-dso-ordering6: a->[bcde]->f
+output: f>e>d>c>b>a>{}<a<b<c<d<e<f
+
+# Sequence including 2 dependent and 3 dependent DSOs, and one of the
+# dependent DSOs is dependent on an earlier DSO.
+tst-dso-ordering7: a->[bc];b->[cde];e->f
+output: f>e>d>c>b>a>{}<a<b<c<d<e<f
+
+# Sequence where the DSO c is unerlinked and calls a function in DSO a which
+# is technically a cycle. The main executable depends on the first two DSOs.
+# Note: This test has unspecified behavior.
+tst-dso-ordering8: a->b->c=>a;{}->[ba]
+output: c>b>a>{}<a<b<c
+
+# Generate the permutation of DT_NEEDED order between the main binary and
+# all 5 DSOs; all link orders should produce exact same init/fini ordering
+tst-dso-ordering9: a->b->c->d->e;{}!->[abcde]
+output: e>d>c>b>a>{}<a<b<c<d<e
+
+# Test if init/fini ordering behavior is proper, despite main program with
+# an soname that may cause confusion
+tst-dso-ordering10: {}->a->b->c;soname({})=c
+output: b>a>{}<a<b
+
+# Complex example from Bugzilla #15311, under-linked and with circular
+# relocation(dynamic) dependencies. While this is technically unspecified, the
+# presumed reasonable practical behavior is for the destructor order to respect
+# the static DT_NEEDED links (here this means the a->b->c->d order).
+# The older dynamic_sort=1 algorithm does not achieve this, while the DFS-based
+# dynamic_sort=2 algorithm does, although it is still arguable whether going
+# beyond spec to do this is the right thing to do.
+# The below expected outputs are what the two algorithms currently produce
+# respectively, for regression testing purposes.
+tst-bz15311: {+a;+e;+f;+g;+d;%d;-d;-g;-f;-e;-a};a->b->c->d;d=>[ba];c=>a;b=>e=>a;c=>f=>b;d=>g=>c
+xfail_output(glibc.rtld.dynamic_sort=1): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<a<c<d<g<f<b<e];}
+output(glibc.rtld.dynamic_sort=2): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<g<f<a<b<c<d<e];}
diff --git a/elf/dso-sort-tests-2.def b/elf/dso-sort-tests-2.def
new file mode 100644
index 0000000000000000..b79e79ecb7dc3dbf
--- /dev/null
+++ b/elf/dso-sort-tests-2.def
@@ -0,0 +1,614 @@
+# Large DSO sorting testcase adapted from Red Hat Bugzilla 1162810
+#
+# Note that below we specify different expected outputs between dynamic_sort=1
+# and dynamic_sort=2 algorithms, due to circular dependencies in the testcase
+# causing different sorting behavior. These expected outputs are what the two
+# algorithms currently produce, and are used for regression comparison tests.
+# They are not "definitively" correct outputs, for circular dependencies
+# inherently have unspecified behavior.
+
+xtest(tst-redhat-1162810):
+{}->A101
+{}->*
+A101->(B101 B163 B122 B181)
+A102->(B102 B140 B199 B158)
+A103->(B103 B117 B176 B135)
+A104->(B104 B194 B153 B112)
+A105->(B105 B171 B130 B189)
+A106->(B106 B148 B107 B166)
+A107->(B107 B125 B184 B143)
+A108->(B108 B102 B161 B120)
+A109->(B109 B179 B138 B197)
+A110->(B110 B156 B115 B174)
+A111->(B111 B133 B192 B151)
+A112->(B112 B110 B169 B128)
+A113->(B113 B187 B146 B105)
+A114->(B114 B164 B123 B182)
+A115->(B115 B141 B200 B159)
+A116->(B116 B118 B177 B136)
+A117->(B117 B195 B154 B113)
+A118->(B118 B172 B131 B190)
+A119->(B119 B149 B108 B167)
+A120->(B120 B126 B185 B144)
+A121->(B121 B103 B162)
+A122->(B122 B180 B139 B198)
+A123->(B123 B157 B116 B175)
+A124->(B124 B134 B193 B152)
+A125->(B125 B111 B170 B129)
+A126->(B126 B188 B147 B106)
+A127->(B127 B165 B124 B183)
+A128->(B128 B142 B101 B160)
+A129->(B129 B119 B178 B137)
+A130->(B130 B196 B155 B114)
+A131->(B131 B173 B132 B191)
+A132->(B132 B150 B109 B168)
+A133->(B133 B127 B186 B145)
+A134->(B134 B104 B163 B122)
+A135->(B135 B181 B140 B199)
+A136->(B136 B158 B117 B176)
+A137->(B137 B135 B194 B153)
+A138->(B138 B112 B171 B130)
+A139->(B139 B189 B148 B107)
+A140->(B140 B166 B125 B184)
+A141->(B141 B143 B102 B161)
+A142->(B142 B120 B179 B138)
+A143->(B143 B197 B156 B115)
+A144->(B144 B174 B133 B192)
+A145->(B145 B151 B110 B169)
+A146->(B146 B128 B187)
+A147->(B147 B105 B164 B123)
+A148->(B148 B182 B141 B200)
+A149->(B149 B159 B118 B177)
+A150->(B150 B136 B195 B154)
+A151->(B151 B113 B172 B131)
+A152->(B152 B190 B149 B108)
+A153->(B153 B167 B126 B185)
+A154->(B154 B144 B103 B162)
+A155->(B155 B121 B180 B139)
+A156->(B156 B198 B157 B116)
+A157->(B157 B175 B134 B193)
+A158->(B158 B152 B111 B170)
+A159->(B159 B129 B188 B147)
+A160->(B160 B106 B165 B124)
+A161->(B161 B183 B142 B101)
+A162->(B162 B160 B119 B178)
+A163->(B163 B137 B196 B155)
+A164->(B164 B114 B173 B132)
+A165->(B165 B191 B150 B109)
+A166->(B166 B168 B127 B186)
+A167->(B167 B145 B104 B163)
+A168->(B168 B122 B181 B140)
+A169->(B169 B199 B158 B117)
+A170->(B170 B176 B135 B194)
+A171->(B171 B153 B112)
+A172->(B172 B130 B189 B148)
+A173->(B173 B107 B166 B125)
+A174->(B174 B184 B143 B102)
+A175->(B175 B161 B120 B179)
+A176->(B176 B138 B197 B156)
+A177->(B177 B115 B174 B133)
+A178->(B178 B192 B151 B110)
+A179->(B179 B169 B128 B187)
+A180->(B180 B146 B105 B164)
+A181->(B181 B123 B182 B141)
+A182->(B182 B200 B159 B118)
+A183->(B183 B177 B136 B195)
+A184->(B184 B154 B113 B172)
+A185->(B185 B131 B190 B149)
+A186->(B186 B108 B167 B126)
+A187->(B187 B185 B144 B103)
+A188->(B188 B162 B121 B180)
+A189->(B189 B139 B198 B157)
+A190->(B190 B116 B175 B134)
+A191->(B191 B193 B152 B111)
+A192->(B192 B170 B129 B188)
+A193->(B193 B147 B106 B165)
+A194->(B194 B124 B183 B142)
+A195->(B195 B101 B160 B119)
+A196->(B196 B178 B137)
+A197->(B197 B155 B114 B173)
+A198->(B198 B132 B191 B150)
+A199->(B199 B109 B168 B127)
+A200->(B200 B186 B145 B104)
+B101->(C101 C164 C123 C182)
+B102->(C102 C141 C200 C159)
+B103->(C103 C118 C177 C136)
+B104->(C104 C195 C154 C113)
+B105->(C105 C172 C131 C190)
+B106->(C106 C149 C108 C167)
+B107->(C107 C126 C185 C144)
+B108->(C108 C103 C162 C121)
+B109->(C109 C180 C139 C198)
+B110->(C110 C157 C116 C175)
+B111->(C111 C134 C193 C152)
+B112->(C112 C111 C170 C129)
+B113->(C113 C188 C147 C106)
+B114->(C114 C165 C124 C183)
+B115->(C115 C142 C101 C160)
+B116->(C116 C119 C178 C137)
+B117->(C117 C196 C155 C114)
+B118->(C118 C173 C132 C191)
+B119->(C119 C150 C109 C168)
+B120->(C120 C127 C186 C145)
+B121->(C121 C104 C163 C122)
+B122->(C122 C181 C140 C199)
+B123->(C123 C158 C117 C176)
+B124->(C124 C135 C194 C153)
+B125->(C125 C112 C171 C130)
+B126->(C126 C189 C148 C107)
+B127->(C127 C166 C125 C184)
+B128->(C128 C143 C102 C161)
+B129->(C129 C120 C179 C138)
+B130->(C130 C197 C156 C115)
+B131->(C131 C174 C133 C192)
+B132->(C132 C151 C110 C169)
+B133->(C133 C128 C187 C146)
+B134->(C134 C105 C164 C123)
+B135->(C135 C182 C141 C200)
+B136->(C136 C159 C118 C177)
+B137->(C137 C136 C195 C154)
+B138->(C138 C113 C172 C131)
+B139->(C139 C190 C149 C108)
+B140->(C140 C167 C126 C185)
+B141->(C141 C144 C103 C162)
+B142->(C142 C121 C180 C139)
+B143->(C143 C198 C157 C116)
+B144->(C144 C175 C134 C193)
+B145->(C145 C152 C111 C170)
+B146->(C146 C129 C188 C147)
+B147->(C147 C106 C165 C124)
+B148->(C148 C183 C142 C101)
+B149->(C149 C160 C119 C178)
+B150->(C150 C137 C196 C155)
+B151->(C151 C114 C173 C132)
+B152->(C152 C191 C150 C109)
+B153->(C153 C168 C127 C186)
+B154->(C154 C145 C104 C163)
+B155->(C155 C122 C181 C140)
+B156->(C156 C199 C158 C117)
+B157->(C157 C176 C135 C194)
+B158->(C158 C153 C112 C171)
+B159->(C159 C130 C189 C148)
+B160->(C160 C107 C166 C125)
+B161->(C161 C184 C143 C102)
+B162->(C162 C161 C120 C179)
+B163->(C163 C138 C197 C156)
+B164->(C164 C115 C174 C133)
+B165->(C165 C192 C151 C110)
+B166->(C166 C169 C128 C187)
+B167->(C167 C146 C105 C164)
+B168->(C168 C123 C182 C141)
+B169->(C169 C200 C159 C118)
+B170->(C170 C177 C136 C195)
+B171->(C171 C154 C113 C172)
+B172->(C172 C131 C190 C149)
+B173->(C173 C108 C167 C126)
+B174->(C174 C185 C144 C103)
+B175->(C175 C162 C121 C180)
+B176->(C176 C139 C198 C157)
+B177->(C177 C116 C175 C134)
+B178->(C178 C193 C152 C111)
+B179->(C179 C170 C129 C188)
+B180->(C180 C147 C106 C165)
+B181->(C181 C124 C183 C142)
+B182->(C182 C101 C160 C119)
+B183->(C183 C178 C137 C196)
+B184->(C184 C155 C114 C173)
+B185->(C185 C132 C191 C150)
+B186->(C186 C109 C168 C127)
+B187->(C187 C186 C145 C104)
+B188->(C188 C163 C122 C181)
+B189->(C189 C140 C199 C158)
+B190->(C190 C117 C176 C135)
+B191->(C191 C194 C153 C112)
+B192->(C192 C171 C130 C189)
+B193->(C193 C148 C107 C166)
+B194->(C194 C125 C184 C143)
+B195->(C195 C102 C161 C120)
+B196->(C196 C179 C138 C197)
+B197->(C197 C156 C115 C174)
+B198->(C198 C133 C192 C151)
+B199->(C199 C110 C169 C128)
+B200->(C200 C187 C146 C105)
+C101->(A165 A124)
+C102->(A183 A142)
+C103->(A101 A160)
+C104->(A119 A178)
+C105->(A137 A196)
+C106->(A155 A114)
+C107->(A173 A132)
+C108->(A191 A150)
+C109->(A109 A168)
+C110->(A127 A186)
+C111->(A145 A104)
+C112->(A163 A122)
+C113->(A181 A140)
+C114->(A199 A158)
+C115->(A117 A176)
+C116->(A135 A194)
+C117->(A153 A112)
+C118->(A171 A130)
+C119->(A189 A148)
+C120->(A107 A166)
+C121->(A125 A184)
+C122->(A143 A102)
+C123->(A161 A120)
+C124->(A179 A138)
+C125->(A197 A156)
+C126->(A115 A174)
+C127->(A133 A192)
+C128->(A151 A110)
+C129->(A169 A128)
+C130->(A187 A146)
+C131->(A105 A164)
+C132->(A123 A182)
+C133->(A141 A200)
+C134->(A159 A118)
+C135->(A177 A136)
+C136->(A195 A154)
+C137->(A113 A172)
+C138->(A131 A190)
+C139->(A149 A108)
+C140->(A167 A126)
+C141->(A185 A144)
+C142->(A103 A162)
+C143->(A121 A180)
+C144->(A139 A198)
+C145->(A157 A116)
+C146->(A175 A134)
+C147->(A193 A152)
+C148->(A111 A170)
+C149->(A129 A188)
+C150->(A147 A106)
+C151->(A165 A124)
+C152->(A183 A142)
+C153->(A101 A160)
+C154->(A119 A178)
+C155->(A137 A196)
+C156->(A155 A114)
+C157->(A173 A132)
+C158->(A191 A150)
+C159->(A109 A168)
+C160->(A127 A186)
+C161->(A145 A104)
+C162->(A163 A122)
+C163->(A181 A140)
+C164->(A199 A158)
+C165->(A117 A176)
+C166->(A135 A194)
+C167->(A153 A112)
+C168->(A171 A130)
+C169->(A189 A148)
+C170->(A107 A166)
+C171->(A125 A184)
+C172->(A143 A102)
+C173->(A161 A120)
+C174->(A179 A138)
+C175->(A197 A156)
+C176->(A115 A174)
+C177->(A133 A192)
+C178->(A151 A110)
+C179->(A169 A128)
+C180->(A187 A146)
+C181->(A105 A164)
+C182->(A123 A182)
+C183->(A141 A200)
+C184->(A159 A118)
+C185->(A177 A136)
+C186->(A195 A154)
+C187->(A113 A172)
+C188->(A131 A190)
+C189->(A149 A108)
+C190->(A167 A126)
+C191->(A185 A144)
+C192->(A103 A162)
+C193->(A121 A180)
+C194->(A139 A198)
+C195->(A157 A116)
+C196->(A175 A134)
+C197->(A193 A152)
+C198->(A111 A170)
+C199->(A129 A188)
+C200->(A147 A106)
+M11X11->(M13X14 M12X13 M12X12 M12X11)
+M11X12->(M13X25 M12X24 M12X23 M12X22)
+M11X13->(M13X21 M12X20 M12X19 M12X18)
+M11X14->(M13X17 M12X16 M12X15 M12X14)
+M11X15->(M13X13 M12X12 M12X11 M12X25)
+M11X16->(M13X24 M12X23 M12X22 M12X21)
+M11X17->(M13X20 M12X19 M12X18 M12X17)
+M11X18->(M13X16 M12X15 M12X14 M12X13)
+M11X19->(M13X12 M12X11 M12X25 M12X24)
+M11X20->(M13X23 M12X22 M12X21 M12X20)
+M11X21->(M13X19 M12X18 M12X17 M12X16)
+M11X22->(M13X15 M12X14 M12X13 M12X12)
+M11X23->(M13X11 M12X25 M12X24 M12X23)
+M11X24->(M13X22 M12X21 M12X20 M12X19)
+M11X25->(M13X18 M12X17 M12X16 M12X15)
+M12X11->(M14X14 M13X13 M13X12 M13X11)
+M12X12->(M14X25 M13X24 M13X23 M13X22)
+M12X13->(M14X21 M13X20 M13X19 M13X18)
+M12X14->(M14X17 M13X16 M13X15 M13X14)
+M12X15->(M14X13 M13X12 M13X11 M13X25)
+M12X16->(M14X24 M13X23 M13X22 M13X21)
+M12X17->(M14X20 M13X19 M13X18 M13X17)
+M12X18->(M14X16 M13X15 M13X14 M13X13)
+M12X19->(M14X12 M13X11 M13X25 M13X24)
+M12X20->(M14X23 M13X22 M13X21 M13X20)
+M12X21->(M14X19 M13X18 M13X17 M13X16)
+M12X22->(M14X15 M13X14 M13X13 M13X12)
+M12X23->(M14X11 M13X25 M13X24 M13X23)
+M12X24->(M14X22 M13X21 M13X20 M13X19)
+M12X25->(M14X18 M13X17 M13X16 M13X15)
+M13X11->(M15X14 M14X13 M14X12 M14X11)
+M13X12->(M15X25 M14X24 M14X23 M14X22)
+M13X13->(M15X21 M14X20 M14X19 M14X18)
+M13X14->(M15X17 M14X16 M14X15 M14X14)
+M13X15->(M15X13 M14X12 M14X11 M14X25)
+M13X16->(M15X24 M14X23 M14X22 M14X21)
+M13X17->(M15X20 M14X19 M14X18 M14X17)
+M13X18->(M15X16 M14X15 M14X14 M14X13)
+M13X19->(M15X12 M14X11 M14X25 M14X24)
+M13X20->(M15X23 M14X22 M14X21 M14X20)
+M13X21->(M15X19 M14X18 M14X17 M14X16)
+M13X22->(M15X15 M14X14 M14X13 M14X12)
+M13X23->(M15X11 M14X25 M14X24 M14X23)
+M13X24->(M15X22 M14X21 M14X20 M14X19)
+M13X25->(M15X18 M14X17 M14X16 M14X15)
+M14X11->(M16X14 M15X13 M15X12 M15X11)
+M14X12->(M16X25 M15X24 M15X23 M15X22)
+M14X13->(M16X21 M15X20 M15X19 M15X18)
+M14X14->(M16X17 M15X16 M15X15 M15X14)
+M14X15->(M16X13 M15X12 M15X11 M15X25)
+M14X16->(M16X24 M15X23 M15X22 M15X21)
+M14X17->(M16X20 M15X19 M15X18 M15X17)
+M14X18->(M16X16 M15X15 M15X14 M15X13)
+M14X19->(M16X12 M15X11 M15X25 M15X24)
+M14X20->(M16X23 M15X22 M15X21 M15X20)
+M14X21->(M16X19 M15X18 M15X17 M15X16)
+M14X22->(M16X15 M15X14 M15X13 M15X12)
+M14X23->(M16X11 M15X25 M15X24 M15X23)
+M14X24->(M16X22 M15X21 M15X20 M15X19)
+M14X25->(M16X18 M15X17 M15X16 M15X15)
+M15X11->(M17X14 M16X13 M16X12 M16X11)
+M15X12->(M17X25 M16X24 M16X23 M16X22)
+M15X13->(M17X21 M16X20 M16X19 M16X18)
+M15X14->(M17X17 M16X16 M16X15 M16X14)
+M15X15->(M17X13 M16X12 M16X11 M16X25)
+M15X16->(M17X24 M16X23 M16X22 M16X21)
+M15X17->(M17X20 M16X19 M16X18 M16X17)
+M15X18->(M17X16 M16X15 M16X14 M16X13)
+M15X19->(M17X12 M16X11 M16X25 M16X24)
+M15X20->(M17X23 M16X22 M16X21 M16X20)
+M15X21->(M17X19 M16X18 M16X17 M16X16)
+M15X22->(M17X15 M16X14 M16X13 M16X12)
+M15X23->(M17X11 M16X25 M16X24 M16X23)
+M15X24->(M17X22 M16X21 M16X20 M16X19)
+M15X25->(M17X18 M16X17 M16X16 M16X15)
+M16X11->(M18X14 M17X13 M17X12 M17X11)
+M16X12->(M18X25 M17X24 M17X23 M17X22)
+M16X13->(M18X21 M17X20 M17X19 M17X18)
+M16X14->(M18X17 M17X16 M17X15 M17X14)
+M16X15->(M18X13 M17X12 M17X11 M17X25)
+M16X16->(M18X24 M17X23 M17X22 M17X21)
+M16X17->(M18X20 M17X19 M17X18 M17X17)
+M16X18->(M18X16 M17X15 M17X14 M17X13)
+M16X19->(M18X12 M17X11 M17X25 M17X24)
+M16X20->(M18X23 M17X22 M17X21 M17X20)
+M16X21->(M18X19 M17X18 M17X17 M17X16)
+M16X22->(M18X15 M17X14 M17X13 M17X12)
+M16X23->(M18X11 M17X25 M17X24 M17X23)
+M16X24->(M18X22 M17X21 M17X20 M17X19)
+M16X25->(M18X18 M17X17 M17X16 M17X15)
+M17X11->(M19X14 M18X13 M18X12 M18X11)
+M17X12->(M19X25 M18X24 M18X23 M18X22)
+M17X13->(M19X21 M18X20 M18X19 M18X18)
+M17X14->(M19X17 M18X16 M18X15 M18X14)
+M17X15->(M19X13 M18X12 M18X11 M18X25)
+M17X16->(M19X24 M18X23 M18X22 M18X21)
+M17X17->(M19X20 M18X19 M18X18 M18X17)
+M17X18->(M19X16 M18X15 M18X14 M18X13)
+M17X19->(M19X12 M18X11 M18X25 M18X24)
+M17X20->(M19X23 M18X22 M18X21 M18X20)
+M17X21->(M19X19 M18X18 M18X17 M18X16)
+M17X22->(M19X15 M18X14 M18X13 M18X12)
+M17X23->(M19X11 M18X25 M18X24 M18X23)
+M17X24->(M19X22 M18X21 M18X20 M18X19)
+M17X25->(M19X18 M18X17 M18X16 M18X15)
+M18X11->(M20X14 M19X13 M19X12 M19X11)
+M18X12->(M20X25 M19X24 M19X23 M19X22)
+M18X13->(M20X21 M19X20 M19X19 M19X18)
+M18X14->(M20X17 M19X16 M19X15 M19X14)
+M18X15->(M20X13 M19X12 M19X11 M19X25)
+M18X16->(M20X24 M19X23 M19X22 M19X21)
+M18X17->(M20X20 M19X19 M19X18 M19X17)
+M18X18->(M20X16 M19X15 M19X14 M19X13)
+M18X19->(M20X12 M19X11 M19X25 M19X24)
+M18X20->(M20X23 M19X22 M19X21 M19X20)
+M18X21->(M20X19 M19X18 M19X17 M19X16)
+M18X22->(M20X15 M19X14 M19X13 M19X12)
+M18X23->(M20X11 M19X25 M19X24 M19X23)
+M18X24->(M20X22 M19X21 M19X20 M19X19)
+M18X25->(M20X18 M19X17 M19X16 M19X15)
+M19X11->(M21X14 M20X13 M20X12 M20X11)
+M19X12->(M21X25 M20X24 M20X23 M20X22)
+M19X13->(M21X21 M20X20 M20X19 M20X18)
+M19X14->(M21X17 M20X16 M20X15 M20X14)
+M19X15->(M21X13 M20X12 M20X11 M20X25)
+M19X16->(M21X24 M20X23 M20X22 M20X21)
+M19X17->(M21X20 M20X19 M20X18 M20X17)
+M19X18->(M21X16 M20X15 M20X14 M20X13)
+M19X19->(M21X12 M20X11 M20X25 M20X24)
+M19X20->(M21X23 M20X22 M20X21 M20X20)
+M19X21->(M21X19 M20X18 M20X17 M20X16)
+M19X22->(M21X15 M20X14 M20X13 M20X12)
+M19X23->(M21X11 M20X25 M20X24 M20X23)
+M19X24->(M21X22 M20X21 M20X20 M20X19)
+M19X25->(M21X18 M20X17 M20X16 M20X15)
+M20X11->(M22X14 M21X13 M21X12 M21X11)
+M20X12->(M22X25 M21X24 M21X23 M21X22)
+M20X13->(M22X21 M21X20 M21X19 M21X18)
+M20X14->(M22X17 M21X16 M21X15 M21X14)
+M20X15->(M22X13 M21X12 M21X11 M21X25)
+M20X16->(M22X24 M21X23 M21X22 M21X21)
+M20X17->(M22X20 M21X19 M21X18 M21X17)
+M20X18->(M22X16 M21X15 M21X14 M21X13)
+M20X19->(M22X12 M21X11 M21X25 M21X24)
+M20X20->(M22X23 M21X22 M21X21 M21X20)
+M20X21->(M22X19 M21X18 M21X17 M21X16)
+M20X22->(M22X15 M21X14 M21X13 M21X12)
+M20X23->(M22X11 M21X25 M21X24 M21X23)
+M20X24->(M22X22 M21X21 M21X20 M21X19)
+M20X25->(M22X18 M21X17 M21X16 M21X15)
+M21X11->(M23X15 M22X14 M22X13 M22X12)
+M21X12->(M11X11 M23X25 M22X24 M22X23 M22X22)
+M21X13->(M23X21 M22X20 M22X19 M22X18)
+M21X14->(M23X17 M22X16 M22X15 M22X14)
+M21X15->(M23X13 M22X12 M22X11 M22X25)
+M21X16->(M23X24 M22X23 M22X22 M22X21)
+M21X17->(M23X20 M22X19 M22X18 M22X17)
+M21X18->(M23X16 M22X15 M22X14 M22X13)
+M21X19->(M23X12 M22X11 M22X25 M22X24)
+M21X20->(M23X23 M22X22 M22X21 M22X20)
+M21X21->(M23X19 M22X18 M22X17 M22X16)
+M21X22->(M23X15 M22X14 M22X13 M22X12)
+M21X23->(M23X11 M22X25 M22X24 M22X23)
+M21X24->(M23X22 M22X21 M22X20 M22X19)
+M21X25->(M23X18 M22X17 M22X16 M22X15)
+M22X11->(M24X16 M23X15 M23X14 M23X13)
+M22X12->(M12X12 M24X11 M23X25 M23X24 M23X23)
+M22X13->(M24X22 M23X21 M23X20 M23X19)
+M22X14->(M24X18 M23X17 M23X16 M23X15)
+M22X15->(M24X14 M23X13 M23X12 M23X11)
+M22X16->(M24X25 M23X24 M23X23 M23X22)
+M22X17->(M24X21 M23X20 M23X19 M23X18)
+M22X18->(M24X17 M23X16 M23X15 M23X14)
+M22X19->(M24X13 M23X12 M23X11 M23X25)
+M22X20->(M24X24 M23X23 M23X22 M23X21)
+M22X21->(M24X20 M23X19 M23X18 M23X17)
+M22X22->(M24X16 M23X15 M23X14 M23X13)
+M22X23->(M24X12 M23X11 M23X25 M23X24)
+M22X24->(M24X23 M23X22 M23X21 M23X20)
+M22X25->(M24X19 M23X18 M23X17 M23X16)
+M23X11->(M25X17 M24X16 M24X15 M24X14)
+M23X12->(M13X13 M25X12 M24X11 M24X25 M24X24)
+M23X13->(M25X23 M24X22 M24X21 M24X20)
+M23X14->(M25X19 M24X18 M24X17 M24X16)
+M23X15->(M25X15 M24X14 M24X13 M24X12)
+M23X16->(M25X11 M24X25 M24X24 M24X23)
+M23X17->(M25X22 M24X21 M24X20 M24X19)
+M23X18->(M25X18 M24X17 M24X16 M24X15)
+M23X19->(M25X14 M24X13 M24X12 M24X11)
+M23X20->(M25X25 M24X24 M24X23 M24X22)
+M23X21->(M25X21 M24X20 M24X19 M24X18)
+M23X22->(M25X17 M24X16 M24X15 M24X14)
+M23X23->(M25X13 M24X12 M24X11 M24X25)
+M23X24->(M25X24 M24X23 M24X22 M24X21)
+M23X25->(M25X20 M24X19 M24X18 M24X17)
+M24X11->(M26X18 M25X17 M25X16 M25X15)
+M24X12->(M14X14 M26X13 M25X12 M25X11 M25X25)
+M24X13->(M26X24 M25X23 M25X22 M25X21)
+M24X14->(M26X20 M25X19 M25X18 M25X17)
+M24X15->(M26X16 M25X15 M25X14 M25X13)
+M24X16->(M26X12 M25X11 M25X25 M25X24)
+M24X17->(M26X23 M25X22 M25X21 M25X20)
+M24X18->(M26X19 M25X18 M25X17 M25X16)
+M24X19->(M26X15 M25X14 M25X13 M25X12)
+M24X20->(M26X11 M25X25 M25X24 M25X23)
+M24X21->(M26X22 M25X21 M25X20 M25X19)
+M24X22->(M26X18 M25X17 M25X16 M25X15)
+M24X23->(M26X14 M25X13 M25X12 M25X11)
+M24X24->(M26X25 M25X24 M25X23 M25X22)
+M24X25->(M26X21 M25X20 M25X19 M25X18)
+M25X11->(M27X19 M26X18 M26X17 M26X16)
+M25X12->(M15X15 M27X14 M26X13 M26X12 M26X11)
+M25X13->(M27X25 M26X24 M26X23 M26X22)
+M25X14->(M27X21 M26X20 M26X19 M26X18)
+M25X15->(M27X17 M26X16 M26X15 M26X14)
+M25X16->(M27X13 M26X12 M26X11 M26X25)
+M25X17->(M27X24 M26X23 M26X22 M26X21)
+M25X18->(M27X20 M26X19 M26X18 M26X17)
+M25X19->(M27X16 M26X15 M26X14 M26X13)
+M25X20->(M27X12 M26X11 M26X25 M26X24)
+M25X21->(M27X23 M26X22 M26X21 M26X20)
+M25X22->(M27X19 M26X18 M26X17 M26X16)
+M25X23->(M27X15 M26X14 M26X13 M26X12)
+M25X24->(M27X11 M26X25 M26X24 M26X23)
+M25X25->(M27X22 M26X21 M26X20 M26X19)
+M26X11->(M28X20 M27X19 M27X18 M27X17)
+M26X12->(M16X16 M28X15 M27X14 M27X13 M27X12)
+M26X13->(M28X11 M27X25 M27X24 M27X23)
+M26X14->(M28X22 M27X21 M27X20 M27X19)
+M26X15->(M28X18 M27X17 M27X16 M27X15)
+M26X16->(M28X14 M27X13 M27X12 M27X11)
+M26X17->(M28X25 M27X24 M27X23 M27X22)
+M26X18->(M28X21 M27X20 M27X19 M27X18)
+M26X19->(M28X17 M27X16 M27X15 M27X14)
+M26X20->(M28X13 M27X12 M27X11 M27X25)
+M26X21->(M28X24 M27X23 M27X22 M27X21)
+M26X22->(M28X20 M27X19 M27X18 M27X17)
+M26X23->(M28X16 M27X15 M27X14 M27X13)
+M26X24->(M28X12 M27X11 M27X25 M27X24)
+M26X25->(M28X23 M27X22 M27X21 M27X20)
+M27X11->(M29X21 M28X20 M28X19 M28X18)
+M27X12->(M17X17 M29X16 M28X15 M28X14 M28X13)
+M27X13->(M29X12 M28X11 M28X25 M28X24)
+M27X14->(M29X23 M28X22 M28X21 M28X20)
+M27X15->(M29X19 M28X18 M28X17 M28X16)
+M27X16->(M29X15 M28X14 M28X13 M28X12)
+M27X17->(M29X11 M28X25 M28X24 M28X23)
+M27X18->(M29X22 M28X21 M28X20 M28X19)
+M27X19->(M29X18 M28X17 M28X16 M28X15)
+M27X20->(M29X14 M28X13 M28X12 M28X11)
+M27X21->(M29X25 M28X24 M28X23 M28X22)
+M27X22->(M29X21 M28X20 M28X19 M28X18)
+M27X23->(M29X17 M28X16 M28X15 M28X14)
+M27X24->(M29X13 M28X12 M28X11 M28X25)
+M27X25->(M29X24 M28X23 M28X22 M28X21)
+M28X11->(M30X22 M29X21 M29X20 M29X19)
+M28X12->(M18X18 M30X17 M29X16 M29X15 M29X14)
+M28X13->(M30X13 M29X12 M29X11 M29X25)
+M28X14->(M30X24 M29X23 M29X22 M29X21)
+M28X15->(M30X20 M29X19 M29X18 M29X17)
+M28X16->(M30X16 M29X15 M29X14 M29X13)
+M28X17->(M30X12 M29X11 M29X25 M29X24)
+M28X18->(M30X23 M29X22 M29X21 M29X20)
+M28X19->(M30X19 M29X18 M29X17 M29X16)
+M28X20->(M30X15 M29X14 M29X13 M29X12)
+M28X21->(M30X11 M29X25 M29X24 M29X23)
+M28X22->(M30X22 M29X21 M29X20 M29X19)
+M28X23->(M30X18 M29X17 M29X16 M29X15)
+M28X24->(M30X14 M29X13 M29X12 M29X11)
+M28X25->(M30X25 M29X24 M29X23 M29X22)
+M29X11->(M30X22 M30X21 M30X20)
+M29X12->(M30X17 M30X16 M30X15)
+M29X13->(M30X13 M30X12 M30X11)
+M29X14->(M30X24 M30X23 M30X22)
+M29X15->(M30X20 M30X19 M30X18)
+M29X16->(M30X16 M30X15 M30X14)
+M29X17->(M30X12 M30X11 M30X25)
+M29X18->(M30X23 M30X22 M30X21)
+M29X19->(M30X19 M30X18 M30X17)
+M29X20->(M30X15 M30X14 M30X13)
+M29X21->(M30X11 M30X25 M30X24)
+M29X22->(M30X22 M30X21 M30X20)
+M29X23->(M30X18 M30X17 M30X16)
+M29X24->(M30X14 M30X13 M30X12)
+M29X25->(M30X25 M30X24 M30X23)
+M30X11
+M30X12
+M30X13
+M30X14
+M30X15
+M30X16
+M30X17
+M30X18
+M30X19
+M30X20
+M30X21
+M30X22
+M30X23
+M30X24
+M30X25
+xfail_output(glibc.rtld.dynamic_sort=1): M30X19>M30X15>M30X16>M30X11>M30X12>M30X17>M30X13>M30X14>M29X20>M30X23>M30X24>M30X20>M30X18>M29X15>M29X12>M30X22>M30X21>M29X22>M30X25>M29X19>M29X23>M29X16>M29X24>M29X13>M29X17>M29X18>M28X19>M29X21>M29X25>M29X14>M28X20>M28X15>M28X16>M28X21>M27X18>M29X11>M28X17>M28X11>M28X22>M27X14>M28X18>M27X15>M28X13>M27X11>M28X23>M27X25>M28X14>M28X25>M27X23>M27X22>M28X24>M27X21>M27X13>M27X19>M27X17>M26X11>M26X23>M26X21>M26X22>M26X20>M26X16>M25X21>M17X22>M15X15>M20X14>M20X16>M18X18>M28X12>M27X24>M25X17>M27X20>M26X18>M26X17>M27X16>M26X19>M25X18>M26X24>M25X20>M24X17>M23X18>M25X13>M26X13>M17X23>M16X16>M26X12>M25X12>M26X15>M24X19>M25X23>M25X24>M25X25>M24X20>M25X19>M24X21>M23X17>M22X21>M24X14>M23X22>M24X24>M22X20>M24X13>M25X11>M24X12>M25X15>M23X15>M25X16>M24X22>M23X13>M24X18>M23X14>M22X22>M21X20>M24X25>M23X16>M22X25>M21X19>M22X14>M23X11>M22X15>M21X18>M22X19>M21X17>M20X17>M19X17>M21X24>M21X12>M20X22>M19X16>M18X25>M19X21>M19X20>M18X24>M20X12>M19X11>M23X20>M22X24>M22X16>M21X21>M25X14>M23X19>M23X24>M20X24>M19X12>M18X15>M17X14>M16X18>M14X25>M16X22>M16X20>M17X17>M22X12>M21X11>M20X15>M18X22>M19X24>M19X18>M18X21>M17X16>M17X18>M16X21>M15X20>M19X22>M18X20>M18X11>M17X19>M16X17>M15X21>M16X14>M16X13>M15X22>M14X20>M17X25>M16X19>M14X21>M13X24>M12X12>M16X24>M15X23>M14X16>M16X15>M15X25>M15X11>M15X12>M14X15>M13X14>M14X22>M13X20>M12X13>M11X11>M22X23>M21X15>M21X16>M20X21>M20X20>M18X17>M19X25>M18X23>M21X13>M15X17>M15X18>M18X19>M17X24>M16X12>M17X13>M20X25>M19X23>M15X19>M14X13>M13X18>M15X13>M17X12>M16X11>M18X13>M18X12>M14X11>M14X24>M13X19>M15X14>M17X20>M20X11>M20X13>M21X14>M15X24>M14X12>M13X22>M14X23>M13X23>M14X19>M17X15>M16X25>M17X11>M18X14>M19X19>M21X25>M13X12>M13X11>M14X18>M13X13>M12X11>M15X16>M14X14>M27X12>M17X21>M20X23>M22X13>M21X22>M24X16>M24X15>M26X25>M23X25>M26X14>M23X12>M22X18>M24X11>M16X23>M19X14>M19X13>M21X23>M22X17>M23X23>M23X21>M25X22>M18X16>M19X15>M20X18>M20X19>M22X11>M24X23>C156>C118>C143>C137>C147>C106>C168>C113>C163>C155>C105>C146>C187>A150>C139>C180>C164>C193>C157>A191>C158>B188>A159>C184>C121>C154>B171>A105>C131>C104>B104>C161>C111>B145>C160>B155>A163>C112>C142>B148>C133>B198>A198>A115>C114>B157>A156>C175>B144>A120>C173>B184>A174>C126>B107>A139>C194>B194>A194>C116>B116>C166>B160>B110>A110>C128>B128>A128>C179>B162>A154>C186>B187>A179>C124>B181>A101>C153>B158>A136>C135>C176>A192>B133>A133>C177>B177>A177>C185>C103>B141>A141>C183>A162>C192>C129>B179>C144>B124>B183>C127>B127>A127>B108>A112>B153>A153>C167>B167>A186>A122>C162>A144>B149>C174>B131>A185>C141>B106>A126>A167>C140>B122>A170>C198>B143>C117>C123>B123>A147>A106>C200>B169>C191>B175>A123>B118>A182>C132>B151>A145>A104>A109>C159>C150>B119>A119>A178>B164>B114>A164>C181>A102>C122>B134>A157>A116>C195>B191>B111>C172>B172>A118>B129>A129>C149>A107>C170>B197>A197>A173>B168>A132>C107>B165>A160>A131>C188>A168>B109>C178>A189>A148>C119>C190>C120>B166>B176>C108>B135>B139>A103>B178>A169>B132>C125>C138>B163>A111>B170>C110>A165>C151>C169>C199>A138>C182>A135>B101>B142>C101>C148>B193>B152>A158>A199>C136>B137>A161>B120>A108>A149>A125>B113>A184>C171>A134>A175>A124>B150>B161>B102>A146>A187>C130>B192>B200>A200>A142>A183>C102>B105>B156>A176>C165>B147>A137>A196>B190>A190>B125>C134>C189>B126>B186>A166>B136>B195>A195>B154>B138>B112>B173>A117>B159>B182>A181>A140>C145>B117>A152>A193>C197>B130>A172>A113>A151>B115>A143>B140>B185>B103>A121>A180>A130>A171>B199>C196>B146>B180>C115>B174>B121>A188>B196>B189>C152>C109>A155>A114>M14X17>M13X15>M13X16>M13X17>M12X17>M12X21>M12X25>M12X14>M13X25>M12X15>M13X21>M12X16>M12X18>M12X19>M12X20>M12X22>M12X23>M12X24>M11X25>M11X24>M11X23>M11X22>M11X21>M11X20>M11X19>M11X18>M11X17>M11X16>M11X15>M11X14>M11X13>M11X12>{}<M11X12<M11X13<M11X14<M11X15<M11X16<M11X17<M11X18<M11X19<M11X20<M11X21<M11X22<M11X23<M11X24<M11X25<M12X24<M12X23<M12X22<M12X20<M12X19<M12X18<M12X16<M13X21<M12X15<M13X25<M12X14<M12X25<M12X21<M12X17<M13X17<M13X16<M13X15<M14X17<A114<A155<C109<C152<B189<B196<A188<B121<B174<C115<B180<B146<C196<B199<A171<A130<A180<A121<B103<B185<B140<A143<B115<A151<A113<A172<B130<C197<A193<A152<B117<C145<A140<A181<B182<B159<A117<B173<B112<B138<B154<A195<B195<B136<A166<B186<B126<C189<C134<B125<A190<B190<A196<A137<B147<C165<A176<B156<B105<C102<A183<A142<A200<B200<B192<C130<A187<A146<B102<B161<B150<A124<A175<A134<C171<A184<B113<A125<A149<A108<B120<A161<B137<C136<A199<A158<B152<B193<C148<C101<B142<B101<A135<C182<A138<C199<C169<C151<A165<C110<B170<A111<B163<C138<C125<B132<A169<B178<A103<B139<B135<C108<B176<B166<C120<C190<C119<A148<A189<C178<B109<A168<C188<A131<A160<B165<C107<A132<B168<A173<A197<B197<C170<A107<C149<A129<B129<A118<B172<C172<B111<B191<C195<A116<A157<B134<C122<A102<C181<A164<B114<B164<A178<A119<B119<C150<C159<A109<A104<A145<B151<C132<A182<B118<A123<B175<C191<B169<C200<A106<A147<B123<C123<C117<B143<C198<A170<B122<C140<A167<A126<B106<C141<A185<B131<C174<B149<A144<C162<A122<A186<B167<C167<A153<B153<A112<B108<A127<B127<C127<B183<B124<C144<B179<C129<C192<A162<C183<A141<B141<C103<C185<A177<B177<C177<A133<B133<A192<C176<C135<A136<B158<C153<A101<B181<C124<A179<B187<C186<A154<B162<C179<A128<B128<C128<A110<B110<B160<C166<B116<C116<A194<B194<C194<A139<B107<C126<A174<B184<C173<A120<B144<C175<A156<B157<C114<A115<A198<B198<C133<B148<C142<C112<A163<B155<C160<B145<C111<C161<B104<C104<C131<A105<B171<C154<C121<C184<A159<B188<C158<A191<C157<C193<C164<C180<C139<A150<C187<C146<C105<C155<C163<C113<C168<C106<C147<C137<C143<C118<C156<M24X23<M22X11<M20X19<M20X18<M19X15<M18X16<M25X22<M23X21<M23X23<M22X17<M21X23<M19X13<M19X14<M16X23<M24X11<M22X18<M23X12<M26X14<M23X25<M26X25<M24X15<M24X16<M21X22<M22X13<M20X23<M17X21<M27X12<M14X14<M15X16<M12X11<M13X13<M14X18<M13X11<M13X12<M21X25<M19X19<M18X14<M17X11<M16X25<M17X15<M14X19<M13X23<M14X23<M13X22<M14X12<M15X24<M21X14<M20X13<M20X11<M17X20<M15X14<M13X19<M14X24<M14X11<M18X12<M18X13<M16X11<M17X12<M15X13<M13X18<M14X13<M15X19<M19X23<M20X25<M17X13<M16X12<M17X24<M18X19<M15X18<M15X17<M21X13<M18X23<M19X25<M18X17<M20X20<M20X21<M21X16<M21X15<M22X23<M11X11<M12X13<M13X20<M14X22<M13X14<M14X15<M15X12<M15X11<M15X25<M16X15<M14X16<M15X23<M16X24<M12X12<M13X24<M14X21<M16X19<M17X25<M14X20<M15X22<M16X13<M16X14<M15X21<M16X17<M17X19<M18X11<M18X20<M19X22<M15X20<M16X21<M17X18<M17X16<M18X21<M19X18<M19X24<M18X22<M20X15<M21X11<M22X12<M17X17<M16X20<M16X22<M14X25<M16X18<M17X14<M18X15<M19X12<M20X24<M23X24<M23X19<M25X14<M21X21<M22X16<M22X24<M23X20<M19X11<M20X12<M18X24<M19X20<M19X21<M18X25<M19X16<M20X22<M21X12<M21X24<M19X17<M20X17<M21X17<M22X19<M21X18<M22X15<M23X11<M22X14<M21X19<M22X25<M23X16<M24X25<M21X20<M22X22<M23X14<M24X18<M23X13<M24X22<M25X16<M23X15<M25X15<M24X12<M25X11<M24X13<M22X20<M24X24<M23X22<M24X14<M22X21<M23X17<M24X21<M25X19<M24X20<M25X25<M25X24<M25X23<M24X19<M26X15<M25X12<M26X12<M16X16<M17X23<M26X13<M25X13<M23X18<M24X17<M25X20<M26X24<M25X18<M26X19<M27X16<M26X17<M26X18<M27X20<M25X17<M27X24<M28X12<M18X18<M20X16<M20X14<M15X15<M17X22<M25X21<M26X16<M26X20<M26X22<M26X21<M26X23<M26X11<M27X17<M27X19<M27X13<M27X21<M28X24<M27X22<M27X23<M28X25<M28X14<M27X25<M28X23<M27X11<M28X13<M27X15<M28X18<M27X14<M28X22<M28X11<M28X17<M29X11<M27X18<M28X21<M28X16<M28X15<M28X20<M29X14<M29X25<M29X21<M28X19<M29X18<M29X17<M29X13<M29X24<M29X16<M29X23<M29X19<M30X25<M29X22<M30X21<M30X22<M29X12<M29X15<M30X18<M30X20<M30X24<M30X23<M29X20<M30X14<M30X13<M30X17<M30X12<M30X11<M30X16<M30X15<M30X19
+output(glibc.rtld.dynamic_sort=2): M30X19>M30X15>M30X16>M30X11>M30X12>M30X17>M30X13>M30X14>M29X20>M30X23>M30X24>M30X20>M30X18>M29X15>M29X12>M30X22>M30X21>M29X22>M30X25>M29X19>M29X23>M29X16>M29X24>M29X13>M29X17>M29X18>M28X19>M29X21>M29X25>M29X14>M28X20>M28X15>M28X16>M28X21>M27X18>M29X11>M28X17>M28X11>M28X22>M28X24>M28X23>M27X21>M28X13>M27X20>M27X19>M26X14>M27X25>M28X18>M27X11>M28X25>M27X24>M26X24>M27X15>M27X14>M27X13>M26X23>M27X17>M26X22>M25X13>M28X14>M27X16>M26X19>M26X18>M27X23>M27X22>M26X17>M25X18>M26X21>M25X17>M26X20>M26X15>M26X13>M25X19>M24X14>M25X23>M26X11>M26X25>M25X16>M25X15>M24X22>M25X21>M25X20>M24X21>M25X25>M25X24>M24X20>M23X13>M22X15>M25X14>M24X19>M23X17>M24X25>M23X24>M24X13>M23X15>M24X18>M23X14>M22X11>M24X15>M23X22>M24X11>M23X19>M22X21>M24X24>M23X21>M22X20>M23X25>M22X19>M21X24>M20X23>M22X22>M25X11>M23X16>M22X18>M23X20>M22X17>M21X21>M21X20>M20X24>M22X14>M22X13>M21X11>M21X17>M22X23>M21X16>M20X25>M19X23>M18X16>M21X22>M20X20>M20X19>M21X13>M20X18>M19X13>M21X18>M20X21>M19X24>M18X12>M20X14>M20X13>M22X25>M20X12>M20X15>M19X14>M18X22>M19X18>M20X17>M19X17>M19X16>M18X21>M17X20>M19X19>M18X13>M17X11>M18X17>M19X25>M18X15>M17X25>M18X19>M17X24>M16X19>M15X17>M17X21>M16X24>M18X23>M17X16>M16X25>M19X15>M18X25>M17X23>M16X23>M15X23>M18X14>M17X14>M16X14>M17X18>M16X13>M17X22>M16X12>M15X22>M14X16>M17X12>M16X22>M15X12>M16X11>M15X11>M16X15>M15X25>M14X15>M13X14>M15X18>M16X21>M15X16>M14X21>M15X14>M16X20>M15X13>M14X22>M15X20>M14X20>M13X20>M14X11>M15X19>M14X24>M13X19>M14X13>M13X18>M12X13>M15X24>M14X23>M13X12>M14X12>M13X11>M12X11>M11X11>M21X12>M20X11>M19X11>M18X11>M17X15>M16X18>M14X25>M14X19>M13X24>M13X23>M13X22>M12X12>M22X12>M21X15>M19X22>M18X20>M16X17>M14X14>M24X12>M23X23>M22X16>M21X14>M20X22>M18X24>M16X16>M26X12>M24X16>M23X11>M21X23>M19X20>M17X17>M27X12>M26X16>M25X22>M24X17>M23X18>M21X25>M19X12>M17X19>M15X21>M14X18>M13X13>M23X12>M21X19>M19X21>M17X13>M15X15>M25X12>M24X23>M22X24>M20X16>M18X18>M28X12>A150>C158>B112>A112>C167>B146>A146>C180>B180>A180>C143>B143>A115>C126>B126>A126>C190>B190>A190>C138>B138>A138>C174>B174>A102>C122>B122>A122>C162>B162>A162>C142>B142>A142>C102>B102>A174>C176>B176>A176>C115>B115>A143>C172>B172>A172>C187>B187>A187>C130>B130>A130>C118>B118>A118>C184>B184>A184>C171>B171>A171>C168>B182>A182>C182>B168>A168>C109>B109>A109>C159>B159>A159>C134>B134>A134>C146>B167>A167>C140>B140>A140>C163>B163>A163>C112>B158>A158>C164>B164>A164>C131>B131>A131>C188>B188>A188>C199>B199>A199>C114>B114>A114>C106>B106>A106>C200>B200>A200>C183>B183>A183>C152>B152>A152>C147>B147>A147>C150>B150>A198>C144>B144>A144>C191>B191>A191>C108>B108>A108>C139>B139>A139>C194>B194>A194>C166>B166>A166>C120>B120>A120>C123>B123>A123>C132>B132>A132>C107>B107>A107>C170>B170>A170>C198>B198>A156>C125>B125>A125>C121>B121>A121>C193>B193>A193>C197>B197>A197>C175>B175>A175>C196>B196>A196>C105>B105>A105>C181>B181>A181>C113>B113>A113>C137>B137>A137>C155>B155>A155>C156>B156>A110>C128>B128>A128>C179>B179>A179>C124>B124>A124>C151>B151>A151>C178>B178>A178>C104>B104>A104>C111>B111>A111>C148>B148>A148>C169>B169>A169>C129>B129>A129>C149>B149>A149>C189>B189>A189>C119>B119>A119>C154>B154>A154>C136>B136>A136>C135>B135>A135>C116>B116>A116>C145>B145>A145>C161>B161>A161>C173>B173>A173>C157>B157>A157>C195>B195>A195>C186>B186>A186>C160>B160>A160>C153>B153>A153>C117>B117>A117>C165>B165>A165>C101>B101>A101>C103>B103>A103>C192>B192>A192>C177>B177>A177>C185>B185>A185>C141>B141>A141>C133>B133>A133>C127>B127>A127>C110>B110>M14X17>M13X15>M13X16>M13X17>M12X17>M12X21>M12X25>M12X14>M13X25>M12X15>M13X21>M12X16>M12X18>M12X19>M12X20>M12X22>M12X23>M12X24>M11X25>M11X24>M11X23>M11X22>M11X21>M11X20>M11X19>M11X18>M11X17>M11X16>M11X15>M11X14>M11X13>M11X12>{}<M11X12<M11X13<M11X14<M11X15<M11X16<M11X17<M11X18<M11X19<M11X20<M11X21<M11X22<M11X23<M11X24<M11X25<M12X24<M12X23<M12X22<M12X20<M12X19<M12X18<M12X16<M13X21<M12X15<M13X25<M12X14<M12X25<M12X21<M12X17<M13X17<M13X16<M13X15<M14X17<B110<C110<A127<B127<C127<A133<B133<C133<A141<B141<C141<A185<B185<C185<A177<B177<C177<A192<B192<C192<A103<B103<C103<A101<B101<C101<A165<B165<C165<A117<B117<C117<A153<B153<C153<A160<B160<C160<A186<B186<C186<A195<B195<C195<A157<B157<C157<A173<B173<C173<A161<B161<C161<A145<B145<C145<A116<B116<C116<A135<B135<C135<A136<B136<C136<A154<B154<C154<A119<B119<C119<A189<B189<C189<A149<B149<C149<A129<B129<C129<A169<B169<C169<A148<B148<C148<A111<B111<C111<A104<B104<C104<A178<B178<C178<A151<B151<C151<A124<B124<C124<A179<B179<C179<A128<B128<C128<A110<B156<C156<A155<B155<C155<A137<B137<C137<A113<B113<C113<A181<B181<C181<A105<B105<C105<A196<B196<C196<A175<B175<C175<A197<B197<C197<A193<B193<C193<A121<B121<C121<A125<B125<C125<A156<B198<C198<A170<B170<C170<A107<B107<C107<A132<B132<C132<A123<B123<C123<A120<B120<C120<A166<B166<C166<A194<B194<C194<A139<B139<C139<A108<B108<C108<A191<B191<C191<A144<B144<C144<A198<B150<C150<A147<B147<C147<A152<B152<C152<A183<B183<C183<A200<B200<C200<A106<B106<C106<A114<B114<C114<A199<B199<C199<A188<B188<C188<A131<B131<C131<A164<B164<C164<A158<B158<C112<A163<B163<C163<A140<B140<C140<A167<B167<C146<A134<B134<C134<A159<B159<C159<A109<B109<C109<A168<B168<C182<A182<B182<C168<A171<B171<C171<A184<B184<C184<A118<B118<C118<A130<B130<C130<A187<B187<C187<A172<B172<C172<A143<B115<C115<A176<B176<C176<A174<B102<C102<A142<B142<C142<A162<B162<C162<A122<B122<C122<A102<B174<C174<A138<B138<C138<A190<B190<C190<A126<B126<C126<A115<B143<C143<A180<B180<C180<A146<B146<C167<A112<B112<C158<A150<M28X12<M18X18<M20X16<M22X24<M24X23<M25X12<M15X15<M17X13<M19X21<M21X19<M23X12<M13X13<M14X18<M15X21<M17X19<M19X12<M21X25<M23X18<M24X17<M25X22<M26X16<M27X12<M17X17<M19X20<M21X23<M23X11<M24X16<M26X12<M16X16<M18X24<M20X22<M21X14<M22X16<M23X23<M24X12<M14X14<M16X17<M18X20<M19X22<M21X15<M22X12<M12X12<M13X22<M13X23<M13X24<M14X19<M14X25<M16X18<M17X15<M18X11<M19X11<M20X11<M21X12<M11X11<M12X11<M13X11<M14X12<M13X12<M14X23<M15X24<M12X13<M13X18<M14X13<M13X19<M14X24<M15X19<M14X11<M13X20<M14X20<M15X20<M14X22<M15X13<M16X20<M15X14<M14X21<M15X16<M16X21<M15X18<M13X14<M14X15<M15X25<M16X15<M15X11<M16X11<M15X12<M16X22<M17X12<M14X16<M15X22<M16X12<M17X22<M16X13<M17X18<M16X14<M17X14<M18X14<M15X23<M16X23<M17X23<M18X25<M19X15<M16X25<M17X16<M18X23<M16X24<M17X21<M15X17<M16X19<M17X24<M18X19<M17X25<M18X15<M19X25<M18X17<M17X11<M18X13<M19X19<M17X20<M18X21<M19X16<M19X17<M20X17<M19X18<M18X22<M19X14<M20X15<M20X12<M22X25<M20X13<M20X14<M18X12<M19X24<M20X21<M21X18<M19X13<M20X18<M21X13<M20X19<M20X20<M21X22<M18X16<M19X23<M20X25<M21X16<M22X23<M21X17<M21X11<M22X13<M22X14<M20X24<M21X20<M21X21<M22X17<M23X20<M22X18<M23X16<M25X11<M22X22<M20X23<M21X24<M22X19<M23X25<M22X20<M23X21<M24X24<M22X21<M23X19<M24X11<M23X22<M24X15<M22X11<M23X14<M24X18<M23X15<M24X13<M23X24<M24X25<M23X17<M24X19<M25X14<M22X15<M23X13<M24X20<M25X24<M25X25<M24X21<M25X20<M25X21<M24X22<M25X15<M25X16<M26X25<M26X11<M25X23<M24X14<M25X19<M26X13<M26X15<M26X20<M25X17<M26X21<M25X18<M26X17<M27X22<M27X23<M26X18<M26X19<M27X16<M28X14<M25X13<M26X22<M27X17<M26X23<M27X13<M27X14<M27X15<M26X24<M27X24<M28X25<M27X11<M28X18<M27X25<M26X14<M27X19<M27X20<M28X13<M27X21<M28X23<M28X24<M28X22<M28X11<M28X17<M29X11<M27X18<M28X21<M28X16<M28X15<M28X20<M29X14<M29X25<M29X21<M28X19<M29X18<M29X17<M29X13<M29X24<M29X16<M29X23<M29X19<M30X25<M29X22<M30X21<M30X22<M29X12<M29X15<M30X18<M30X20<M30X24<M30X23<M29X20<M30X14<M30X13<M30X17<M30X12<M30X11<M30X16<M30X15<M30X19
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py
new file mode 100644
index 0000000000000000..944ee740527d60fd
--- /dev/null
+++ b/scripts/dso-ordering-test.py
@@ -0,0 +1,1144 @@
+#!/usr/bin/python3
+# Generate testcase files and Makefile fragments for DSO sorting test
+# 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
+# <http://www.gnu.org/licenses/>.
+
+"""Generate testcase files and Makefile fragments for DSO sorting test
+
+This script takes a small description string language, and generates
+testcases for displaying the ELF dynamic linker's dependency sorting
+behavior, allowing verification.
+
+Testcase descriptions are semicolon-separated description strings, and
+this tool generates a testcase from the description, including main program,
+associated modules, and Makefile fragments for including into elf/Makefile.
+
+This allows automation of what otherwise would be very laborous manual
+construction of complex dependency cases, however it must be noted that this
+is only a tool to speed up testcase construction, and thus the generation
+features are largely mechanical in nature; inconsistencies or errors may occur
+if the input description was itself erroneous or have unforeseen interactions.
+
+The format of the input test description files are:
+
+ # Each test description has a name, lines of description,
+ # and an expected output specification. Comments use '#'.
+ testname1: <test-description-line>
+ output: <expected-output-string>
+
+ # Tests can be marked to be XFAIL by using 'xfail_output' instead
+ testname2: <test-description-line>
+ xfail_output: <expected-output-string>
+
+ # A default set of GLIBC_TUNABLES tunables can be specified, for which
+ # all following tests will run multiple times, once for each of the
+ # GLIBC_TUNABLES=... strings set by the 'tunable_option' command.
+ tunable_option: <glibc-tunable-string1>
+ tunable_option: <glibc-tunable-string2>
+
+ # Test descriptions can use multiple lines, which will all be merged
+ # together, so order is not important.
+ testname3: <test-description-line>
+ <test-description-line>
+ <test-description-line>
+ ...
+ output: <expected-output-string>
+
+ # 'testname3' will be run and compared two times, for both
+ # GLIBC_TUNABLES=<glibc-tunable-string1> and
+ # GLIBC_TUNABLES=<glibc-tunable-string2>. This can be cleared and reset by the
+ # 'clear_tunables' command:
+ clear_tunables
+
+ # Multiple expected outputs can also be specified, with an associated
+ # tunable option in (), which multiple tests will be run with each
+ # GLIBC_TUNABLES=... option tried.
+ testname4:
+ <test-description-line>
+ ...
+ output(<glibc-tunable-string1>): <expected-output-string-1>
+ output(<glibc-tunable-string2>): <expected-output-string-2>
+ # Individual tunable output cases can be XFAILed, though note that
+ # this will have the effect of XFAILing the entire 'testname4' test
+ # in the final top-level tests.sum summary.
+ xfail_output(<glibc-tunable-string3>): <expected-output-string-3>
+
+ # When multiple outputs (with specific tunable strings) are specified,
+ # these take priority over any active 'tunable_option' settings.
+
+ # When a test is meant to be placed under 'xtests' (not run under
+ # "make check", but only when "make xtests" is used), the testcase name can be
+ # declared using 'xtest(<test-name>)':
+ ...
+ xtest(test-too-big1): <test-description>
+ output: <expected-output-string>
+ ...
+
+ # Do note that under current elf/Makefile organization, for such a xtest case,
+ # while the test execution is only run under 'make xtests', the associated
+ # DSOs are always built even under 'make check'.
+
+On the description language used, an example description line string:
+
+ a->b!->[cdef];c=>g=>h;{+c;%c;-c}->a
+
+Each identifier represents a shared object module, currently sequences of
+letters/digits are allowed, case-sensitive.
+
+All such shared objects have a constructor/destructor generated for them
+that emits its name followed by a '>' for constructors, and '<' followed by
+its name for destructors, e.g. if the name is 'obj1', then "obj1>" and "<obj1"
+is printed by its constructor/destructor respectively.
+
+The -> operator specifies a link time dependency, these can be chained for
+convenience (e.g. a->b->c->d).
+
+The => operator creates a call-reference, e.g. for a=>b, an fn_a() function
+is created inside module 'a', which calls fn_b() in module 'b'.
+These module functions emit 'name()' output in nested form,
+e.g. a=>b emits 'a(b())'
+
+For single character object names, square brackets [] in the description
+allows specifying multiple objects; e.g. a->[bcd]->e is equivalent to
+ a->b->e;a->c->e;a->d->e
+
+The () parenthesis construct with space separated names is also allowed for
+specifying objects. For names with integer suffixes a range can also be used,
+e.g. (foo1 bar2-5), specifies DSOs foo1, bar2, bar2, bar3, bar4, bar5.
+
+A {} construct specifies the main test program, and its link dependencies
+are also specified using ->. Inside {}, a few ;-separated constructs are
+allowed:
+ +a Loads module a using dlopen(RTLD_LAZY|RTLD_GLOBAL)
+ ^a Loads module a using dlopen(RTLD_LAZY)
+ %a Use dlsym() to load and call fn_a()
+ @a Calls fn_a() directly.
+ -a Unloads module a using dlclose()
+
+The generated main program outputs '{' '}' with all output from above
+constructs in between. The other output before/after {} are the ordered
+constructor/destructor output.
+
+If no {} construct is present, a default empty main program is linked
+against all objects which have no dependency linked to it. e.g. for
+'[ab]->c;d->e', the default main program is equivalent to '{}->[abd]'
+
+Sometimes for very complex or large testcases, besides specifying a
+few explicit dependencies from main{}, the above default dependency
+behavior is still useful to automatically have, but is turned off
+upon specifying a single explicit {}->dso_name.
+In this case, add {}->* to explicitly add this generation behavior:
+
+ # Main program links to 'foo', and all other objects which have no
+ # dependency linked to it.
+ {}->foo,{}->*
+
+Note that '*' works not only on main{}, but can be used as the
+dependency target of any object. Note that it only works as a target,
+not a dependency source.
+
+The '!' operator after object names turns on permutation of its
+dependencies, e.g. while a->[bcd] only generates one set of objects,
+with 'a.so' built with a link line of "b.so c.so d.so", for a!->[bcd]
+permutations of a's dependencies creates multiple testcases with
+different link line orders: "b.so c.so d.so", "c.so b.so d.so",
+"b.so d.so c.so", etc. Note that for a <test-name> specified on
+the script command-line, multiple <test-name_1>, <test-name_2>, etc.
+tests will be generated (e.g. for a!->[bc]!->[de], eight tests with
+different link orders for a, b, and c will be generated)
+
+It is possible to specify the ELF soname field for an object or the
+main program:
+ # DSO 'a' will be linked with the appropriate -Wl,-soname=x setting
+ a->b->c;soname(a)=x
+ # The the main program can also have a soname specified
+ soname({})=y
+
+This can be used to test how ld.so behaves when objects and/or the
+main program have such a field set.
+
+
+Strings Output by Generated Testcase Programs
+
+The text output produced by a generated testcase consists of three main
+parts:
+ 1. The constructors' output
+ 2. Output from the main program
+ 3. Destructors' output
+
+To see by example, a simple test description "a->b->c" generates a testcase
+that when run, outputs: "c>b>a>{}<a<b<c"
+
+Each generated DSO constructor prints its name followed by a '>' character,
+and the "c>b>a" part above is the full constructor output by all DSOs, the
+order indicating that DSO 'c', which does not depend on any other DSO, has
+its constructor run first, followed by 'b' and then 'a'.
+
+Destructor output for each DSO is a '<' character followed by its name,
+reflecting its reverse nature of constructors. In the above example, the
+destructor output part is "<a<b<c".
+
+The middle "{}" part is the main program. In this simple example, nothing
+was specified for the main program, so by default it is implicitly linked
+to the DSO 'a' (with no other DSOs depending on it) and only prints the
+brackets {} with no actions inside.
+
+To see an example with actions inside the main program, lets see an example
+description: c->g=>h;{+c;%c;-c}->a->h
+
+This produces a testcase, that when executed outputs:
+ h>a>{+c[g>c>];%c();-c[<c<g];}<a<h
+
+The constructor and destructor parts display the a->h dependency as expected.
+Inside the main program, the "+c" action triggers a dlopen() of DSO 'c',
+causing another chain of constructors "g>c>" to be triggered. Here it is
+displayed inside [] brackets for each dlopen call. The same is done for "-c",
+a dlclose() of 'c'.
+
+The "%c" output is due to calling to fn_c() inside DSO 'c', this comprises
+of two parts: the '%' character is printed by the caller, here it is the main
+program. The 'c' character is printed from inside fn_c(). The '%' character
+indicates that this is called by a dlsym() of "fn_c". A '@' character would
+mean a direct call (with a symbol reference). These can all be controlled
+by the main test program constructs documented earlier.
+
+The output strings described here is the exact same form placed in
+test description files' "output: <expected output>" line.
+"""
+
+import sys
+import re
+import os
+import subprocess
+import argparse
+from collections import OrderedDict
+import itertools
+
+# BUILD_GCC is only used under the --build option,
+# which builds the generated testcase, including DSOs using BUILD_GCC.
+# Mainly for testing purposes, especially debugging of this script,
+# and can be changed here to another toolchain path if needed.
+build_gcc = "gcc"
+
+def get_parser():
+ parser = argparse.ArgumentParser("")
+ parser.add_argument("description",
+ help="Description string of DSO dependency test to be "
+ "generated (see script source for documentation of "
+ "description language), either specified here as "
+ "command line argument, or by input file using "
+ "-f/--description-file option",
+ nargs="?", default="")
+ parser.add_argument("test_name",
+ help="Identifier for testcase being generated",
+ nargs="?", default="")
+ parser.add_argument("--objpfx",
+ help="Path to place generated files, defaults to "
+ "current directory if none specified",
+ nargs="?", default="./")
+ parser.add_argument("-m", "--output-makefile",
+ help="File to write Makefile fragment to, defaults to "
+ "stdout when option not present",
+ nargs="?", default="")
+ parser.add_argument("-f", "--description-file",
+ help="Input file containing testcase descriptions",
+ nargs="?", default="")
+ parser.add_argument("--build", help="After C testcase generated, build it "
+ "using gcc (for manual testing purposes)",
+ action="store_true")
+ parser.add_argument("--debug-output",
+ help="Prints some internal data "
+ "structures; used for debugging of this script",
+ action="store_true")
+ return parser
+
+# Main script starts here.
+cmdlineargs = get_parser().parse_args()
+test_name = cmdlineargs.test_name
+description = cmdlineargs.description
+objpfx = cmdlineargs.objpfx
+description_file = cmdlineargs.description_file
+output_makefile = cmdlineargs.output_makefile
+makefile = ""
+default_tunable_options = []
+
+current_input_lineno = 0
+def error(msg):
+ global current_input_lineno
+ print("Error: %s%s" % ((("Line %d, " % current_input_lineno)
+ if current_input_lineno != 0 else ""),
+ msg))
+ exit(1)
+
+if(test_name or description) and description_file:
+ error("both command-line testcase and input file specified")
+if test_name and not description:
+ error("command-line testcase name without description string")
+
+# Main class type describing a testcase.
+class TestDescr:
+ def __init__(self):
+ self.objs = [] # list of all DSO objects
+ self.deps = OrderedDict() # map of DSO object -> list of dependencies
+
+ # map of DSO object -> list of call refs
+ self.callrefs = OrderedDict()
+
+ # map of DSO object -> list of permutations of dependencies
+ self.dep_permutations = OrderedDict()
+
+ # map of DSO object -> SONAME of object (if one is specified)
+ self.soname_map = OrderedDict()
+
+ # list of main program operations
+ self.main_program = []
+ # set if default dependencies added to main
+ self.main_program_default_deps = True
+
+ self.test_name = "" # name of testcase
+ self.expected_outputs = OrderedDict() # expected outputs of testcase
+ self.xfail = False # set if this is a XFAIL testcase
+ self.xtest = False # set if this is put under 'xtests'
+
+ # Add 'object -> [object, object, ...]' relations to CURR_MAP
+ def __add_deps_internal(self, src_objs, dst_objs, curr_map):
+ for src in src_objs:
+ for dst in dst_objs:
+ if not src in curr_map:
+ curr_map[src] = []
+ if not dst in curr_map[src]:
+ curr_map[src].append(dst)
+ def add_deps(self, src_objs, dst_objs):
+ self.__add_deps_internal(src_objs, dst_objs, self.deps)
+ def add_callrefs(self, src_objs, dst_objs):
+ self.__add_deps_internal(src_objs, dst_objs, self.callrefs)
+
+# Process commands inside the {} construct.
+# Note that throughout this script, the main program object is represented
+# by the '#' string.
+def process_main_program(test_descr, mainprog_str):
+ if mainprog_str:
+ test_descr.main_program = mainprog_str.split(';')
+ for s in test_descr.main_program:
+ m = re.match(r"^([+\-%^@])([0-9a-zA-Z]+)$", s)
+ if not m:
+ error("'%s' is not recognized main program operation" % (s))
+ opr = m.group(1)
+ obj = m.group(2)
+ if not obj in test_descr.objs:
+ test_descr.objs.append(obj)
+ if opr == '%' or opr == '@':
+ test_descr.add_callrefs(['#'], [obj])
+ # We have a main program specified, turn this off
+ test_descr.main_program_default_deps = False
+
+# For(a1 a2 b1-12) object set descriptions, expand into an object list
+def expand_object_set_string(descr_str):
+ obj_list = []
+ descr_list = descr_str.split()
+ for descr in descr_list:
+ m = re.match(r"^([a-zA-Z][0-9a-zA-Z]*)(-[0-9]+)?$", descr)
+ if not m:
+ error("'%s' is not a valid object set description" % (descr))
+ obj = m.group(1)
+ idx_end = m.group(2)
+ if not idx_end:
+ if not obj in obj_list:
+ obj_list.append(obj)
+ else:
+ idx_end = int(idx_end[1:])
+ m = re.match(r"^([0-9a-zA-Z][a-zA-Z]*)([0-9]+)$", obj)
+ if not m:
+ error("object description '%s' is malformed" % (obj))
+ obj_name = m.group(1)
+ idx_start = int(m.group (2))
+ if idx_start > idx_end:
+ error("index range %s-%s invalid" % (idx_start, idx_end))
+ for i in range(idx_start, idx_end + 1):
+ o = obj_name + str(i)
+ if not o in obj_list:
+ obj_list.append(o)
+ return obj_list
+
+# Lexer for tokens
+tokenspec = [ ("SONAME", r"soname\(([0-9a-zA-Z{}]+)\)=([0-9a-zA-Z]+)"),
+ ("OBJ", r"([0-9a-zA-Z]+)"),
+ ("DEP", r"->"),
+ ("CALLREF", r"=>"),
+ ("OBJSET", r"\[([0-9a-zA-Z]+)\]"),
+ ("OBJSET2", r"\(([0-9a-zA-Z \-]+)\)"),
+ ("OBJSET3", r"\*"),
+ ("PROG", r"{([0-9a-zA-Z;+^\-%@]*)}"),
+ ("PERMUTE", r"!"),
+ ("SEMICOL", r";"),
+ ("ERROR", r".") ]
+tok_re = '|'.join('(?P<%s>%s)' % pair for pair in tokenspec)
+
+# Main line parser of description language
+def parse_description_string(t, descr_str):
+ # State used when parsing dependencies
+ curr_objs = []
+ in_dep = False
+ in_callref = False
+ def clear_dep_state():
+ nonlocal in_dep, in_callref
+ in_dep = in_callref = False
+
+ for m in re.finditer(tok_re, descr_str):
+ kind = m.lastgroup
+ value = m.group()
+ if kind == "SONAME":
+ s = re.match(r"soname\(([0-9a-zA-Z{}]+)\)=([0-9a-zA-Z]+)", value)
+ obj = s.group(1)
+ val = s.group(2)
+ if obj == "{}":
+ if '#' in t.soname_map:
+ error("soname of main program already set")
+ # Adjust to internal name
+ obj = '#'
+ else:
+ if re.match(r"[{}]", obj):
+ error("invalid object name '%s'" % (obj))
+ if not obj in t.objs:
+ error("'%s' is not name of already defined object" % (obj))
+ if obj in t.soname_map:
+ error("'%s' already has soname of '%s' set"
+ % (obj, t.soname_map[obj]))
+ t.soname_map[obj] = val
+
+ elif kind == "OBJ":
+ if in_dep:
+ t.add_deps(curr_objs, [value])
+ elif in_callref:
+ t.add_callrefs(curr_objs, [value])
+ clear_dep_state()
+ curr_objs = [value]
+ if not value in t.objs:
+ t.objs.append(value)
+
+ elif kind == "OBJSET":
+ objset = value[1:len(value)-1]
+ if in_dep:
+ t.add_deps(curr_objs, list (objset))
+ elif in_callref:
+ t.add_callrefs(curr_objs, list (objset))
+ clear_dep_state()
+ curr_objs = list(objset)
+ for o in list(objset):
+ if not o in t.objs:
+ t.objs.append(o)
+
+ elif kind == "OBJSET2":
+ descr_str = value[1:len(value)-1]
+ descr_str.strip()
+ objs = expand_object_set_string(descr_str)
+ if not objs:
+ error("empty object set '%s'" % (value))
+ if in_dep:
+ t.add_deps(curr_objs, objs)
+ elif in_callref:
+ t.add_callrefs(curr_objs, objs)
+ clear_dep_state()
+ curr_objs = objs
+ for o in objs:
+ if not o in t.objs:
+ t.objs.append(o)
+
+ elif kind == "OBJSET3":
+ if in_dep:
+ t.add_deps(curr_objs, ['*'])
+ elif in_callref:
+ t.add_callrefs(curr_objs, ['*'])
+ else:
+ error("non-dependence target set '*' can only be used "
+ "as target of ->/=> operations")
+ clear_dep_state()
+ curr_objs = ['*']
+
+ elif kind == "PERMUTE":
+ if in_dep or in_callref:
+ error("syntax error, permute operation invalid here")
+ if not curr_objs:
+ error("syntax error, no objects to permute here")
+
+ for obj in curr_objs:
+ if not obj in t.dep_permutations:
+ # Signal this object has permuted dependencies
+ t.dep_permutations[obj] = []
+
+ elif kind == "PROG":
+ if t.main_program:
+ error("cannot have more than one main program")
+ if in_dep:
+ error("objects cannot have dependency on main program")
+ if in_callref:
+ # TODO: A DSO can resolve to a symbol in the main binary,
+ # which we syntactically allow here, but haven't yet
+ # implemented.
+ t.add_callrefs(curr_objs, ["#"])
+ process_main_program(t, value[1:len(value)-1])
+ clear_dep_state()
+ curr_objs = ["#"]
+
+ elif kind == "DEP":
+ if in_dep or in_callref:
+ error("syntax error, multiple contiguous ->,=> operations")
+ if '*' in curr_objs:
+ error("non-dependence target set '*' can only be used "
+ "as target of ->/=> operations")
+ in_dep = True
+
+ elif kind == "CALLREF":
+ if in_dep or in_callref:
+ error("syntax error, multiple contiguous ->,=> operations")
+ if '*' in curr_objs:
+ error("non-dependence target set '*' can only be used "
+ "as target of ->/=> operations")
+ in_callref = True
+
+ elif kind == "SEMICOL":
+ curr_objs = []
+ clear_dep_state()
+
+ else:
+ error("unknown token '%s'" % (value))
+ return t
+
+# Main routine to process each testcase description
+def process_testcase(t):
+ global objpfx
+ assert t.test_name
+
+ base_test_name = t.test_name
+ test_subdir = base_test_name + "-dir"
+ testpfx = objpfx + test_subdir + "/"
+
+ if not os.path.exists(testpfx):
+ os.mkdir(testpfx)
+
+ def find_objs_not_depended_on(t):
+ objs_not_depended_on = []
+ for obj in t.objs:
+ skip = False
+ for r in t.deps.items():
+ if obj in r[1]:
+ skip = True
+ break
+ if not skip:
+ objs_not_depended_on.append(obj)
+ return objs_not_depended_on
+
+ non_dep_tgt_objs = find_objs_not_depended_on(t)
+ for obj in t.objs:
+ if obj in t.deps:
+ deps = t.deps[obj]
+ if '*' in deps:
+ t.deps[obj].remove('*')
+ t.add_deps([obj], non_dep_tgt_objs)
+ if obj in t.callrefs:
+ deps = t.callrefs[obj]
+ if '*' in deps:
+ t.deps[obj].remove('*')
+ t.add_callrefs([obj], non_dep_tgt_objs)
+ if "#" in t.deps:
+ deps = t.deps["#"]
+ if '*' in deps:
+ t.deps["#"].remove('*')
+ t.add_deps(["#"], non_dep_tgt_objs)
+
+ # If no main program was specified in dependency description, make a
+ # default main program with deps pointing to all DSOs which are not
+ # depended by another DSO.
+ if t.main_program_default_deps:
+ main_deps = non_dep_tgt_objs
+ if not main_deps:
+ error("no objects for default main program to point "
+ "dependency to(all objects strongly connected?)")
+ t.add_deps(["#"], main_deps)
+
+ # Some debug output
+ if cmdlineargs.debug_output:
+ print("Testcase: %s" % (t.test_name))
+ print("All objects: %s" % (t.objs))
+ print("--- Static link dependencies ---")
+ for r in t.deps.items():
+ print("%s -> %s" % (r[0], r[1]))
+ print("--- Objects whose dependencies are to be permuted ---")
+ for r in t.dep_permutations.items():
+ print("%s" % (r[0]))
+ print("--- Call reference dependencies ---")
+ for r in t.callrefs.items():
+ print("%s => %s" % (r[0], r[1]))
+ print("--- main program ---")
+ print(t.main_program)
+
+ # Main testcase generation routine, does Makefile fragment generation,
+ # testcase source generation, and if --build specified builds testcase.
+ def generate_testcase(test_descr, test_suffix):
+
+ test_name = test_descr.test_name + test_suffix
+
+ # Print out needed Makefile fragments for use in glibc/elf/Makefile.
+ module_names = ""
+ for o in test_descr.objs:
+ module_names += " " + test_subdir + "/" + test_name + "-" + o
+ makefile.write("modules-names +=%s\n" % (module_names))
+
+ # Depth-first traversal, executing FN(OBJ) in post-order
+ def dfs(t, fn):
+ def dfs_rec(obj, fn, obj_visited):
+ if obj in obj_visited:
+ return
+ obj_visited[obj] = True
+ if obj in t.deps:
+ for dep in t.deps[obj]:
+ dfs_rec(dep, fn, obj_visited)
+ fn(obj)
+
+ obj_visited = {}
+ for obj in t.objs:
+ dfs_rec(obj, fn, obj_visited)
+
+ # Generate link dependencies for all DSOs, done in a DFS fashion.
+ # Usually this doesn't need to be this complex, just listing the direct
+ # dependencies is enough. However to support creating circular
+ # dependency situations, traversing it by DFS and tracking processing
+ # status is the natural way to do it.
+ obj_processed = {}
+ fake_created = {}
+ def gen_link_deps(obj):
+ if obj in test_descr.deps:
+ dso = test_subdir + "/" + test_name + "-" + obj + ".so"
+ dependencies = ""
+ for dep in test_descr.deps[obj]:
+ if dep in obj_processed:
+ depstr = (" $(objpfx)" + test_subdir + "/"
+ + test_name + "-" + dep + ".so")
+ else:
+ # A circular dependency is satisfied by making a
+ # fake DSO tagged with the correct SONAME
+ depstr = (" $(objpfx)" + test_subdir + "/"
+ + test_name + "-" + dep + ".FAKE.so")
+ # Create empty C file and Makefile fragments for fake
+ # object. This only needs to be done at most once for
+ # an object name.
+ if not dep in fake_created:
+ f = open(testpfx + test_name + "-" + dep
+ + ".FAKE.c", "w")
+ f.write(" \n")
+ f.close()
+ # Generate rule to create fake object
+ makefile.write \
+ ("LDFLAGS-%s = -Wl,--no-as-needed "
+ "-Wl,-soname=%s\n"
+ % (test_name + "-" + dep + ".FAKE.so",
+ ("$(objpfx)" + test_subdir + "/"
+ + test_name + "-" + dep + ".so")))
+ makefile.write \
+ ("modules-names += %s\n"
+ % (test_subdir + "/"
+ + test_name + "-" + dep + ".FAKE"))
+ fake_created[dep] = True
+ dependencies += depstr
+ makefile.write("$(objpfx)%s:%s\n" % (dso, dependencies))
+ # Mark obj as processed
+ obj_processed[obj] = True
+
+ dfs(test_descr, gen_link_deps)
+
+ # Print LDFLAGS-* and *-no-z-defs
+ for o in test_descr.objs:
+ dso = test_name + "-" + o + ".so"
+ ldflags = "-Wl,--no-as-needed"
+ if o in test_descr.soname_map:
+ soname = ("$(objpfx)" + test_subdir + "/"
+ + test_name + "-"
+ + test_descr.soname_map[o] + ".so")
+ ldflags += (" -Wl,-soname=" + soname)
+ makefile.write("LDFLAGS-%s = %s\n" % (dso, ldflags))
+ if o in test_descr.callrefs:
+ makefile.write("%s-no-z-defs = yes\n" % (dso))
+
+ # Print dependencies for main test program.
+ depstr = ""
+ if '#' in test_descr.deps:
+ for o in test_descr.deps['#']:
+ depstr += (" $(objpfx)" + test_subdir + "/"
+ + test_name + "-" + o + ".so")
+ makefile.write("$(objpfx)%s/%s:%s\n" % (test_subdir, test_name, depstr))
+ ldflags = "-Wl,--no-as-needed"
+ if '#' in test_descr.soname_map:
+ soname = ("$(objpfx)" + test_subdir + "/"
+ + test_name + "-"
+ + test_descr.soname_map['#'] + ".so")
+ ldflags += (" -Wl,-soname=" + soname)
+ makefile.write("LDFLAGS-%s = %s\n" % (test_name, ldflags))
+
+ not_depended_objs = find_objs_not_depended_on(test_descr)
+ if not_depended_objs:
+ depstr = ""
+ for dep in not_depended_objs:
+ depstr += (" $(objpfx)" + test_subdir + "/"
+ + test_name + "-" + dep + ".so")
+ makefile.write("$(objpfx)%s.out:%s\n" % (base_test_name, depstr))
+
+ # Add main executable to test-srcs
+ makefile.write("test-srcs += %s/%s\n" % (test_subdir, test_name))
+ # Add dependency on main executable of test
+ makefile.write("$(objpfx)%s.out: $(objpfx)%s/%s\n"
+ % (base_test_name, test_subdir, test_name))
+
+ for r in test_descr.expected_outputs.items():
+ tunable_options = []
+ specific_tunable = r[0]
+ xfail = r[1][1]
+ if specific_tunable != "":
+ tunable_options = [specific_tunable]
+ else:
+ tunable_options = default_tunable_options
+ if not tunable_options:
+ tunable_options = [""]
+
+ for tunable in tunable_options:
+ tunable_env = ""
+ tunable_sfx = ""
+ exp_tunable_sfx = ""
+ if tunable:
+ tunable_env = "GLIBC_TUNABLES=%s " % tunable
+ tunable_sfx = "-" + tunable.replace("=","_")
+ if specific_tunable:
+ tunable_sfx = "-" + specific_tunable.replace("=","_")
+ exp_tunable_sfx = tunable_sfx
+ tunable_descr = ("(%s)" % tunable_env.strip()
+ if tunable_env else "")
+ # Write out fragment of shell script for this single test.
+ test_descr.sh.write \
+ ("%s${test_wrapper_env} ${run_program_env} \\\n"
+ "${common_objpfx}support/test-run-command \\\n"
+ "${common_objpfx}elf/ld.so \\\n"
+ "--library-path ${common_objpfx}elf/%s:"
+ "${common_objpfx}elf:${common_objpfx}.:"
+ "${common_objpfx}dlfcn \\\n"
+ "${common_objpfx}elf/%s/%s > \\\n"
+ " ${common_objpfx}elf/%s/%s%s.output\n"
+ % (tunable_env ,test_subdir,
+ test_subdir, test_name, test_subdir, test_name,
+ tunable_sfx))
+ # Generate a run of each test and compare with expected out
+ test_descr.sh.write \
+ ("if [ $? -ne 0 ]; then\n"
+ " echo '%sFAIL: %s%s execution test'\n"
+ " something_failed=true\n"
+ "else\n"
+ " diff -wu ${common_objpfx}elf/%s/%s%s.output \\\n"
+ " ${common_objpfx}elf/%s/%s%s.exp\n"
+ " if [ $? -ne 0 ]; then\n"
+ " echo '%sFAIL: %s%s expected output comparison'\n"
+ " something_failed=true\n"
+ " fi\n"
+ "fi\n"
+ % (("X" if xfail else ""), test_name, tunable_descr,
+ test_subdir, test_name, tunable_sfx,
+ test_subdir, base_test_name, exp_tunable_sfx,
+ ("X" if xfail else ""), test_name, tunable_descr))
+
+ # Generate C files according to dependency and calling relations from
+ # description string.
+ for obj in test_descr.objs:
+ src_name = test_name + "-" + obj + ".c"
+ f = open(testpfx + src_name, "w")
+ if obj in test_descr.callrefs:
+ called_objs = test_descr.callrefs[obj]
+ for callee in called_objs:
+ f.write("extern void fn_%s (void);\n" % (callee))
+ if len(obj) == 1:
+ f.write("extern int putchar(int);\n")
+ f.write("static void __attribute__((constructor)) " +
+ "init(void){putchar('%s');putchar('>');}\n" % (obj))
+ f.write("static void __attribute__((destructor)) " +
+ "fini(void){putchar('<');putchar('%s');}\n" % (obj))
+ else:
+ f.write('extern int printf(const char *, ...);\n')
+ f.write('static void __attribute__((constructor)) ' +
+ 'init(void){printf("%s>");}\n' % (obj))
+ f.write('static void __attribute__((destructor)) ' +
+ 'fini(void){printf("<%s");}\n' % (obj))
+ if obj in test_descr.callrefs:
+ called_objs = test_descr.callrefs[obj]
+ if len(obj) != 1:
+ f.write("extern int putchar(int);\n")
+ f.write("void fn_%s (void) {\n" % (obj))
+ if len(obj) == 1:
+ f.write(" putchar ('%s');\n" % (obj));
+ f.write(" putchar ('(');\n");
+ else:
+ f.write(' printf ("%s(");\n' % (obj));
+ for callee in called_objs:
+ f.write(" fn_%s ();\n" % (callee))
+ f.write(" putchar (')');\n");
+ f.write("}\n")
+ else:
+ for callref in test_descr.callrefs.items():
+ if obj in callref[1]:
+ if len(obj) == 1:
+ # We need to declare printf here in this case.
+ f.write('extern int printf(const char *, ...);\n')
+ f.write("void fn_%s (void) {\n" % (obj))
+ f.write(' printf ("%s()");\n' % (obj))
+ f.write("}\n")
+ break
+ f.close()
+
+ # Open C file for writing main program
+ f = open(testpfx + test_name + ".c", "w")
+
+ # if there are some operations in main(), it means we need -ldl
+ f.write("#include <stdio.h>\n")
+ f.write("#include <stdlib.h>\n")
+ f.write("#include <dlfcn.h>\n")
+ for s in test_descr.main_program:
+ if s[0] == '@':
+ f.write("extern void fn_%s (void);\n" % (s[1:]));
+ f.write("int main (void) {\n")
+ f.write(" putchar('{');\n")
+
+ # Helper routine for generating sanity checking code.
+ def put_fail_check(fail_cond, action_desc):
+ f.write(' if (%s) { printf ("\\n%s failed: %%s\\n", '
+ 'dlerror()); exit (1);}\n' % (fail_cond, action_desc))
+ i = 0
+ while i < len(test_descr.main_program):
+ s = test_descr.main_program[i]
+ obj = s[1:]
+ dso = test_name + "-" + obj
+ if s[0] == '+' or s[0] == '^':
+ if s[0] == '+':
+ dlopen_flags = "RTLD_LAZY|RTLD_GLOBAL"
+ f.write(" putchar('+');\n");
+ else:
+ dlopen_flags = "RTLD_LAZY"
+ f.write(" putchar(':');\n");
+ if len(obj) == 1:
+ f.write(" putchar('%s');\n" % (obj));
+ else:
+ f.write(' printf("%s");\n' % (obj));
+ f.write(" putchar('[');\n");
+ f.write(' void *%s = dlopen ("%s.so", %s);\n'
+ % (obj, dso, dlopen_flags))
+ put_fail_check("!%s" % (obj),
+ "%s.so dlopen" % (dso))
+ f.write(" putchar(']');\n");
+ elif s[0] == '-':
+ f.write(" putchar('-');\n");
+ if len(obj) == 1:
+ f.write(" putchar('%s');\n" % (obj));
+ else:
+ f.write(' printf("%s");\n' % (obj));
+ f.write(" putchar('[');\n");
+ put_fail_check("dlclose (%s) != 0" % (obj),
+ "%s.so dlclose" % (dso))
+ f.write(" putchar(']');\n");
+ elif s[0] == '%':
+ f.write(" putchar('%');\n");
+ f.write(' void (*fn_%s)(void) = dlsym (%s, "fn_%s");\n'
+ % (obj, obj, obj))
+ put_fail_check("!fn_%s" % (obj),
+ "dlsym(fn_%s) from %s.so" % (obj, dso))
+ f.write(" fn_%s ();\n" % (obj))
+ elif s[0] == '@':
+ f.write(" putchar('@');\n");
+ f.write(" fn_%s ();\n" % (obj))
+ f.write(" putchar(';');\n");
+ i += 1
+ f.write(" putchar('}');\n")
+ f.write(" return 0;\n")
+ f.write("}\n")
+ f.close()
+
+ # --build option processing: build generated sources using 'build_gcc'
+ if cmdlineargs.build:
+ # Helper routine to run a shell command, for running GCC below
+ def run_cmd(args):
+ cmd = str.join(' ', args)
+ if cmdlineargs.debug_output:
+ print(cmd)
+ p = subprocess.Popen(args)
+ p.wait()
+ if p.returncode != 0:
+ error("error running command: %s" % (cmd))
+
+ # Compile individual .os files
+ for obj in test_descr.objs:
+ src_name = test_name + "-" + obj + ".c"
+ obj_name = test_name + "-" + obj + ".os"
+ run_cmd([build_gcc, "-c", "-fPIC", testpfx + src_name,
+ "-o", testpfx + obj_name])
+
+ obj_processed = {}
+ fake_created = {}
+ # Function to create <test_name>-<obj>.so
+ def build_dso(obj):
+ obj_name = test_name + "-" + obj + ".os"
+ dso_name = test_name + "-" + obj + ".so"
+ deps = []
+ if obj in test_descr.deps:
+ for dep in test_descr.deps[obj]:
+ if dep in obj_processed:
+ deps.append(dep)
+ else:
+ deps.append(dep + ".FAKE")
+ if not dep in fake_created:
+ base_name = testpfx + test_name + "-" + dep
+ cmd = [build_gcc, "-Wl,--no-as-needed",
+ ("-Wl,-soname=" + base_name + ".so"),
+ "-shared", base_name + ".FAKE.c",
+ "-o", base_name + ".FAKE.so"]
+ run_cmd(cmd)
+ fake_created[dep] = True
+ dso_deps = map(lambda d: testpfx + test_name + "-" + d + ".so",
+ deps)
+ cmd = [build_gcc, "-shared", "-o", testpfx + dso_name,
+ testpfx + obj_name, "-Wl,--no-as-needed"]
+ if obj in test_descr.soname_map:
+ soname = ("-Wl,-soname=" + testpfx + test_name + "-"
+ + test_descr.soname_map[obj] + ".so")
+ cmd += [soname]
+ cmd += list(dso_deps)
+ run_cmd(cmd)
+ obj_processed[obj] = True
+
+ # Build all DSOs, this needs to be in topological dependency order,
+ # or link will fail
+ dfs(test_descr, build_dso)
+
+ # Build main program
+ deps = []
+ if '#' in test_descr.deps:
+ deps = test_descr.deps['#']
+ main_deps = map(lambda d: testpfx + test_name + "-" + d + ".so",
+ deps)
+ cmd = [build_gcc, "-Wl,--no-as-needed", "-o", testpfx + test_name,
+ testpfx + test_name + ".c", "-L%s" % (os.getcwd()),
+ "-Wl,-rpath-link=%s" % (os.getcwd())]
+ if '#' in test_descr.soname_map:
+ soname = ("-Wl,-soname=" + testpfx + test_name + "-"
+ + test_descr.soname_map['#'] + ".so")
+ cmd += [soname]
+ cmd += list(main_deps)
+ run_cmd(cmd)
+
+ # Check if we need to enumerate permutations of dependencies
+ need_permutation_processing = False
+ if t.dep_permutations:
+ # Adjust dep_permutations into map of object -> dependency permutations
+ for r in t.dep_permutations.items():
+ obj = r[0]
+ if obj in t.deps and len(t.deps[obj]) > 1:
+ deps = t.deps[obj]
+ t.dep_permutations[obj] = list(itertools.permutations (deps))
+ need_permutation_processing = True
+
+ def enum_permutations(t, perm_list):
+ test_subindex = 1
+ curr_perms = []
+ def enum_permutations_rec(t, perm_list):
+ nonlocal test_subindex, curr_perms
+ if len(perm_list) >= 1:
+ curr = perm_list[0]
+ obj = curr[0]
+ perms = curr[1]
+ if not perms:
+ # This may be an empty list if no multiple dependencies to
+ # permute were found, skip to next in this case
+ enum_permutations_rec(t, perm_list[1:])
+ else:
+ for deps in perms:
+ t.deps[obj] = deps
+ permstr = "" if obj == "#" else obj + "_"
+ permstr += str.join('', deps)
+ curr_perms.append(permstr)
+ enum_permutations_rec(t, perm_list[1:])
+ curr_perms = curr_perms[0:len(curr_perms)-1]
+ else:
+ # t.deps is now instantiated with one dependency order
+ # permutation(across all objects that have multiple
+ # permutations), now process a testcase
+ generate_testcase(t, ("_" + str (test_subindex)
+ + "-" + str.join('-', curr_perms)))
+ test_subindex += 1
+ enum_permutations_rec(t, perm_list)
+
+ # Create *.exp files with expected outputs
+ for r in t.expected_outputs.items():
+ sfx = ""
+ if r[0] != "":
+ sfx = "-" + r[0].replace("=","_")
+ f = open(testpfx + t.test_name + sfx + ".exp", "w")
+ (output, xfail) = r[1]
+ f.write('%s' % output)
+ f.close()
+
+ # Create header part of top-level testcase shell script, to wrap execution
+ # and output comparison together.
+ t.sh = open(testpfx + t.test_name + ".sh", "w")
+ t.sh.write("#!/bin/sh\n")
+ t.sh.write("# Test driver for %s, generated by "
+ "dso-ordering-test.py\n" % (t.test_name))
+ t.sh.write("common_objpfx=$1\n")
+ t.sh.write("test_wrapper_env=$2\n")
+ t.sh.write("run_program_env=$3\n")
+ t.sh.write("something_failed=false\n")
+
+ # Starting part of Makefile fragment
+ makefile.write("ifeq (yes,$(build-shared))\n")
+
+ if need_permutation_processing:
+ enum_permutations(t, list (t.dep_permutations.items()))
+ else:
+ # We have no permutations to enumerate, just process testcase normally
+ generate_testcase(t, "")
+
+ # If testcase is XFAIL, indicate so
+ if t.xfail:
+ makefile.write("test-xfail-%s = yes\n" % t.test_name)
+
+ # Output end part of Makefile fragment
+ expected_output_files = ""
+ for r in t.expected_outputs.items():
+ sfx = ""
+ if r[0] != "":
+ sfx = "-" + r[0].replace("=","_")
+ expected_output_files += " $(objpfx)%s/%s%s.exp" % (test_subdir,
+ t.test_name, sfx)
+ makefile.write \
+ ("$(objpfx)%s.out: $(objpfx)%s/%s.sh%s "
+ "$(common-objpfx)support/test-run-command\n"
+ % (t.test_name, test_subdir, t.test_name,
+ expected_output_files))
+ makefile.write("\t$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' "
+ "'$(run-program-env)' > $@; $(evaluate-test)\n")
+ makefile.write("ifeq ($(run-built-tests),yes)\n")
+ if t.xtest:
+ makefile.write("xtests-special += $(objpfx)%s.out\n" % (t.test_name))
+ else:
+ makefile.write("tests-special += $(objpfx)%s.out\n" % (t.test_name))
+ makefile.write("endif\n")
+ makefile.write("endif\n")
+
+ # Write ending part of shell script generation
+ t.sh.write("if $something_failed; then\n"
+ " exit 1\n"
+ "else\n"
+ " echo '%sPASS: all tests for %s succeeded'\n"
+ " exit 0\n"
+ "fi\n" % (("X" if t.xfail else ""),
+ t.test_name))
+ t.sh.close()
+
+# Decription file parsing
+def parse_description_file(filename):
+ global default_tunable_options
+ global current_input_lineno
+ f = open(filename)
+ if not f:
+ error("cannot open description file %s" % (filename))
+ descrfile_lines = f.readlines()
+ t = None
+ for line in descrfile_lines:
+ p = re.compile(r"#.*$")
+ line = p.sub("", line) # Filter out comments
+ line = line.strip() # Remove excess whitespace
+ current_input_lineno += 1
+
+ m = re.match(r"^tunable_option:\s*(.*)$", line)
+ if m:
+ if m.group(1) == "":
+ error("tunable option cannot be empty")
+ default_tunable_options.append(m.group (1))
+ continue
+
+ m = re.match(r"^clear_tunables$", line)
+ if m:
+ default_tunable_options = []
+ continue
+
+ m = re.match(r"^([^:]+):\s*(.*)$", line)
+ if m:
+ lhs = m.group(1)
+ o = re.match(r"^output(.*)$", lhs)
+ xfail = False
+ if not o:
+ o = re.match(r"^xfail_output(.*)$", lhs)
+ if o:
+ xfail = True;
+ if o:
+ if not t:
+ error("output specification without testcase description")
+ tsstr = ""
+ if o.group(1):
+ ts = re.match(r"^\(([a-zA-Z0-9_.=]*)\)$", o.group (1))
+ if not ts:
+ error("tunable option malformed '%s'" % o.group(1))
+ tsstr = ts.group(1)
+ t.expected_outputs[tsstr] = (m.group(2), xfail)
+ # Any tunable option XFAILed means entire testcase
+ # is XFAIL/XPASS
+ t.xfail |= xfail
+ else:
+ if t:
+ # Starting a new test description, end and process
+ # current one.
+ process_testcase(t)
+ t = TestDescr()
+ x = re.match(r"^xtest\((.*)\)$", lhs)
+ if x:
+ t.xtest = True
+ t.test_name = x.group(1)
+ else:
+ t.test_name = lhs
+ descr_string = m.group(2)
+ parse_description_string(t, descr_string)
+ continue
+ else:
+ if line:
+ if not t:
+ error("no active testcase description")
+ parse_description_string(t, line)
+ # Process last completed test description
+ if t:
+ process_testcase(t)
+
+# Setup Makefile output to file or stdout as selected
+if output_makefile:
+ output_makefile_dir = os.path.dirname(output_makefile)
+ if output_makefile_dir:
+ os.makedirs(output_makefile_dir, exist_ok = True)
+ makefile = open(output_makefile, "w")
+else:
+ makefile = open(sys.stdout.fileno (), "w")
+
+# Finally, the main top-level calling of above parsing routines.
+if description_file:
+ parse_description_file(description_file)
+else:
+ t = TestDescr()
+ t.test_name = test_name
+ parse_description_string(t, description)
+ process_testcase(t)
+
+# Close Makefile fragment output
+makefile.close()
diff --git a/support/Depend b/support/Depend
new file mode 100644
index 0000000000000000..7e7d5dc67c13e669
--- /dev/null
+++ b/support/Depend
@@ -0,0 +1 @@
+elf
diff --git a/support/Makefile b/support/Makefile
index 7749ac24f1ac3622..636d69c4f8e7e139 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -215,10 +215,16 @@ others-noinstall += shell-container echo-container true-container
others += $(LINKS_DSO_PROGRAM)
others-noinstall += $(LINKS_DSO_PROGRAM)
+others += test-run-command
+others-static += test-run-command
+others-noinstall += test-run-command
+LDLIBS-test-run-command = $(libsupport)
+
$(objpfx)test-container : $(libsupport)
$(objpfx)shell-container : $(libsupport)
$(objpfx)echo-container : $(libsupport)
$(objpfx)true-container : $(libsupport)
+$(objpfx)test-run-command : $(libsupport) $(common-objpfx)elf/static-stubs.o
tests = \
README-testing \
diff --git a/support/support_test_main.c b/support/support_test_main.c
index def84d803928176b..49e9d9c5baf776eb 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -228,6 +228,18 @@ run_test_function (int argc, char **argv, const struct test_config *config)
while (wait_for_debugger)
usleep (1000);
+ if (config->run_command_mode)
+ {
+ /* In run-command-mode, the child process executes the command line
+ arguments as a new program. */
+ char **argv_ = xmalloc (sizeof (char *) * argc);
+ memcpy (argv_, &argv[1], sizeof (char *) * (argc - 1));
+ argv_[argc - 1] = NULL;
+ execv (argv_[0], argv_);
+ printf ("error: should not return here\n");
+ exit (1);
+ }
+
if (config->test_function != NULL)
return config->test_function ();
else if (config->test_function_argv != NULL)
diff --git a/support/test-driver.c b/support/test-driver.c
index 9798f16227b9d467..93f25a99c1b9d2cb 100644
--- a/support/test-driver.c
+++ b/support/test-driver.c
@@ -116,7 +116,9 @@ main (int argc, char **argv)
#if defined (TEST_FUNCTION) && defined (TEST_FUNCTON_ARGV)
# error TEST_FUNCTION and TEST_FUNCTION_ARGV cannot be defined at the same time
#endif
-#if defined (TEST_FUNCTION)
+#ifdef RUN_COMMAND_MODE
+ test_config.run_command_mode = 1;
+#elif defined (TEST_FUNCTION)
test_config.test_function = TEST_FUNCTION;
#elif defined (TEST_FUNCTION_ARGV)
test_config.test_function_argv = TEST_FUNCTION_ARGV;
diff --git a/support/test-driver.h b/support/test-driver.h
index 549179b254946390..818689ad1ae7fd8c 100644
--- a/support/test-driver.h
+++ b/support/test-driver.h
@@ -36,6 +36,7 @@ struct test_config
int expected_signal; /* If non-zero, expect termination by signal. */
char no_mallopt; /* Boolean flag to disable mallopt. */
char no_setvbuf; /* Boolean flag to disable setvbuf. */
+ char run_command_mode; /* Boolean flag to indicate run-command-mode. */
const char *optstring; /* Short command line options. */
};
diff --git a/support/test-run-command.c b/support/test-run-command.c
new file mode 100644
index 0000000000000000..61560d7bfb1686a8
--- /dev/null
+++ b/support/test-run-command.c
@@ -0,0 +1,22 @@
+/* Main program for test-run-command support utility.
+ 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 is basically a configuration of test-driver.c into a general
+ command-line program runner. */
+#define RUN_COMMAND_MODE
+#include <test-driver.c>
SOURCES/glibc-rh1159809-10.patch 0 → 100644
+ 79
− 0
View file @ 5de88b90
commit dbb75513f5cf9285c77c9e55777c5c35b653f890
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Sep 6 07:38:10 2022 +0200
elf: Rename _dl_sort_maps parameter from skip to force_first
The new implementation will not be able to skip an arbitrary number
of objects.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/elf/dl-sort-maps.c b/elf/dl-sort-maps.c
index 99354dc08a010dd3..7a586749adc3fa7d 100644
--- a/elf/dl-sort-maps.c
+++ b/elf/dl-sort-maps.c
@@ -27,12 +27,12 @@
If FOR_FINI is true, this is called for finishing an object. */
static void
_dl_sort_maps_original (struct link_map **maps, unsigned int nmaps,
- unsigned int skip, bool for_fini)
+ bool force_first, bool for_fini)
{
/* Allows caller to do the common optimization of skipping the first map,
usually the main binary. */
- maps += skip;
- nmaps -= skip;
+ maps += force_first;
+ nmaps -= force_first;
/* A list of one element need not be sorted. */
if (nmaps <= 1)
@@ -182,7 +182,7 @@ dfs_traversal (struct link_map ***rpo, struct link_map *map,
static void
_dl_sort_maps_dfs (struct link_map **maps, unsigned int nmaps,
- unsigned int skip __attribute__ ((unused)), bool for_fini)
+ bool force_first __attribute__ ((unused)), bool for_fini)
{
for (int i = nmaps - 1; i >= 0; i--)
maps[i]->l_visited = 0;
@@ -286,7 +286,7 @@ _dl_sort_maps_init (void)
void
_dl_sort_maps (struct link_map **maps, unsigned int nmaps,
- unsigned int skip, bool for_fini)
+ bool force_first, bool for_fini)
{
/* It can be tempting to use a static function pointer to store and call
the current selected sorting algorithm routine, but experimentation
@@ -296,9 +296,9 @@ _dl_sort_maps (struct link_map **maps, unsigned int nmaps,
input cases. A simple if-case with direct function calls appears to
be the fastest. */
if (__glibc_likely (GLRO(dl_dso_sort_algo) == dso_sort_algorithm_original))
- _dl_sort_maps_original (maps, nmaps, skip, for_fini);
+ _dl_sort_maps_original (maps, nmaps, force_first, for_fini);
else
- _dl_sort_maps_dfs (maps, nmaps, skip, for_fini);
+ _dl_sort_maps_dfs (maps, nmaps, force_first, for_fini);
}
#endif /* HAVE_TUNABLES. */
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 9f09a4a280396659..2c1b4c47c6a6c643 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1056,9 +1056,11 @@ extern void _dl_init (struct link_map *main_map, int argc, char **argv,
initializer functions have completed. */
extern void _dl_fini (void) attribute_hidden;
-/* Sort array MAPS according to dependencies of the contained objects. */
+/* Sort array MAPS according to dependencies of the contained objects.
+ If FORCE_FIRST, MAPS[0] keeps its place even if the dependencies
+ say otherwise. */
extern void _dl_sort_maps (struct link_map **maps, unsigned int nmaps,
- unsigned int skip, bool for_fini) attribute_hidden;
+ bool force_first, bool for_fini) attribute_hidden;
/* The dynamic linker calls this function before and having changing
any shared object mappings. The `r_state' member of `struct r_debug'
SOURCES/glibc-rh1159809-11.patch 0 → 100644
+ 90
− 0
View file @ 5de88b90
commit 1df71d32fe5f5905ffd5d100e5e9ca8ad6210891
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Sep 20 11:00:42 2022 +0200
elf: Implement force_first handling in _dl_sort_maps_dfs (bug 28937)
The implementation in _dl_close_worker requires that the first
element of l_initfini is always this very map (“We are always the
zeroth entry, and since we don't include ourselves in the
dependency analysis start at 1.”). Rather than fixing that
assumption, this commit adds an implementation of the force_first
argument to the new dependency sorting algorithm. This also means
that the directly dlopen'ed shared object is always initialized last,
which is the least surprising behavior in the presence of cycles.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/elf/dl-sort-maps.c b/elf/dl-sort-maps.c
index 7a586749adc3fa7d..6f5c17b47b98fbc7 100644
--- a/elf/dl-sort-maps.c
+++ b/elf/dl-sort-maps.c
@@ -182,8 +182,9 @@ dfs_traversal (struct link_map ***rpo, struct link_map *map,
static void
_dl_sort_maps_dfs (struct link_map **maps, unsigned int nmaps,
- bool force_first __attribute__ ((unused)), bool for_fini)
+ bool force_first, bool for_fini)
{
+ struct link_map *first_map = maps[0];
for (int i = nmaps - 1; i >= 0; i--)
maps[i]->l_visited = 0;
@@ -208,14 +209,6 @@ _dl_sort_maps_dfs (struct link_map **maps, unsigned int nmaps,
Adjusting the order so that maps[0] is last traversed naturally avoids
this problem.
- Further, the old "optimization" of skipping the main object at maps[0]
- from the call-site (i.e. _dl_sort_maps(maps+1,nmaps-1)) is in general
- no longer valid, since traversing along object dependency-links
- may "find" the main object even when it is not included in the initial
- order (e.g. a dlopen()'ed shared object can have circular dependencies
- linked back to itself). In such a case, traversing N-1 objects will
- create a N-object result, and raise problems.
-
To summarize, just passing in the full list, and iterating from back
to front makes things much more straightforward. */
@@ -274,6 +267,27 @@ _dl_sort_maps_dfs (struct link_map **maps, unsigned int nmaps,
}
memcpy (maps, rpo, sizeof (struct link_map *) * nmaps);
+
+ /* Skipping the first object at maps[0] is not valid in general,
+ since traversing along object dependency-links may "find" that
+ first object even when it is not included in the initial order
+ (e.g., a dlopen'ed shared object can have circular dependencies
+ linked back to itself). In such a case, traversing N-1 objects
+ will create a N-object result, and raise problems. Instead,
+ force the object back into first place after sorting. This naive
+ approach may introduce further dependency ordering violations
+ compared to rotating the cycle until the first map is again in
+ the first position, but as there is a cycle, at least one
+ violation is already present. */
+ if (force_first && maps[0] != first_map)
+ {
+ int i;
+ for (i = 0; maps[i] != first_map; ++i)
+ ;
+ assert (i < nmaps);
+ memmove (&maps[1], maps, i * sizeof (maps[0]));
+ maps[0] = first_map;
+ }
}
void
diff --git a/elf/dso-sort-tests-1.def b/elf/dso-sort-tests-1.def
index 5f7f18ef270bc12d..4bf9052db16fb352 100644
--- a/elf/dso-sort-tests-1.def
+++ b/elf/dso-sort-tests-1.def
@@ -64,3 +64,10 @@ output: b>a>{}<a<b
tst-bz15311: {+a;+e;+f;+g;+d;%d;-d;-g;-f;-e;-a};a->b->c->d;d=>[ba];c=>a;b=>e=>a;c=>f=>b;d=>g=>c
output(glibc.rtld.dynamic_sort=1): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<a<c<d<g<f<b<e];}
output(glibc.rtld.dynamic_sort=2): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<g<f<a<b<c<d<e];}
+
+# Test that even in the presence of dependency loops involving dlopen'ed
+# object, that object is initialized last (and not unloaded prematurely).
+# Final destructor order is indeterminate due to the cycle.
+tst-bz28937: {+a;+b;-b;+c;%c};a->a1;a->a2;a2->a;b->b1;c->a1;c=>a1
+output(glibc.rtld.dynamic_sort=1): {+a[a2>a1>a>];+b[b1>b>];-b[<b<b1];+c[c>];%c(a1());}<a<a2<c<a1
+output(glibc.rtld.dynamic_sort=2): {+a[a2>a1>a>];+b[b1>b>];-b[<b<b1];+c[c>];%c(a1());}<a2<a<c<a1
SOURCES/glibc-rh1159809-12.patch 0 → 100644
+ 35
− 0
View file @ 5de88b90
Downstream-specific patch to link DSO sorting tests with -ldl
if needed. Upstream does not need this because <dlfcn.h> interfaces
are part of libc.
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py
index 43b5ec4d920ad6a3..ae85e0f4a6ae5b3e 100644
--- a/scripts/dso-ordering-test.py
+++ b/scripts/dso-ordering-test.py
@@ -657,6 +657,8 @@ def process_testcase(t):
% (test_name + "-" + dep + ".FAKE.so",
("$(objpfx)" + test_subdir + "/"
+ test_name + "-" + dep + ".so")))
+ makefile.write(
+ "LDLIBS-%s += -Wl,--as-needed -ldl -Wl,--no-as-needed\n" % dso)
rule = ("$(objpfx)" + test_subdir + "/"
+ test_name + "-" + dep + ".FAKE.os: "
"$(objpfx)" + test_srcdir
@@ -685,6 +687,8 @@ def process_testcase(t):
+ test_descr.soname_map[o] + ".so")
ldflags += (" -Wl,-soname=" + soname)
makefile.write("LDFLAGS-%s = %s\n" % (dso, ldflags))
+ makefile.write(
+ "LDLIBS-%s += -Wl,--as-needed -ldl -Wl,--no-as-needed\n" % dso)
if o in test_descr.callrefs:
makefile.write("%s-no-z-defs = yes\n" % (dso))
@@ -702,6 +706,8 @@ def process_testcase(t):
+ test_descr.soname_map['#'] + ".so")
ldflags += (" -Wl,-soname=" + soname)
makefile.write("LDFLAGS-%s = %s\n" % (test_name, ldflags))
+ makefile.write(
+ "LDLIBS-%s += -Wl,--as-needed -ldl -Wl,--no-as-needed\n" % test_name)
rule = ("$(objpfx)" + test_subdir + "/" + test_name + ".o: "
"$(objpfx)" + test_srcdir + test_name + ".c\n"
"\t$(compile.c) $(OUTPUT_OPTION)\n")
SOURCES/glibc-rh1159809-2.patch 0 → 100644
+ 189
− 0
View file @ 5de88b90
commit b4bbedb1e75737a80bcc3d53d6eef1fbe0b5f4d5
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Nov 6 14:13:27 2021 -0700
dso-ordering-test.py: Put all sources in one directory [BZ #28550]
Put all sources for DSO sorting tests in the dso-sort-tests-src directory
and compile test relocatable objects with
$(objpfx)tst-dso-ordering1-dir/tst-dso-ordering1-a.os: $(objpfx)dso-sort-tests-src/tst-dso-ordering1-a.c
$(compile.c) $(OUTPUT_OPTION)
to avoid random $< values from $(before-compile) when compiling test
relocatable objects with
$(objpfx)%$o: $(objpfx)%.c $(before-compile); $$(compile-command.c)
compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)
for 3 "make -j 28" parallel builds on a machine with 112 cores at the
same time.
This partially fixes BZ #28550.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py
index 944ee740527d60fd..bde0406be9da14fc 100644
--- a/scripts/dso-ordering-test.py
+++ b/scripts/dso-ordering-test.py
@@ -526,9 +526,13 @@ def process_testcase(t):
base_test_name = t.test_name
test_subdir = base_test_name + "-dir"
testpfx = objpfx + test_subdir + "/"
+ test_srcdir = "dso-sort-tests-src/"
+ testpfx_src = objpfx + test_srcdir
if not os.path.exists(testpfx):
os.mkdir(testpfx)
+ if not os.path.exists(testpfx_src):
+ os.mkdir(testpfx_src)
def find_objs_not_depended_on(t):
objs_not_depended_on = []
@@ -595,6 +599,11 @@ def process_testcase(t):
# Print out needed Makefile fragments for use in glibc/elf/Makefile.
module_names = ""
for o in test_descr.objs:
+ rule = ("$(objpfx)" + test_subdir + "/" + test_name
+ + "-" + o + ".os: $(objpfx)" + test_srcdir
+ + test_name + "-" + o + ".c\n"
+ "\t$(compile.c) $(OUTPUT_OPTION)\n")
+ makefile.write (rule)
module_names += " " + test_subdir + "/" + test_name + "-" + o
makefile.write("modules-names +=%s\n" % (module_names))
@@ -637,7 +646,7 @@ def process_testcase(t):
# object. This only needs to be done at most once for
# an object name.
if not dep in fake_created:
- f = open(testpfx + test_name + "-" + dep
+ f = open(testpfx_src + test_name + "-" + dep
+ ".FAKE.c", "w")
f.write(" \n")
f.close()
@@ -648,6 +657,12 @@ def process_testcase(t):
% (test_name + "-" + dep + ".FAKE.so",
("$(objpfx)" + test_subdir + "/"
+ test_name + "-" + dep + ".so")))
+ rule = ("$(objpfx)" + test_subdir + "/"
+ + test_name + "-" + dep + ".FAKE.os: "
+ "$(objpfx)" + test_srcdir
+ + test_name + "-" + dep + ".FAKE.c\n"
+ "\t$(compile.c) $(OUTPUT_OPTION)\n")
+ makefile.write (rule)
makefile.write \
("modules-names += %s\n"
% (test_subdir + "/"
@@ -687,6 +702,10 @@ def process_testcase(t):
+ test_descr.soname_map['#'] + ".so")
ldflags += (" -Wl,-soname=" + soname)
makefile.write("LDFLAGS-%s = %s\n" % (test_name, ldflags))
+ rule = ("$(objpfx)" + test_subdir + "/" + test_name + ".o: "
+ "$(objpfx)" + test_srcdir + test_name + ".c\n"
+ "\t$(compile.c) $(OUTPUT_OPTION)\n")
+ makefile.write (rule)
not_depended_objs = find_objs_not_depended_on(test_descr)
if not_depended_objs:
@@ -745,7 +764,7 @@ def process_testcase(t):
" something_failed=true\n"
"else\n"
" diff -wu ${common_objpfx}elf/%s/%s%s.output \\\n"
- " ${common_objpfx}elf/%s/%s%s.exp\n"
+ " ${common_objpfx}elf/%s%s%s.exp\n"
" if [ $? -ne 0 ]; then\n"
" echo '%sFAIL: %s%s expected output comparison'\n"
" something_failed=true\n"
@@ -753,14 +772,14 @@ def process_testcase(t):
"fi\n"
% (("X" if xfail else ""), test_name, tunable_descr,
test_subdir, test_name, tunable_sfx,
- test_subdir, base_test_name, exp_tunable_sfx,
+ test_srcdir, base_test_name, exp_tunable_sfx,
("X" if xfail else ""), test_name, tunable_descr))
# Generate C files according to dependency and calling relations from
# description string.
for obj in test_descr.objs:
src_name = test_name + "-" + obj + ".c"
- f = open(testpfx + src_name, "w")
+ f = open(testpfx_src + src_name, "w")
if obj in test_descr.callrefs:
called_objs = test_descr.callrefs[obj]
for callee in called_objs:
@@ -804,7 +823,7 @@ def process_testcase(t):
f.close()
# Open C file for writing main program
- f = open(testpfx + test_name + ".c", "w")
+ f = open(testpfx_src + test_name + ".c", "w")
# if there are some operations in main(), it means we need -ldl
f.write("#include <stdio.h>\n")
@@ -885,7 +904,7 @@ def process_testcase(t):
for obj in test_descr.objs:
src_name = test_name + "-" + obj + ".c"
obj_name = test_name + "-" + obj + ".os"
- run_cmd([build_gcc, "-c", "-fPIC", testpfx + src_name,
+ run_cmd([build_gcc, "-c", "-fPIC", testpfx_src + src_name,
"-o", testpfx + obj_name])
obj_processed = {}
@@ -903,10 +922,12 @@ def process_testcase(t):
deps.append(dep + ".FAKE")
if not dep in fake_created:
base_name = testpfx + test_name + "-" + dep
+ src_base_name = (testpfx_src + test_name
+ + "-" + dep)
cmd = [build_gcc, "-Wl,--no-as-needed",
("-Wl,-soname=" + base_name + ".so"),
"-shared", base_name + ".FAKE.c",
- "-o", base_name + ".FAKE.so"]
+ "-o", src_base_name + ".FAKE.so"]
run_cmd(cmd)
fake_created[dep] = True
dso_deps = map(lambda d: testpfx + test_name + "-" + d + ".so",
@@ -932,7 +953,7 @@ def process_testcase(t):
main_deps = map(lambda d: testpfx + test_name + "-" + d + ".so",
deps)
cmd = [build_gcc, "-Wl,--no-as-needed", "-o", testpfx + test_name,
- testpfx + test_name + ".c", "-L%s" % (os.getcwd()),
+ testpfx_src + test_name + ".c", "-L%s" % (os.getcwd()),
"-Wl,-rpath-link=%s" % (os.getcwd())]
if '#' in test_descr.soname_map:
soname = ("-Wl,-soname=" + testpfx + test_name + "-"
@@ -987,14 +1008,14 @@ def process_testcase(t):
sfx = ""
if r[0] != "":
sfx = "-" + r[0].replace("=","_")
- f = open(testpfx + t.test_name + sfx + ".exp", "w")
+ f = open(testpfx_src + t.test_name + sfx + ".exp", "w")
(output, xfail) = r[1]
f.write('%s' % output)
f.close()
# Create header part of top-level testcase shell script, to wrap execution
# and output comparison together.
- t.sh = open(testpfx + t.test_name + ".sh", "w")
+ t.sh = open(testpfx_src + t.test_name + ".sh", "w")
t.sh.write("#!/bin/sh\n")
t.sh.write("# Test driver for %s, generated by "
"dso-ordering-test.py\n" % (t.test_name))
@@ -1022,12 +1043,12 @@ def process_testcase(t):
sfx = ""
if r[0] != "":
sfx = "-" + r[0].replace("=","_")
- expected_output_files += " $(objpfx)%s/%s%s.exp" % (test_subdir,
+ expected_output_files += " $(objpfx)%s%s%s.exp" % (test_srcdir,
t.test_name, sfx)
makefile.write \
- ("$(objpfx)%s.out: $(objpfx)%s/%s.sh%s "
+ ("$(objpfx)%s.out: $(objpfx)%s%s.sh%s "
"$(common-objpfx)support/test-run-command\n"
- % (t.test_name, test_subdir, t.test_name,
+ % (t.test_name, test_srcdir, t.test_name,
expected_output_files))
makefile.write("\t$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' "
"'$(run-program-env)' > $@; $(evaluate-test)\n")
SOURCES/glibc-rh1159809-3.patch 0 → 100644
+ 589
− 0
View file @ 5de88b90
This diff is collapsed.
SOURCES/glibc-rh1159809-4.patch 0 → 100644
+ 25
− 0
View file @ 5de88b90
commit d3bf2f5927d51258a51ac7fde04f4805f8ee294a
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Nov 3 09:19:30 2021 -0300
elf: Do not run DSO sorting if tunables is not enabled
Since the argorithm selection requires tunables.
Checked on x86_64-linux-gnu with --enable-tunables=no.
diff --git a/elf/Makefile b/elf/Makefile
index e92f62f279566684..3b5e1f59e6696a2b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -998,8 +998,10 @@ include $(objpfx)$(1).generated-makefile
endef
# Generate from each testcase description file
+ifeq (yes,$(have-tunables))
$(eval $(call include_dsosort_tests,dso-sort-tests-1.def))
$(eval $(call include_dsosort_tests,dso-sort-tests-2.def))
+endif
check-abi: $(objpfx)check-abi-ld.out
tests-special += $(objpfx)check-abi-ld.out
SOURCES/glibc-rh1159809-5.patch 0 → 100644
+ 45
− 0
View file @ 5de88b90
commit 1f67d8286b5da9266a138198ef1f15c27cbb0010
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Nov 15 16:28:39 2021 -0800
elf: Use a temporary file to generate Makefile fragments [BZ #28550]
1. Use a temporary file to generate Makefile fragments for DSO sorting
tests and use -include on them.
2. Add Makefile fragments to postclean-generated so that a "make clean"
removes the autogenerated fragments and a subsequent "make" regenerates
them.
This partially fixes BZ #28550.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/elf/Makefile b/elf/Makefile
index 3b5e1f59e6696a2b..22a8060f7d3bb1a1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -986,6 +986,7 @@ tests-special += \
# tests-special
endif
+ifndef avoid-generated
# DSO sorting tests:
# The dso-ordering-test.py script generates testcase source files in $(objpfx),
# creating a $(objpfx)<testcase-name>-dir for each testcase, and creates a
@@ -993,9 +994,14 @@ endif
define include_dsosort_tests
$(objpfx)$(1).generated-makefile: $(1)
$(PYTHON) $(..)scripts/dso-ordering-test.py \
- --description-file $$< --objpfx $(objpfx) --output-makefile $$@
-include $(objpfx)$(1).generated-makefile
+ --description-file $$< --objpfx $(objpfx) --output-makefile $$@T
+ mv $$@T $$@
+-include $(objpfx)$(1).generated-makefile
endef
+endif
+
+postclean-generated += $(objpfx)/dso-sort-tests-2.generated-makefile \
+ $(objpfx)/dso-sort-tests-2.generated-makefile
# Generate from each testcase description file
ifeq (yes,$(have-tunables))
SOURCES/glibc-rh1159809-6.patch 0 → 100644
+ 49
− 0
View file @ 5de88b90
commit 0884724a95b60452ad483dbe086d237d02ba624d
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Dec 14 12:37:44 2021 +0100
elf: Use new dependency sorting algorithm by default
The default has to change eventually, and there are no known failures
that require a delay.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list
index 54ef2a921310b229..f11ca5b3e8b09b43 100644
--- a/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@ -146,7 +146,7 @@ glibc {
type: INT_32
minval: 1
maxval: 2
- default: 1
+ default: 2
}
}
}
diff --git a/elf/tst-rtld-list-tunables.exp b/elf/tst-rtld-list-tunables.exp
index 118afc271057afd4..478ee8ab091685eb 100644
--- a/elf/tst-rtld-list-tunables.exp
+++ b/elf/tst-rtld-list-tunables.exp
@@ -10,6 +10,6 @@ glibc.malloc.tcache_max: 0x0 (min: 0x0, max: 0x[f]+)
glibc.malloc.tcache_unsorted_limit: 0x0 (min: 0x0, max: 0x[f]+)
glibc.malloc.top_pad: 0x0 (min: 0x0, max: 0x[f]+)
glibc.malloc.trim_threshold: 0x0 (min: 0x0, max: 0x[f]+)
-glibc.rtld.dynamic_sort: 1 (min: 1, max: 2)
+glibc.rtld.dynamic_sort: 2 (min: 1, max: 2)
glibc.rtld.nns: 0x4 (min: 0x1, max: 0x10)
glibc.rtld.optional_static_tls: 0x200 (min: 0x0, max: 0x[f]+)
diff --git a/manual/tunables.texi b/manual/tunables.texi
index c3f96cdc85208926..7b70e80391ee87f7 100644
--- a/manual/tunables.texi
+++ b/manual/tunables.texi
@@ -312,7 +312,7 @@ value of @samp{2}, a different algorithm is used, which implements a
topological sort through depth-first search, and does not exhibit the
performance issues of @samp{1}.
-The default value of this tunable is @samp{1}.
+The default value of this tunable is @samp{2}.
@end deftp
@node Elision Tunables
SOURCES/glibc-rh1159809-7.patch 0 → 100644
+ 357
− 0
View file @ 5de88b90
commit 3a0588ae48fb35384a6bd33f9b66403badfa1262
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Feb 8 15:22:49 2022 -0300
elf: Fix DFS sorting algorithm for LD_TRACE_LOADED_OBJECTS with missing libraries (BZ #28868)
On _dl_map_object the underlying file is not opened in trace mode
(in other cases where the underlying file can't be opened,
_dl_map_object quits with an error). If there any missing libraries
being processed, they will not be considered on final nlist size
passed on _dl_sort_maps later in the function. And it is then used by
_dl_sort_maps_dfs on the stack allocated working maps:
222 /* Array to hold RPO sorting results, before we copy back to maps[]. */
223 struct link_map *rpo[nmaps];
224
225 /* The 'head' position during each DFS iteration. Note that we start at
226 one past the last element due to first-decrement-then-store (see the
227 bottom of above dfs_traversal() routine). */
228 struct link_map **rpo_head = &rpo[nmaps];
However while transversing the 'l_initfini' on dfs_traversal it will
still consider the l_faked maps and thus update rpo more times than the
allocated working 'rpo', overflowing the stack object.
As suggested in bugzilla, one option would be to avoid sorting the maps
for trace mode. However I think ignoring l_faked object does make
sense (there is one less constraint to call the sorting function), it
allows a slight less stack usage for trace, and it is slight simpler
solution.
The tests does trigger the stack overflow, however I tried to make
it more generic to check different scenarios or missing objects.
Checked on x86_64-linux-gnu.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Conflicts:
elf/Makefile
(differences in backported tests)
diff --git a/elf/Makefile b/elf/Makefile
index 22a8060f7d3bb1a1..634c3113227d64a6 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -584,6 +584,11 @@ modules-names = \
libmarkermod5-3 \
libmarkermod5-4 \
libmarkermod5-5 \
+ libtracemod1-1 \
+ libtracemod2-1 \
+ libtracemod3-1 \
+ libtracemod4-1 \
+ libtracemod5-1 \
ltglobmod1 \
ltglobmod2 \
neededobj1 \
@@ -983,6 +988,11 @@ tests-special += \
$(objpfx)tst-initorder2-cmp.out \
$(objpfx)tst-unused-dep-cmp.out \
$(objpfx)tst-unused-dep.out \
+ $(objpfx)tst-trace1.out \
+ $(objpfx)tst-trace2.out \
+ $(objpfx)tst-trace3.out \
+ $(objpfx)tst-trace4.out \
+ $(objpfx)tst-trace5.out \
# tests-special
endif
@@ -2619,6 +2629,51 @@ $(objpfx)tst-rtld-run-static.out: $(objpfx)/ldconfig
$(objpfx)tst-dlmopen-gethostbyname: $(libdl)
$(objpfx)tst-dlmopen-gethostbyname.out: $(objpfx)tst-dlmopen-gethostbyname-mod.so
+
+LDFLAGS-libtracemod1-1.so += -Wl,-soname,libtracemod1.so
+LDFLAGS-libtracemod2-1.so += -Wl,-soname,libtracemod2.so
+LDFLAGS-libtracemod3-1.so += -Wl,-soname,libtracemod3.so
+LDFLAGS-libtracemod4-1.so += -Wl,-soname,libtracemod4.so
+LDFLAGS-libtracemod5-1.so += -Wl,-soname,libtracemod5.so
+
+$(objpfx)libtracemod1-1.so: $(objpfx)libtracemod2-1.so \
+ $(objpfx)libtracemod3-1.so
+$(objpfx)libtracemod2-1.so: $(objpfx)libtracemod4-1.so \
+ $(objpfx)libtracemod5-1.so
+
+define libtracemod-x
+$(objpfx)libtracemod$(1)/libtracemod$(1).so: $(objpfx)libtracemod$(1)-1.so
+ $$(make-target-directory)
+ cp $$< $$@
+endef
+libtracemod-suffixes = 1 2 3 4 5
+$(foreach i,$(libtracemod-suffixes), $(eval $(call libtracemod-x,$(i))))
+
+define tst-trace-skeleton
+$(objpfx)tst-trace$(1).out: $(objpfx)libtracemod1/libtracemod1.so \
+ $(objpfx)libtracemod2/libtracemod2.so \
+ $(objpfx)libtracemod3/libtracemod3.so \
+ $(objpfx)libtracemod4/libtracemod4.so \
+ $(objpfx)libtracemod5/libtracemod5.so \
+ $(..)scripts/tst-ld-trace.py \
+ tst-trace$(1).exp
+ ${ $(PYTHON) $(..)scripts/tst-ld-trace.py \
+ "$(test-wrapper-env) $(elf-objpfx)$(rtld-installed-name) \
+ --library-path $(common-objpfx):$(strip $(2)) \
+ $(objpfx)libtracemod1/libtracemod1.so" tst-trace$(1).exp \
+ } > $$@; $$(evaluate-test)
+endef
+
+$(eval $(call tst-trace-skeleton,1,))
+$(eval $(call tst-trace-skeleton,2,\
+ $(objpfx)libtracemod2))
+$(eval $(call tst-trace-skeleton,3,\
+ $(objpfx)libtracemod2:$(objpfx)libtracemod3))
+$(eval $(call tst-trace-skeleton,4,\
+ $(objpfx)libtracemod2:$(objpfx)libtracemod3:$(objpfx)libtracemod4))
+$(eval $(call tst-trace-skeleton,5,\
+ $(objpfx)libtracemod2:$(objpfx)libtracemod3:$(objpfx)libtracemod4:$(objpfx)libtracemod5))
+
$(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \
$(objpfx)tst-audit-tlsdesc-mod2.so \
$(shared-thread-library)
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 9365d54c8e03e5f4..9ff589c8562b2dd1 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -489,6 +489,8 @@ _dl_map_object_deps (struct link_map *map,
for (nlist = 0, runp = known; runp; runp = runp->next)
{
+ /* _dl_sort_maps ignores l_faked object, so it is safe to not consider
+ them for nlist. */
if (__builtin_expect (trace_mode, 0) && runp->map->l_faked)
/* This can happen when we trace the loading. */
--map->l_searchlist.r_nlist;
diff --git a/elf/dl-sort-maps.c b/elf/dl-sort-maps.c
index 398a08f28c4d9ff1..99354dc08a010dd3 100644
--- a/elf/dl-sort-maps.c
+++ b/elf/dl-sort-maps.c
@@ -140,7 +140,9 @@ static void
dfs_traversal (struct link_map ***rpo, struct link_map *map,
bool *do_reldeps)
{
- if (map->l_visited)
+ /* _dl_map_object_deps ignores l_faked objects when calculating the
+ number of maps before calling _dl_sort_maps, ignore them as well. */
+ if (map->l_visited || map->l_faked)
return;
map->l_visited = 1;
diff --git a/elf/libtracemod1-1.c b/elf/libtracemod1-1.c
new file mode 100644
index 0000000000000000..7c89c9a5a40b9668
--- /dev/null
+++ b/elf/libtracemod1-1.c
@@ -0,0 +1 @@
+/* Empty */
diff --git a/elf/libtracemod2-1.c b/elf/libtracemod2-1.c
new file mode 100644
index 0000000000000000..7c89c9a5a40b9668
--- /dev/null
+++ b/elf/libtracemod2-1.c
@@ -0,0 +1 @@
+/* Empty */
diff --git a/elf/libtracemod3-1.c b/elf/libtracemod3-1.c
new file mode 100644
index 0000000000000000..7c89c9a5a40b9668
--- /dev/null
+++ b/elf/libtracemod3-1.c
@@ -0,0 +1 @@
+/* Empty */
diff --git a/elf/libtracemod4-1.c b/elf/libtracemod4-1.c
new file mode 100644
index 0000000000000000..7c89c9a5a40b9668
--- /dev/null
+++ b/elf/libtracemod4-1.c
@@ -0,0 +1 @@
+/* Empty */
diff --git a/elf/libtracemod5-1.c b/elf/libtracemod5-1.c
new file mode 100644
index 0000000000000000..7c89c9a5a40b9668
--- /dev/null
+++ b/elf/libtracemod5-1.c
@@ -0,0 +1 @@
+/* Empty */
diff --git a/elf/tst-trace1.exp b/elf/tst-trace1.exp
new file mode 100644
index 0000000000000000..4a6f5211a68fe2c8
--- /dev/null
+++ b/elf/tst-trace1.exp
@@ -0,0 +1,4 @@
+ld 1
+libc 1
+libtracemod2.so 0
+libtracemod3.so 0
diff --git a/elf/tst-trace2.exp b/elf/tst-trace2.exp
new file mode 100644
index 0000000000000000..e13506e2eb9aeca2
--- /dev/null
+++ b/elf/tst-trace2.exp
@@ -0,0 +1,6 @@
+ld 1
+libc 1
+libtracemod2.so 1
+libtracemod3.so 0
+libtracemod4.so 0
+libtracemod5.so 0
diff --git a/elf/tst-trace3.exp b/elf/tst-trace3.exp
new file mode 100644
index 0000000000000000..e574549d12a53d72
--- /dev/null
+++ b/elf/tst-trace3.exp
@@ -0,0 +1,6 @@
+ld 1
+libc 1
+libtracemod2.so 1
+libtracemod3.so 1
+libtracemod4.so 0
+libtracemod5.so 0
diff --git a/elf/tst-trace4.exp b/elf/tst-trace4.exp
new file mode 100644
index 0000000000000000..31ca97b35bde0009
--- /dev/null
+++ b/elf/tst-trace4.exp
@@ -0,0 +1,6 @@
+ld 1
+libc 1
+libtracemod2.so 1
+libtracemod3.so 1
+libtracemod4.so 1
+libtracemod5.so 0
diff --git a/elf/tst-trace5.exp b/elf/tst-trace5.exp
new file mode 100644
index 0000000000000000..5d7d95372656396f
--- /dev/null
+++ b/elf/tst-trace5.exp
@@ -0,0 +1,6 @@
+ld 1
+libc 1
+libtracemod2.so 1
+libtracemod3.so 1
+libtracemod4.so 1
+libtracemod5.so 1
diff --git a/scripts/tst-ld-trace.py b/scripts/tst-ld-trace.py
new file mode 100755
index 0000000000000000..f5a402800377f44b
--- /dev/null
+++ b/scripts/tst-ld-trace.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python3
+# Dump the output of LD_TRACE_LOADED_OBJECTS in architecture neutral format.
+# Copyright (C) 2022 Free Software Foundation, Inc.
+# Copyright The GNU Toolchain Authors.
+# 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/>.
+
+import argparse
+import os
+import subprocess
+import sys
+
+try:
+ subprocess.run
+except:
+ class _CompletedProcess:
+ def __init__(self, args, returncode, stdout=None, stderr=None):
+ self.args = args
+ self.returncode = returncode
+ self.stdout = stdout
+ self.stderr = stderr
+
+ def _run(*popenargs, input=None, timeout=None, check=False, **kwargs):
+ assert(timeout is None)
+ with subprocess.Popen(*popenargs, **kwargs) as process:
+ try:
+ stdout, stderr = process.communicate(input)
+ except:
+ process.kill()
+ process.wait()
+ raise
+ returncode = process.poll()
+ if check and returncode:
+ raise subprocess.CalledProcessError(returncode, popenargs)
+ return _CompletedProcess(popenargs, returncode, stdout, stderr)
+
+ subprocess.run = _run
+
+def is_vdso(lib):
+ return lib.startswith('linux-gate') or lib.startswith('linux-vdso')
+
+
+def parse_trace(cmd, fref):
+ new_env = os.environ.copy()
+ new_env['LD_TRACE_LOADED_OBJECTS'] = '1'
+ trace_out = subprocess.run(cmd, stdout=subprocess.PIPE, check=True,
+ universal_newlines=True, env=new_env).stdout
+ trace = []
+ for line in trace_out.splitlines():
+ line = line.strip()
+ if is_vdso(line):
+ continue
+ fields = line.split('=>' if '=>' in line else ' ')
+ lib = os.path.basename(fields[0].strip())
+ if lib.startswith('ld'):
+ lib = 'ld'
+ elif lib.startswith('libc'):
+ lib = 'libc'
+ found = 1 if fields[1].strip() != 'not found' else 0
+ trace += ['{} {}'.format(lib, found)]
+ trace = sorted(trace)
+
+ reference = sorted(line.replace('\n','') for line in fref.readlines())
+
+ ret = 0 if trace == reference else 1
+ if ret != 0:
+ for i in reference:
+ if i not in trace:
+ print("Only in {}: {}".format(fref.name, i))
+ for i in trace:
+ if i not in reference:
+ print("Only in trace: {}".format(i))
+
+ sys.exit(ret)
+
+
+def get_parser():
+ parser = argparse.ArgumentParser(description=__doc__)
+ parser.add_argument('command',
+ help='comand to run')
+ parser.add_argument('reference',
+ help='reference file to compare')
+ return parser
+
+
+def main(argv):
+ parser = get_parser()
+ opts = parser.parse_args(argv)
+ with open(opts.reference, 'r') as fref:
+ # Remove the initial 'env' command.
+ parse_trace(opts.command.split()[1:], fref)
+
+
+if __name__ == '__main__':
+ main(sys.argv[1:])
SOURCES/glibc-rh1159809-8.patch 0 → 100644
+ 36
− 0
View file @ 5de88b90
commit a2211c76c3b994099fd58a06d6072d7495d699cd
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Mar 18 18:18:35 2022 +0100
scripts/dso-ordering-test.py: Fix C&P error in * callrefs processing
The elf/dso-sort-tests-src subdirectory is not changed by this commit,
so it seems that the cut-and-paste error was not material.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py
index bde0406be9da14fc..ee476c810c76f1b0 100644
--- a/scripts/dso-ordering-test.py
+++ b/scripts/dso-ordering-test.py
@@ -551,17 +551,17 @@ def process_testcase(t):
if obj in t.deps:
deps = t.deps[obj]
if '*' in deps:
- t.deps[obj].remove('*')
+ deps.remove('*')
t.add_deps([obj], non_dep_tgt_objs)
if obj in t.callrefs:
deps = t.callrefs[obj]
if '*' in deps:
- t.deps[obj].remove('*')
+ deps.remove('*')
t.add_callrefs([obj], non_dep_tgt_objs)
if "#" in t.deps:
deps = t.deps["#"]
if '*' in deps:
- t.deps["#"].remove('*')
+ deps.remove('*')
t.add_deps(["#"], non_dep_tgt_objs)
# If no main program was specified in dependency description, make a
SOURCES/glibc-rh1159809-9.patch 0 → 100644
+ 37
− 0
View file @ 5de88b90
commit 183d99737298bb3200f0610fdcd1c7549c8ed560
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Sep 6 07:38:10 2022 +0200
scripts/dso-ordering-test.py: Generate program run-time dependencies
The main program needs to depend on all shared objects, even objects
that have link-time dependencies among shared objects. Filtering
out shared objects that already have an link-time dependencies is not
necessary here; make will do this automatically.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py
index ee476c810c76f1b0..43b5ec4d920ad6a3 100644
--- a/scripts/dso-ordering-test.py
+++ b/scripts/dso-ordering-test.py
@@ -707,13 +707,12 @@ def process_testcase(t):
"\t$(compile.c) $(OUTPUT_OPTION)\n")
makefile.write (rule)
- not_depended_objs = find_objs_not_depended_on(test_descr)
- if not_depended_objs:
- depstr = ""
- for dep in not_depended_objs:
- depstr += (" $(objpfx)" + test_subdir + "/"
- + test_name + "-" + dep + ".so")
- makefile.write("$(objpfx)%s.out:%s\n" % (base_test_name, depstr))
+ # Ensure that all shared objects are built before running the
+ # test, whether there link-time dependencies or not.
+ depobjs = ["$(objpfx){}/{}-{}.so".format(test_subdir, test_name, dep)
+ for dep in test_descr.objs]
+ makefile.write("$(objpfx){}.out: {}\n".format(
+ base_test_name, " ".join(depobjs)))
# Add main executable to test-srcs
makefile.write("test-srcs += %s/%s\n" % (test_subdir, test_name))
SOURCES/glibc-rh1871383-1.patch 0 → 100644
+ 245
− 0
View file @ 5de88b90
From a1a486d70ebcc47a686ff5846875eacad0940e41 Mon Sep 17 00:00:00 2001
From: Eyal Itkin <eyalit@checkpoint.com>
Date: Fri, 20 Mar 2020 21:19:17 +0200
Subject: Add Safe-Linking to fastbins and tcache
Safe-Linking is a security mechanism that protects single-linked
lists (such as the fastbin and tcache) from being tampered by attackers.
The mechanism makes use of randomness from ASLR (mmap_base), and when
combined with chunk alignment integrity checks, it protects the "next"
pointers from being hijacked by an attacker.
While Safe-Unlinking protects double-linked lists (such as the small
bins), there wasn't any similar protection for attacks against
single-linked lists. This solution protects against 3 common attacks:
* Partial pointer override: modifies the lower bytes (Little Endian)
* Full pointer override: hijacks the pointer to an attacker's location
* Unaligned chunks: pointing the list to an unaligned address
The design assumes an attacker doesn't know where the heap is located,
and uses the ASLR randomness to "sign" the single-linked pointers. We
mark the pointer as P and the location in which it is stored as L, and
the calculation will be:
* PROTECT(P) := (L >> PAGE_SHIFT) XOR (P)
* *L = PROTECT(P)
This way, the random bits from the address L (which start at the bit
in the PAGE_SHIFT position), will be merged with LSB of the stored
protected pointer. This protection layer prevents an attacker from
modifying the pointer into a controlled value.
An additional check that the chunks are MALLOC_ALIGNed adds an
important layer:
* Attackers can't point to illegal (unaligned) memory addresses
* Attackers must guess correctly the alignment bits
On standard 32 bit Linux machines, an attack will directly fail 7
out of 8 times, and on 64 bit machines it will fail 15 out of 16
times.
This proposed patch was benchmarked and it's effect on the overall
performance of the heap was negligible and couldn't be distinguished
from the default variance between tests on the vanilla version. A
similar protection was added to Chromium's version of TCMalloc
in 2012, and according to their documentation it had an overhead of
less than 2%.
Reviewed-by: DJ Delorie <dj@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Adhemerval Zacnella <adhemerval.zanella@linaro.org>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index f7cd29bc2f..1282863681 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -327,6 +327,18 @@ __malloc_assert (const char *assertion, const char *file, unsigned int line,
# define MAX_TCACHE_COUNT UINT16_MAX
#endif
+/* Safe-Linking:
+ Use randomness from ASLR (mmap_base) to protect single-linked lists
+ of Fast-Bins and TCache. That is, mask the "next" pointers of the
+ lists' chunks, and also perform allocation alignment checks on them.
+ This mechanism reduces the risk of pointer hijacking, as was done with
+ Safe-Unlinking in the double-linked lists of Small-Bins.
+ It assumes a minimum page size of 4096 bytes (12 bits). Systems with
+ larger pages provide less entropy, although the pointer mangling
+ still works. */
+#define PROTECT_PTR(pos, ptr) \
+ ((__typeof (ptr)) ((((size_t) pos) >> 12) ^ ((size_t) ptr)))
+#define REVEAL_PTR(ptr) PROTECT_PTR (&ptr, ptr)
/*
REALLOC_ZERO_BYTES_FREES should be set if a call to
@@ -2157,12 +2169,15 @@ do_check_malloc_state (mstate av)
while (p != 0)
{
+ if (__glibc_unlikely (!aligned_OK (p)))
+ malloc_printerr ("do_check_malloc_state(): " \
+ "unaligned fastbin chunk detected");
/* each chunk claims to be inuse */
do_check_inuse_chunk (av, p);
total += chunksize (p);
/* chunk belongs in this bin */
assert (fastbin_index (chunksize (p)) == i);
- p = p->fd;
+ p = REVEAL_PTR (p->fd);
}
}
@@ -2923,7 +2938,7 @@ tcache_put (mchunkptr chunk, size_t tc_idx)
detect a double free. */
e->key = tcache;
- e->next = tcache->entries[tc_idx];
+ e->next = PROTECT_PTR (&e->next, tcache->entries[tc_idx]);
tcache->entries[tc_idx] = e;
++(tcache->counts[tc_idx]);
}
@@ -2934,9 +2949,11 @@ static __always_inline void *
tcache_get (size_t tc_idx)
{
tcache_entry *e = tcache->entries[tc_idx];
- tcache->entries[tc_idx] = e->next;
+ tcache->entries[tc_idx] = REVEAL_PTR (e->next);
--(tcache->counts[tc_idx]);
e->key = NULL;
+ if (__glibc_unlikely (!aligned_OK (e)))
+ malloc_printerr ("malloc(): unaligned tcache chunk detected");
return (void *) e;
}
@@ -2960,7 +2977,10 @@ tcache_thread_shutdown (void)
while (tcache_tmp->entries[i])
{
tcache_entry *e = tcache_tmp->entries[i];
- tcache_tmp->entries[i] = e->next;
+ if (__glibc_unlikely (!aligned_OK (e)))
+ malloc_printerr ("tcache_thread_shutdown(): " \
+ "unaligned tcache chunk detected");
+ tcache_tmp->entries[i] = REVEAL_PTR (e->next);
__libc_free (e);
}
}
@@ -3570,8 +3590,11 @@ _int_malloc (mstate av, size_t bytes)
victim = pp; \
if (victim == NULL) \
break; \
+ pp = REVEAL_PTR (victim->fd); \
+ if (__glibc_unlikely (!aligned_OK (pp))) \
+ malloc_printerr ("malloc(): unaligned fastbin chunk detected"); \
} \
- while ((pp = catomic_compare_and_exchange_val_acq (fb, victim->fd, victim)) \
+ while ((pp = catomic_compare_and_exchange_val_acq (fb, pp, victim)) \
!= victim); \
if ((unsigned long) (nb) <= (unsigned long) (get_max_fast ()))
@@ -3583,8 +3606,11 @@ _int_malloc (mstate av, size_t bytes)
if (victim != NULL)
{
+ if (__glibc_unlikely (!aligned_OK (victim)))
+ malloc_printerr ("malloc(): unaligned fastbin chunk detected");
+
if (SINGLE_THREAD_P)
- *fb = victim->fd;
+ *fb = REVEAL_PTR (victim->fd);
else
REMOVE_FB (fb, pp, victim);
if (__glibc_likely (victim != NULL))
@@ -3605,8 +3631,10 @@ _int_malloc (mstate av, size_t bytes)
while (tcache->counts[tc_idx] < mp_.tcache_count
&& (tc_victim = *fb) != NULL)
{
+ if (__glibc_unlikely (!aligned_OK (tc_victim)))
+ malloc_printerr ("malloc(): unaligned fastbin chunk detected");
if (SINGLE_THREAD_P)
- *fb = tc_victim->fd;
+ *fb = REVEAL_PTR (tc_victim->fd);
else
{
REMOVE_FB (fb, pp, tc_victim);
@@ -4196,11 +4224,15 @@ _int_free (mstate av, mchunkptr p, int have_lock)
LIBC_PROBE (memory_tcache_double_free, 2, e, tc_idx);
for (tmp = tcache->entries[tc_idx];
tmp;
- tmp = tmp->next)
+ tmp = REVEAL_PTR (tmp->next))
+ {
+ if (__glibc_unlikely (!aligned_OK (tmp)))
+ malloc_printerr ("free(): unaligned chunk detected in tcache 2");
if (tmp == e)
malloc_printerr ("free(): double free detected in tcache 2");
/* If we get here, it was a coincidence. We've wasted a
few cycles, but don't abort. */
+ }
}
if (tcache->counts[tc_idx] < mp_.tcache_count)
@@ -4264,7 +4296,7 @@ _int_free (mstate av, mchunkptr p, int have_lock)
add (i.e., double free). */
if (__builtin_expect (old == p, 0))
malloc_printerr ("double free or corruption (fasttop)");
- p->fd = old;
+ p->fd = PROTECT_PTR (&p->fd, old);
*fb = p;
}
else
@@ -4274,7 +4306,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
add (i.e., double free). */
if (__builtin_expect (old == p, 0))
malloc_printerr ("double free or corruption (fasttop)");
- p->fd = old2 = old;
+ old2 = old;
+ p->fd = PROTECT_PTR (&p->fd, old);
}
while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2))
!= old2);
@@ -4472,13 +4505,17 @@ static void malloc_consolidate(mstate av)
if (p != 0) {
do {
{
+ if (__glibc_unlikely (!aligned_OK (p)))
+ malloc_printerr ("malloc_consolidate(): " \
+ "unaligned fastbin chunk detected");
+
unsigned int idx = fastbin_index (chunksize (p));
if ((&fastbin (av, idx)) != fb)
malloc_printerr ("malloc_consolidate(): invalid chunk size");
}
check_inuse_chunk(av, p);
- nextp = p->fd;
+ nextp = REVEAL_PTR (p->fd);
/* Slightly streamlined version of consolidation code in free() */
size = chunksize (p);
@@ -4896,8 +4933,13 @@ int_mallinfo (mstate av, struct mallinfo *m)
for (i = 0; i < NFASTBINS; ++i)
{
- for (p = fastbin (av, i); p != 0; p = p->fd)
+ for (p = fastbin (av, i);
+ p != 0;
+ p = REVEAL_PTR (p->fd))
{
+ if (__glibc_unlikely (!aligned_OK (p)))
+ malloc_printerr ("int_mallinfo(): " \
+ "unaligned fastbin chunk detected");
++nfastblocks;
fastavail += chunksize (p);
}
@@ -5437,8 +5479,11 @@ __malloc_info (int options, FILE *fp)
while (p != NULL)
{
+ if (__glibc_unlikely (!aligned_OK (p)))
+ malloc_printerr ("__malloc_info(): " \
+ "unaligned fastbin chunk detected");
++nthissize;
- p = p->fd;
+ p = REVEAL_PTR (p->fd);
}
fastavail += nthissize * thissize;
SOURCES/glibc-rh1871383-2.patch 0 → 100644
+ 87
− 0
View file @ 5de88b90
From 768358b6a80742f6be68ecd9f952f4b60614df96 Mon Sep 17 00:00:00 2001
From: Eyal Itkin <eyalit@checkpoint.com>
Date: Tue, 31 Mar 2020 01:55:13 -0400
Subject: Typo fixes and CR cleanup in Safe-Linking
Removed unneeded '\' chars from end of lines and fixed some
indentation issues that were introduced in the original
Safe-Linking patch.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 1282863681..0e4acb22f6 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2170,7 +2170,7 @@ do_check_malloc_state (mstate av)
while (p != 0)
{
if (__glibc_unlikely (!aligned_OK (p)))
- malloc_printerr ("do_check_malloc_state(): " \
+ malloc_printerr ("do_check_malloc_state(): "
"unaligned fastbin chunk detected");
/* each chunk claims to be inuse */
do_check_inuse_chunk (av, p);
@@ -2977,9 +2977,9 @@ tcache_thread_shutdown (void)
while (tcache_tmp->entries[i])
{
tcache_entry *e = tcache_tmp->entries[i];
- if (__glibc_unlikely (!aligned_OK (e)))
- malloc_printerr ("tcache_thread_shutdown(): " \
- "unaligned tcache chunk detected");
+ if (__glibc_unlikely (!aligned_OK (e)))
+ malloc_printerr ("tcache_thread_shutdown(): "
+ "unaligned tcache chunk detected");
tcache_tmp->entries[i] = REVEAL_PTR (e->next);
__libc_free (e);
}
@@ -4225,14 +4225,14 @@ _int_free (mstate av, mchunkptr p, int have_lock)
for (tmp = tcache->entries[tc_idx];
tmp;
tmp = REVEAL_PTR (tmp->next))
- {
- if (__glibc_unlikely (!aligned_OK (tmp)))
- malloc_printerr ("free(): unaligned chunk detected in tcache 2");
- if (tmp == e)
- malloc_printerr ("free(): double free detected in tcache 2");
- /* If we get here, it was a coincidence. We've wasted a
- few cycles, but don't abort. */
- }
+ {
+ if (__glibc_unlikely (!aligned_OK (tmp)))
+ malloc_printerr ("free(): unaligned chunk detected in tcache 2");
+ if (tmp == e)
+ malloc_printerr ("free(): double free detected in tcache 2");
+ /* If we get here, it was a coincidence. We've wasted a
+ few cycles, but don't abort. */
+ }
}
if (tcache->counts[tc_idx] < mp_.tcache_count)
@@ -4506,7 +4506,7 @@ static void malloc_consolidate(mstate av)
do {
{
if (__glibc_unlikely (!aligned_OK (p)))
- malloc_printerr ("malloc_consolidate(): " \
+ malloc_printerr ("malloc_consolidate(): "
"unaligned fastbin chunk detected");
unsigned int idx = fastbin_index (chunksize (p));
@@ -4938,7 +4938,7 @@ int_mallinfo (mstate av, struct mallinfo *m)
p = REVEAL_PTR (p->fd))
{
if (__glibc_unlikely (!aligned_OK (p)))
- malloc_printerr ("int_mallinfo(): " \
+ malloc_printerr ("int_mallinfo(): "
"unaligned fastbin chunk detected");
++nfastblocks;
fastavail += chunksize (p);
@@ -5480,7 +5480,7 @@ __malloc_info (int options, FILE *fp)
while (p != NULL)
{
if (__glibc_unlikely (!aligned_OK (p)))
- malloc_printerr ("__malloc_info(): " \
+ malloc_printerr ("__malloc_info(): "
"unaligned fastbin chunk detected");
++nthissize;
p = REVEAL_PTR (p->fd);
SOURCES/glibc-rh1871383-3.patch 0 → 100644
+ 100
− 0
View file @ 5de88b90
From 49c3c37651e2d2ec4ff8ce21252bbbc08a9d6639 Mon Sep 17 00:00:00 2001
From: Eyal Itkin <eyalit@checkpoint.com>
Date: Tue, 31 Mar 2020 02:00:14 -0400
Subject: Fix alignment bug in Safe-Linking
Alignment checks should be performed on the user's buffer and NOT
on the mchunkptr as was done before. This caused bugs in 32 bit
versions, because: 2*sizeof(t) != MALLOC_ALIGNMENT.
As the tcache works on users' buffers it uses the aligned_OK()
check, and the rest work on mchunkptr and therefore check using
misaligned_chunk().
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 0e4acb22f6..6acb5ad43a 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2169,7 +2169,7 @@ do_check_malloc_state (mstate av)
while (p != 0)
{
- if (__glibc_unlikely (!aligned_OK (p)))
+ if (__glibc_unlikely (misaligned_chunk (p)))
malloc_printerr ("do_check_malloc_state(): "
"unaligned fastbin chunk detected");
/* each chunk claims to be inuse */
@@ -2949,11 +2949,11 @@ static __always_inline void *
tcache_get (size_t tc_idx)
{
tcache_entry *e = tcache->entries[tc_idx];
+ if (__glibc_unlikely (!aligned_OK (e)))
+ malloc_printerr ("malloc(): unaligned tcache chunk detected");
tcache->entries[tc_idx] = REVEAL_PTR (e->next);
--(tcache->counts[tc_idx]);
e->key = NULL;
- if (__glibc_unlikely (!aligned_OK (e)))
- malloc_printerr ("malloc(): unaligned tcache chunk detected");
return (void *) e;
}
@@ -3591,7 +3591,7 @@ _int_malloc (mstate av, size_t bytes)
if (victim == NULL) \
break; \
pp = REVEAL_PTR (victim->fd); \
- if (__glibc_unlikely (!aligned_OK (pp))) \
+ if (__glibc_unlikely (pp != NULL && misaligned_chunk (pp))) \
malloc_printerr ("malloc(): unaligned fastbin chunk detected"); \
} \
while ((pp = catomic_compare_and_exchange_val_acq (fb, pp, victim)) \
@@ -3606,8 +3606,8 @@ _int_malloc (mstate av, size_t bytes)
if (victim != NULL)
{
- if (__glibc_unlikely (!aligned_OK (victim)))
- malloc_printerr ("malloc(): unaligned fastbin chunk detected");
+ if (__glibc_unlikely (misaligned_chunk (victim)))
+ malloc_printerr ("malloc(): unaligned fastbin chunk detected 2");
if (SINGLE_THREAD_P)
*fb = REVEAL_PTR (victim->fd);
@@ -3631,8 +3631,8 @@ _int_malloc (mstate av, size_t bytes)
while (tcache->counts[tc_idx] < mp_.tcache_count
&& (tc_victim = *fb) != NULL)
{
- if (__glibc_unlikely (!aligned_OK (tc_victim)))
- malloc_printerr ("malloc(): unaligned fastbin chunk detected");
+ if (__glibc_unlikely (misaligned_chunk (tc_victim)))
+ malloc_printerr ("malloc(): unaligned fastbin chunk detected 3");
if (SINGLE_THREAD_P)
*fb = REVEAL_PTR (tc_victim->fd);
else
@@ -4505,7 +4505,7 @@ static void malloc_consolidate(mstate av)
if (p != 0) {
do {
{
- if (__glibc_unlikely (!aligned_OK (p)))
+ if (__glibc_unlikely (misaligned_chunk (p)))
malloc_printerr ("malloc_consolidate(): "
"unaligned fastbin chunk detected");
@@ -4937,7 +4937,7 @@ int_mallinfo (mstate av, struct mallinfo *m)
p != 0;
p = REVEAL_PTR (p->fd))
{
- if (__glibc_unlikely (!aligned_OK (p)))
+ if (__glibc_unlikely (misaligned_chunk (p)))
malloc_printerr ("int_mallinfo(): "
"unaligned fastbin chunk detected");
++nfastblocks;
@@ -5479,7 +5479,7 @@ __malloc_info (int options, FILE *fp)
while (p != NULL)
{
- if (__glibc_unlikely (!aligned_OK (p)))
+ if (__glibc_unlikely (misaligned_chunk (p)))
malloc_printerr ("__malloc_info(): "
"unaligned fastbin chunk detected");
++nthissize;
SOURCES/glibc-rh1871383-4.patch 0 → 100644
+ 215
− 0
View file @ 5de88b90
From 6310d570bf20348135d09e1f9de84a9ae7d06f83 Mon Sep 17 00:00:00 2001
From: Eyal Itkin <eyalit@checkpoint.com>
Date: Thu, 2 Apr 2020 07:26:35 -0400
Subject: Add tests for Safe-Linking
Adding the test "tst-safe-linking" for testing that Safe-Linking works
as expected. The test checks these 3 main flows:
* tcache protection
* fastbin protection
* malloc_consolidate() correctness
As there is a random chance of 1/16 that of the alignment will remain
correct, the test checks each flow up to 10 times, using different random
values for the pointer corruption. As a result, the chance for a false
failure of a given tested flow is 2**(-40), thus highly unlikely.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/malloc/Makefile b/malloc/Makefile
index 984045b5b9..e22cbde22d 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -39,6 +39,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
tst-malloc-too-large \
tst-malloc-stats-cancellation \
tst-tcfree1 tst-tcfree2 tst-tcfree3 \
+ tst-safe-linking \
tests-static := \
tst-interpose-static-nothread \
diff --git a/malloc/tst-safe-linking.c b/malloc/tst-safe-linking.c
new file mode 100644
index 0000000000..067b6c09cf
--- /dev/null
+++ b/malloc/tst-safe-linking.c
@@ -0,0 +1,179 @@
+/* Test reporting of Safe-Linking caught errors.
+ 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 <signal.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+#include <time.h>
+#include <stdbool.h>
+#include <support/capture_subprocess.h>
+#include <support/check.h>
+
+/* Run CALLBACK and check that the data on standard error equals
+ EXPECTED. */
+static void
+check (const char *test, void (*callback) (void *),
+ const char *expected)
+{
+ int i, rand_mask;
+ bool success = false;
+ /* There is a chance of 1/16 that a corrupted pointer will be aligned.
+ Try multiple times so that statistical failure will be improbable. */
+ for (i = 0; i < 10 && !success; ++i)
+ {
+ rand_mask = rand () & 0xFF;
+ struct support_capture_subprocess result
+ = support_capture_subprocess (callback, &rand_mask);
+ /* Did not crash, could happen. Try again. */
+ if (strlen (result.err.buffer) == 0)
+ continue;
+ /* Crashed, must be the expected result. */
+ if (strcmp (result.err.buffer, expected) != 0)
+ {
+ support_record_failure ();
+ printf ("error: test %s unexpected standard error data\n"
+ " expected: %s\n"
+ " actual: %s\n",
+ test, expected, result.err.buffer);
+ }
+ TEST_VERIFY (WIFSIGNALED (result.status));
+ if (WIFSIGNALED (result.status))
+ TEST_VERIFY (WTERMSIG (result.status) == SIGABRT);
+ support_capture_subprocess_free (&result);
+ success = true;
+ }
+ TEST_VERIFY (success);
+}
+
+/* Implementation details must be kept in sync with malloc. */
+#define TCACHE_FILL_COUNT 7
+#define TCACHE_ALLOC_SIZE 0x20
+#define MALLOC_CONSOLIDATE_SIZE 256*1024
+
+/* Try corrupting the tcache list. */
+static void
+test_tcache (void *closure)
+{
+ int mask = ((int *)closure)[0];
+ size_t size = TCACHE_ALLOC_SIZE;
+
+ /* Populate the tcache list. */
+ void * volatile a = malloc (size);
+ void * volatile b = malloc (size);
+ void * volatile c = malloc (size);
+ free (a);
+ free (b);
+ free (c);
+
+ /* Corrupt the pointer with a random value, and avoid optimizations. */
+ printf ("Before: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+ memset (c, mask & 0xFF, size);
+ printf ("After: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+
+ c = malloc (size);
+ /* This line will trigger the Safe-Linking check. */
+ b = malloc (size);
+ printf ("b=%p\n", b);
+}
+
+/* Try corrupting the fastbin list. */
+static void
+test_fastbin (void *closure)
+{
+ int i;
+ int mask = ((int *)closure)[0];
+ size_t size = TCACHE_ALLOC_SIZE;
+
+ /* Take the tcache out of the game. */
+ for (i = 0; i < TCACHE_FILL_COUNT; ++i)
+ {
+ void * volatile p = calloc (1, size);
+ free (p);
+ }
+
+ /* Populate the fastbin list. */
+ void * volatile a = calloc (1, size);
+ void * volatile b = calloc (1, size);
+ void * volatile c = calloc (1, size);
+ free (a);
+ free (b);
+ free (c);
+
+ /* Corrupt the pointer with a random value, and avoid optimizations. */
+ printf ("Before: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+ memset (c, mask & 0xFF, size);
+ printf ("After: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+
+ c = calloc (1, size);
+ /* This line will trigger the Safe-Linking check. */
+ b = calloc (1, size);
+ printf ("b=%p\n", b);
+}
+
+/* Try corrupting the fastbin list and trigger a consolidate. */
+static void
+test_fastbin_consolidate (void *closure)
+{
+ int i;
+ int mask = ((int*)closure)[0];
+ size_t size = TCACHE_ALLOC_SIZE;
+
+ /* Take the tcache out of the game. */
+ for (i = 0; i < TCACHE_FILL_COUNT; ++i)
+ {
+ void * volatile p = calloc (1, size);
+ free (p);
+ }
+
+ /* Populate the fastbin list. */
+ void * volatile a = calloc (1, size);
+ void * volatile b = calloc (1, size);
+ void * volatile c = calloc (1, size);
+ free (a);
+ free (b);
+ free (c);
+
+ /* Corrupt the pointer with a random value, and avoid optimizations. */
+ printf ("Before: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+ memset (c, mask & 0xFF, size);
+ printf ("After: c=%p, c[0]=%p\n", c, ((void **)c)[0]);
+
+ /* This line will trigger the Safe-Linking check. */
+ b = malloc (MALLOC_CONSOLIDATE_SIZE);
+ printf ("b=%p\n", b);
+}
+
+static int
+do_test (void)
+{
+ /* Seed the random for the test. */
+ srand (time (NULL));
+
+ check ("test_tcache", test_tcache,
+ "malloc(): unaligned tcache chunk detected\n");
+ check ("test_fastbin", test_fastbin,
+ "malloc(): unaligned fastbin chunk detected 2\n");
+ check ("test_fastbin_consolidate", test_fastbin_consolidate,
+ "malloc_consolidate(): unaligned fastbin chunk detected\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
SOURCES/glibc-rh1871383-5.patch 0 → 100644
+ 35
− 0
View file @ 5de88b90
From b9cde4e3aa1ff338da7064daf1386b2f4a7351ba Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Sat, 4 Apr 2020 01:44:56 -0400
Subject: malloc: ensure set_max_fast never stores zero [BZ #25733]
The code for set_max_fast() stores an "impossibly small value"
instead of zero, when the parameter is zero. However, for
small values of the parameter (ex: 1 or 2) the computation
results in a zero being stored anyway.
This patch checks for the parameter being small enough for the
computation to result in zero instead, so that a zero is never
stored.
key values which result in zero being stored:
x86-64: 1..7 (or other 64-bit)
i686: 1..11
armhfp: 1..3 (or other 32-bit)
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 6acb5ad43a..ee87ddbbf9 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1632,7 +1632,7 @@ static INTERNAL_SIZE_T global_max_fast;
*/
#define set_max_fast(s) \
- global_max_fast = (((s) == 0) \
+ global_max_fast = (((size_t) (s) <= MALLOC_ALIGN_MASK - SIZE_SZ) \
? MIN_CHUNK_SIZE / 2 : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
static inline INTERNAL_SIZE_T
SOURCES/glibc-rh1871383-6.patch 0 → 100644
+ 35
− 0
View file @ 5de88b90
From 0e00b35704e67c499c3abfbd5b6224a13d38b012 Mon Sep 17 00:00:00 2001
From: "W. Hashimoto" <ssmallkirby@gmail.com>
Date: Fri, 11 Dec 2020 16:59:10 -0500
Subject: malloc: Detect infinite-loop in _int_free when freeing tcache
[BZ#27052]
If linked-list of tcache contains a loop, it invokes infinite
loop in _int_free when freeing tcache. The PoC which invokes
such infinite loop is on the Bugzilla(#27052). This loop
should terminate when the loop exceeds mp_.tcache_count and
the program should abort. The affected glibc version is
2.29 or later.
Reviewed-by: DJ Delorie <dj@redhat.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5b87bdb081..ec2d934595 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4224,11 +4224,14 @@ _int_free (mstate av, mchunkptr p, int have_lock)
if (__glibc_unlikely (e->key == tcache))
{
tcache_entry *tmp;
+ size_t cnt = 0;
LIBC_PROBE (memory_tcache_double_free, 2, e, tc_idx);
for (tmp = tcache->entries[tc_idx];
tmp;
- tmp = REVEAL_PTR (tmp->next))
+ tmp = REVEAL_PTR (tmp->next), ++cnt)
{
+ if (cnt >= mp_.tcache_count)
+ malloc_printerr ("free(): too many chunks detected in tcache");
if (__glibc_unlikely (!aligned_OK (tmp)))
malloc_printerr ("free(): unaligned chunk detected in tcache 2");
if (tmp == e)
SOURCES/glibc-rh1871383-7.patch 0 → 100644
+ 133
− 0
View file @ 5de88b90
From fc859c304898a5ec72e0ba5269ed136ed0ea10e1 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date: Wed, 7 Jul 2021 23:02:46 +0530
Subject: Harden tcache double-free check
The tcache allocator layer uses the tcache pointer as a key to
identify a block that may be freed twice. Since this is in the
application data area, an attacker exploiting a use-after-free could
potentially get access to the entire tcache structure through this
key. A detailed write-up was provided by Awarau here:
https://awaraucom.wordpress.com/2020/07/19/house-of-io-remastered/
Replace this static pointer use for key checking with one that is
generated at malloc initialization. The first attempt is through
getrandom with a fallback to random_bits(), which is a simple
pseudo-random number generator based on the clock. The fallback ought
to be sufficient since the goal of the randomness is only to make the
key arbitrary enough that it is very unlikely to collide with user
data.
Co-authored-by: Eyal Itkin <eyalit@checkpoint.com>
[note: context for arena.c chunk #2 changed to accomodate missing
tagging support code - DJ]
diff -rup a/malloc/arena.c b/malloc/arena.c
--- a/malloc/arena.c 2022-09-16 01:09:02.003843024 -0400
+++ b/malloc/arena.c 2022-09-16 01:25:51.879994057 -0400
@@ -286,6 +286,10 @@ extern struct dl_open_hook *_dl_open_hoo
libc_hidden_proto (_dl_open_hook);
#endif
+#if USE_TCACHE
+static void tcache_key_initialize (void);
+#endif
+
static void
ptmalloc_init (void)
{
@@ -294,6 +298,10 @@ ptmalloc_init (void)
__malloc_initialized = 0;
+#if USE_TCACHE
+ tcache_key_initialize ();
+#endif
+
#ifdef SHARED
/* In case this libc copy is in a non-default namespace, never use brk.
Likewise if dlopened from statically linked program. */
diff -rup a/malloc/malloc.c b/malloc/malloc.c
--- a/malloc/malloc.c 2022-09-16 01:09:05.491977387 -0400
+++ b/malloc/malloc.c 2022-09-16 01:25:51.883994213 -0400
@@ -247,6 +247,10 @@
/* For SINGLE_THREAD_P. */
#include <sysdep-cancel.h>
+/* For tcache double-free check. */
+#include <random-bits.h>
+#include <sys/random.h>
+
/*
Debugging:
@@ -2924,7 +2928,7 @@ typedef struct tcache_entry
{
struct tcache_entry *next;
/* This field exists to detect double frees. */
- struct tcache_perthread_struct *key;
+ uintptr_t key;
} tcache_entry;
/* There is one of these for each thread, which contains the
@@ -2941,6 +2945,31 @@ typedef struct tcache_perthread_struct
static __thread bool tcache_shutting_down = false;
static __thread tcache_perthread_struct *tcache = NULL;
+/* Process-wide key to try and catch a double-free in the same thread. */
+static uintptr_t tcache_key;
+
+/* The value of tcache_key does not really have to be a cryptographically
+ secure random number. It only needs to be arbitrary enough so that it does
+ not collide with values present in applications. If a collision does happen
+ consistently enough, it could cause a degradation in performance since the
+ entire list is checked to check if the block indeed has been freed the
+ second time. The odds of this happening are exceedingly low though, about 1
+ in 2^wordsize. There is probably a higher chance of the performance
+ degradation being due to a double free where the first free happened in a
+ different thread; that's a case this check does not cover. */
+static void
+tcache_key_initialize (void)
+{
+ if (__getrandom (&tcache_key, sizeof(tcache_key), GRND_NONBLOCK)
+ != sizeof (tcache_key))
+ {
+ tcache_key = random_bits ();
+#if __WORDSIZE == 64
+ tcache_key = (tcache_key << 32) | random_bits ();
+#endif
+ }
+}
+
/* Caller must ensure that we know tc_idx is valid and there's room
for more chunks. */
static __always_inline void
@@ -2950,7 +2979,7 @@ tcache_put (mchunkptr chunk, size_t tc_i
/* Mark this chunk as "in the tcache" so the test in _int_free will
detect a double free. */
- e->key = tcache;
+ e->key = tcache_key;
e->next = PROTECT_PTR (&e->next, tcache->entries[tc_idx]);
tcache->entries[tc_idx] = e;
@@ -2967,7 +2996,7 @@ tcache_get (size_t tc_idx)
malloc_printerr ("malloc(): unaligned tcache chunk detected");
tcache->entries[tc_idx] = REVEAL_PTR (e->next);
--(tcache->counts[tc_idx]);
- e->key = NULL;
+ e->key = 0;
return (void *) e;
}
@@ -4231,7 +4260,7 @@ _int_free (mstate av, mchunkptr p, int h
trust it (it also matches random payload data at a 1 in
2^<size_t> chance), so verify it's not an unlikely
coincidence before aborting. */
- if (__glibc_unlikely (e->key == tcache))
+ if (__glibc_unlikely (e->key == tcache_key))
{
tcache_entry *tmp;
size_t cnt = 0;
SOURCES/glibc-rh2109510-1.patch 0 → 100644
+ 27
− 0
View file @ 5de88b90
commit 97f8225d22ef727ae9935cc231643efdc430d530
Author: Zack Weinberg <zackw@panix.com>
Date: Thu Mar 14 09:44:22 2019 -0400
scripts/check-obsolete-constructs.py: Process all headers as UTF-8.
A few of our installed headers contain UTF-8 in comments.
check-obsolete-constructs opened files without explicitly specifying
their encoding, so it would barf on these headers if “make check” was
run in a non-UTF-8 locale.
* scripts/check-obsolete-constructs.py (HeaderChecker.check):
Specify encoding="utf-8" when opening headers to check.
diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py
index ce5c72251f4d7cc0..89d21dea6e788783 100755
--- a/scripts/check-obsolete-constructs.py
+++ b/scripts/check-obsolete-constructs.py
@@ -437,7 +437,7 @@ class HeaderChecker:
def check(self, fname):
self.fname = fname
try:
- with open(fname, "rt") as fp:
+ with open(fname, "rt", encoding="utf-8") as fp:
contents = fp.read()
except OSError as e:
sys.stderr.write("{}: {}\n".format(fname, e.strerror))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment