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.129.124]) by sourceware.org (Postfix) with ESMTPS id 189C33882647 for ; Tue, 4 Jul 2023 20:04:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 189C33882647 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688501071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2YTwT7aoD/L4eBWuPGUAmqSqS4+u/hlzx8qPiHbloEE=; b=YhOjnIUo0wqTYR7CV4i75KX7C9/3KsnlLIki689Vjl49JIw427ILku7zaf2jtEn+LgEI6m IclzYl4R18i/NJJQbYHTEu4HuPD5H291jYTajBRgEpdSpXp7MMNyKH9zftOBNu2ONs2PEE 6T3Asg+F8P4CdeA7lZ9cu9jtSO6cg2w= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-507-_L2Yf2gDObK8MAaoaBaf2Q-1; Tue, 04 Jul 2023 16:04:30 -0400 X-MC-Unique: _L2Yf2gDObK8MAaoaBaf2Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4537F2A59562 for ; Tue, 4 Jul 2023 20:04:30 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FF681121314 for ; Tue, 4 Jul 2023 20:04:29 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 30/33] elf: Use _dl_find_object instead of _dl_find_dso_for_object in dlopen In-Reply-To: Message-ID: References: X-From-Line: d05e501d8c01e3bb91ebb5eed7290e8124d68906 Mon Sep 17 00:00:00 2001 Date: Tue, 04 Jul 2023 22:04:27 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The _dl_find_object uses a binary search and is faster if there are many objects. --- elf/dl-open.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elf/dl-open.c b/elf/dl-open.c index 9f9407341e..9bd48826f9 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -894,8 +894,10 @@ no more namespaces available for dlmopen()")); if (nsid == __LM_ID_CALLER || strchr (file, '$') != NULL || strchr (file, '/') == NULL) { - args.caller_map = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen); - if (args.caller_map == NULL) + struct dl_find_object dlfo; + if (_dl_find_object ((void *) caller_dlopen, &dlfo) == 0) + args.caller_map = l_private (dlfo.dlfo_link_map); + else /* By default we assume this is the main application. */ args.caller_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded; if (args.nsid == __LM_ID_CALLER) -- 2.41.0