From patchwork Wed Feb 5 09:56:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 24160 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F001220675 for ; Wed, 5 Feb 2014 09:56:09 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id c41sf311529yho.1 for ; Wed, 05 Feb 2014 01:56:09 -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=udy5g8O/2rt2QIlyGTEtW5SHj6aMDxBhop67L2rcnTc=; b=F50cf2/wEaKFdWMVwCEE3wxyQi8tE8t/Ly5Fr+47Yly1gYGhhpyYU4MktgwrJkp5eM n15AWgHI48CbGx2MGWNvCBBltD422FQdquD7VAEtvlKHJpOm8BDXzNf7+Vu6WW8BgOSb WnNi4lehSFTgnyeZKdswoC/jtgb51BhV6HjyEO7ssZ7KafsfzQzN23hEkUrvB+CUznqv E2HBO+jxZvj2bgtnqaRlKjb/+EpdMLDODgn3+rlGETZvRI5NDLs0XNhQe9PQ0Xnq8kvV 86Nofp7kZakoNYoCcWXhu9fhB6PfulvXFuKSqtWO/Zb0wkEmONen2p1fqOi21dhPGUGf cbhQ== X-Gm-Message-State: ALoCoQmaZGrSfG312M0XEyaeVEcXID7C8kICGH8BFIDtVcoE5Rq9BjKv2xE1y82DLMqnqLw3MEYG X-Received: by 10.58.32.131 with SMTP id j3mr17324543vei.13.1391594169142; Wed, 05 Feb 2014 01:56:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.9 with SMTP id l9ls33303qga.13.gmail; Wed, 05 Feb 2014 01:56:09 -0800 (PST) X-Received: by 10.221.29.196 with SMTP id rz4mr328493vcb.8.1391594169088; Wed, 05 Feb 2014 01:56:09 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id us10si9545010vcb.134.2014.02.05.01.56.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 01:56:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id p14so105201vbm.39 for ; Wed, 05 Feb 2014 01:56:09 -0800 (PST) X-Received: by 10.221.55.133 with SMTP id vy5mr278308vcb.17.1391594168987; Wed, 05 Feb 2014 01:56:08 -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 u4csp32468vcz; Wed, 5 Feb 2014 01:56:08 -0800 (PST) X-Received: by 10.194.175.66 with SMTP id by2mr438518wjc.59.1391594167797; Wed, 05 Feb 2014 01:56:07 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id c8si8954932wix.16.2014.02.05.01.56.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 01:56:07 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id n12so111252wgh.0 for ; Wed, 05 Feb 2014 01:56:07 -0800 (PST) X-Received: by 10.194.82.69 with SMTP id g5mr438565wjy.85.1391594167237; Wed, 05 Feb 2014 01:56:07 -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 h13sm60124602wjr.22.2014.02.05.01.56.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2014 01:56:06 -0800 (PST) From: Will Newton To: libc-ports@sourceware.org Cc: patches@linaro.org Subject: [PATCH v2] ARM: Add SystemTap probes to longjmp and setjmp. Date: Wed, 5 Feb 2014 09:56:02 +0000 Message-Id: <1391594162-22269-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.212.52 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 points 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 and longjmp_target 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 | 61 ++++++++++++++++++++------------- ports/sysdeps/arm/include/bits/setjmp.h | 2 +- ports/sysdeps/arm/setjmp.S | 12 +++++-- 3 files changed, 47 insertions(+), 28 deletions(-) Changes in v2: - Add longjmp_target probe - Move longjmp probe up to point before restore of sp/lr diff --git a/ports/sysdeps/arm/__longjmp.S b/ports/sysdeps/arm/__longjmp.S index 27c57a1..08521e5 100644 --- a/ports/sysdeps/arm/__longjmp.S +++ b/ports/sysdeps/arm/__longjmp.S @@ -17,6 +17,7 @@ . */ #include +#include #include #include #include @@ -25,31 +26,35 @@ 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) - mov sp, a4 - ldr a4, [ip], #4 - PTR_DEMANGLE2 (lr, a4, a3) + PTR_DEMANGLE (a4, a4, a3, r4) + cfi_undefined (r4) + ldr r4, [ip], #4 + PTR_DEMANGLE2 (r4, r4, a3) #else - ldr sp, [ip], #4 - ldr lr, [ip], #4 + ldr a4, [ip], #4 + ldr r4, [ip], #4 + cfi_undefined (r4) #endif + /* longjmp probe expects longjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r4), respectively. */ + LIBC_PROBE (longjmp, 3, 4@r0, -4@r1, 4@r4) + mov sp, a4 + mov lr, r4 + sfi_sp sfi_breg ip, \ + ldmia \B!, JMP_BUF_REGLIST cfi_restore (v1) cfi_restore (v2) cfi_restore (v3) @@ -67,27 +72,27 @@ ENTRY (__longjmp) #ifdef NEED_HWCAP # ifdef IS_IN_rtld - ldr a2, 1f + ldr a4, 1f ldr a3, .Lrtld_local_ro -0: add a2, pc, a2 - add a2, a2, a3 - ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] +0: add a4, pc, a4 + add a4, a4, a3 + ldr a4, [a4, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] # else # ifdef PIC - ldr a2, 1f + ldr a4, 1f ldr a3, .Lrtld_global_ro -0: add a2, pc, a2 - ldr a2, [a2, a3] - ldr a2, [a2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] +0: add a4, pc, a4 + ldr a4, [a4, a3] + ldr a4, [a4, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] # else - ldr a2, .Lhwcap - ldr a2, [a2, #0] + ldr a4, .Lhwcap + ldr a4, [a4, #0] # endif # endif #endif #ifdef __SOFTFP__ - tst a2, #HWCAP_ARM_VFP + tst a4, #HWCAP_ARM_VFP beq .Lno_vfp #endif @@ -98,7 +103,7 @@ ENTRY (__longjmp) .Lno_vfp: #ifndef ARM_ASSUME_NO_IWMMXT - tst a2, #HWCAP_ARM_IWMMXT + tst a4, #HWCAP_ARM_IWMMXT beq .Lno_iwmmxt /* Restore the call-preserved iWMMXt registers. */ @@ -118,6 +123,14 @@ ENTRY (__longjmp) .Lno_iwmmxt: #endif + /* longjmp_target probe expects longjmp first argument (4@r0), second + argument (-4@r1), and target address (4@r14), respectively. */ + LIBC_PROBE (longjmp_target, 3, 4@r0, -4@r1, 4@r14) + + movs r0, r1 /* get the return value in place */ + it eq + moveq r0, #1 /* can't let setjmp() return zero! */ + DO_RET(lr) #ifdef NEED_HWCAP 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