From patchwork Mon May 8 15:26:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 98833 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1383479qge; Mon, 8 May 2017 08:28:46 -0700 (PDT) X-Received: by 10.99.106.5 with SMTP id f5mr18799947pgc.66.1494257326397; Mon, 08 May 2017 08:28:46 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id m63si12813402pld.109.2017.05.08.08.28.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2017 08:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-79122-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-79122-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-79122-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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:date:message-id:in-reply-to :references; q=dns; s=default; b=ssLDCKbV69uvszhWKgkgStthGq3y9Fk 4xdKL2z9dz5/dLyRsVscB67/CP1HJ2XB3IomWFE+1U3lAUOlBVQ+zEs/fTB3cGSg ifrpX1hjTru2KfZqkcACY2L3YRUmYgQNidZPrF2I25g8hhI0TVHQ1xq1qyYvYkWW OruFXdQQzgo4= 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:date:message-id:in-reply-to :references; s=default; bh=qSpRTEUvPsket9BfFM8XUSCpD9E=; b=ledj5 D/OmrKLkAaaIzxZbJ3tRqtfjv63BqdBwvslscgd4wTorTJ2r+pgy/dMJ9HZ1LF1F jozVhHDIvX1dRkFJ/tuAtVR+IRsXLCf0rBwIZrAxTBU1XqZyNnXAlmcTH4YqyaxE OZT4GyoIUVPhH2nmnwaOUiS0NgypDXhEH3oss0= Received: (qmail 57505 invoked by alias); 8 May 2017 15:27:12 -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 57279 invoked by uid 89); 8 May 2017 15:27:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=nip, stdinth, stdint.h, UD:stdint.h X-HELO: mail-qt0-f175.google.com 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:in-reply-to :references; bh=GfhRG9te2n936kDJiH7r3PNs4s9rlDvwgt1zNoTC1W0=; b=P+dpGlyFCa0Qxf0difgRbmGiNUhwoGdKVbGnnEBHMvS44WliH9zTX/Na2+4/MEJavF tyXoV1wyHIYHgZNp52MTUA+xArOp4Ntpbb+/h4fjIGSJAyP1v6Vbx2FP96eOMM0nhgYq Z4hZZUCztwMc+MlAhvd4gQ9Z6udJF2jpsO9TJS6oIwnwmhb1kLINn7WKXFJluel+Spxu G0Akj+uGRxKfbsALS2SPgXwIYGruSfBFpaxM+pYTzZpK+qSBfXDQUCp9jdXuTycixBUn v6JGA4paZJ/boAvRZ7zw5oq3G3Znk7+kDmKfnBhKruHasqoGOKfsEiuXKNqxJ0bGtE8b fRxQ== X-Gm-Message-State: AN3rC/74PYV5wGoQZmVIoNdmTvSZnW9xrtcAONL5LiLhdFQJgB79vt+c hSJIBvv/2t8BCL5aUmHjHA== X-Received: by 10.200.56.243 with SMTP id g48mr30737426qtc.79.1494257229258; Mon, 08 May 2017 08:27:09 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 8/8] powerpc: Fix signal handling in backtrace Date: Mon, 8 May 2017 12:26:52 -0300 Message-Id: <1494257212-524-8-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> References: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> Now with read consolidation which uses SYSCALL_CANCEL macro, a frame pointer is created in the syscall code and this makes the powerpc backtrace obtain a bogus entry for the signal handling patch. It is because it does not setup the correct frame pointer register (r1) based on the saved value from the kernel sigreturn. It was not failing because the syscall frame pointer register was the same one for the next frame (the function that actually called the syscall). This patch fixes it by setup the next stack frame using the saved one by the kernel sigreturn. It fixes tst-backtrace{5,6} after the read consolidation patch. Checked on powerpc-linux-gnu and powerpc64le-linux-gnu. * sysdeps/powerpc/powerpc32/backtrace.c (is_sigtramp_address): Use void* for argument type and use VDSO_SYMBOL macro. (is_sigtramp_address_rt): Likewise. (__backtrace): Setup expected frame pointer address for signal handling. * sysdeps/powerpc/powerpc32/backtrace.c (is_sigtramp_address): Use void* for argumetn type and use VSDO_SYMBOL macro. (__backtrace): Setup expected frame pointer address for signal handling. --- ChangeLog | 10 ++++++++++ sysdeps/powerpc/powerpc32/backtrace.c | 17 ++++++++++------- sysdeps/powerpc/powerpc64/backtrace.c | 17 ++++++++++------- 3 files changed, 30 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/ChangeLog b/ChangeLog index bc97d16..dcda6c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2016-05-08 Adhemerval Zanella + * sysdeps/powerpc/powerpc32/backtrace.c (is_sigtramp_address): Use + void* for argument type and use VDSO_SYMBOL macro. + (is_sigtramp_address_rt): Likewise. + (__backtrace): Setup expected frame pointer address for signal + handling. + * sysdeps/powerpc/powerpc32/backtrace.c (is_sigtramp_address): Use + void* for argumetn type and use VSDO_SYMBOL macro. + (__backtrace): Setup expected frame pointer address for signal + handling. + * sysdeps/unix/sysv/linux/writev.c: New file. * sysdeps/unix/sysv/linux/readv.c: New file. diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c index b60ac32..3940621 100644 --- a/sysdeps/powerpc/powerpc32/backtrace.c +++ b/sysdeps/powerpc/powerpc32/backtrace.c @@ -52,10 +52,10 @@ struct signal_frame_32 { }; static inline int -is_sigtramp_address (unsigned int nip) +is_sigtramp_address (void *nip) { #ifdef SHARED - if (nip == (unsigned int)__vdso_sigtramp32) + if (nip == VDSO_SYMBOL (sigtramp32)) return 1; #endif return 0; @@ -69,10 +69,10 @@ struct rt_signal_frame_32 { }; static inline int -is_sigtramp_address_rt (unsigned int nip) +is_sigtramp_address_rt (void * nip) { #ifdef SHARED - if (nip == (unsigned int)__vdso_sigtramp_rt32) + if (nip == VDSO_SYMBOL (sigtramp_rt32)) return 1; #endif return 0; @@ -100,20 +100,23 @@ __backtrace (void **array, int size) /* Check if the symbol is the signal trampoline and get the interrupted * symbol address from the trampoline saved area. */ - if (is_sigtramp_address ((unsigned int)current->return_address)) + 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 ((unsigned int)current->return_address)) + 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) - array[++count] = (void*)((*gregset)[PT_NIP]); + { + array[++count] = (void*)((*gregset)[PT_NIP]); + current = (void*)((*gregset)[PT_R1]); + } } /* It's possible the second-last stack frame can't return diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c index 83b963e..723948d 100644 --- a/sysdeps/powerpc/powerpc64/backtrace.c +++ b/sysdeps/powerpc/powerpc64/backtrace.c @@ -16,10 +16,12 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see . */ -#include #include #include #include +#include + +#include #include /* This is the stack layout we see with every stack frame. @@ -37,7 +39,7 @@ struct layout { struct layout *next; - long condition_register; + long int condition_register; void *return_address; }; @@ -47,16 +49,16 @@ struct layout dummy frame to make it look like it has a caller. */ struct signal_frame_64 { #define SIGNAL_FRAMESIZE 128 - char dummy[SIGNAL_FRAMESIZE]; + char dummy[SIGNAL_FRAMESIZE]; struct ucontext uc; /* We don't care about the rest, since the IP value is at 'uc' field. */ }; static inline int -is_sigtramp_address (unsigned long nip) +is_sigtramp_address (void *nip) { #ifdef SHARED - if (nip == (unsigned long)__vdso_sigtramp_rt64) + if (nip == VDSO_SYMBOL (sigtramp_rt64)) return 1; #endif return 0; @@ -82,10 +84,11 @@ __backtrace (void **array, int size) /* Check if the symbol is the signal trampoline and get the interrupted * symbol address from the trampoline saved area. */ - if (is_sigtramp_address ((unsigned long)current->return_address)) + if (is_sigtramp_address (current->return_address)) { struct signal_frame_64 *sigframe = (struct signal_frame_64*) current; - array[++count] = (void*)sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; + array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; + current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1]; } }