From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755351AbaD1KlQ (ORCPT ); Mon, 28 Apr 2014 06:41:16 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:40114 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754500AbaD1KlO (ORCPT ); Mon, 28 Apr 2014 06:41:14 -0400 Message-ID: <535E3040.7090402@linaro.org> Date: Mon, 28 Apr 2014 19:41:04 +0900 From: AKASHI Takahiro User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Will Deacon CC: "rostedt@goodmis.org" , "fweisbec@gmail.com" , "mingo@redhat.com" , Catalin Marinas , "tim.bird@sonymobile.com" , "gkulkarni@caviumnetworks.com" , "dsaxena@linaro.org" , "arndb@arndb.de" , "linux-arm-kernel@lists.infradead.org" , "linaro-kernel@lists.linaro.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v7 6/7] arm64: ftrace: Add CALLER_ADDRx macros References: <1394705630-12384-1-git-send-email-takahiro.akashi@linaro.org> <1394862353-28963-7-git-send-email-takahiro.akashi@linaro.org> <20140416135217.GF1001@arm.com> In-Reply-To: <20140416135217.GF1001@arm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Will, On 04/16/2014 10:52 PM, Will Deacon wrote: > On Sat, Mar 15, 2014 at 05:45:52AM +0000, AKASHI Takahiro wrote: >> CALLER_ADDRx returns caller's address at specified level in call stacks. >> They are used for several tracers like irqsoff and preemptoff. >> Strange to say, however, they are refered even without FTRACE. >> >> Signed-off-by: AKASHI Takahiro >> --- >> arch/arm64/include/asm/ftrace.h | 13 ++++++++- >> arch/arm64/kernel/Makefile | 3 ++- >> arch/arm64/kernel/return_address.c | 55 ++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 69 insertions(+), 2 deletions(-) >> create mode 100644 arch/arm64/kernel/return_address.c >> >> diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h >> index ed5c448..c44c4b1 100644 >> --- a/arch/arm64/include/asm/ftrace.h >> +++ b/arch/arm64/include/asm/ftrace.h >> @@ -18,6 +18,7 @@ >> >> #ifndef __ASSEMBLY__ >> extern void _mcount(unsigned long); >> +extern void *return_address(unsigned int); >> >> struct dyn_arch_ftrace { >> /* No extra data needed for arm64 */ >> @@ -33,6 +34,16 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) >> */ >> return addr; >> } >> -#endif /* __ASSEMBLY__ */ >> + >> +#define HAVE_ARCH_CALLER_ADDR >> + >> +#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) >> +#define CALLER_ADDR1 ((unsigned long)return_address(1)) >> +#define CALLER_ADDR2 ((unsigned long)return_address(2)) >> +#define CALLER_ADDR3 ((unsigned long)return_address(3)) >> +#define CALLER_ADDR4 ((unsigned long)return_address(4)) >> +#define CALLER_ADDR5 ((unsigned long)return_address(5)) >> +#define CALLER_ADDR6 ((unsigned long)return_address(6)) >> +#endif /* ifndef __ASSEMBLY__ */ > > Hmm, I thought you were going to take a look at reworking the core code for > this, as Steve and I suggested? > > http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/240239.html Sorry that I've forgot to submit a new revision with this change. I will post it soon. Thanks, -Takahiro AKASHI > Will >