From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-arch@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, H.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 3/4] ia64 mcount offset calculation
Date: Tue, 10 May 2011 10:10:42 +0200 [thread overview]
Message-ID: <20110510081103.902546467@de.ibm.com> (raw)
In-Reply-To: 20110510081039.241831019@de.ibm.com
[-- Attachment #1: 302-mcount-adjust-ia64.diff --]
[-- Type: text/plain, Size: 2241 bytes --]
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Do the mcount offset adjustment in the recordmcount.pl/recordmcount.[ch]
at compile time and not in ftrace_call_adjust at run time.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/ia64/include/asm/ftrace.h | 7 +++++--
scripts/recordmcount.c | 7 ++++++-
scripts/recordmcount.pl | 1 +
3 files changed, 12 insertions(+), 3 deletions(-)
Index: test-2.6/arch/ia64/include/asm/ftrace.h
===================================================================
--- test-2.6.orig/arch/ia64/include/asm/ftrace.h 2010-01-11 10:58:31.000000000 +0100
+++ test-2.6/arch/ia64/include/asm/ftrace.h 2011-05-03 09:39:04.929486388 +0200
@@ -14,8 +14,11 @@
static inline unsigned long ftrace_call_adjust(unsigned long addr)
{
- /* second bundle, insn 2 */
- return addr - 0x12;
+ /*
+ * addr is the address of the mcount call instruction.
+ * recordmcount does the necessary offset calculation.
+ */
+ return addr;
}
struct dyn_arch_ftrace {
Index: test-2.6/scripts/recordmcount.c
===================================================================
--- test-2.6.orig/scripts/recordmcount.c 2011-05-03 09:39:02.145472579 +0200
+++ test-2.6/scripts/recordmcount.c 2011-05-03 09:39:04.929486388 +0200
@@ -307,7 +307,12 @@
case EM_ARM: reltype = R_ARM_ABS32;
altmcount = "__gnu_mcount_nc";
break;
- case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
+ case EM_IA_64:
+ reltype = R_IA64_IMM64;
+ /* Adjust relocation to second bundle, insn 2 */
+ mcount_adjust_32 = -18;
+ gpfx = '_';
+ break;
case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break;
Index: test-2.6/scripts/recordmcount.pl
===================================================================
--- test-2.6.orig/scripts/recordmcount.pl 2011-05-03 09:39:02.145472579 +0200
+++ test-2.6/scripts/recordmcount.pl 2011-05-03 09:39:04.929486388 +0200
@@ -278,6 +278,7 @@
} elsif ($arch eq "ia64") {
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+ $mcount_adjust = -18;
$type = "data8";
if ($is_module eq "0") {
WARNING: multiple messages have this Message-ID (diff)
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-arch@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>, Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Russell King <linux@arm.linux.org.uk>,
Rabin Vincent <rabin@rab.in>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 3/4] ia64 mcount offset calculation
Date: Tue, 10 May 2011 10:10:42 +0200 [thread overview]
Message-ID: <20110510081103.902546467@de.ibm.com> (raw)
Message-ID: <20110510081042.JhUb5pi-u_vomWuaWvp0cWpwBB-QtEhpohe-peuESlw@z> (raw)
In-Reply-To: 20110510081039.241831019@de.ibm.com
[-- Attachment #1: 302-mcount-adjust-ia64.diff --]
[-- Type: text/plain, Size: 2242 bytes --]
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Do the mcount offset adjustment in the recordmcount.pl/recordmcount.[ch]
at compile time and not in ftrace_call_adjust at run time.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/ia64/include/asm/ftrace.h | 7 +++++--
scripts/recordmcount.c | 7 ++++++-
scripts/recordmcount.pl | 1 +
3 files changed, 12 insertions(+), 3 deletions(-)
Index: test-2.6/arch/ia64/include/asm/ftrace.h
===================================================================
--- test-2.6.orig/arch/ia64/include/asm/ftrace.h 2010-01-11 10:58:31.000000000 +0100
+++ test-2.6/arch/ia64/include/asm/ftrace.h 2011-05-03 09:39:04.929486388 +0200
@@ -14,8 +14,11 @@
static inline unsigned long ftrace_call_adjust(unsigned long addr)
{
- /* second bundle, insn 2 */
- return addr - 0x12;
+ /*
+ * addr is the address of the mcount call instruction.
+ * recordmcount does the necessary offset calculation.
+ */
+ return addr;
}
struct dyn_arch_ftrace {
Index: test-2.6/scripts/recordmcount.c
===================================================================
--- test-2.6.orig/scripts/recordmcount.c 2011-05-03 09:39:02.145472579 +0200
+++ test-2.6/scripts/recordmcount.c 2011-05-03 09:39:04.929486388 +0200
@@ -307,7 +307,12 @@
case EM_ARM: reltype = R_ARM_ABS32;
altmcount = "__gnu_mcount_nc";
break;
- case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break;
+ case EM_IA_64:
+ reltype = R_IA64_IMM64;
+ /* Adjust relocation to second bundle, insn 2 */
+ mcount_adjust_32 = -18;
+ gpfx = '_';
+ break;
case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break;
case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break;
case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break;
Index: test-2.6/scripts/recordmcount.pl
===================================================================
--- test-2.6.orig/scripts/recordmcount.pl 2011-05-03 09:39:02.145472579 +0200
+++ test-2.6/scripts/recordmcount.pl 2011-05-03 09:39:04.929486388 +0200
@@ -278,6 +278,7 @@
} elsif ($arch eq "ia64") {
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+ $mcount_adjust = -18;
$type = "data8";
if ($is_module eq "0") {
next prev parent reply other threads:[~2011-05-10 8:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-10 8:10 [patch 0/4] [RFC] mcount address adjustment Martin Schwidefsky
2011-05-10 8:10 ` Martin Schwidefsky
2011-05-10 8:10 ` [patch 1/4] recordmcount " Martin Schwidefsky
2011-05-10 8:10 ` Martin Schwidefsky
2011-05-10 8:10 ` [patch 2/4] x86 mcount offset calculation Martin Schwidefsky
2011-05-10 8:10 ` Martin Schwidefsky
2011-05-10 8:10 ` Martin Schwidefsky [this message]
2011-05-10 8:10 ` [patch 3/4] ia64 " Martin Schwidefsky
2011-05-16 18:58 ` Steven Rostedt
2011-05-16 19:17 ` Luck, Tony
2011-05-16 19:17 ` Luck, Tony
2011-05-16 20:41 ` Steven Rostedt
2011-05-17 8:04 ` Martin Schwidefsky
2011-05-17 11:20 ` Steven Rostedt
2011-05-10 8:10 ` [patch 4/4] s390 " Martin Schwidefsky
2011-05-10 8:10 ` Martin Schwidefsky
2011-05-11 17:23 ` [patch 0/4] [RFC] mcount address adjustment Rabin Vincent
2011-05-12 9:24 ` Martin Schwidefsky
2011-05-12 13:30 ` Rabin Vincent
2011-05-16 12:57 ` Dave Martin
2011-05-16 14:28 ` Steven Rostedt
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=20110510081103.902546467@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=fweisbec@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.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;
as well as URLs for NNTP newsgroup(s).