s390/tracing: pass struct ftrace_regs to ftrace_trace_function

ftrace_trace_function expects a struct ftrace_regs, but the s390
architecure code passes struct pt_regs. This isn't a problem with the
current code because struct ftrace_regs contains only one member:
struct pt_regs. To avoid issues in the future this should be fixed.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 150809c..fa5f688 100644 (file)
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -184,5 +184,7 @@ int main(void)
        OFFSET(__FGRAPH_RET_FP, fgraph_ret_regs, fp);
        DEFINE(__FGRAPH_RET_SIZE, sizeof(struct fgraph_ret_regs));
 #endif
+       OFFSET(__FTRACE_REGS_PT_REGS, ftrace_regs, regs);
+       DEFINE(__FTRACE_REGS_SIZE, sizeof(struct ftrace_regs));
        return 0;
 }

diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index fd27ff9..d2596e0 100644 (file)
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -12,12 +12,19 @@
 #include <asm/export.h>
 
 
-#define STACK_FRAME_SIZE       (STACK_FRAME_OVERHEAD + __PT_SIZE)
-#define STACK_PTREGS           (STACK_FRAME_OVERHEAD)
-#define STACK_PTREGS_GPRS      (STACK_PTREGS + __PT_GPRS)
-#define STACK_PTREGS_PSW       (STACK_PTREGS + __PT_PSW)
-#define STACK_PTREGS_ORIG_GPR2 (STACK_PTREGS + __PT_ORIG_GPR2)
-#define STACK_PTREGS_FLAGS     (STACK_PTREGS + __PT_FLAGS)
+#define STACK_FRAME_SIZE_PTREGS                (STACK_FRAME_OVERHEAD + __PT_SIZE)
+#define STACK_PTREGS                   (STACK_FRAME_OVERHEAD)
+#define STACK_PTREGS_GPRS              (STACK_PTREGS + __PT_GPRS)
+#define STACK_PTREGS_PSW               (STACK_PTREGS + __PT_PSW)
+
+#define STACK_FRAME_SIZE_FREGS         (STACK_FRAME_OVERHEAD + __FTRACE_REGS_SIZE)
+#define STACK_FREGS                    (STACK_FRAME_OVERHEAD)
+#define STACK_FREGS_PTREGS             (STACK_FRAME_OVERHEAD + __FTRACE_REGS_PT_REGS)
+#define STACK_FREGS_PTREGS_GPRS                (STACK_FREGS_PTREGS + __PT_GPRS)
+#define STACK_FREGS_PTREGS_PSW         (STACK_FREGS_PTREGS + __PT_PSW)
+#define STACK_FREGS_PTREGS_ORIG_GPR2   (STACK_FREGS_PTREGS + __PT_ORIG_GPR2)
+#define STACK_FREGS_PTREGS_FLAGS       (STACK_FREGS_PTREGS + __PT_FLAGS)
+
 /* packed stack: allocate just enough for r14, r15 and backchain */
 #define TRACED_FUNC_FRAME_SIZE 24
 
@@ -53,23 +60,23 @@ SYM_CODE_END(ftrace_stub_direct_tramp)
        stg     %r1,__SF_BACKCHAIN(%r15)
        stg     %r0,(__SF_GPRS+8*8)(%r15)
        stg     %r15,(__SF_GPRS+9*8)(%r15)
-       # allocate pt_regs and stack frame for ftrace_trace_function
-       aghi    %r15,-STACK_FRAME_SIZE
-       stg     %r1,(STACK_PTREGS_GPRS+15*8)(%r15)
-       xc      STACK_PTREGS_ORIG_GPR2(8,%r15),STACK_PTREGS_ORIG_GPR2(%r15)
+       # allocate ftrace_regs and stack frame for ftrace_trace_function
+       aghi    %r15,-STACK_FRAME_SIZE_FREGS
+       stg     %r1,(STACK_FREGS_PTREGS_GPRS+15*8)(%r15)
+       xc      STACK_FREGS_PTREGS_ORIG_GPR2(8,%r15),STACK_FREGS_PTREGS_ORIG_GPR2(%r15)
 
        .if \allregs == 1
