From patchwork Mon Nov 7 13:11:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 60085 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF2963858005 for ; Mon, 7 Nov 2022 13:11:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF2963858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667826694; bh=6s320kZQmVFmX6ef0yape9YA0E9yUi6vIBtceaBU+MQ=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=J3zK6B1uSafsD1dUU3jlx45w2KwzvuIH3jMX0EVEikAtXFT1VJRHK8v+hykXdDY6o 9LDXp1zGnb8iysg1QIlVo56yRwRBXEm3oRaHeheW4Dsc/gegcROjD4+S1JAi46xwZb 48xvb6nvql5jxAOVAIAc+DaLXJ+JorxKZ57elVbU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 C452A3858D3C for ; Mon, 7 Nov 2022 13:11:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C452A3858D3C 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-517-MDEP9AoIO_WlhSqQjNOSLQ-1; Mon, 07 Nov 2022 08:11:08 -0500 X-MC-Unique: MDEP9AoIO_WlhSqQjNOSLQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AFE3E1C06ED5 for ; Mon, 7 Nov 2022 13:11:07 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F095D4B3FC6 for ; Mon, 7 Nov 2022 13:11:06 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v3 2/3] elf: Introduce _dl_debug_change_state In-Reply-To: References: X-From-Line: 6089579814fa079211f9fa8cce3b7d9a9b0e59b7 Mon Sep 17 00:00:00 2001 Message-Id: <6089579814fa079211f9fa8cce3b7d9a9b0e59b7.1667826585.git.fweimer@redhat.com> Date: Mon, 07 Nov 2022 14:11:05 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.0 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It combines updating r_state with the debugger notification. The change to _dl_open introduces an additional debugger notification for dlmopen, but debuggers are expected to ignore it. --- elf/dl-close.c | 6 ++---- elf/dl-debug.c | 7 +++++++ elf/dl-load.c | 6 ++---- elf/dl-open.c | 5 ++--- elf/rtld.c | 6 ++---- sysdeps/generic/ldsodefs.h | 14 ++++++++++++-- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/elf/dl-close.c b/elf/dl-close.c index 14deca2e2b..d7b0be0398 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -420,8 +420,7 @@ _dl_close_worker (struct link_map *map, bool force) /* Notify the debugger we are about to remove some loaded objects. */ struct r_debug *r = _dl_debug_update (nsid); - r->r_state = RT_DELETE; - _dl_debug_state (); + _dl_debug_change_state (r, RT_DELETE); LIBC_PROBE (unmap_start, 2, nsid, r); if (unload_global) @@ -725,8 +724,7 @@ _dl_close_worker (struct link_map *map, bool force) while (GL(dl_ns)[GL(dl_nns) - 1]._ns_loaded == NULL); /* Notify the debugger those objects are finalized and gone. */ - r->r_state = RT_CONSISTENT; - _dl_debug_state (); + _dl_debug_change_state (r, RT_CONSISTENT); LIBC_PROBE (unmap_complete, 2, nsid, r); /* Recheck if we need to retry, release the lock. */ diff --git a/elf/dl-debug.c b/elf/dl-debug.c index 66f9ad375d..47961236cf 100644 --- a/elf/dl-debug.c +++ b/elf/dl-debug.c @@ -67,6 +67,13 @@ _dl_debug_update (Lmid_t ns) return &r->base; } +void +_dl_debug_change_state (struct r_debug *r, int state) +{ + atomic_store_release (&r->r_state, state); + _dl_debug_state (); +} + /* Initialize _r_debug_extended for the namespace NS. LDBASE is the run-time load address of the dynamic linker, to be put in _r_debug_extended.r_ldbase. Return the address of _r_debug. */ diff --git a/elf/dl-load.c b/elf/dl-load.c index 911db4c906..db5d1e83fc 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -987,8 +987,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, if (make_consistent && r != NULL) { - r->r_state = RT_CONSISTENT; - _dl_debug_state (); + _dl_debug_change_state (r, RT_CONSISTENT); LIBC_PROBE (map_failed, 2, nsid, r); } @@ -1507,8 +1506,7 @@ cannot enable executable stack as shared object requires"); /* Notify the debugger we have added some objects. We need to call _dl_debug_initialize in a static program in case dynamic linking has not been used before. */ - r->r_state = RT_ADD; - _dl_debug_state (); + _dl_debug_change_state (r, RT_ADD); LIBC_PROBE (map_start, 2, nsid, r); make_consistent = true; } diff --git a/elf/dl-open.c b/elf/dl-open.c index e7db5e9642..686f7b18e0 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -617,8 +617,7 @@ dl_open_worker_begin (void *a) /* Notify the debugger all new objects are now ready to go. */ struct r_debug *r = _dl_debug_update (args->nsid); - r->r_state = RT_CONSISTENT; - _dl_debug_state (); + _dl_debug_change_state (r, RT_CONSISTENT); LIBC_PROBE (map_complete, 3, args->nsid, r, new); _dl_open_check (new); @@ -851,7 +850,7 @@ no more namespaces available for dlmopen()")); } GL(dl_ns)[nsid].libc_map = NULL; - _dl_debug_update (nsid)->r_state = RT_CONSISTENT; + _dl_debug_change_state (_dl_debug_update (nsid), RT_CONSISTENT); } /* Never allow loading a DSO in a namespace which is empty. Such direct placements is only causing problems. Also don't allow diff --git a/elf/rtld.c b/elf/rtld.c index 70ad1acc43..a85daaa732 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1833,8 +1833,7 @@ dl_main (const ElfW(Phdr) *phdr, elf_setup_debug_entry (main_map, r); /* We start adding objects. */ - r->r_state = RT_ADD; - _dl_debug_state (); + _dl_debug_change_state (r, RT_ADD); LIBC_PROBE (init_start, 2, LM_ID_BASE, r); /* Auditing checkpoint: we are ready to signal that the initial map @@ -2401,8 +2400,7 @@ dl_main (const ElfW(Phdr) *phdr, /* Notify the debugger all new objects are now ready to go. We must re-get the address since by now the variable might be in another object. */ r = _dl_debug_update (LM_ID_BASE); - r->r_state = RT_CONSISTENT; - _dl_debug_state (); + _dl_debug_change_state (r, RT_CONSISTENT); LIBC_PROBE (init_complete, 2, LM_ID_BASE, r); #if defined USE_LDCONFIG && !defined MAP_COPY diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index f668a954d3..d62998b5ec 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1064,8 +1064,14 @@ extern void _dl_debug_state (void); rtld_hidden_proto (_dl_debug_state) /* Initialize `struct r_debug_extended' for the namespace NS. LDBASE - is the run-time load address of the dynamic linker, to be put in the - `r_ldbase' member. Return the address of the structure. */ + is the run-time load address of the dynamic linker, to be put in + the `r_ldbase' member. + + This function returns the address of the r_debug structure for the + namespace. This is not merely a convenience or optimization, but + it is necessary for the LIBC_PROBE Systemtap/debugger probes to + work reliably: direct variable access can create probes that tools + cannot consume. */ extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns) attribute_hidden; @@ -1073,6 +1079,10 @@ extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns) of the namespace NS. */ extern struct r_debug *_dl_debug_update (Lmid_t ns) attribute_hidden; +/* Updates R->r_state to STATE and notifies the debugger by calling + _dl_debug_state. */ +void _dl_debug_change_state (struct r_debug *r, int state) attribute_hidden; + /* Initialize the basic data structure for the search paths. SOURCE is either "LD_LIBRARY_PATH" or "--library-path". GLIBC_HWCAPS_PREPEND adds additional glibc-hwcaps subdirectories to