From patchwork Mon Jan 27 09:37:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 23741 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50C6B20143 for ; Mon, 27 Jan 2014 09:37:24 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 131sf27848827ykp.1 for ; Mon, 27 Jan 2014 01:37:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=S18Bm/llz9mklN+5NUu8iKF8PDLG4pKVnq9ZxA+1uuk=; b=EMBzmxz0HGCLlKQnd4+52wP8t6tKCjpaL63H3mocrcNwMXwiOoI6fYMgJeykel69+V 051mQ1WKj8C8hXgNuucVmkO9g+rYDCwv2+Dm6kR/HzqMmHFs871trCzCHg4ETpll7KmM QV4HDNj1oLApErRz8PU4MIYXR1Ab2qdw/zfeV8c0MfrFDKxO0zRXstp/i1UGImdrzThI MbrDHoRW26rA47CPoghZiW5pxPAawIsuTVB4f38Vefccsp2Ib4T1gcVP4kT5BDF/GpQY 8Mx4A6An4yNjeDIvSNZ+7pecS07x39EsP+LJld4bz8kfU1fgSkxnSvNVyDHpMel0VPLC FTpA== X-Gm-Message-State: ALoCoQlaPAF43/SG0kwdjokEU1PyVfNddEuF2jy6xdEgMjC1CzSZtry9f1AcO4KTFp3+2c4IZJml X-Received: by 10.236.149.198 with SMTP id x46mr9927930yhj.7.1390815443590; Mon, 27 Jan 2014 01:37:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.40 with SMTP id 37ls1504288qgu.46.gmail; Mon, 27 Jan 2014 01:37:23 -0800 (PST) X-Received: by 10.58.235.129 with SMTP id um1mr15309600vec.17.1390815443503; Mon, 27 Jan 2014 01:37:23 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id kl10si1400501vdb.129.2014.01.27.01.37.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 01:37:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ij19so3208876vcb.6 for ; Mon, 27 Jan 2014 01:37:23 -0800 (PST) X-Received: by 10.52.160.164 with SMTP id xl4mr2781311vdb.21.1390815443413; Mon, 27 Jan 2014 01:37:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp116518vcz; Mon, 27 Jan 2014 01:37:22 -0800 (PST) X-Received: by 10.180.74.200 with SMTP id w8mr11222301wiv.58.1390815432687; Mon, 27 Jan 2014 01:37:12 -0800 (PST) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx.google.com with ESMTPS id cu5si5024893wjc.50.2014.01.27.01.37.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 01:37:12 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.49 is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=74.125.82.49; Received: by mail-wg0-f49.google.com with SMTP id a1so5170659wgh.4 for ; Mon, 27 Jan 2014 01:37:12 -0800 (PST) X-Received: by 10.180.97.71 with SMTP id dy7mr11034798wib.35.1390815432209; Mon, 27 Jan 2014 01:37:12 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id el1sm16267451wib.4.2014.01.27.01.37.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jan 2014 01:37:11 -0800 (PST) From: Will Newton To: libc-ports@sourceware.org Cc: patches@linaro.org Subject: [PATCH] ARM: Add SystemTap probes to longjmp and setjmp. Date: Mon, 27 Jan 2014 09:37:06 +0000 Message-Id: <1390815426-10792-1-git-send-email-will.newton@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now the ARM port implements pointer encryption for jmpbufs, gdb needs a SystemTap probe point in longjmp to determine the target PC of a call to longjmp. This patch implements the probe point in longjmp and a similar probe point in setjmp. In order to have all the appropriate registers available to pass to the probe this reorders the layout of jmpbuf, putting the sp and lr registers at the start rather than the end. Tested on armv7, no new failures in the glibc testsuite and confirmed that this fixes the gdb.base/longjmp.exp failures in the gdb testsuite. ports/ChangeLog.arm: 2014-01-27 Will Newton * sysdeps/arm/__longjmp.S: Include stap-probe.h. (__longjmp): Restore sp and lr before restoring callee saved registers. Add longjmp SystemTap probe point. * sysdeps/arm/include/bits/setjmp.h (__JMP_BUF_SP): Define to zero to match jmpbuf layout. * sysdeps/arm/setjmp.S: Include stap-probe.h. (__sigsetjmp): Save sp and lr before saving callee saved registers. Add setjmp SystemTap probe point. --- ports/sysdeps/arm/__longjmp.S | 21 ++++++++++++++------- ports/sysdeps/arm/include/bits/setjmp.h | 2 +- ports/sysdeps/arm/setjmp.S | 12 +++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index 27c57a1..ad5fa9f 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -25,24 +26,21 @@ ENTRY (__longjmp) mov ip, r0 - movs r0, r1 /* get the return value in place */ - it eq - moveq r0, #1 /* can't let setjmp() return zero! */ #ifdef CHECK_SP sfi_breg ip, \ - ldr r4, [\B, #32] /* jmpbuf's sp */ + ldr r4, [\B] /* jmpbuf's sp */ cfi_undefined (r4) #ifdef PTR_DEMANGLE PTR_DEMANGLE (r4, r4, a3, a4) #endif CHECK_SP (r4) #endif - sfi_sp sfi_breg ip, \ - ldmia \B!, JMP_BUF_REGLIST + #ifdef PTR_DEMANGLE ldr a4, [ip], #4 - PTR_DEMANGLE (a4, a4, a3, a2) + PTR_DEMANGLE (a4, a4, a3, r4) + cfi_undefined (r4) mov sp, a4 ldr a4, [ip], #4 PTR_DEMANGLE2 (lr, a4, a3) @@ -50,6 +48,11 @@ ENTRY (__longjmp) ldr sp, [ip], #4 ldr lr, [ip], #4 #endif + /* longjmp probe expects longjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r14), respectively. */ + LIBC_PROBE (longjmp, 3, 4@r0, -4@r1, 4@r14) + sfi_sp sfi_breg ip, \ + ldmia \B!, JMP_BUF_REGLIST cfi_restore (v1) cfi_restore (v2) cfi_restore (v3) @@ -61,6 +64,10 @@ ENTRY (__longjmp) cfi_restore (sp) cfi_restore (lr) + movs r0, r1 /* get the return value in place */ + it eq + moveq r0, #1 /* can't let setjmp() return zero! */ + #if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__ # define NEED_HWCAP 1 #endif diff --git a/ports/sysdeps/arm/include/bits/setjmp.h b/ports/sysdeps/arm/include/bits/setjmp.h index 220dfe8..5877c1f 100644 --- a/ports/sysdeps/arm/include/bits/setjmp.h +++ b/ports/sysdeps/arm/include/bits/setjmp.h @@ -30,7 +30,7 @@ # define JMP_BUF_REGLIST {v1-v6, sl, fp} /* Index of __jmp_buf where the sp register resides. */ -# define __JMP_BUF_SP 8 +# define __JMP_BUF_SP 0 #endif #endif /* include/bits/setjmp.h */ diff --git a/ports/sysdeps/arm/setjmp.S b/ports/sysdeps/arm/setjmp.S index b0b45ed..5e55ca5 100644 --- a/ports/sysdeps/arm/setjmp.S +++ b/ports/sysdeps/arm/setjmp.S @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -27,9 +28,11 @@ ENTRY (__sigsetjmp) #endif mov ip, r0 - /* Save registers */ - sfi_breg ip, \ - stmia \B!, JMP_BUF_REGLIST + /* setjmp probe expects sigsetjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r14), respectively. */ + LIBC_PROBE (setjmp, 3, 4@r0, -4@r1, 4@r14) + + /* Save sp and lr */ #ifdef PTR_MANGLE mov a4, sp PTR_MANGLE2 (a4, a4, a3) @@ -40,6 +43,9 @@ ENTRY (__sigsetjmp) str sp, [ip], #4 str lr, [ip], #4 #endif + /* Save registers */ + sfi_breg ip, \ + stmia \B!, JMP_BUF_REGLIST #if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__ # define NEED_HWCAP 1