ARM: 9258/1: stacktrace: Make stack walk callback consistent with generic code

As with the generic arch_stack_walk() code the ARM stack walk code takes
a callback that is called per stack frame. Currently the ARM code always
passes a struct stackframe to the callback and the generic code just
passes the pc, however none of the users ever reference anything in the
struct other than the pc value. The ARM code also uses a return type of
int while the generic code uses a return type of bool though in both
cases the return value is a boolean value and the sense is inverted
between the two.

In order to reduce code duplication when ARM is converted to use
arch_stack_walk() change the signature and return sense of the ARM
specific callback to match that of the generic code.

Signed-off-by: Li Huafei <lihuafei1@huawei.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Linus Waleij <linus.walleij@linaro.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stacktrace.h
index 36b2ff44fcbbc924fe25b50e996c8c72e3cf4c57..360f0d2406bfa08364086e885157a3a02459c277 100644 (file)
--- a/arch/arm/include/asm/stacktrace.h
+++ b/arch/arm/include/asm/stacktrace.h
@@ -44,7 +44,7 @@ void arm_get_current_stackframe(struct pt_regs *regs, struct stackframe *frame)
 
 extern int unwind_frame(struct stackframe *frame);
 extern void walk_stackframe(struct stackframe *frame,
-                           int (*fn)(struct stackframe *, void *), void *data);
+                           bool (*fn)(void *, unsigned long), void *data);
 extern void dump_mem(const char *lvl, const char *str, unsigned long bottom,
                     unsigned long top);
 extern void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk,

diff --git a/arch/arm/kernel/perf_callchain.c b/arch/arm/kernel/perf_callchain.c
index bc6b246ab55e02076b291e9387a6104e66011111..7147edbe56c67c41915c5fa8ae11a3b5493261d3 100644 (file)
--- a/arch/arm/kernel/perf_callchain.c
+++ b/arch/arm/kernel/perf_callchain.c
@@ -81,13 +81,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
  * whist unwinding the stackframe and is like a subroutine return so we use
  * the PC.
  */
-static int
-callchain_trace(struct stackframe *fr,
-               void *data)
+static bool
+callchain_trace(void *data, unsigned long pc)
 {
        struct perf_callchain_entry_ctx *entry = data;
-       perf_callchain_store(entry, fr->pc);
-       return 0;
+       perf_callchain_store(entry, pc);
+       return true;
 }
 
 void

diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index 38f1ea9c724d5fd4bc813c389b1d03f0bb3e9820..ac15db66df4cd64aac95a778d3c8541fbce60729 100644 (file)
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -16,17 +16,17 @@ struct return_address_data {
        void *addr;
 };
 
-static int save_return_addr(struct stackframe *frame, void *d)
+static bool save_return_addr(void *d, unsigned long pc)
 {
        struct return_address_data *data = d;
 
        if (!data->level) {
-               data->addr = (void *)frame->pc;
+               data->addr = (void *)pc;
 
-               return 1;
+               return false;
        } else {
                --data->level;
-               return 0;
+               return true;
        }
 }
 

diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c
index 85443b5d1922151e7d9bb4ac6cb38da11a626740..d05968bc7812302c2487401a5cbc7afa74998320 100644 (file)
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
@@ -127,12 +127,12 @@ int notrace unwind_frame(struct stackframe *frame)
 #endif
 
 void notrace walk_stackframe(struct stackframe *frame,
-                    int (*fn)(struct stackframe *, void *), void *data)
+                    bool (*fn)(void *, unsigned long), void *data)
 {
        while (1) {
                int ret;
 
-               if (fn(frame, data))
+               if (!fn(data, frame->pc))
                        break;
                ret = unwind_frame(frame);
                if (ret < 0)
@@ -148,21 +148,20 @@ struct stack_trace_data {
        unsigned int skip;
 };
 
-static int save_trace(struct stackframe *frame, void *d)
+static bool save_trace(void *d, unsigned long addr)
 {
        struct stack_trace_data *data = d;
        struct stack_trace *trace = data->trace;
-       unsigned long addr = frame->pc;
 
        if (data->no_sched_functions && in_sched_functions(addr))
-               return 0;
+               return true;
        if (data->skip) {
                data->skip--;
-               return 0;
+               return true;
        }
 
        trace->entries[trace->nr_entries++] = addr;
-       return trace->nr_entries >= trace->max_entries;
+       return trace->nr_entries < trace->max_entries;
 }
 
 /* This must be noinline to so that our skip calculation works correctly */