From patchwork Thu Feb 13 17:08:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1237620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109691-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=ag1hWijH; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OWwOILTc; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48JNK25lb0z9s29 for ; Fri, 14 Feb 2020 04:09:10 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=KtHo4xYUueizw4kE gbOQ4uDeGG+vHD1h3civqPjuBusH9KBzhKor0yI+hbjX8FPsd9FnQ+9P68ngphL9 IYkjdJeJCwiIm7Qo+ytVVIeSf6RRopSb1hr/6P2DhHIqHmOnFM3VcTIZOufT/YF8 QbTNV2bRrsMaVLsSPZycltypmg0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=VXBnNGXw37pANZ2J5xYpls sVghE=; b=ag1hWijH6OmFWE8VnWJzUpLxrRdZ7o7+STcCSWLBRUXwEYntD8/TCa 4P1EKfUVyB7BbtSrjGP41V/1LE8Z/SXX3QLsMFQn6Da1S8hHpausropKncuEeYCo Cwaei+TcQOXM0o1J6aWfsPbJMG5ZIvFJjGtpFUnUZwWaDGXKtIMIE= Received: (qmail 50309 invoked by alias); 13 Feb 2020 17:08:23 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50243 invoked by uid 89); 13 Feb 2020 17:08:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581613696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+/cd00h8rxyZlLCB1lhZg3KLJcHgCIb7rvgGnELCm9k=; b=OWwOILTcnp6/RamGnE6z8H58volPeyLYFBoFCu3GHI4T8huLpFU+c01MuP68nhmENk8SJg 5aUlyLcPpxMkyD4OSqjOZHygXV3hM/p8YLyKZB0wGQgccacRvtvMeCrocGRmSF4DTVcSTs 9WXxVZ4dugSvOgEJR/kq2zd2Jx2KGJU= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 04/11] i386: Implement backtrace on top of In-Reply-To: References: X-From-Line: f7768f19ef7682beec781fee7d525b6371e28a9f Mon Sep 17 00:00:00 2001 Message-Id: Date: Thu, 13 Feb 2020 18:08:03 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com --- sysdeps/i386/backtrace.c | 82 +++++++++------------------------------- 1 file changed, 18 insertions(+), 64 deletions(-) diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c index 2491a637d9..29027a478d 100644 --- a/sysdeps/i386/backtrace.c +++ b/sysdeps/i386/backtrace.c @@ -17,52 +17,18 @@ 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; void *lastebp, *lastesp; }; -#ifdef SHARED -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); -static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); -static _Unwind_Ptr (*unwind_getcfa) (struct _Unwind_Context *); -static _Unwind_Ptr (*unwind_getgr) (struct _Unwind_Context *, int); -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_getip = __libc_dlsym (libgcc_handle, "_Unwind_GetIP"); - unwind_getcfa = __libc_dlsym (libgcc_handle, "_Unwind_GetCFA"); - unwind_getgr = __libc_dlsym (libgcc_handle, "_Unwind_GetGR"); - if (unwind_getip == NULL || unwind_getgr == NULL || unwind_getcfa == NULL) - { - unwind_backtrace = NULL; - __libc_dlclose (libgcc_handle); - libgcc_handle = NULL; - } -} -#else -# define unwind_backtrace _Unwind_Backtrace -# define unwind_getip _Unwind_GetIP -# define unwind_getcfa _Unwind_GetCFA -# define unwind_getgr _Unwind_GetGR -#endif - static _Unwind_Reason_Code backtrace_helper (struct _Unwind_Context *ctx, void *a) { @@ -71,13 +37,16 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) /* We are first called with address in the __backtrace function. Skip it. */ if (arg->cnt != -1) - arg->array[arg->cnt] = (void *) unwind_getip (ctx); + arg->array[arg->cnt] + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx); if (++arg->cnt == arg->size) return _URC_END_OF_STACK; /* %ebp is DWARF2 register 5 on IA-32. */ - arg->lastebp = (void *) unwind_getgr (ctx, 5); - arg->lastesp = (void *) unwind_getcfa (ctx); + arg->lastebp + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetGR) (ctx, 5); + arg->lastesp + = (void *) UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetCFA) (ctx); return _URC_NO_REASON; } @@ -111,20 +80,19 @@ struct layout 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; @@ -147,17 +115,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