This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v4 2/3] elf: avoid redundant sort in dlopen
- From: David Kilroy <David dot Kilroy at arm dot com>
- To: "libc-alpha at sourceware dot org" <libc-alpha at sourceware dot org>
- Cc: nd <nd at arm dot com>
- Date: Wed, 29 Jan 2020 11:17:33 +0000
- Subject: [PATCH v4 2/3] elf: avoid redundant sort in dlopen
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=goNe/qpZbGO0aU1w87lhJVz92WRF+RclIW7yuvGqrdE=; b=aq4desJmyGem9YxiM9hgCQ/r0GUsO7+/XspEkgEsQa7i0b/eqVrqtERVBpCNYonIciFZ/LiQ1l/qEhkOn+jpAd9Occ8tQ8yAAjXW73jvUDczwujjmXUjxiabgx++6x3FivHALlc6tzsZ5ocKhrNTkx/dCA9Y27YoSP2ijgqTmMvh3dMBX7pJwy/xRraln7wjF5zvMg0mJviqdhkBamzLuTTZV6ZV27oxOPRPDmBYpIqBX4Vwx/OOfz0trVtrZOqzykqL+uu5ssJDo4QcNrxXxbiadl0WUnGz7lcUZk+71YelD8ohPXgW7PukHuFEudhUkMlAIZeeRJzt4Vfry7SWWw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TLOe5F7XCau839aXzHoJadQ3FXdxnlQsCinFoHF3WwMKJE13KdFjkc1gwmXt3q90utNV04v4waXyKpvnF9hVBMLCZGjh7iWXOGvgky9C1XxqFR4rrfvrUVAIhKYspFcbTXDuvUAATREa2mnJUpsl6NRDF5tstKVMZFoB3r+M60J0nDSfSucZKxFnDWpGSVasMWtHy475iks+ax/OcRs/F5EkoaYF5/5D50Q6Kouaas9uRevERDHqRDGMm0BiMVVMiz6tbsyKfW28hcIBXcKIqL+TnC3WQvecolVDWUCtYI7aHtOhqdHp+IhJXxriz+ih7bVFINxpRklMzSpcOr+FkQ==
- Original-authentication-results: spf=none (sender IP is ) smtp.mailfrom=David dot Kilroy at arm dot com;
- References: <1580296643-36839-1-git-send-email-david.kilroy@arm.com>
l_initfini is already sorted by dependency in _dl_map_object_deps(),
so avoid sorting again in dl_open_worker().
Tested by running the testsuite on x86_64.
---
elf/dl-open.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/elf/dl-open.c b/elf/dl-open.c
index ecb2ba9..314adc2 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -617,9 +617,10 @@ dl_open_worker (void *a)
if (GLRO(dl_lazy))
reloc_mode |= mode & RTLD_LAZY;
- /* Sort the objects by dependency for the relocation process. This
- allows IFUNC relocations to work and it also means copy
- relocation of dependencies are if necessary overwritten. */
+ /* Objects must be sorted by dependency for the relocation process.
+ This allows IFUNC relocations to work and it also means copy
+ relocation of dependencies are if necessary overwritten.
+ __dl_map_object_deps has already sorted l_initfini for us. */
unsigned int nmaps = 0;
unsigned int j = 0;
struct link_map *l = new->l_initfini[0];
@@ -642,7 +643,6 @@ dl_open_worker (void *a)
l = new->l_initfini[++j];
}
while (l != NULL);
- _dl_sort_maps (maps, nmaps, NULL, false);
int relocation_in_progress = 0;
--
2.7.4