* [PATCH v3 1/3] stacktrace: Remove reliable argument from arch_stack_walk() callback
2020-09-14 15:34 [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK Mark Brown
@ 2020-09-14 15:34 ` Mark Brown
2020-09-14 15:34 ` [PATCH v3 2/3] arm64: stacktrace: Make stack walk callback consistent with generic code Mark Brown
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-09-14 15:34 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Rutland, Vasily Gorbik, Heiko Carstens, Borislav Petkov,
Thomas Gleixner, H . Peter Anvin, Christian Borntraeger,
Ingo Molnar, Jiri Slaby, Miroslav Benes, x86, linux-arm-kernel,
linux-s390, linux-kernel, Mark Brown
Currently the callback passed to arch_stack_walk() has an argument called
reliable passed to it to indicate if the stack entry is reliable, a comment
says that this is used by some printk() consumers. However in the current
kernel none of the arch_stack_walk() implementations ever set this flag to
true and the only callback implementation we have is in the generic
stacktrace code which ignores the flag. It therefore appears that this
flag is redundant so we can simplify and clarify things by removing it.
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
---
arch/s390/kernel/stacktrace.c | 4 ++--
arch/x86/kernel/stacktrace.c | 10 +++++-----
include/linux/stacktrace.h | 5 +----
kernel/stacktrace.c | 8 +++-----
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c
index fc5419ac64c8..7f1266c24f6b 100644
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@ -19,7 +19,7 @@ void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
unwind_for_each_frame(&state, task, regs, 0) {
addr = unwind_get_return_address(&state);
- if (!addr || !consume_entry(cookie, addr, false))
+ if (!addr || !consume_entry(cookie, addr))
break;
}
}
@@ -56,7 +56,7 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,
return -EINVAL;
#endif
- if (!consume_entry(cookie, addr, false))
+ if (!consume_entry(cookie, addr))
return -EINVAL;
}
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 2fd698e28e4d..8627fda8d993 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -18,13 +18,13 @@ void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
struct unwind_state state;
unsigned long addr;
- if (regs && !consume_entry(cookie, regs->ip, false))
+ if (regs && !consume_entry(cookie, regs->ip))
return;
for (unwind_start(&state, task, regs, NULL); !unwind_done(&state);
unwind_next_frame(&state)) {
addr = unwind_get_return_address(&state);
- if (!addr || !consume_entry(cookie, addr, false))
+ if (!addr || !consume_entry(cookie, addr))
break;
}
}
@@ -72,7 +72,7 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,
if (!addr)
return -EINVAL;
- if (!consume_entry(cookie, addr, false))
+ if (!consume_entry(cookie, addr))
return -EINVAL;
}
@@ -114,7 +114,7 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
{
const void __user *fp = (const void __user *)regs->bp;
- if (!consume_entry(cookie, regs->ip, false))
+ if (!consume_entry(cookie, regs->ip))
return;
while (1) {
@@ -128,7 +128,7 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
break;
if (!frame.ret_addr)
break;
- if (!consume_entry(cookie, frame.ret_addr, false))
+ if (!consume_entry(cookie, frame.ret_addr))
break;
fp = frame.next_fp;
}
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index b7af8cc13eda..50e2df30b0aa 100644
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -29,14 +29,11 @@ unsigned int stack_trace_save_user(unsigned long *store, unsigned int size);
* stack_trace_consume_fn - Callback for arch_stack_walk()
* @cookie: Caller supplied pointer handed back by arch_stack_walk()
* @addr: The stack entry address to consume
- * @reliable: True when the stack entry is reliable. Required by
- * some printk based consumers.
*
* Return: True, if the entry was consumed or skipped
* False, if there is no space left to store
*/
-typedef bool (*stack_trace_consume_fn)(void *cookie, unsigned long addr,
- bool reliable);
+typedef bool (*stack_trace_consume_fn)(void *cookie, unsigned long addr);
/**
* arch_stack_walk - Architecture specific function to walk the stack
* @consume_entry: Callback which is invoked by the architecture code for
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index 946f44a9e86a..9f8117c7cfdd 100644
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
@@ -78,8 +78,7 @@ struct stacktrace_cookie {
unsigned int len;
};
-static bool stack_trace_consume_entry(void *cookie, unsigned long addr,
- bool reliable)
+static bool stack_trace_consume_entry(void *cookie, unsigned long addr)
{
struct stacktrace_cookie *c = cookie;
@@ -94,12 +93,11 @@ static bool stack_trace_consume_entry(void *cookie, unsigned long addr,
return c->len < c->size;
}
-static bool stack_trace_consume_entry_nosched(void *cookie, unsigned long addr,
- bool reliable)
+static bool stack_trace_consume_entry_nosched(void *cookie, unsigned long addr)
{
if (in_sched_functions(addr))
return true;
- return stack_trace_consume_entry(cookie, addr, reliable);
+ return stack_trace_consume_entry(cookie, addr);
}
/**
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/3] arm64: stacktrace: Make stack walk callback consistent with generic code
2020-09-14 15:34 [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK Mark Brown
2020-09-14 15:34 ` [PATCH v3 1/3] stacktrace: Remove reliable argument from arch_stack_walk() callback Mark Brown
@ 2020-09-14 15:34 ` Mark Brown
2020-09-14 15:34 ` [PATCH v3 3/3] arm64: stacktrace: Convert to ARCH_STACKWALK Mark Brown
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-09-14 15:34 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Rutland, Vasily Gorbik, Heiko Carstens, Borislav Petkov,
Thomas Gleixner, H . Peter Anvin, Christian Borntraeger,
Ingo Molnar, Jiri Slaby, Miroslav Benes, x86, linux-arm-kernel,
linux-s390, linux-kernel, Mark Brown
As with the generic arch_stack_walk() code the arm64 stack walk code takes
a callback that is called per stack frame. Currently the arm64 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 arm64 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 arm64 is converted to use
arch_stack_walk() change the signature and return sense of the arm64
specific callback to match that of the generic code.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/stacktrace.h | 2 +-
arch/arm64/kernel/perf_callchain.c | 6 +++---
arch/arm64/kernel/return_address.c | 8 ++++----
arch/arm64/kernel/stacktrace.c | 11 +++++------
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/include/asm/stacktrace.h b/arch/arm64/include/asm/stacktrace.h
index fc7613023c19..eb29b1fe8255 100644
--- a/arch/arm64/include/asm/stacktrace.h
+++ b/arch/arm64/include/asm/stacktrace.h
@@ -63,7 +63,7 @@ struct stackframe {
extern int unwind_frame(struct task_struct *tsk, struct stackframe *frame);
extern void walk_stackframe(struct task_struct *tsk, struct stackframe *frame,
- int (*fn)(struct stackframe *, void *), void *data);
+ bool (*fn)(void *, unsigned long), void *data);
extern void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk,
const char *loglvl);
diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c
index b0e03e052dd1..88ff471b0bce 100644
--- a/arch/arm64/kernel/perf_callchain.c
+++ b/arch/arm64/kernel/perf_callchain.c
@@ -137,11 +137,11 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
* whist unwinding the stackframe and is like a subroutine return so we use
* the PC.
*/
-static int callchain_trace(struct stackframe *frame, void *data)
+static bool callchain_trace(void *data, unsigned long pc)
{
struct perf_callchain_entry_ctx *entry = data;
- perf_callchain_store(entry, frame->pc);
- return 0;
+ perf_callchain_store(entry, pc);
+ return true;
}
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
diff --git a/arch/arm64/kernel/return_address.c b/arch/arm64/kernel/return_address.c
index a5e8b3b9d798..a6d18755652f 100644
--- a/arch/arm64/kernel/return_address.c
+++ b/arch/arm64/kernel/return_address.c
@@ -18,16 +18,16 @@ 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;
- return 1;
+ data->addr = (void *)pc;
+ return false;
} else {
--data->level;
- return 0;
+ return true;
}
}
NOKPROBE_SYMBOL(save_return_addr);
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index 2dd8e3b8b94b..05eaba21fd46 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -118,12 +118,12 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)
NOKPROBE_SYMBOL(unwind_frame);
void notrace walk_stackframe(struct task_struct *tsk, 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(tsk, frame);
if (ret < 0)
@@ -139,17 +139,16 @@ 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 false;
if (data->skip) {
data->skip--;
- return 0;
+ return false;
}
trace->entries[trace->nr_entries++] = addr;
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 3/3] arm64: stacktrace: Convert to ARCH_STACKWALK
2020-09-14 15:34 [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK Mark Brown
2020-09-14 15:34 ` [PATCH v3 1/3] stacktrace: Remove reliable argument from arch_stack_walk() callback Mark Brown
2020-09-14 15:34 ` [PATCH v3 2/3] arm64: stacktrace: Make stack walk callback consistent with generic code Mark Brown
@ 2020-09-14 15:34 ` Mark Brown
2020-09-16 13:13 ` [PATCH v3 0/3] arm64: " Miroslav Benes
2020-09-18 16:17 ` Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-09-14 15:34 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Rutland, Vasily Gorbik, Heiko Carstens, Borislav Petkov,
Thomas Gleixner, H . Peter Anvin, Christian Borntraeger,
Ingo Molnar, Jiri Slaby, Miroslav Benes, x86, linux-arm-kernel,
linux-s390, linux-kernel, Mark Brown
Historically architectures have had duplicated code in their stack trace
implementations for filtering what gets traced. In order to avoid this
duplication some generic code has been provided using a new interface
arch_stack_walk(), enabled by selecting ARCH_STACKWALK in Kconfig, which
factors all this out into the generic stack trace code. Convert arm64
to use this common infrastructure.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/stacktrace.c | 79 +++++-----------------------------
2 files changed, 11 insertions(+), 69 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 6d232837cbee..d1ba52e4b976 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -29,6 +29,7 @@ config ARM64
select ARCH_HAS_SETUP_DMA_OPS
select ARCH_HAS_SET_DIRECT_MAP
select ARCH_HAS_SET_MEMORY
+ select ARCH_STACKWALK
select ARCH_HAS_STRICT_KERNEL_RWX
select ARCH_HAS_STRICT_MODULE_RWX
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index 05eaba21fd46..804d076b02cb 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -133,82 +133,23 @@ void notrace walk_stackframe(struct task_struct *tsk, struct stackframe *frame,
NOKPROBE_SYMBOL(walk_stackframe);
#ifdef CONFIG_STACKTRACE
-struct stack_trace_data {
- struct stack_trace *trace;
- unsigned int no_sched_functions;
- unsigned int skip;
-};
-static bool save_trace(void *d, unsigned long addr)
+void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
+ struct task_struct *task, struct pt_regs *regs)
{
- struct stack_trace_data *data = d;
- struct stack_trace *trace = data->trace;
-
- if (data->no_sched_functions && in_sched_functions(addr))
- return false;
- if (data->skip) {
- data->skip--;
- return false;
- }
-
- trace->entries[trace->nr_entries++] = addr;
-
- return trace->nr_entries >= trace->max_entries;
-}
-
-void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
-{
- struct stack_trace_data data;
- struct stackframe frame;
-
- data.trace = trace;
- data.skip = trace->skip;
- data.no_sched_functions = 0;
-
- start_backtrace(&frame, regs->regs[29], regs->pc);
- walk_stackframe(current, &frame, save_trace, &data);
-}
-EXPORT_SYMBOL_GPL(save_stack_trace_regs);
-
-static noinline void __save_stack_trace(struct task_struct *tsk,
- struct stack_trace *trace, unsigned int nosched)
-{
- struct stack_trace_data data;
struct stackframe frame;
- if (!try_get_task_stack(tsk))
- return;
-
- data.trace = trace;
- data.skip = trace->skip;
- data.no_sched_functions = nosched;
-
- if (tsk != current) {
- start_backtrace(&frame, thread_saved_fp(tsk),
- thread_saved_pc(tsk));
- } else {
- /* We don't want this function nor the caller */
- data.skip += 2;
+ if (regs)
+ start_backtrace(&frame, regs->regs[29], regs->pc);
+ else if (task == current)
start_backtrace(&frame,
(unsigned long)__builtin_frame_address(0),
- (unsigned long)__save_stack_trace);
- }
-
- walk_stackframe(tsk, &frame, save_trace, &data);
+ (unsigned long)arch_stack_walk);
+ else
+ start_backtrace(&frame, thread_saved_fp(task),
+ thread_saved_pc(task));
- put_task_stack(tsk);
-}
-
-void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
-{
- __save_stack_trace(tsk, trace, 1);
-}
-EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
-
-void save_stack_trace(struct stack_trace *trace)
-{
- __save_stack_trace(current, trace, 0);
+ walk_stackframe(task, &frame, consume_entry, cookie);
}
-EXPORT_SYMBOL_GPL(save_stack_trace);
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK
2020-09-14 15:34 [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK Mark Brown
` (2 preceding siblings ...)
2020-09-14 15:34 ` [PATCH v3 3/3] arm64: stacktrace: Convert to ARCH_STACKWALK Mark Brown
@ 2020-09-16 13:13 ` Miroslav Benes
2020-09-18 16:17 ` Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Miroslav Benes @ 2020-09-16 13:13 UTC (permalink / raw)
To: Mark Brown
Cc: Catalin Marinas, Will Deacon, Mark Rutland, Vasily Gorbik,
Heiko Carstens, Borislav Petkov, Thomas Gleixner, H . Peter Anvin,
Christian Borntraeger, Ingo Molnar, Jiri Slaby, x86,
linux-arm-kernel, linux-s390, linux-kernel
On Mon, 14 Sep 2020, Mark Brown wrote:
> This series updates the arm64 stacktrace code to use the newer and much
> simpler arch_stack_walk() interface, the main benefit being a single
> entry point to the arch code with no need for the arch code to worry
> about skipping frames. Along the way I noticed that the reliable
> parameter to the arch_stack_walk() callback appears to be redundant
> so there's also a patch here removing that from the existing code to
> simplify the interface.
>
> This is preparatory work for implementing reliable stack trace for
> arm64.
>
> v3:
> - Rebase onto v5.9-rc3.
> - Fix handling of task == current.
> - Flip the sense of the walk_stackframe() callback.
> v2:
> - Rebase onto v5.9-rc1.
>
> Mark Brown (3):
> stacktrace: Remove reliable argument from arch_stack_walk() callback
> arm64: stacktrace: Make stack walk callback consistent with generic
> code
> arm64: stacktrace: Convert to ARCH_STACKWALK
The patches look good to me.
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
M
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK
2020-09-14 15:34 [PATCH v3 0/3] arm64: Convert to ARCH_STACKWALK Mark Brown
` (3 preceding siblings ...)
2020-09-16 13:13 ` [PATCH v3 0/3] arm64: " Miroslav Benes
@ 2020-09-18 16:17 ` Will Deacon
4 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2020-09-18 16:17 UTC (permalink / raw)
To: Mark Brown, Catalin Marinas
Cc: kernel-team, Will Deacon, Heiko Carstens, Vasily Gorbik, x86,
H . Peter Anvin, Borislav Petkov, linux-arm-kernel, Mark Rutland,
linux-s390, linux-kernel, Miroslav Benes, Thomas Gleixner,
Jiri Slaby, Christian Borntraeger, Ingo Molnar
On Mon, 14 Sep 2020 16:34:06 +0100, Mark Brown wrote:
> This series updates the arm64 stacktrace code to use the newer and much
> simpler arch_stack_walk() interface, the main benefit being a single
> entry point to the arch code with no need for the arch code to worry
> about skipping frames. Along the way I noticed that the reliable
> parameter to the arch_stack_walk() callback appears to be redundant
> so there's also a patch here removing that from the existing code to
> simplify the interface.
>
> [...]
Applied to arm64 (for-next/stacktrace), thanks!
[1/3] stacktrace: Remove reliable argument from arch_stack_walk() callback
https://git.kernel.org/arm64/c/264c03a245de
[2/3] arm64: stacktrace: Make stack walk callback consistent with generic code
https://git.kernel.org/arm64/c/baa2cd417053
[3/3] arm64: stacktrace: Convert to ARCH_STACKWALK
https://git.kernel.org/arm64/c/5fc57df2f6fd
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 6+ messages in thread