History

MIPS: mcount: Adjust stack pointer for static trace in MIPS32

Every mcount() call in the MIPS 32-bit kernel is done as follows: [...] move at, ra jal _mcount addiu sp, sp, -8 [...] but upon returning from the mcount() function, the stack pointer is not adjusted properly. This is explained in details in 58b69401c797 (MIPS: Function tracer: Fix broken function tracing). Commit ad8c396936e3 ("MIPS: Unbreak function tracer for 64-bit kernel.) fixed the stack manipulation for 64-bit but it didn't fix it completely for MIPS32.

Markos Chandras committed 12 years ago

Commit 8a574cf1 parent c8c0da61 file · +12 −0Browse files

Unified · Split

arch/mips/kernel/mcount.S+12−0
@@ -129,7 +129,11 @@ NESTED(_mcount, PT_SIZE, ra) · 128 unmodified lines
129129 nop
130130 #endif
131131 b ftrace_stub
132+#ifdef CONFIG_32BIT
133+ addiu sp, sp, 8
134+#else
132135 nop
136+#endif
133137
134138 static_trace:
135139 MCOUNT_SAVE_REGS
@@ -139,6 +143,9 @@ static_trace: · 3 unmodified lines
139143 move a1, AT /* arg2: parent's return address */
140144
141145 MCOUNT_RESTORE_REGS
146+#ifdef CONFIG_32BIT
147+ addiu sp, sp, 8
148+#endif
142149 .globl ftrace_stub
143150 ftrace_stub:
144151 RETURN_BACK
@@ -183,6 +190,11 @@ NESTED(ftrace_graph_caller, PT_SIZE, ra) · 38 unmodified lines
183190 jal prepare_ftrace_return
184191 nop
185192 MCOUNT_RESTORE_REGS
193+#ifndef CONFIG_DYNAMIC_FTRACE
194+#ifdef CONFIG_32BIT
195+ addiu sp, sp, 8
196+#endif
197+#endif
186198 RETURN_BACK
187199 END(ftrace_graph_caller)
188200

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t