Message ID | 20211015200708.3990016-1-hjl.tools@gmail.com |
---|---|
State | New |
Headers | show |
Series | Add and use link-test-modules-rpath-link [BZ #28455] | expand |
On Fri, Oct 15, 2021 at 1:07 PM H.J. Lu <hjl.tools@gmail.com> wrote: > > DT_RUNPATH is only used to find the immediate dependencies of the > executable or shared object containing the DT_RUNPATH entry: > > 1. Define link-test-modules-rpath-link if $(build-hardcoded-path-in-tests) > is yes. > 2. Use $(link-test-modules-rpath-link) in build-module-helper so that > test modules can dlopen modules with DT_RUNPATH. > 3. Add a test to show why link-test-modules-rpath-link is needed. > > This partially fixes BZ #28455. > --- > Makeconfig | 2 ++ > Makerules | 1 + > elf/Makefile | 8 +++++++- > elf/tst-global2.c | 28 ++++++++++++++++++++++++++++ > elf/tst-globalmod2.c | 37 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 75 insertions(+), 1 deletion(-) > create mode 100644 elf/tst-global2.c > create mode 100644 elf/tst-globalmod2.c > > diff --git a/Makeconfig b/Makeconfig > index 2fa0884b4e..302fbf7e6b 100644 > --- a/Makeconfig > +++ b/Makeconfig > @@ -569,8 +569,10 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link) > # build-hardcoded-path-in-tests. > ifeq (yes,$(build-hardcoded-path-in-tests)) > link-libc-tests-rpath-link = $(link-libc-rpath) > +link-test-modules-rpath-link = $(link-libc-rpath) > else > link-libc-tests-rpath-link = $(link-libc-rpath-link) > +link-test-modules-rpath-link = > endif # build-hardcoded-path-in-tests > > link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ > diff --git a/Makerules b/Makerules > index 596fa68376..ac15671a0a 100644 > --- a/Makerules > +++ b/Makerules > @@ -600,6 +600,7 @@ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ > $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ > -B$(csu-objpfx) $(load-map-file) \ > $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ > + $(link-test-modules-rpath-link) \ > -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) > endef > > diff --git a/elf/Makefile b/elf/Makefile > index b01ace2d5a..eeef71b82a 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ > tst-tls-ie tst-tls-ie-dlmopen argv0test \ > tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ > tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ > - tst-dl-is_dso tst-ro-dynamic > + tst-dl-is_dso tst-ro-dynamic tst-global2 > # reldep9 > tests-internal += loadtest unload unload2 circleload1 \ > neededtest neededtest2 neededtest3 neededtest4 \ > @@ -365,6 +365,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ > tst-auxvalmod \ > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > + tst-globalmod2 \ > > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > @@ -1269,6 +1270,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so > > $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so > > +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so > +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so > +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags > +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags > + > $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so > $(objpfx)order2-cmp.out: $(objpfx)order2.out > (echo "12345" | cmp $< -) > $@; \ > diff --git a/elf/tst-global2.c b/elf/tst-global2.c > new file mode 100644 > index 0000000000..b17b69c42b > --- /dev/null > +++ b/elf/tst-global2.c > @@ -0,0 +1,28 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. > + 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/>. */ > + > +extern int test (void); > + > +static int > +do_test (void) > +{ > + return test (); > +} > + > +#include <support/test-driver.c> > diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c > new file mode 100644 > index 0000000000..1d0cf3047e > --- /dev/null > +++ b/elf/tst-globalmod2.c > @@ -0,0 +1,37 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <https://www.gnu.org/licenses/>. */ > + > +#include <dlfcn.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +extern int test (void); > + > +int > +test (void) > +{ > + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); > + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) > + { > + puts ("found \"call_me\""); > + return EXIT_SUCCESS; > + } > + puts ("didn't find \"call_me\""); > + return EXIT_FAILURE; > +} > -- > 2.31.1 > PING.
On 10/15/21 16:07, H.J. Lu via Libc-alpha wrote: > DT_RUNPATH is only used to find the immediate dependencies of the > executable or shared object containing the DT_RUNPATH entry: > > 1. Define link-test-modules-rpath-link if $(build-hardcoded-path-in-tests) > is yes. > 2. Use $(link-test-modules-rpath-link) in build-module-helper so that > test modules can dlopen modules with DT_RUNPATH. > 3. Add a test to show why link-test-modules-rpath-link is needed. Please post v2. Requested minor changes in tests. Please talk about DT_RUNPATH in test comments. Passes without regression on x86_64 and i686. Passes CI/CD. The DSOs used in tests themselves must also set DT_RUNPATH to find their dependencies in the build directory. When we have $(build-hardocded-path-in-tests) this must come from $(link-libc-rpath) which has all the right paths. > This partially fixes BZ #28455. > --- > Makeconfig | 2 ++ > Makerules | 1 + > elf/Makefile | 8 +++++++- > elf/tst-global2.c | 28 ++++++++++++++++++++++++++++ > elf/tst-globalmod2.c | 37 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 75 insertions(+), 1 deletion(-) > create mode 100644 elf/tst-global2.c > create mode 100644 elf/tst-globalmod2.c > > diff --git a/Makeconfig b/Makeconfig > index 2fa0884b4e..302fbf7e6b 100644 > --- a/Makeconfig > +++ b/Makeconfig > @@ -569,8 +569,10 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link) > # build-hardcoded-path-in-tests. > ifeq (yes,$(build-hardcoded-path-in-tests)) > link-libc-tests-rpath-link = $(link-libc-rpath) > +link-test-modules-rpath-link = $(link-libc-rpath) OK. > else > link-libc-tests-rpath-link = $(link-libc-rpath-link) > +link-test-modules-rpath-link = OK. > endif # build-hardcoded-path-in-tests > > link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ > diff --git a/Makerules b/Makerules > index 596fa68376..ac15671a0a 100644 > --- a/Makerules > +++ b/Makerules > @@ -600,6 +600,7 @@ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ > $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ > -B$(csu-objpfx) $(load-map-file) \ > $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ > + $(link-test-modules-rpath-link) \ OK. Add to build-module-helper. > -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) > endef > > diff --git a/elf/Makefile b/elf/Makefile > index b01ace2d5a..eeef71b82a 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ > tst-tls-ie tst-tls-ie-dlmopen argv0test \ > tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ > tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ > - tst-dl-is_dso tst-ro-dynamic > + tst-dl-is_dso tst-ro-dynamic tst-global2 OK. New tst-global2 which loads a DSO that has to find ANOTHER DSO in the rpath. > # reldep9 > tests-internal += loadtest unload unload2 circleload1 \ > neededtest neededtest2 neededtest3 neededtest4 \ > @@ -365,6 +365,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ > tst-auxvalmod \ > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > + tst-globalmod2 \ OK. > > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > @@ -1269,6 +1270,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so > > $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so > > +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so > +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so > +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags > +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags OK. Force new dtags. > + > $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so > $(objpfx)order2-cmp.out: $(objpfx)order2.out > (echo "12345" | cmp $< -) > $@; \ > diff --git a/elf/tst-global2.c b/elf/tst-global2.c > new file mode 100644 > index 0000000000..b17b69c42b > --- /dev/null > +++ b/elf/tst-global2.c > @@ -0,0 +1,28 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. One line. Should reference bug 284555. > + 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/>. */ > + Please add extended comments here. > +extern int test (void); > + > +static int > +do_test (void) > +{ > + return test (); > +} > + > +#include <support/test-driver.c> > diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c > new file mode 100644 > index 0000000000..1d0cf3047e > --- /dev/null > +++ b/elf/tst-globalmod2.c > @@ -0,0 +1,37 @@ > +/* Test dlopening a shared library in a shared library built with > + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. One line. Should reference bug number. > + 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/>. */ > + Please add extended comments here. > +#include <dlfcn.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +extern int test (void); > + > +int > +test (void) > +{ > + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); > + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) > + { > + puts ("found \"call_me\""); > + return EXIT_SUCCESS; > + } > + puts ("didn't find \"call_me\""); > + return EXIT_FAILURE; > +} >
diff --git a/Makeconfig b/Makeconfig index 2fa0884b4e..302fbf7e6b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -569,8 +569,10 @@ link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link) # build-hardcoded-path-in-tests. ifeq (yes,$(build-hardcoded-path-in-tests)) link-libc-tests-rpath-link = $(link-libc-rpath) +link-test-modules-rpath-link = $(link-libc-rpath) else link-libc-tests-rpath-link = $(link-libc-rpath-link) +link-test-modules-rpath-link = endif # build-hardcoded-path-in-tests link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ diff --git a/Makerules b/Makerules index 596fa68376..ac15671a0a 100644 --- a/Makerules +++ b/Makerules @@ -600,6 +600,7 @@ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ -B$(csu-objpfx) $(load-map-file) \ $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ + $(link-test-modules-rpath-link) \ -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) endef diff --git a/elf/Makefile b/elf/Makefile index b01ace2d5a..eeef71b82a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls-ie tst-tls-ie-dlmopen argv0test \ tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ - tst-dl-is_dso tst-ro-dynamic + tst-dl-is_dso tst-ro-dynamic tst-global2 # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -365,6 +365,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ tst-auxvalmod \ tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ + tst-globalmod2 \ # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. @@ -1269,6 +1270,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags + $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so $(objpfx)order2-cmp.out: $(objpfx)order2.out (echo "12345" | cmp $< -) > $@; \ diff --git a/elf/tst-global2.c b/elf/tst-global2.c new file mode 100644 index 0000000000..b17b69c42b --- /dev/null +++ b/elf/tst-global2.c @@ -0,0 +1,28 @@ +/* Test dlopening a shared library in a shared library built with + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. + 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/>. */ + +extern int test (void); + +static int +do_test (void) +{ + return test (); +} + +#include <support/test-driver.c> diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c new file mode 100644 index 0000000000..1d0cf3047e --- /dev/null +++ b/elf/tst-globalmod2.c @@ -0,0 +1,37 @@ +/* Test dlopening a shared library in a shared library built with + -Wl,--enable-new-dtags in glibc with --enable-hardcoded-path-in-tests. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> + +extern int test (void); + +int +test (void) +{ + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) + { + puts ("found \"call_me\""); + return EXIT_SUCCESS; + } + puts ("didn't find \"call_me\""); + return EXIT_FAILURE; +}