Skip to contentSkip to conversation

powerpc/ftrace: linker fixes

GIT PULL New Steven Rostedt 1 participant 3 messages Oct 14, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

Benjamin,

Please pull the latest ppc/ftrace tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
ppc/ftrace

Steven Rostedt (2):
powerpc/ftrace: show real return addresses in modules powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler

----

 arch/powerpc/kernel/entry_64.S |    3 +--
 arch/powerpc/kernel/process.c  |   10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
#1 lore raw

PATCH 1/2 powerpc/ftrace: show real return addresses in modules

From: Steven Rostedt <[email protected]>

When the function graph tracer is enabled, it replaces the return address with a hook back to the tracer. This makes back traces see the hook instead of the actual return address.

The current code also shows the real address by checking if the return address jumps to the return_to_handler. If it is, is also prints out the saved real return address.

On powerpc64, some modules may return to mod_return_to_handler, which is not checked. This patch will also show the real address if a return is to mod_return_to_handler as well.

---
 arch/powerpc/kernel/process.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
arch/powerpc/kernel/process.c +7 -3
index 1168c5f..2ec1eae 100644
@@ -1016,9 +1016,13 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 	int curr_frame = current->curr_ret_stack;
 	extern void return_to_handler(void);
-	unsigned long addr = (unsigned long)return_to_handler;
+	unsigned long rth = (unsigned long)return_to_handler;
+	unsigned long mrth = -1;
 #ifdef CONFIG_PPC64
-	addr = *(unsigned long*)addr;
+	extern void mod_return_to_handler(void);
+	rth = *(unsigned long *)rth;
+	mrth = (unsigned long)mod_return_to_handler;
+	mrth = *(unsigned long *)mrth;
 #endif
 #endif
 
@@ -1044,7 +1048,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
 		if (!firstframe || ip != lr) {
 			printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-			if (ip == addr && curr_frame >= 0) {
+			if ((ip == rth || ip == mrth) && curr_frame >= 0) {
 				printk(" (%pS)",
 				       (void *)current->ret_stack[curr_frame].ret);
 				curr_frame--;
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH 2/2 powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler

In reply to Steven Rostedt

From: Steven Rostedt <[email protected]>

The mod_return_to_handler needs to switch to the kernel TOC before jumping to a the kernel code. It currently does this by looking at the kernel function data and retrieves the TOC that way.

Not only is this inefficient, it also breaks with a relocatable kernel. The PACA contains the kernel TOC and we can easily retrieve it that way.

---
 arch/powerpc/kernel/entry_64.S |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/powerpc/kernel/entry_64.S +1 -2
index 900e0ee..f9fd54b 100644
@@ -1038,8 +1038,7 @@ _GLOBAL(mod_return_to_handler)
 	 * We are in a module using the module's TOC.
 	 * Switch to our TOC to run inside the core kernel.
 	 */
-	LOAD_REG_IMMEDIATE(r4,ftrace_return_to_handler)
-	ld	r2, 8(r4)
+	ld	r2, PACATOC(r13)
 
 	bl	.ftrace_return_to_handler
 	nop
Signature · 1 line
1.6.3.3