-       stg     %r14,(STACK_PTREGS_PSW)(%r15)
-       mvghi   STACK_PTREGS_FLAGS(%r15),_PIF_FTRACE_FULL_REGS
+       stg     %r14,(STACK_FREGS_PTREGS_PSW)(%r15)
+       mvghi   STACK_FREGS_PTREGS_FLAGS(%r15),_PIF_FTRACE_FULL_REGS
        .else
-       xc      STACK_PTREGS_FLAGS(8,%r15),STACK_PTREGS_FLAGS(%r15)
+       xc      STACK_FREGS_PTREGS_FLAGS(8,%r15),STACK_FREGS_PTREGS_FLAGS(%r15)
        .endif
 
        lg      %r14,(__SF_GPRS+8*8)(%r1)       # restore original return address
        aghi    %r1,-TRACED_FUNC_FRAME_SIZE
        stg     %r1,__SF_BACKCHAIN(%r15)
-       stg     %r0,(STACK_PTREGS_PSW+8)(%r15)
-       stmg    %r2,%r14,(STACK_PTREGS_GPRS+2*8)(%r15)
+       stg     %r0,(STACK_FREGS_PTREGS_PSW+8)(%r15)
+       stmg    %r2,%r14,(STACK_FREGS_PTREGS_GPRS+2*8)(%r15)
        .endm
 
 SYM_CODE_START(ftrace_regs_caller)
@@ -96,30 +103,30 @@ SYM_CODE_START(ftrace_common)
        lg      %r1,0(%r1)
 #endif
        lgr     %r3,%r14
-       la      %r5,STACK_PTREGS(%r15)
+       la      %r5,STACK_FREGS(%r15)
        BASR_EX %r14,%r1
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 # The j instruction gets runtime patched to a nop instruction.
 # See ftrace_enable_ftrace_graph_caller.
 SYM_INNER_LABEL(ftrace_graph_caller, SYM_L_GLOBAL)
        j       .Lftrace_graph_caller_end
-       lmg     %r2,%r3,(STACK_PTREGS_GPRS+14*8)(%r15)
-       lg      %r4,(STACK_PTREGS_PSW+8)(%r15)
+       lmg     %r2,%r3,(STACK_FREGS_PTREGS_GPRS+14*8)(%r15)
+       lg      %r4,(STACK_FREGS_PTREGS_PSW+8)(%r15)
        brasl   %r14,prepare_ftrace_return
-       stg     %r2,(STACK_PTREGS_GPRS+14*8)(%r15)
+       stg     %r2,(STACK_FREGS_PTREGS_GPRS+14*8)(%r15)
 .Lftrace_graph_caller_end:
 #endif
-       lg      %r0,(STACK_PTREGS_PSW+8)(%r15)
+       lg      %r0,(STACK_FREGS_PTREGS_PSW+8)(%r15)
 #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
-       ltg     %r1,STACK_PTREGS_ORIG_GPR2(%r15)
+       ltg     %r1,STACK_FREGS_PTREGS_ORIG_GPR2(%r15)
        locgrz  %r1,%r0
 #else
-       lg      %r1,STACK_PTREGS_ORIG_GPR2(%r15)
+       lg      %r1,STACK_FREGS_PTREGS_ORIG_GPR2(%r15)
        ltgr    %r1,%r1
        jnz     0f
        lgr     %r1,%r0
 #endif
-0:     lmg     %r2,%r15,(STACK_PTREGS_GPRS+2*8)(%r15)
+0:     lmg     %r2,%r15,(STACK_FREGS_PTREGS_GPRS+2*8)(%r15)
        BR_EX   %r1
 SYM_CODE_END(ftrace_common)
 
@@ -164,11 +171,11 @@ SYM_CODE_END(ftrace_shared_hotpatch_trampoline_exrl)
 
 SYM_CODE_START(arch_rethook_trampoline)
        stg     %r14,(__SF_GPRS+8*8)(%r15)
-       lay     %r15,-STACK_FRAME_SIZE(%r15)
+       lay     %r15,-STACK_FRAME_SIZE_PTREGS(%r15)
        stmg    %r0,%r14,STACK_PTREGS_GPRS(%r15)
 
        # store original stack pointer in backchain and pt_regs
-       lay     %r7,STACK_FRAME_SIZE(%r15)
+       lay     %r7,STACK_FRAME_SIZE_PTREGS(%r15)
        stg     %r7,__SF_BACKCHAIN(%r15)
        stg     %r7,STACK_PTREGS_GPRS+(15*8)(%r15)