From patchwork Fri Feb 12 17:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 42023 X-Patchwork-Delegate: rzinsly@linux.ibm.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 098133860C2D; Fri, 12 Feb 2021 17:09:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 098133860C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613149791; bh=bdOalOUVqCUDKJg/vVBHG6O16S1npnGD+btqj9qL/Cs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=F+1WJIiYh+LAgrOEtEUZ04AUusp+FZtxzRIica2V/IQDaRBFBV/TXoDNkvG4TY6AI NP+RUmJ/iUvKfOI6TTsgoWM09Io7pxxLTWpoWz5aAZ6H+OIni5Gvjpu+6eU7KJHf04 xwatu+VYsliCwPCZ35I+QnKaeZQSVf43aMwwp4IU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 86EB73857808 for ; Fri, 12 Feb 2021 17:09:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 86EB73857808 Received: by mail-qk1-x735.google.com with SMTP id q85so220902qke.8 for ; Fri, 12 Feb 2021 09:09:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=bdOalOUVqCUDKJg/vVBHG6O16S1npnGD+btqj9qL/Cs=; b=HS/CfakTaHcBmzsl9Tkk67mjnbwEOOHKShRGkPBE533HG5PfSdXqt5GJnYTqN57IgN grwpM0Su+7+kZBPxq/T79OMNVX3Sms3L+hJhmDV0ylj2BnHUZiHLWUX807OAvIn+5eif h0zkiUDJx59YXKBbX/NFzaH1TsY8pfHGt95OxsdgnlCg/QcsqfWqyu/kFDq5P/jIyvRw 41A8/CjiPgY55wf3wLzXKovPkuAl6OQ8pt8Y1R9wg5YmZPUidYMhURJm52/cuwX6aNln sQ+ORjQ6ELZI/vXg+gzQoXZBWmEYwARfLfihL8LW80bpMg3Wuis8SYuQ5rhNEwC3Qghw B1pg== X-Gm-Message-State: AOAM533PsT+v24mkunQY/DIOuvrM3pFdTobPAwTXoQSRFcamdvFeShDa k6Ck8KTYC4JUMt4kMsslYhB6z1VvQwIrnA== X-Google-Smtp-Source: ABdhPJwcyKrFip2NwtVdYIwJFiGIMRV0KSZZySu+65w/KQrdFpnhVL0XuWJFtSbXF/F0suMW3Pfz5g== X-Received: by 2002:a37:c93:: with SMTP id 141mr3413068qkm.206.1613149786403; Fri, 12 Feb 2021 09:09:46 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 76sm6671516qke.95.2021.02.12.09.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Feb 2021 09:09:46 -0800 (PST) To: libc-alpha@sourceware.org, Raoni Fassina Firmino , Florian Weimer , Tulio Magno Quites Machado Filho Subject: [PATCH] powerpc: Remove backtrace implementation Date: Fri, 12 Feb 2021 14:09:41 -0300 Message-Id: <20210212170941.1786380-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The powerpc optimization to provide a fast stacktrace requires some ad-hoc code to handle Linux signal frames and the change is fragile once the kernel decides to slight change its execution sequence [1]. The generic implementation work as-is and it should be future proof since the kernel provides the expected CFI directives in vDSO shared page. Checked on powerpc-linux-gnu, powerpc64le-linux-gnu, and powerpc64-linux-gnu. [1] https://sourceware.org/pipermail/libc-alpha/2021-January/122027.html --- sysdeps/powerpc/powerpc32/backtrace.c | 133 ----------------------- sysdeps/powerpc/powerpc64/backtrace.c | 117 -------------------- sysdeps/unix/sysv/linux/dl-vdso-setup.c | 11 -- sysdeps/unix/sysv/linux/dl-vdso-setup.h | 9 -- sysdeps/unix/sysv/linux/powerpc/sysdep.h | 7 -- 5 files changed, 277 deletions(-) delete mode 100644 sysdeps/powerpc/powerpc32/backtrace.c delete mode 100644 sysdeps/powerpc/powerpc64/backtrace.c diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c deleted file mode 100644 index 60314779fe..0000000000 --- a/sysdeps/powerpc/powerpc32/backtrace.c +++ /dev/null @@ -1,133 +0,0 @@ -/* Return backtrace of current program state. - Copyright (C) 1998-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include - -/* This is the stack layout we see with every stack frame. - Note that every routine is required by the ABI to lay out the stack - like this. - - +----------------+ +-----------------+ - %r1 -> | %r1 last frame--------> | %r1 last frame--->... --> NULL - | | | | - | (unused) | | return address | - +----------------+ +-----------------+ -*/ -struct layout -{ - struct layout *next; - void *return_address; -}; - -#define SIGNAL_FRAMESIZE 64 - -/* Since the signal handler is just like any other function it needs to - save/restore its LR and it will save it into callers stack frame. - Since a signal handler doesn't have a caller, the kernel creates a - dummy frame to make it look like it has a caller. */ -struct signal_frame_32 { - char dummy[SIGNAL_FRAMESIZE]; - struct sigcontext sctx; - mcontext_t mctx; - /* We don't care about the rest, since IP value is at 'mctx' field. */ -}; - -static inline bool -is_sigtramp_address (void *nip) -{ -#ifdef HAVE_SIGTRAMP_RT32 - if (nip == GLRO (dl_vdso_sigtramp_32)) - return true; -#endif - return false; -} - -struct rt_signal_frame_32 { - char dummy[SIGNAL_FRAMESIZE + 16]; - siginfo_t info; - ucontext_t uc; - /* We don't care about the rest, since IP value is at 'uc' field. */ -}; - -static inline bool -is_sigtramp_address_rt (void * nip) -{ -#ifdef HAVE_SIGTRAMP_32 - if (nip == GLRO (dl_vdso_sigtramp_rt32)) - return true; -#endif - return false; -} - -int -__backtrace (void **array, int size) -{ - struct layout *current; - int count; - - /* Force gcc to spill LR. */ - asm volatile ("" : "=l"(current)); - - /* Get the address on top-of-stack. */ - asm volatile ("lwz %0,0(1)" : "=r"(current)); - - for ( count = 0; - current != NULL && count < size; - current = current->next, count++) - { - gregset_t *gregset = NULL; - - array[count] = current->return_address; - - /* Check if the symbol is the signal trampoline and get the interrupted - * symbol address from the trampoline saved area. */ - if (is_sigtramp_address (current->return_address)) - { - struct signal_frame_32 *sigframe = - (struct signal_frame_32*) current; - gregset = &sigframe->mctx.gregs; - } - else if (is_sigtramp_address_rt (current->return_address)) - { - struct rt_signal_frame_32 *sigframe = - (struct rt_signal_frame_32*) current; - gregset = &sigframe->uc.uc_mcontext.uc_regs->gregs; - } - if (gregset) - { - if (count + 1 == size) - break; - array[++count] = (void*)((*gregset)[PT_NIP]); - current = (void*)((*gregset)[PT_R1]); - } - } - - /* It's possible the second-last stack frame can't return - (that is, it's __libc_start_main), in which case - the CRT startup code will have set its LR to 'NULL'. */ - if (count > 0 && array[count-1] == NULL) - count--; - - return count; -} -weak_alias (__backtrace, backtrace) -libc_hidden_def (__backtrace) diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c deleted file mode 100644 index 37de9b5bdd..0000000000 --- a/sysdeps/powerpc/powerpc64/backtrace.c +++ /dev/null @@ -1,117 +0,0 @@ -/* Return backtrace of current program state. - Copyright (C) 1998-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include -#include -#include -#include - -#include -#include - -/* This is the stack layout we see with every stack frame. - Note that every routine is required by the ABI to lay out the stack - like this. - - +----------------+ +-----------------+ - %r1 -> | %r1 last frame--------> | %r1 last frame--->... --> NULL - | | | | - | cr save | | cr save | - | | | | - | (unused) | | return address | - +----------------+ +-----------------+ -*/ -struct layout -{ - struct layout *next; - long int condition_register; - void *return_address; -}; - -/* Since the signal handler is just like any other function it needs to - save/restore its LR and it will save it into callers stack frame. - Since a signal handler doesn't have a caller, the kernel creates a - dummy frame to make it look like it has a caller. */ -struct signal_frame_64 { -#define SIGNAL_FRAMESIZE 128 - char dummy[SIGNAL_FRAMESIZE]; - ucontext_t uc; - /* We don't care about the rest, since the IP value is at 'uc' field. */ -}; - -/* Test if the address match to the inside the trampoline code. - Up to and including kernel 5.8, returning from an interrupt or syscall to a - signal handler starts execution directly at the handler's entry point, with - LR set to address of the sigreturn trampoline (the vDSO symbol). - Newer kernels will branch to signal handler from the trampoline instead, so - checking the stacktrace against the vDSO entrypoint does not work in such - case. - The vDSO branches with a 'bctrl' instruction, so checking either the - vDSO address itself and the next instruction should cover all kernel - versions. */ -static inline bool -is_sigtramp_address (void *nip) -{ -#ifdef HAVE_SIGTRAMP_RT64 - if (nip == GLRO (dl_vdso_sigtramp_rt64) || - nip == GLRO (dl_vdso_sigtramp_rt64) + 4) - return true; -#endif - return false; -} - -int -__backtrace (void **array, int size) -{ - struct layout *current; - int count; - - /* Force gcc to spill LR. */ - asm volatile ("" : "=l"(current)); - - /* Get the address on top-of-stack. */ - asm volatile ("ld %0,0(1)" : "=r"(current)); - - for ( count = 0; - current != NULL && count < size; - current = current->next, count++) - { - array[count] = current->return_address; - - /* Check if the symbol is the signal trampoline and get the interrupted - * symbol address from the trampoline saved area. */ - if (is_sigtramp_address (current->return_address)) - { - struct signal_frame_64 *sigframe = (struct signal_frame_64*) current; - if (count + 1 == size) - break; - array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; - current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1]; - } - } - - /* It's possible the second-last stack frame can't return - (that is, it's __libc_start_main), in which case - the CRT startup code will have set its LR to 'NULL'. */ - if (count > 0 && array[count-1] == NULL) - count--; - - return count; -} -weak_alias (__backtrace, backtrace) -libc_hidden_def (__backtrace) diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.c b/sysdeps/unix/sysv/linux/dl-vdso-setup.c index 037a2774b6..b42b9dfe32 100644 --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.c +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.c @@ -71,17 +71,6 @@ PROCINFO_CLASS int (*_dl_vdso_clock_getres_time64) (clockid_t, # ifdef HAVE_GET_TBFREQ PROCINFO_CLASS uint64_t (*_dl_vdso_get_tbfreq)(void) RELRO; # endif -/* The sigtramp are used on powerpc backtrace without using - INLINE_VSYSCALL, so there is no need to set their type. */ -# ifdef HAVE_SIGTRAMP_RT64 -PROCINFO_CLASS void *_dl_vdso_sigtramp_rt64 RELRO; -# endif -# ifdef HAVE_SIGTRAMP_RT32 -PROCINFO_CLASS void *_dl_vdso_sigtramp_rt32 RELRO; -# endif -# ifdef HAVE_SIGTRAMP_32 -PROCINFO_CLASS void *_dl_vdso_sigtramp_32 RELRO; -# endif #endif #undef RELRO diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.h b/sysdeps/unix/sysv/linux/dl-vdso-setup.h index daf9873c4e..75b00a0046 100644 --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.h +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.h @@ -47,15 +47,6 @@ setup_vdso_pointers (void) #ifdef HAVE_GET_TBFREQ GLRO(dl_vdso_get_tbfreq) = dl_vdso_vsym (HAVE_GET_TBFREQ); #endif -#ifdef HAVE_SIGTRAMP_RT64 - GLRO(dl_vdso_sigtramp_rt64) = dl_vdso_vsym (HAVE_SIGTRAMP_RT64); -#endif -#ifdef HAVE_SIGTRAMP_RT32 - GLRO(dl_vdso_sigtramp_rt32) = dl_vdso_vsym (HAVE_SIGTRAMP_RT32); -#endif -#ifdef HAVE_SIGTRAMP_32 - GLRO(dl_vdso_sigtramp_32) = dl_vdso_vsym (HAVE_SIGTRAMP_32); -#endif } #endif diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h index 6b99464e61..1b1c8f64ab 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h @@ -252,11 +252,4 @@ #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" #define HAVE_GET_TBFREQ "__kernel_get_tbfreq" -#if defined(__PPC64__) || defined(__powerpc64__) -# define HAVE_SIGTRAMP_RT64 "__kernel_sigtramp_rt64" -#else -# define HAVE_SIGTRAMP_32 "__kernel_sigtramp32" -# define HAVE_SIGTRAMP_RT32 "__kernel_sigtramp_rt32" -#endif - #endif /* _LINUX_POWERPC_SYSDEP_H */