From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 2954F1F953 for ; Mon, 29 Nov 2021 16:09:20 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DE71385AC22 for ; Mon, 29 Nov 2021 16:09:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DE71385AC22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638202159; bh=fQBswdjgtSgS8T2E1+c6l3SvZHPDDtSqlGr9SmJKoR4=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=XZaiM5Zixz6HkyaHtudY6xQz4u21CSFy/0Rfs+7g74S64B892B9zqbLTMNO4WVMal SCmUmqpSVbVBsP3BL/mRl5N6HIVxYKNG1IBMUbJCBd7pDDkXzOJFhqP/tZAYEri//3 Hg/uLm658vDEdNqxI7KuVeUCU4IUTQ2CW8lpXMOY= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id EF902385AC19 for ; Mon, 29 Nov 2021 16:08:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EF902385AC19 Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-75-GgAan81VMBqskrRDvvWgqg-1; Mon, 29 Nov 2021 11:08:35 -0500 X-MC-Unique: GgAan81VMBqskrRDvvWgqg-1 Received: by mail-qt1-f199.google.com with SMTP id g2-20020ac87d02000000b002b277218d03so23807647qtb.16 for ; Mon, 29 Nov 2021 08:08:35 -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=fQBswdjgtSgS8T2E1+c6l3SvZHPDDtSqlGr9SmJKoR4=; b=Wwz188QOrs0uOTaI8YifUPAG1IyCnIIKrzUxn08/LAxu3J7xLDIjBkwIDTW48TBiNE A+hPDpYDbVwhLKr3MuJfPQizAiGQPMC0MJEvbSSrV9OhLtOfCZae9Siqku1oRIip+/K4 MBFEaGimDV7koC/qz/+X1YtnA/jSuqmIRMBDhf/RWikZ9sN4sg4X8FH5F6kB7FevbY4C pPYnR24z7hFobgfP+57szlVeUhdVc5eNrxpJqGP27tJTokYyDK6g7xRq1p+ep+SjQOVB DCtggVY7tCVofERlvjT4sAM7Guqnk/QxR3WWRAPyOhu7kToS5FjKax9D+Fsgvby9Qkzu w+/w== X-Gm-Message-State: AOAM530sgU7bNq++X/N5qFwEx4DW7DooJ75E3E+xynl7JrYtrwpMeYOg f4ZaG6ZVnxYilICTNcpdJ+a+bfSyHkikujFeX3PuJ7bK3BjEgpH0qqgoxR1grFRcDvj0BSpDJq3 o4JQg0O2NfCitfIzfu7/H X-Received: by 2002:a05:6214:1c4a:: with SMTP id if10mr43089460qvb.13.1638202114978; Mon, 29 Nov 2021 08:08:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwHRL9AByMH+oCm4a5uvefRkFNLh8/nk2caJ7Tkcz+/iGiqhAAviHxsfodc0lcRRvbkAl1MOA== X-Received: by 2002:a05:6214:1c4a:: with SMTP id if10mr43089425qvb.13.1638202114709; Mon, 29 Nov 2021 08:08:34 -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 u11sm8461284qko.119.2021.11.29.08.08.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Nov 2021 08:08:34 -0800 (PST) Message-ID: <955f383b-137f-df7c-4fa6-228afd4ce232@redhat.com> Date: Mon, 29 Nov 2021 11:08:33 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH] Add and use link-test-modules-rpath-link [BZ #28455] To: "H.J. Lu" , libc-alpha@sourceware.org References: <20211015200708.3990016-1-hjl.tools@gmail.com> Organization: Red Hat In-Reply-To: <20211015200708.3990016-1-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-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: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" 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 > + . */ > + Please add extended comments here. > +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..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 > + . */ > + Please add extended comments here. > +#include > +#include > +#include > + > +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; > +} > -- Cheers, Carlos.