From: Catalin Marinas <catalin.marinas@arm.com>
To: Rabin Vincent <rabin@rab.in>
Cc: linux-kernel@vger.kernel.org,
"Abhishek Sagar" <sagar.abhishek@gmail.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Frederic Weisbecker" <fweisbec@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 06/10] ARM: ftrace: add Thumb-2 support
Date: Tue, 16 Mar 2010 10:23:54 +0000 [thread overview]
Message-ID: <tnxsk80r2dh.fsf@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <1268462987-8271-7-git-send-email-rabin@rab.in> (Rabin Vincent's message of "Sat, 13 Mar 2010 12:19:43 +0530")
Hi Rabin,
Rabin Vincent <rabin@rab.in> wrote:
> Fix the mcount routines to build and run on a kernel built with the
> Thumb-2 instruction set:
>
> - Without the BSYM, the following assembler errors appear:
>
> entry-common.S: Assembler messages:
> entry-common.S:179: Error: invalid immediate for address calculation (value = 0x00000004)
I'm still confused by this. I think that's a compiler problem but need
to get some feedback from toolchain people.
> --- a/arch/arm/kernel/entry-common.S
> +++ b/arch/arm/kernel/entry-common.S
> @@ -167,7 +167,8 @@ ENTRY(__gnu_mcount_nc)
> stmdb sp!, {r0-r3, lr}
> ldr r0, =ftrace_trace_function
> ldr r2, [r0]
> - adr r0, ftrace_stub
> + THUMB( orr r2, r2, #1 )
> + adr r0, BSYM(ftrace_stub)
If the ftrace_stub isn't .globl, the code compiles fine. My approach
would be something like this:
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index d085033..5f5aef6 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -122,7 +122,7 @@ ENTRY(__gnu_mcount_nc)
stmdb sp!, {r0-r3, lr}
ldr r0, =ftrace_trace_function
ldr r2, [r0]
- adr r0, ftrace_stub
+ adr r0, 1f
cmp r0, r2
bne gnu_trace
ldmia sp!, {r0-r3, ip, lr}
@@ -132,8 +132,9 @@ gnu_trace:
ldr r1, [sp, #20] @ lr of instrumented routine
mov r0, lr
sub r0, r0, #MCOUNT_INSN_SIZE
- mov lr, pc
+ adr lr, BSYM(2f)
mov pc, r2
+2:
ldmia sp!, {r0-r3, ip, lr}
mov pc, ip
@@ -141,7 +142,7 @@ ENTRY(mcount)
stmdb sp!, {r0-r3, lr}
ldr r0, =ftrace_trace_function
ldr r2, [r0]
- adr r0, ftrace_stub
+ adr r0, 1f
cmp r0, r2
bne trace
ldr lr, [fp, #-4] @ restore lr
@@ -160,6 +161,7 @@ trace:
.globl ftrace_stub
ftrace_stub:
+1:
mov pc, lr
#endif /* CONFIG_FUNCTION_TRACER */
--
Catalin
next prev parent reply other threads:[~2010-03-16 10:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-13 6:49 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace (v2) Rabin Vincent
2010-03-13 6:49 ` [PATCH 01/10] ARM: ftrace: clean up mcount assembly indentation Rabin Vincent
2010-03-13 6:49 ` [PATCH 02/10] ARM: ftrace: document mcount formats Rabin Vincent
2010-03-13 6:49 ` [PATCH 03/10] ftrace: allow building without frame pointers Rabin Vincent
2010-03-13 17:36 ` Steven Rostedt
2010-03-15 18:45 ` Rabin Vincent
2010-03-14 16:56 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 04/10] ARM: " Rabin Vincent
2010-03-13 17:38 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-17 16:16 ` Catalin Marinas
2010-03-13 6:49 ` [PATCH 05/10] ARM: ftrace: add ENDPROC annotations Rabin Vincent
2010-03-13 8:45 ` Russell King - ARM Linux
2010-04-21 19:23 ` Rabin Vincent
2010-08-10 17:07 ` Catalin Marinas
2010-08-10 19:11 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 06/10] ARM: ftrace: add Thumb-2 support Rabin Vincent
2010-03-14 22:30 ` Catalin Marinas
2010-03-15 18:32 ` Rabin Vincent
2010-03-16 10:23 ` Catalin Marinas [this message]
2010-03-31 18:25 ` Rabin Vincent
2010-04-23 15:37 ` Catalin Marinas
2010-03-13 6:49 ` [PATCH 07/10] ftrace: pass KBUILD_CFLAGS to record_mcount.pl Rabin Vincent
2010-03-13 17:41 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-31 18:45 ` Rabin Vincent
2010-08-03 16:42 ` Rabin Vincent
2010-08-06 15:31 ` Frederic Weisbecker
2010-08-06 20:23 ` Steven Rostedt
2010-08-07 5:33 ` Rabin Vincent
2010-08-07 12:57 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 08/10] ARM: ftrace: fix and update dynamic ftrace Rabin Vincent
2010-03-13 17:42 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 09/10] ARM: ftrace: add Thumb-2 support to " Rabin Vincent
2010-03-13 6:49 ` [PATCH 10/10] ARM: ftrace: enable " Rabin Vincent
2010-04-21 19:26 ` [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace (v2) Rabin Vincent
-- strict thread matches above, loose matches on Subject: below --
2010-02-13 19:48 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace Rabin Vincent
2010-02-13 19:48 ` [PATCH 06/10] ARM: ftrace: add Thumb-2 support Rabin Vincent
2010-02-13 23:27 ` Catalin Marinas
2010-02-14 16:38 ` Rabin Vincent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tnxsk80r2dh.fsf@e102109-lin.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--cc=fweisbec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rabin@rab.in \
--cc=rostedt@goodmis.org \
--cc=sagar.abhishek@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®