From patchwork Wed Feb 17 16:02:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42077 X-Patchwork-Delegate: carlos@redhat.com 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 90FA1393D01E; Wed, 17 Feb 2021 16:02:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90FA1393D01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613577753; bh=GgkQPhlMWLtofGzRe5p2UYegtSI+jrISB9CrFB2/cBI=; 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=T1EHtOrBOdsPUYLGoAnDPzAZxYrQK5jFUbBbvy9R4PH7k0adGgUpMHhMQdLTMEI8F /neZHRl9IlzaPlanOb+FS+r9DQiU3RxO3oETfbFz6+Cel2AlfEDnjeQG5lAbQHUWc7 JTXlyI+7e95ESURljTFaDL6Mc7GFFsfnukmIZfH8= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 98C7E3836C6E for ; Wed, 17 Feb 2021 16:02:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 98C7E3836C6E Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-05kCoejkNbeGP9VsiuXjLA-1; Wed, 17 Feb 2021 11:02:27 -0500 X-MC-Unique: 05kCoejkNbeGP9VsiuXjLA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 61E1A107ACFE for ; Wed, 17 Feb 2021 16:02:26 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-131.ams2.redhat.com [10.36.113.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBC165D72F for ; Wed, 17 Feb 2021 16:02:25 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 03/10] arm: Implement backtrace on top of In-Reply-To: References: Message-Id: <945edd526ef312471b810b359018154ce74b2478.1613577607.git.fweimer@redhat.com> Date: Wed, 17 Feb 2021 17:02:57 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" --- sysdeps/arm/backtrace.c | 77 +++++++++++------------------------------ 1 file changed, 20 insertions(+), 57 deletions(-) Reviewed-by: Carlos O'Donell diff --git a/sysdeps/arm/backtrace.c b/sysdeps/arm/backtrace.c index 3ed975fb96..193f2410ba 100644 --- a/sysdeps/arm/backtrace.c +++ b/sysdeps/arm/backtrace.c @@ -17,58 +17,36 @@ License along with the GNU C Library. If not, see . */ -#include -#include #include #include -#include +#include struct trace_arg { void **array; + struct unwind_link *unwind_link; int cnt, size; }; #ifdef SHARED -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); -static _Unwind_VRS_Result (*unwind_vrs_get) (_Unwind_Context *, - _Unwind_VRS_RegClass, - _uw, - _Unwind_VRS_DataRepresentation, - void *); - -static void *libgcc_handle; - -static void -init (void) -{ - libgcc_handle = __libc_dlopen ("libgcc_s.so.1"); - - if (libgcc_handle == NULL) - return; - - unwind_backtrace = __libc_dlsym (libgcc_handle, "_Unwind_Backtrace"); - unwind_vrs_get = __libc_dlsym (libgcc_handle, "_Unwind_VRS_Get"); - if (unwind_vrs_get == NULL) - unwind_backtrace = NULL; -} - /* This function is identical to "_Unwind_GetGR", except that it uses "unwind_vrs_get" instead of "_Unwind_VRS_Get". */ static inline _Unwind_Word -unwind_getgr (_Unwind_Context *context, int regno) +unwind_getgr (struct unwind_link *unwind_link, + _Unwind_Context *context, int regno) { _uw val; - unwind_vrs_get (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); + UNWIND_LINK_PTR (unwind_link, _Unwind_VRS_Get) + (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); return val; } /* This macro is identical to the _Unwind_GetIP macro, except that it uses "unwind_getgr" instead of "_Unwind_GetGR". */ -# define unwind_getip(context) \ - (unwind_getgr (context, 15) & ~(_Unwind_Word)1) -#else -# define unwind_backtrace _Unwind_Backtrace +#define unwind_getip(context) \ + (unwind_getgr (arg->unwind_link, context, 15) & ~(_Unwind_Word)1) + +#else /* !SHARED */ # define unwind_getip _Unwind_GetIP #endif @@ -89,20 +67,19 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) int __backtrace (void **array, int size) { - struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; - - if (size <= 0) - return 0; - -#ifdef SHARED - __libc_once_define (static, once); + struct trace_arg arg = + { + .array = array, + .unwind_link = __libc_unwind_link_get (), + .size = size, + .cnt = -1 + }; - __libc_once (once, init); - if (unwind_backtrace == NULL) + if (size <= 0 || arg.unwind_link == NULL) return 0; -#endif - unwind_backtrace (backtrace_helper, &arg); + UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace) + (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt; @@ -110,17 +87,3 @@ __backtrace (void **array, int size) } weak_alias (__backtrace, backtrace) libc_hidden_def (__backtrace) - - -#ifdef SHARED -/* Free all resources if necessary. */ -libc_freeres_fn (free_mem) -{ - unwind_backtrace = NULL; - if (libgcc_handle != NULL) - { - __libc_dlclose (libgcc_handle); - libgcc_handle = NULL; - } -} -#endif