From: Carlos O'Donell <carlos@redhat.com>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 06/10] sparc: Implement backtrace on top <unwind-link.h>
Date: Mon, 1 Mar 2021 08:54:55 -0500 [thread overview]
Message-ID: <9a747452-651d-e322-7352-6f558db5f24f@redhat.com> (raw)
In-Reply-To: <994e0ad746c4324afa738d675cc4bead4ba95291.1613577607.git.fweimer@redhat.com>
On 2/17/21 11:03 AM, Florian Weimer via Libc-alpha wrote:
LGTM. And the sparc version.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/sparc/backtrace.c | 66 +++++++++------------------------------
> 1 file changed, 15 insertions(+), 51 deletions(-)
>
> diff --git a/sysdeps/sparc/backtrace.c b/sysdeps/sparc/backtrace.c
> index 62196f0538..1bad755b7f 100644
> --- a/sysdeps/sparc/backtrace.c
> +++ b/sysdeps/sparc/backtrace.c
> @@ -21,9 +21,8 @@
> #include <stddef.h>
> #include <sysdep.h>
> #include <sys/trap.h>
> -#include <dlfcn.h>
> -#include <unwind.h>
> #include <backtrace.h>
> +#include <unwind-link.h>
>
> struct layout
> {
> @@ -36,45 +35,12 @@ struct layout
> struct trace_arg
> {
> void **array;
> + struct unwind_link *unwind_link;
> _Unwind_Word cfa;
> int cnt;
> int size;
> };
>
> -#ifdef SHARED
> -static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
> -static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
> -static _Unwind_Word (*unwind_getcfa) (struct _Unwind_Context *);
> -static void *libgcc_handle;
> -
> -/* Dummy version in case libgcc_s does not contain the real code. */
> -static _Unwind_Word
> -dummy_getcfa (struct _Unwind_Context *ctx __attribute__ ((unused)))
> -{
> - return 0;
> -}
> -
> -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");
> - if (unwind_getip == NULL)
> - unwind_backtrace = NULL;
> - unwind_getcfa = (__libc_dlsym (libgcc_handle, "_Unwind_GetCFA")
> - ?: dummy_getcfa);
> -}
> -#else
> -# define unwind_backtrace _Unwind_Backtrace
> -# define unwind_getip _Unwind_GetIP
> -# define unwind_getcfa _Unwind_GetCFA
> -#endif
> -
> static _Unwind_Reason_Code
> backtrace_helper (struct _Unwind_Context *ctx, void *a)
> {
> @@ -85,11 +51,12 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
> Skip it. */
> if (arg->cnt != -1)
> {
> - ip = unwind_getip (ctx);
> + ip = UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetIP) (ctx);
> arg->array[arg->cnt] = (void *) ip;
>
> /* Check whether we make any progress. */
> - _Unwind_Word cfa = unwind_getcfa (ctx);
> + _Unwind_Word cfa
> + = UNWIND_LINK_PTR (arg->unwind_link, _Unwind_GetCFA) (ctx);
>
> if (arg->cnt > 0 && arg->array[arg->cnt - 1] == arg->array[arg->cnt]
> && cfa == arg->cfa)
> @@ -104,23 +71,19 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
> int
> __backtrace (void **array, int size)
> {
> - struct trace_arg arg = { .array = array, .cfa = 0, .size = size, .cnt = -1 };
> - bool use_unwinder;
> int count;
> + struct trace_arg arg =
> + {
> + .array = array,
> + .unwind_link = __libc_unwind_link_get (),
> + .size = size,
> + .cnt = -1,
> + };
>
> if (size <= 0)
> return 0;
>
> - use_unwinder = true;
> -#ifdef SHARED
> - __libc_once_define (static, once);
> -
> - __libc_once (once, init);
> - if (unwind_backtrace == NULL)
> - use_unwinder = false;
> -#endif
> -
> - if (use_unwinder == false)
> + if (arg.unwind_link == NULL)
> {
> struct layout *current;
> unsigned long fp, i7;
> @@ -145,7 +108,8 @@ __backtrace (void **array, int size)
> }
> else
> {
> - unwind_backtrace (backtrace_helper, &arg);
> + UNWIND_LINK_PTR (arg.unwind_link, _Unwind_Backtrace)
> + (backtrace_helper, &arg);
>
> /* _Unwind_Backtrace seems to put NULL address above
> _start. Fix it up here. */
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-03-01 13:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 16:02 [PATCH 00/10] Unwinder interface consolidation Florian Weimer
2021-02-17 16:02 ` [PATCH 01/10] Implement <unwind-link.h> for dynamically loading the libgcc_s unwinder Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:02 ` [PATCH 02/10] backtrace: Implement on top of <unwind-link.h> Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:02 ` [PATCH 03/10] arm: Implement backtrace " Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 04/10] i386: " Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 05/10] m68k: " Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 06/10] sparc: Implement backtrace on top <unwind-link.h> Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell [this message]
2021-02-17 16:03 ` [PATCH 07/10] __frame_state_for: Use <unwind-link.h> for unwinder access Florian Weimer
2021-03-01 13:54 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 08/10] Move sysdeps/gnu/unwind-resume.c to sysdeps/generic/unwind-resume.c Florian Weimer
2021-03-01 13:55 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 09/10] Implement _Unwind_Resume in libc on top of <unwind-link.h> Florian Weimer
2021-03-01 13:55 ` Carlos O'Donell
2021-02-17 16:03 ` [PATCH 10/10] nptl: Use <unwind-link.h> for accessing the libgcc_s unwinder Florian Weimer
2021-03-01 13:55 ` Carlos O'Donell
2021-03-01 13:54 ` [PATCH 00/10] Unwinder interface consolidation Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a747452-651d-e322-7352-6f558db5f24f@redhat.com \
--to=carlos@redhat.com \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).