[PATCH v3 1/5] KVM: arm64: Factor out common stack unwinding logic
From: Kalesh Singh
Date: Tue Jun 07 2022 - 12:51:44 EST
Factor out the stack unwinding logic common to both the host kernel and
the nVHE hypersivor into __unwind_next(). This allows for reuse in the
nVHE hypervisor stack unwinding (later in this series).
Signed-off-by: Kalesh Singh <kaleshsingh@xxxxxxxxxx>
Reviewed-by: Mark Brown <broonie@xxxxxxxxxx>
---
Changes in v3:
- Add Mark's Reviewed-by tag
arch/arm64/kernel/stacktrace.c | 36 +++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index 0467cb79f080..ee60c279511c 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -81,23 +81,19 @@ NOKPROBE_SYMBOL(unwind_init);
* records (e.g. a cycle), determined based on the location and fp value of A
* and the location (but not the fp value) of B.
*/
-static int notrace unwind_next(struct task_struct *tsk,
- struct unwind_state *state)
+static int notrace __unwind_next(struct task_struct *tsk,
+ struct unwind_state *state,
+ struct stack_info *info)
{
unsigned long fp = state->fp;
- struct stack_info info;
-
- /* Final frame; nothing to unwind */
- if (fp == (unsigned long)task_pt_regs(tsk)->stackframe)
- return -ENOENT;
if (fp & 0x7)
return -EINVAL;
- if (!on_accessible_stack(tsk, fp, 16, &info))
+ if (!on_accessible_stack(tsk, fp, 16, info))
return -EINVAL;
- if (test_bit(info.type, state->stacks_done))
+ if (test_bit(info->type, state->stacks_done))
return -EINVAL;
/*
@@ -113,7 +109,7 @@ static int notrace unwind_next(struct task_struct *tsk,
* stack to another, it's never valid to unwind back to that first
* stack.
*/
- if (info.type == state->prev_type) {
+ if (info->type == state->prev_type) {
if (fp <= state->prev_fp)
return -EINVAL;
} else {
@@ -127,7 +123,25 @@ static int notrace unwind_next(struct task_struct *tsk,
state->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp));
state->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp + 8));
state->prev_fp = fp;
- state->prev_type = info.type;
+ state->prev_type = info->type;
+
+ return 0;
+}
+NOKPROBE_SYMBOL(__unwind_next);
+
+static int notrace unwind_next(struct task_struct *tsk,
+ struct unwind_state *state)
+{
+ struct stack_info info;
+ int err;
+
+ /* Final frame; nothing to unwind */
+ if (state->fp == (unsigned long)task_pt_regs(tsk)->stackframe)
+ return -ENOENT;
+
+ err = __unwind_next(tsk, state, &info);
+ if (err)
+ return err;
state->pc = ptrauth_strip_insn_pac(state->pc);
--
2.36.1.255.ge46751e96f-goog