From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D96793858D39 for ; Mon, 13 Dec 2021 15:32:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D96793858D39 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-172-y45ra7mlOJqQhmLSLf-3Bg-1; Mon, 13 Dec 2021 10:32:21 -0500 X-MC-Unique: y45ra7mlOJqQhmLSLf-3Bg-1 Received: by mail-qv1-f70.google.com with SMTP id q2-20020a05621419e200b003aeeeff5417so24228435qvc.9 for ; Mon, 13 Dec 2021 07:32:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=vDZQzeZwNAZDAcrT47rkMkutMap1VH3s+hdJKuu9tAI=; b=cLdi+YNwPk/LPFenoN/9iU3JGX9fVv76YhB4rNxAFzxmZ0cqXzviQ2ved1Uv1sCbrh lz/fxluK65siNpJ0W1cYOwiaWmAHBU+O3wJw4bXgtHfpKR/lcYsBtzp7C4k/V4Kt5S5G R4zalMLVY7xdY/mTTUYOH28/PunxCPssm+N3uulDvh0+s3/VgGU8YCa7o7Pv+d3NhrGo UBz3aL8eifFGU+8nss626PRdu1XP+QXqPfOaKIee6wxLzDTYmcJG6yAuZ4dTk59iTwHj BWwW6ywvdwQJ0vPm//cVO+BKoozL9LDKUnUc1tnw7DKiL5IS1EQwXDlNIFX3QclrnbNj lnUA== X-Gm-Message-State: AOAM532tS4b+hKgXlvbjMBnMmul/Zl7XMNIxh0i+5c+PblR53/sdZJHf H017Qs8/iakRctF4yOHBF887SgbrGuSqdhoU/U24O02Ml6MrucltN29LGdP0xGxdCrigMz5Xdb8 CYrlB58isjKnGMJJjLNeW X-Received: by 2002:a37:a811:: with SMTP id r17mr33100236qke.305.1639409538741; Mon, 13 Dec 2021 07:32:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwohvEbFzUAp9SL5lgCgjGtNAxoHTqG3orkUqKmcELnNCKK/f39QobnE5UCB4bVGDVIdwrwIQ== X-Received: by 2002:a37:a811:: with SMTP id r17mr33100211qke.305.1639409538409; Mon, 13 Dec 2021 07:32:18 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id r16sm9716838qta.46.2021.12.13.07.32.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Dec 2021 07:32:17 -0800 (PST) Message-ID: Date: Mon, 13 Dec 2021 10:32:16 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH v3 1/3] Add and use link-test-modules-rpath-link [BZ #28455] To: "H.J. Lu" , libc-alpha@sourceware.org References: <20211208152501.1483087-1-hjl.tools@gmail.com> <20211208152501.1483087-2-hjl.tools@gmail.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20211208152501.1483087-2-hjl.tools@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2021 15:32:26 -0000 On 12/8/21 10:24, H.J. Lu 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. I think should go in regardless of my suggestions in 3/3. Please post a v4 that is distinct from your series and I'll ACK that. > This partially fixes BZ #28455. > --- > Makeconfig | 2 ++ > Makerules | 1 + > elf/Makefile | 7 +++++++ > elf/tst-global2.c | 32 ++++++++++++++++++++++++++++++++ > elf/tst-globalmod2.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 83 insertions(+) > create mode 100644 elf/tst-global2.c > create mode 100644 elf/tst-globalmod2.c > > diff --git a/Makeconfig b/Makeconfig > index 3fa2f13003..2e2b6dbdf9 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. Use $(link-libc-rpath) if we are using $(build-hardcoded-path-in-tests) because with DT_RUNPATH we may need to find the paths with DT_RUNPATH. > else > link-libc-tests-rpath-link = $(link-libc-rpath-link) > +link-test-modules-rpath-link = OK. Otherwise nothing. > endif # build-hardcoded-path-in-tests > > link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \ > diff --git a/Makerules b/Makerules > index 8db0ca1296..7afba30039 100644 > --- a/Makerules > +++ b/Makerules > @@ -591,6 +591,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. > -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) > endef > > diff --git a/elf/Makefile b/elf/Makefile > index ef36008673..4b5bdcb08e 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -232,6 +232,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ > tst-dl-is_dso tst-ro-dynamic \ > tst-audit18 \ > tst-rtld-run-static \ > + tst-global2 \ Please split and sort to reduce conflicts. > # reldep9 > tests-internal += loadtest unload unload2 circleload1 \ > neededtest neededtest2 neededtest3 neededtest4 \ > @@ -374,6 +375,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ > tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ > tst-auditmod18 \ > tst-audit18mod \ > + tst-globalmod2 \ Likewise. > > # Most modules build with _ISOMAC defined, but those filtered out > # depend on internal headers. > @@ -1310,6 +1312,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 OK. Dep is present for build. > +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so OK. Dep on reldepmod4.so is present for correct buildordering. > +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags > +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags OK. Force DT_RUNPATH. > + > $(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..e929f526f4 > --- /dev/null > +++ b/elf/tst-global2.c > @@ -0,0 +1,32 @@ > +/* Test BZ #28455. OK. > + 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 > + . */ > + > +/* In glibc configured with --enable-hardcoded-path-in-tests, a test > + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, > + instead of DT_RPATH, can call a function in a shared library, which > + dlopens another shared library. */ > + > +extern int test (void); > + > +static int > +do_test (void) > +{ > + return test (); > +} > + > +#include > diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c > new file mode 100644 > index 0000000000..6fd70a72a8 > --- /dev/null > +++ b/elf/tst-globalmod2.c > @@ -0,0 +1,41 @@ > +/* Test BZ #28455. > + 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 > + . */ > + > +/* In glibc configured with --enable-hardcoded-path-in-tests, a test > + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, > + instead of DT_RPATH, can call a function in a shared library, which > + dlopens another shared library. */ > + > +#include > +#include > +#include > + > +extern int test (void); > + > +int > +test (void) > +{ > + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); OK. Will test that we can find the DSOs from build directory. > + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) > + { > + puts ("found \"call_me\""); > + return EXIT_SUCCESS; > + } > + puts ("didn't find \"call_me\""); > + return EXIT_FAILURE; > +} > -- Cheers, Carlos.