KVM nVHE Hypervisor stack unwinder
v4 cover KVM nVHE Hypervisor stack unwinder
Hi all,
This is v4 of the series adding support for nVHE hypervisor stacktraces; and is based on arm64 for-next/stacktrace.
Thanks all for your feedback on previous revisions. Mark Brown, I appreciate your Reviewed-by on the v3, I have dropped the tags in this new verision since I think the series has changed quite a bit.
The previous versions were posted at:
v3: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/
The main updates in this version are to address concerens from Marc on the memory usage and reusing the common code by refactoring into a shared header.
Thanks,
Kalesh
============
KVM nVHE Stack unwinding.
===
nVHE has two modes of operation: protected (pKVM) and unprotected (conventional nVHE). Depending on the mode, a slightly different approach is used to dump the hyperviosr stacktrace but the core unwinding logic remains the same.
Protected nVHE (pKVM) stacktraces
====
In protected nVHE mode, the host cannot directly access hypervisor memory.
The hypervisor stack unwinding happens in EL2 and is made accessible to the host via a shared buffer. Symbolizing and printing the stacktrace addresses is delegated to the host and happens in EL1.
Non-protected (Conventional) nVHE stacktraces
====
In non-protected mode, the host is able to directly access the hypervisor stack pages.
The hypervisor stack unwinding and dumping of the stacktrace is performed by the host in EL1, as this avoids the memory overhead of setting up shared buffers between the host and hypervisor.
Resuing the Core Unwinding Logic
====
Since the hypervisor cannot link against the kernel code in proteced mode. The common stack unwinding code is moved to a shared header to allow reuse in the nVHE hypervisor.
Reducing the memory footprint
====
In this version the below steps were taken to reduce the memory usage of nVHE stack unwinding:
1) The nVHE overflow stack is reduced from PAGE_SIZE to 4KB; benificial for configurations with non 4KB pages (16KB or 64KB pages).
2) In protected nVHE mode (pKVM), the shared stacktrace buffers with the host are reduced from PAGE_SIZE to the minimum size required.
3) In systems other than Android, conventional nVHE makes up the vast majority of use case. So the pKVM stack tracing is disabled by default (!CONFIG_PROTECTED_NVHE_STACKTRACE), which avoid the memory usage for setting up shared buffers.
4) In non-protected nVHE mode (conventional nVHE), the stack unwinding is done directly in EL1 by the host and no shared buffers with the hyperviosr are needed.
Sample Output
====
The below shows an example output from a simple stack overflow test:
[ 126.862960] kvm [371]: nVHE hyp panic at: [<ffff8000090a51d0>] __kvm_nvhe_recursive_death+0x10/0x34! [ 126.869920] kvm [371]: Protected nVHE HYP call trace: [ 126.870528] kvm [371]: [<ffff8000090a5570>] __kvm_nvhe_hyp_panic+0xac/0xf8 [ 126.871342] kvm [371]: [<ffff8000090a55cc>] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 126.872174] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.872971] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 . . .
[ 126.927314] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.927727] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.928137] kvm [371]: [<ffff8000090a4de4>] __kvm_nvhe___kvm_vcpu_run+0x30/0x40c [ 126.928561] kvm [371]: [<ffff8000090a7b64>] __kvm_nvhe_handle___kvm_vcpu_run+0x30/0x48 [ 126.928984] kvm [371]: [<ffff8000090a78b8>] __kvm_nvhe_handle_trap+0xc4/0x128 [ 126.929385] kvm [371]: [<ffff8000090a6864>] __kvm_nvhe___host_exit+0x64/0x64 [ 126.929804] kvm [371]: ---- End of Protected nVHE HYP call trace ----
============
Kalesh Singh (18):
arm64: stacktrace: Add shared header for common stack unwinding code
arm64: stacktrace: Factor out on_accessible_stack_common()
arm64: stacktrace: Factor out unwind_next_common()
arm64: stacktrace: Handle frame pointer from different address spaces
arm64: stacktrace: Factor out common unwind()
arm64: stacktrace: Add description of stacktrace/common.h
KVM: arm64: On stack overflow switch to hyp overflow_stack
KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
KVM: arm64: Stub implementation of pKVM HYP stack unwinder
KVM: arm64: Stub implementation of non-protected nVHE HYP stack
unwinder
KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
KVM: arm64: Prepare non-protected nVHE hypervisor stacktrace
KVM: arm64: Implement protected nVHE hyp stack unwinder
KVM: arm64: Implement non-protected nVHE hyp stack unwinder
KVM: arm64: Introduce pkvm_dump_backtrace()
KVM: arm64: Introduce hyp_dump_backtrace()
KVM: arm64: Dump nVHE hypervisor stack on panic
arch/arm64/include/asm/kvm_asm.h | 16 ++ arch/arm64/include/asm/memory.h | 7 + arch/arm64/include/asm/stacktrace.h | 92 ++++--- arch/arm64/include/asm/stacktrace/common.h | 224 ++++++++++++++++ arch/arm64/include/asm/stacktrace/nvhe.h | 291 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 157 ----------- arch/arm64/kvm/Kconfig | 15 ++ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/handle_exit.c | 4 + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 108 ++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 + 13 files changed, 727 insertions(+), 205 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.h create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.h create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.c
base-commit: 82a592c13b0aeff94d84d54183dae0b26384c95f
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
PATCH v4 1/18 arm64: stacktrace: Add shared header for common stack unwinding code
In order to reuse the arm64 stack unwinding logic for the nVHE hypervisor stack, move the common code to a shared header (arch/arm64/include/asm/stacktrace/common.h).
The nVHE hypervisor cannot safely link against kernel code, so we make use of the shared header to avoid duplicated logic later in this series.
--- arch/arm64/include/asm/stacktrace.h | 35 +------ arch/arm64/include/asm/stacktrace/common.h | 105 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 57 ----------- 3 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.h
arch/arm64/include/asm/stacktrace.h +1 -34
@@ -8,52 +8,19 @@#include <linux/percpu.h> #include <linux/sched.h> #include <linux/sched/task_stack.h> -#include <linux/types.h> #include <linux/llist.h> #include <asm/memory.h> #include <asm/ptrace.h> #include <asm/sdei.h> -enum stack_type { -STACK_TYPE_UNKNOWN , -STACK_TYPE_TASK , -STACK_TYPE_IRQ , -STACK_TYPE_OVERFLOW , -STACK_TYPE_SDEI_NORMAL , -STACK_TYPE_SDEI_CRITICAL , - __NR_STACK_TYPES -}; - -struct stack_info { -unsigned long low; -unsigned long high; -enum stack_type type; -}; +#include <asm/stacktrace/common.h> extern void dump_backtrace (struct pt_regs *regs,struct task_struct *tsk,const char *loglvl); DECLARE_PER_CPU(unsigned long *, irq_stack_ptr); -static inline bool on_stack (unsigned long sp,unsigned long size, -unsigned long low,unsigned long high, -enum stack_type type,struct stack_info *info) -{ -if (!low) -return false; - -if (sp < low || sp + size < sp || sp + size > high) -return false; - -if (info) { - info->low = low; - info->high = high; - info->type = type; - } -return true; -} -static inline bool on_irq_stack (unsigned long sp,unsigned long size,struct stack_info *info) {
arch/arm64/include/asm/stacktrace/common.h new file +105 -0
105 lines not on this page · raw message
arch/arm64/kernel/stacktrace.c +0 -57
63 lines not on this page · raw message
Signature · 1 line
2.37.0.170.g444d1eabd0-goog
Re: [PATCH v4 01/18] arm64: stacktrace: Add shared header for common stack unwinding code
Quoted 7 lines · Kalesh Singh
In order to reuse the arm64 stack unwinding logic for the nVHE hypervisor stack, move the common code to a shared header (
arch/arm64/include/asm/stacktrace/common.h).The nVHE hypervisor cannot safely link against kernel code, so we make use of the shared header to avoid duplicated logic later in this series.
Re: [PATCH v4 01/18] arm64: stacktrace: Add shared header for common stack unwinding code
In reply to Kalesh SinghHi Kalesh,
Quoted 11 lines · Kalesh Singh
In order to reuse the arm64 stack unwinding logic for the nVHE hypervisor stack, move the common code to a shared header (
arch/arm64/include/asm/stacktrace/common.h).The nVHE hypervisor cannot safely link against kernel code, so we make use of the shared header to avoid duplicated logic later in this series.
Signed-off-by Kalesh Singh <[email protected]>---
Thanks,
/fuad
Quoted 244 lines
arch/arm64/include/asm/stacktrace.h | 35 +------ arch/arm64/include/asm/stacktrace/common.h | 105 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 57 ----------- 3 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.harch/arm64/include/asm/stacktrace.h +1
-34@@ -8,52 +8,19 @@#include <linux/percpu.h> #include <linux/sched.h> #include <linux/sched/task_stack.h> -#include <linux/types.h> #include <linux/llist.h> #include <asm/memory.h> #include <asm/ptrace.h> #include <asm/sdei.h> -enum stack_type { -STACK_TYPE_UNKNOWN , -STACK_TYPE_TASK , -STACK_TYPE_IRQ , -STACK_TYPE_OVERFLOW , -STACK_TYPE_SDEI_NORMAL , -STACK_TYPE_SDEI_CRITICAL , - __NR_STACK_TYPES -}; - -struct stack_info { -unsigned long low; -unsigned long high; -enum stack_type type; -}; +#include <asm/stacktrace/common.h> extern void dump_backtrace (struct pt_regs *regs,struct task_struct *tsk,const char *loglvl); DECLARE_PER_CPU(unsigned long *, irq_stack_ptr); -static inline bool on_stack (unsigned long sp,unsigned long size, -unsigned long low,unsigned long high, -enum stack_type type,struct stack_info *info) -{ -if (!low) -return false; - -if (sp < low || sp + size < sp || sp + size > high) -return false; - -if (info) { - info->low = low; - info->high = high; - info->type = type; - } -return true; -} -static inline bool on_irq_stack (unsigned long sp,unsigned long size,struct stack_info *info) {arch/arm64/include/asm/stacktrace/common.h new file +105
-0@@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Common arm64 stack unwinder code. +* +* Copyright (C) 2012 ARM Ltd. +*/ +#ifndef __ASM_STACKTRACE_COMMON_H +#define __ASM_STACKTRACE_COMMON_H + +#include <linux/bitmap.h> +#include <linux/bitops.h> +#include <linux/types.h> + +enum stack_type { +STACK_TYPE_UNKNOWN , +STACK_TYPE_TASK , +STACK_TYPE_IRQ , +STACK_TYPE_OVERFLOW , +STACK_TYPE_SDEI_NORMAL , +STACK_TYPE_SDEI_CRITICAL , + __NR_STACK_TYPES +}; + +struct stack_info { +unsigned long low; +unsigned long high; +enum stack_type type; +}; + +/* +* A snapshot of a frame record or fp/lr register values, along with some +* accounting information necessary for robust unwinding. +* +* @fp: The fp value in the frame record (or the real fp) +* @pc: The lr value in the frame record (or the real lr) +* +* @stacks_done: Stacks which have been entirely unwound, for which it is no +* longer valid to unwind to. +* +* @prev_fp: The fp that pointed to this frame record, or a synthetic value +* of 0. This is used to ensure that within a stack, each +* subsequent frame record is at an increasing address. +* @prev_type: The type of stack this frame record was on, or a synthetic +* value of STACK_TYPE_UNKNOWN. This is used to detect a +* transition from one stack to another. +* +* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance +* associated with the most recently encountered replacement lr +* value. +* +* @task: The task being unwound. +*/ +struct unwind_state { +unsigned long fp; +unsigned long pc; + DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); +unsigned long prev_fp; +enum stack_type prev_type; +#ifdef CONFIG_KRETPROBES +struct llist_node *kr_cur; +#endif +struct task_struct *task; +}; + +static inline bool on_stack (unsigned long sp,unsigned long size, +unsigned long low,unsigned long high, +enum stack_type type,struct stack_info *info) +{ +if (!low) +return false; + +if (sp < low || sp + size < sp || sp + size > high) +return false; + +if (info) { + info->low = low; + info->high = high; + info->type = type; + } +return true; +} + +static inline void unwind_init_common (struct unwind_state *state, +struct task_struct *task) +{ + state->task = task; +#ifdef CONFIG_KRETPROBES + state->kr_cur =NULL ; +#endif + +/* +* Prime the first unwind. +* +* In unwind_next() we'll check that the FP points to a valid stack, +* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be +* treated as a transition to whichever stack that happens to be. The +* prev_fp value won't be used, but we set it to 0 such that it is +* definitely not an accessible stack address. +*/ +bitmap_zero (state->stacks_done, __NR_STACK_TYPES); + state->prev_fp =0 ; + state->prev_type =STACK_TYPE_UNKNOWN ; +} + +#endif /* __ASM_STACKTRACE_COMMON_H */ arch/arm64/kernel/stacktrace.c +0
-58@@ -18,63 +18,6 @@#include <asm/stack_pointer.h> #include <asm/stacktrace.h> -/* -* A snapshot of a frame record or fp/lr register values, along with some -* accounting information necessary for robust unwinding. -* -* @fp: The fp value in the frame record (or the real fp) -* @pc: The lr value in the frame record (or the real lr) -* -* @stacks_done: Stacks which have been entirely unwound, for which it is no -* longer valid to unwind to. -* -* @prev_fp: The fp that pointed to this frame record, or a synthetic value -* of 0. This is used to ensure that within a stack, each -* subsequent frame record is at an increasing address. -* @prev_type: The type of stack this frame record was on, or a synthetic -* value of STACK_TYPE_UNKNOWN. This is used to detect a -* transition from one stack to another. -* -* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance -* associated with the most recently encountered replacement lr -* value. -* -* @task: The task being unwound. -*/ -struct unwind_state { -unsigned long fp; -unsigned long pc; - DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); -unsigned long prev_fp; -enum stack_type prev_type; -#ifdef CONFIG_KRETPROBES -struct llist_node *kr_cur; -#endif -struct task_struct *task; -}; - -static void unwind_init_common (struct unwind_state *state, -struct task_struct *task) -{ - state->task = task; -#ifdef CONFIG_KRETPROBES - state->kr_cur =NULL ; -#endif - -/* -* Prime the first unwind. -* -* In unwind_next() we'll check that the FP points to a valid stack, -* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be -* treated as a transition to whichever stack that happens to be. The -* prev_fp value won't be used, but we set it to 0 such that it is -* definitely not an accessible stack address. -*/ -bitmap_zero (state->stacks_done, __NR_STACK_TYPES); - state->prev_fp =0 ; - state->prev_type =STACK_TYPE_UNKNOWN ; -} -/* * Start an unwind from a pt_regs. * --
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 01/18] arm64: stacktrace: Add shared header for common stack unwinding code
In reply to Kalesh SinghHi,
Can you please explain why you are targetting my @oracle.com email address with this patch set?
This causes me problems as I use Outlook's Web interface for that which doesn't appear to cope with the threading, and most certainly is only capable of top-reply only which is against Linux kernel email standards.
Thanks.
Quoted 262 lines · Kalesh Singh
In order to reuse the arm64 stack unwinding logic for the nVHE hypervisor stack, move the common code to a shared header (
arch/arm64/include/asm/stacktrace/common.h).The nVHE hypervisor cannot safely link against kernel code, so we make use of the shared header to avoid duplicated logic later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace.h | 35 +------ arch/arm64/include/asm/stacktrace/common.h | 105 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 57 ----------- 3 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.harch/arm64/include/asm/stacktrace.h +1
-34@@ -8,52 +8,19 @@#include <linux/percpu.h> #include <linux/sched.h> #include <linux/sched/task_stack.h> -#include <linux/types.h> #include <linux/llist.h> #include <asm/memory.h> #include <asm/ptrace.h> #include <asm/sdei.h> -enum stack_type { -STACK_TYPE_UNKNOWN , -STACK_TYPE_TASK , -STACK_TYPE_IRQ , -STACK_TYPE_OVERFLOW , -STACK_TYPE_SDEI_NORMAL , -STACK_TYPE_SDEI_CRITICAL , - __NR_STACK_TYPES -}; - -struct stack_info { -unsigned long low; -unsigned long high; -enum stack_type type; -}; +#include <asm/stacktrace/common.h> extern void dump_backtrace (struct pt_regs *regs,struct task_struct *tsk,const char *loglvl); DECLARE_PER_CPU(unsigned long *, irq_stack_ptr); -static inline bool on_stack (unsigned long sp,unsigned long size, -unsigned long low,unsigned long high, -enum stack_type type,struct stack_info *info) -{ -if (!low) -return false; - -if (sp < low || sp + size < sp || sp + size > high) -return false; - -if (info) { - info->low = low; - info->high = high; - info->type = type; - } -return true; -} -static inline bool on_irq_stack (unsigned long sp,unsigned long size,struct stack_info *info) {arch/arm64/include/asm/stacktrace/common.h new file +105
-0@@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Common arm64 stack unwinder code. +* +* Copyright (C) 2012 ARM Ltd. +*/ +#ifndef __ASM_STACKTRACE_COMMON_H +#define __ASM_STACKTRACE_COMMON_H + +#include <linux/bitmap.h> +#include <linux/bitops.h> +#include <linux/types.h> + +enum stack_type { +STACK_TYPE_UNKNOWN , +STACK_TYPE_TASK , +STACK_TYPE_IRQ , +STACK_TYPE_OVERFLOW , +STACK_TYPE_SDEI_NORMAL , +STACK_TYPE_SDEI_CRITICAL , + __NR_STACK_TYPES +}; + +struct stack_info { +unsigned long low; +unsigned long high; +enum stack_type type; +}; + +/* +* A snapshot of a frame record or fp/lr register values, along with some +* accounting information necessary for robust unwinding. +* +* @fp: The fp value in the frame record (or the real fp) +* @pc: The lr value in the frame record (or the real lr) +* +* @stacks_done: Stacks which have been entirely unwound, for which it is no +* longer valid to unwind to. +* +* @prev_fp: The fp that pointed to this frame record, or a synthetic value +* of 0. This is used to ensure that within a stack, each +* subsequent frame record is at an increasing address. +* @prev_type: The type of stack this frame record was on, or a synthetic +* value of STACK_TYPE_UNKNOWN. This is used to detect a +* transition from one stack to another. +* +* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance +* associated with the most recently encountered replacement lr +* value. +* +* @task: The task being unwound. +*/ +struct unwind_state { +unsigned long fp; +unsigned long pc; + DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); +unsigned long prev_fp; +enum stack_type prev_type; +#ifdef CONFIG_KRETPROBES +struct llist_node *kr_cur; +#endif +struct task_struct *task; +}; + +static inline bool on_stack (unsigned long sp,unsigned long size, +unsigned long low,unsigned long high, +enum stack_type type,struct stack_info *info) +{ +if (!low) +return false; + +if (sp < low || sp + size < sp || sp + size > high) +return false; + +if (info) { + info->low = low; + info->high = high; + info->type = type; + } +return true; +} + +static inline void unwind_init_common (struct unwind_state *state, +struct task_struct *task) +{ + state->task = task; +#ifdef CONFIG_KRETPROBES + state->kr_cur =NULL ; +#endif + +/* +* Prime the first unwind. +* +* In unwind_next() we'll check that the FP points to a valid stack, +* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be +* treated as a transition to whichever stack that happens to be. The +* prev_fp value won't be used, but we set it to 0 such that it is +* definitely not an accessible stack address. +*/ +bitmap_zero (state->stacks_done, __NR_STACK_TYPES); + state->prev_fp =0 ; + state->prev_type =STACK_TYPE_UNKNOWN ; +} + +#endif /* __ASM_STACKTRACE_COMMON_H */ arch/arm64/kernel/stacktrace.c +0
-57@@ -18,63 +18,6 @@#include <asm/stack_pointer.h> #include <asm/stacktrace.h> -/* -* A snapshot of a frame record or fp/lr register values, along with some -* accounting information necessary for robust unwinding. -* -* @fp: The fp value in the frame record (or the real fp) -* @pc: The lr value in the frame record (or the real lr) -* -* @stacks_done: Stacks which have been entirely unwound, for which it is no -* longer valid to unwind to. -* -* @prev_fp: The fp that pointed to this frame record, or a synthetic value -* of 0. This is used to ensure that within a stack, each -* subsequent frame record is at an increasing address. -* @prev_type: The type of stack this frame record was on, or a synthetic -* value of STACK_TYPE_UNKNOWN. This is used to detect a -* transition from one stack to another. -* -* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance -* associated with the most recently encountered replacement lr -* value. -* -* @task: The task being unwound. -*/ -struct unwind_state { -unsigned long fp; -unsigned long pc; - DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); -unsigned long prev_fp; -enum stack_type prev_type; -#ifdef CONFIG_KRETPROBES -struct llist_node *kr_cur; -#endif -struct task_struct *task; -}; - -static void unwind_init_common (struct unwind_state *state, -struct task_struct *task) -{ - state->task = task; -#ifdef CONFIG_KRETPROBES - state->kr_cur =NULL ; -#endif - -/* -* Prime the first unwind. -* -* In unwind_next() we'll check that the FP points to a valid stack, -* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be -* treated as a transition to whichever stack that happens to be. The -* prev_fp value won't be used, but we set it to 0 such that it is -* definitely not an accessible stack address. -*/ -bitmap_zero (state->stacks_done, __NR_STACK_TYPES); - state->prev_fp =0 ; - state->prev_type =STACK_TYPE_UNKNOWN ; -} -/* * Start an unwind from a pt_regs. * Signature · 7 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 6 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 01/18] arm64: stacktrace: Add shared header for common stack unwinding code
Quoted 10 lines · Russell King (Oracle)
Hi,
Can you please explain why you are targetting my @oracle.com email address with this patch set?
This causes me problems as I use Outlook's Web interface for that which doesn't appear to cope with the threading, and most certainly is only capable of top-reply only which is against Linux kernel email standards.
Hi Russell,
Sorry I wasn't aware of it (I got your oracle email from get_maintainer script). Going forward I'll use the one you responded from instead.
Thanks,
Kalesh
Quoted 261 lines
Thanks.
Quoted 257 lines · Kalesh Singh
In order to reuse the arm64 stack unwinding logic for the nVHE hypervisor stack, move the common code to a shared header (
arch/arm64/include/asm/stacktrace/common.h).The nVHE hypervisor cannot safely link against kernel code, so we make use of the shared header to avoid duplicated logic later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace.h | 35 +------ arch/arm64/include/asm/stacktrace/common.h | 105 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 57 ----------- 3 files changed, 106 insertions(+), 91 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.harch/arm64/include/asm/stacktrace.h +1
-34@@ -8,52 +8,19 @@#include <linux/percpu.h> #include <linux/sched.h> #include <linux/sched/task_stack.h> -#include <linux/types.h> #include <linux/llist.h> #include <asm/memory.h> #include <asm/ptrace.h> #include <asm/sdei.h> -enum stack_type { -STACK_TYPE_UNKNOWN , -STACK_TYPE_TASK , -STACK_TYPE_IRQ , -STACK_TYPE_OVERFLOW , -STACK_TYPE_SDEI_NORMAL , -STACK_TYPE_SDEI_CRITICAL , - __NR_STACK_TYPES -}; - -struct stack_info { -unsigned long low; -unsigned long high; -enum stack_type type; -}; +#include <asm/stacktrace/common.h> extern void dump_backtrace (struct pt_regs *regs,struct task_struct *tsk,const char *loglvl); DECLARE_PER_CPU(unsigned long *, irq_stack_ptr); -static inline bool on_stack (unsigned long sp,unsigned long size, -unsigned long low,unsigned long high, -enum stack_type type,struct stack_info *info) -{ -if (!low) -return false; - -if (sp < low || sp + size < sp || sp + size > high) -return false; - -if (info) { - info->low = low; - info->high = high; - info->type = type; - } -return true; -} -static inline bool on_irq_stack (unsigned long sp,unsigned long size,struct stack_info *info) {arch/arm64/include/asm/stacktrace/common.h new file +105
-0@@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Common arm64 stack unwinder code. +* +* Copyright (C) 2012 ARM Ltd. +*/ +#ifndef __ASM_STACKTRACE_COMMON_H +#define __ASM_STACKTRACE_COMMON_H + +#include <linux/bitmap.h> +#include <linux/bitops.h> +#include <linux/types.h> + +enum stack_type { +STACK_TYPE_UNKNOWN , +STACK_TYPE_TASK , +STACK_TYPE_IRQ , +STACK_TYPE_OVERFLOW , +STACK_TYPE_SDEI_NORMAL , +STACK_TYPE_SDEI_CRITICAL , + __NR_STACK_TYPES +}; + +struct stack_info { +unsigned long low; +unsigned long high; +enum stack_type type; +}; + +/* +* A snapshot of a frame record or fp/lr register values, along with some +* accounting information necessary for robust unwinding. +* +* @fp: The fp value in the frame record (or the real fp) +* @pc: The lr value in the frame record (or the real lr) +* +* @stacks_done: Stacks which have been entirely unwound, for which it is no +* longer valid to unwind to. +* +* @prev_fp: The fp that pointed to this frame record, or a synthetic value +* of 0. This is used to ensure that within a stack, each +* subsequent frame record is at an increasing address. +* @prev_type: The type of stack this frame record was on, or a synthetic +* value of STACK_TYPE_UNKNOWN. This is used to detect a +* transition from one stack to another. +* +* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance +* associated with the most recently encountered replacement lr +* value. +* +* @task: The task being unwound. +*/ +struct unwind_state { +unsigned long fp; +unsigned long pc; + DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); +unsigned long prev_fp; +enum stack_type prev_type; +#ifdef CONFIG_KRETPROBES +struct llist_node *kr_cur; +#endif +struct task_struct *task; +}; + +static inline bool on_stack (unsigned long sp,unsigned long size, +unsigned long low,unsigned long high, +enum stack_type type,struct stack_info *info) +{ +if (!low) +return false; + +if (sp < low || sp + size < sp || sp + size > high) +return false; + +if (info) { + info->low = low; + info->high = high; + info->type = type; + } +return true; +} + +static inline void unwind_init_common (struct unwind_state *state, +struct task_struct *task) +{ + state->task = task; +#ifdef CONFIG_KRETPROBES + state->kr_cur =NULL ; +#endif + +/* +* Prime the first unwind. +* +* In unwind_next() we'll check that the FP points to a valid stack, +* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be +* treated as a transition to whichever stack that happens to be. The +* prev_fp value won't be used, but we set it to 0 such that it is +* definitely not an accessible stack address. +*/ +bitmap_zero (state->stacks_done, __NR_STACK_TYPES); + state->prev_fp =0 ; + state->prev_type =STACK_TYPE_UNKNOWN ; +} + +#endif /* __ASM_STACKTRACE_COMMON_H */ arch/arm64/kernel/stacktrace.c +0
-58@@ -18,63 +18,6 @@#include <asm/stack_pointer.h> #include <asm/stacktrace.h> -/* -* A snapshot of a frame record or fp/lr register values, along with some -* accounting information necessary for robust unwinding. -* -* @fp: The fp value in the frame record (or the real fp) -* @pc: The lr value in the frame record (or the real lr) -* -* @stacks_done: Stacks which have been entirely unwound, for which it is no -* longer valid to unwind to. -* -* @prev_fp: The fp that pointed to this frame record, or a synthetic value -* of 0. This is used to ensure that within a stack, each -* subsequent frame record is at an increasing address. -* @prev_type: The type of stack this frame record was on, or a synthetic -* value of STACK_TYPE_UNKNOWN. This is used to detect a -* transition from one stack to another. -* -* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance -* associated with the most recently encountered replacement lr -* value. -* -* @task: The task being unwound. -*/ -struct unwind_state { -unsigned long fp; -unsigned long pc; - DECLARE_BITMAP(stacks_done, __NR_STACK_TYPES); -unsigned long prev_fp; -enum stack_type prev_type; -#ifdef CONFIG_KRETPROBES -struct llist_node *kr_cur; -#endif -struct task_struct *task; -}; - -static void unwind_init_common (struct unwind_state *state, -struct task_struct *task) -{ - state->task = task; -#ifdef CONFIG_KRETPROBES - state->kr_cur =NULL ; -#endif - -/* -* Prime the first unwind. -* -* In unwind_next() we'll check that the FP points to a valid stack, -* which can't be STACK_TYPE_UNKNOWN, and the first unwind will be -* treated as a transition to whichever stack that happens to be. The -* prev_fp value won't be used, but we set it to 0 such that it is -* definitely not an accessible stack address. -*/ -bitmap_zero (state->stacks_done, __NR_STACK_TYPES); - state->prev_fp =0 ; - state->prev_type =STACK_TYPE_UNKNOWN ; -} -/* * Start an unwind from a pt_regs. * -- 2.37.0.170.g444d1eabd0-goog
Quoted 9 lines
Quoted 5 lines
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 01/18] arm64: stacktrace: Add shared header for common stack unwinding code
Quoted 13 lines · Kalesh Singh
Quoted 10 lines · Russell King (Oracle)
Hi,
Can you please explain why you are targetting my @oracle.com email address with this patch set?
This causes me problems as I use Outlook's Web interface for that which doesn't appear to cope with the threading, and most certainly is only capable of top-reply only which is against Linux kernel email standards.
Quoted 5 lines
Hi Russell,
Sorry I wasn't aware of it (I got your oracle email from
get_maintainerscript). Going forward I'll use the one you responded from instead.
Oh, this is the very annoying behaviour of get_maintainer.pl default mode to think that if someone touches a file, they're interested in future changes to it. In this case, it's because we both touched arch/arm64/include/asm/memory.h back in November 2021, and this silly script thinks I'll still be interested.
b89ddf4cca43 arm64/bpf: Remove 128MB limit for BPF JIT programs
(The patch was originally developed for Oracle's UEK kernels, hence why it's got my @oracle.com address, but was later merged upstream. Interestingly, no one spotted that Alan Maguire's s-o-b should've been on it, as he was involved in the submission path to mainline.)
Signature · 6 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 2/18 arm64: stacktrace: Factor out on_accessible_stack_common()
In reply to Kalesh SinghMove common on_accessible_stack checks to stacktrace/common.h. This is used in the implementation of the nVHE hypervisor unwinder later in this series.
--- arch/arm64/include/asm/stacktrace.h | 8 ++------ arch/arm64/include/asm/stacktrace/common.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-)
arch/arm64/include/asm/stacktrace.h +2 -6
@@ -56,7 +56,6 @@ static inline bool on_overflow_stack(unsigned long sp, unsigned long size, struct stack_info *info) { return false; }#endif -/* * We can only safely access per-cpu stacks from current in a non-preemptible * context.
@@ -65,8 +64,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, unsigned long sp, unsigned long size, struct stack_info *info) { - if (info) - info->type = STACK_TYPE_UNKNOWN; + if (on_accessible_stack_common(tsk, sp, size, info)) + return true;if (on_task_stack (tsk, sp, size, info))return true;
@@ -74,12 +73,9 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,return false;if (on_irq_stack (sp, size, info))return true; -if (on_overflow_stack (sp, size, info)) -return true;if (on_sdei_stack (sp, size, info))return true; return false; } -#endif /* __ASM_STACKTRACE_H */
arch/arm64/include/asm/stacktrace/common.h +18 -0
@@ -62,6 +62,9 @@ struct unwind_state {struct task_struct *task; }; +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)
@@ -80,6 +83,21 @@ static inline bool on_stack(unsigned long sp, unsigned long size,return true; } +static inline bool on_accessible_stack_common (const struct task_struct *tsk, +unsigned long sp, +unsigned long size, +struct stack_info *info) +{ +if (info) + info->type =STACK_TYPE_UNKNOWN ; + +/* +* Both the kernel and nvhe hypervisor make use of +* an overflow_stack +*/ +return on_overflow_stack (sp, size, info); +} +static inline void unwind_init_common (struct unwind_state *state,struct task_struct *task) {
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 02/18] arm64: stacktrace: Factor out on_accessible_stack_common()
Hi Kalesh,
Quoted 7 lines · Kalesh Singh
Move common
on_accessible_stackchecks tostacktrace/common.h. This is used in the implementation of the nVHE hypervisor unwinder later in this series.Signed-off-by Kalesh Singh <[email protected]>---
Thanks,
/fuad
Quoted 77 lines
arch/arm64/include/asm/stacktrace.h | 8 ++------ arch/arm64/include/asm/stacktrace/common.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-)arch/arm64/include/asm/stacktrace.h +2
-6@@ -56,7 +56,6 @@ static inline bool on_overflow_stack(unsigned long sp, unsigned long size, struct stack_info *info) { return false; }#endif -/* * We can only safely access per-cpu stacks from current in a non-preemptible * context. @@ -65,8 +64,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, unsigned long sp, unsigned long size, struct stack_info *info) { - if (info) - info->type = STACK_TYPE_UNKNOWN; + if (on_accessible_stack_common(tsk, sp, size, info)) + return true;if (on_task_stack (tsk, sp, size, info))return true;@@ -74,12 +73,9 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,return false;if (on_irq_stack (sp, size, info))return true; -if (on_overflow_stack (sp, size, info)) -return true;if (on_sdei_stack (sp, size, info))return true; return false; } -#endif /* __ASM_STACKTRACE_H */ arch/arm64/include/asm/stacktrace/common.h +18
-1@@ -62,6 +62,9 @@ struct unwind_state {struct task_struct *task; }; +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)@@ -80,6 +83,21 @@ static inline bool on_stack(unsigned long sp, unsigned long size,return true; } +static inline bool on_accessible_stack_common (const struct task_struct *tsk, +unsigned long sp, +unsigned long size, +struct stack_info *info) +{ +if (info) + info->type =STACK_TYPE_UNKNOWN ; + +/* +* Both the kernel and nvhe hypervisor make use of +* an overflow_stack +*/ +return on_overflow_stack (sp, size, info); +} +static inline void unwind_init_common (struct unwind_state *state,struct task_struct *task) { --
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 02/18] arm64: stacktrace: Factor out on_accessible_stack_common()
In reply to Kalesh Singharch/arm64/include/asm/stacktrace.h static inline bool on_overflow_stack(unsigned long sp, unsigned long size, · line 61
Quoted 8 lines · Kalesh Singh
arch/arm64/include/asm/stacktrace.h +0
-1@@ -56,7 +56,6 @@ static inline bool on_overflow_stack(unsigned long sp, unsigned long size, struct stack_info *info) { return false; }#endif -/* * We can only safely access per-cpu stacks from current in a non-preemptible * context.
Random perfectly fine but unrelated whitespace change here. Otherwise
PATCH v4 3/18 arm64: stacktrace: Factor out unwind_next_common()
In reply to Kalesh SinghMove common unwind_next logic to stacktrace/common.h. This allows reusing the code in the implementation the nVHE hypervisor stack unwinder, later in this series.
--- arch/arm64/include/asm/stacktrace/common.h | 50 ++++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 41 ++---------------- 2 files changed, 54 insertions(+), 37 deletions(-)
arch/arm64/include/asm/stacktrace/common.h +50 -0
@@ -65,6 +65,10 @@ struct unwind_state {static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info); +static inline bool on_accessible_stack (const struct task_struct *tsk, +unsigned long sp,unsigned long size, +struct stack_info *info); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)
@@ -120,4 +124,50 @@ static inline void unwind_init_common(struct unwind_state *state, state->prev_type =STACK_TYPE_UNKNOWN ; } +static inline int unwind_next_common (struct unwind_state *state, +struct stack_info *info) +{ +struct task_struct *tsk = state->task; +unsigned long fp = state->fp; + +if (fp &0x7 ) +return -EINVAL ; + +if (!on_accessible_stack (tsk, fp,16 , info)) +return -EINVAL ; + +if (test_bit (info->type, state->stacks_done)) +return -EINVAL ; + +/* +* As stacks grow downward, any valid record on the same stack must be +* at a strictly higher address than the prior record. +* +* Stacks can nest in several valid orders, e.g. +* +* TASK -> IRQ -> OVERFLOW -> SDEI_NORMAL +* TASK -> SDEI_NORMAL -> SDEI_CRITICAL -> OVERFLOW +* +* ... but the nesting itself is strict. Once we transition from one +* stack to another, it's never valid to unwind back to that first +* stack. +*/ +if (info->type == state->prev_type) { +if (fp <= state->prev_fp) +return -EINVAL ; + }else { +__set_bit (state->prev_type, state->stacks_done); + } + +/* +* Record this frame record's values and location. The prev_fp and +* prev_type are only meaningful to the next unwind_next() invocation. +*/ + state->fp =READ_ONCE (*(unsigned long *)(fp)); + state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); + state->prev_fp = fp; + state->prev_type = info->type; + +return 0 ; +}#endif /* __ASM_STACKTRACE_COMMON_H */
arch/arm64/kernel/stacktrace.c +4 -37
52 lines not on this page · raw message
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 03/18] arm64: stacktrace: Factor out unwind_next_common()
Hi Kalesh,
Quoted 6 lines · Kalesh Singh
Move common
unwind_nextlogic tostacktrace/common.h. This allows reusing the code in the implementation the nVHE hypervisor stack unwinder, later in this series.Signed-off-by Kalesh Singh <[email protected]>
Thanks,
/fuad
Quoted 129 lines
--- arch/arm64/include/asm/stacktrace/common.h | 50 ++++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 41 ++---------------- 2 files changed, 54 insertions(+), 37 deletions(-)arch/arm64/include/asm/stacktrace/common.h +50
-0@@ -65,6 +65,10 @@ struct unwind_state {static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info); +static inline bool on_accessible_stack (const struct task_struct *tsk, +unsigned long sp,unsigned long size, +struct stack_info *info); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)@@ -120,4 +124,50 @@ static inline void unwind_init_common(struct unwind_state *state, state->prev_type =STACK_TYPE_UNKNOWN ; } +static inline int unwind_next_common (struct unwind_state *state, +struct stack_info *info) +{ +struct task_struct *tsk = state->task; +unsigned long fp = state->fp; + +if (fp &0x7 ) +return -EINVAL ; + +if (!on_accessible_stack (tsk, fp,16 , info)) +return -EINVAL ; + +if (test_bit (info->type, state->stacks_done)) +return -EINVAL ; + +/* +* As stacks grow downward, any valid record on the same stack must be +* at a strictly higher address than the prior record. +* +* Stacks can nest in several valid orders, e.g. +* +* TASK -> IRQ -> OVERFLOW -> SDEI_NORMAL +* TASK -> SDEI_NORMAL -> SDEI_CRITICAL -> OVERFLOW +* +* ... but the nesting itself is strict. Once we transition from one +* stack to another, it's never valid to unwind back to that first +* stack. +*/ +if (info->type == state->prev_type) { +if (fp <= state->prev_fp) +return -EINVAL ; + }else { +__set_bit (state->prev_type, state->stacks_done); + } + +/* +* Record this frame record's values and location. The prev_fp and +* prev_type are only meaningful to the next unwind_next() invocation. +*/ + state->fp =READ_ONCE (*(unsigned long *)(fp)); + state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); + state->prev_fp = fp; + state->prev_type = info->type; + +return 0 ; +}#endif /* __ASM_STACKTRACE_COMMON_H */ arch/arm64/kernel/stacktrace.c +4
-38@@ -81,48 +81,15 @@ static int notrace unwind_next(struct unwind_state *state)struct task_struct *tsk = state->task;unsigned long fp = state->fp;struct stack_info info; +int err;/* 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)) -return -EINVAL ; - -if (test_bit (info.type, state->stacks_done)) -return -EINVAL ; - -/* -* As stacks grow downward, any valid record on the same stack must be -* at a strictly higher address than the prior record. -* -* Stacks can nest in several valid orders, e.g. -* -* TASK -> IRQ -> OVERFLOW -> SDEI_NORMAL -* TASK -> SDEI_NORMAL -> SDEI_CRITICAL -> OVERFLOW -* -* ... but the nesting itself is strict. Once we transition from one -* stack to another, it's never valid to unwind back to that first -* stack. -*/ -if (info.type == state->prev_type) { -if (fp <= state->prev_fp) -return -EINVAL ; - }else { -__set_bit (state->prev_type, state->stacks_done); - } - -/* -* Record this frame record's values and location. The prev_fp and -* prev_type are only meaningful to the next unwind_next() invocation. -*/ - state->fp =READ_ONCE (*(unsigned long *)(fp)); - state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); - state->prev_fp = fp; - state->prev_type = info.type; + err =unwind_next_common (state, &info); +if (err) +return err; state->pc =ptrauth_strip_insn_pac (state->pc); --
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 03/18] arm64: stacktrace: Factor out unwind_next_common()
In reply to Kalesh SinghQuoted 3 lines · Kalesh Singh
Move common
unwind_nextlogic tostacktrace/common.h. This allows reusing the code in the implementation the nVHE hypervisor stack unwinder, later in this series.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 4/18 arm64: stacktrace: Handle frame pointer from different address spaces
In reply to Kalesh SinghThe unwinder code is made reusable so that it can be used to unwind various types of stacks. One usecase is unwinding the nVHE hyp stack from the host (EL1) in non-protected mode. This means that the unwinder must be able to tracnslate HYP stack addresses to kernel addresses.
Add a callback (stack_trace_translate_fp_fn) to allow specifying the translation function.
--- arch/arm64/include/asm/stacktrace/common.h | 26 ++++++++++++++++++++-- arch/arm64/kernel/stacktrace.c | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-)
arch/arm64/include/asm/stacktrace/common.h +24 -2
@@ -123,9 +123,22 @@ static inline void unwind_init_common(struct unwind_state *state, state->prev_fp =0 ; state->prev_type =STACK_TYPE_UNKNOWN ; } +/** +* stack_trace_translate_fp_fn() - Translates a non-kernel frame pointer to +* a kernel address. +* +* @fp: the frame pointer to be updated to it's kernel address. +* @type: the stack type associated with frame pointer @fp +* +* Returns true and success and @fp is updated to the corresponding +* kernel virtual address; otherwise returns false. +*/ +typedef bool (*stack_trace_translate_fp_fn )(unsigned long *fp, +enum stack_type type);static inline int unwind_next_common (struct unwind_state *state, -struct stack_info *info) +struct stack_info *info, +stack_trace_translate_fp_fn translate_fp) {struct task_struct *tsk = state->task;unsigned long fp = state->fp;
@@ -159,13 +172,22 @@ static inline int unwind_next_common(struct unwind_state *state,__set_bit (state->prev_type, state->stacks_done); } +/* Record fp as prev_fp before attempting to get the next fp */ + state->prev_fp = fp; + +/* +* If fp is not from the current address space perform the necessary +* translation before dereferencing it to get the next fp. +*/ +if (translate_fp && !translate_fp (&fp, info->type)) +return -EINVAL ; +/* * Record this frame record's values and location. The prev_fp and * prev_type are only meaningful to the next unwind_next() invocation. */ state->fp =READ_ONCE (*(unsigned long *)(fp)); state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); - state->prev_fp = fp; state->prev_type = info->type;return 0 ;
arch/arm64/kernel/stacktrace.c +1 -1
@@ -87,7 +87,7 @@ static int notrace unwind_next(struct unwind_state *state)if (fp == (unsigned long )task_pt_regs (tsk)->stackframe)return -ENOENT ; - err =unwind_next_common (state, &info); + err =unwind_next_common (state, &info,NULL );if (err)return err;
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 04/18] arm64: stacktrace: Handle frame pointer from different address spaces
Hi Kalesh,
Quoted 5 lines · Kalesh Singh' via kernel-team
The unwinder code is made reusable so that it can be used to unwind various types of stacks. One usecase is unwinding the nVHE hyp stack from the host (EL1) in non-protected mode. This means that the unwinder must be able to tracnslate HYP stack
s/tracnslate/translate
Quoted 19 lines
addresses to kernel addresses.
Add a callback (
stack_trace_translate_fp_fn) to allow specifying the translation function.Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/common.h | 26 ++++++++++++++++++++-- arch/arm64/kernel/stacktrace.c | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-)arch/arm64/include/asm/stacktrace/common.h +0
-0@@ -123,9 +123,22 @@ static inline void unwind_init_common(struct unwind_state *state, state->prev_fp =0 ; state->prev_type =STACK_TYPE_UNKNOWN ; }
arch/arm64/include/asm/stacktrace/common.h static inline void unwind_init_common(struct unwind_state *state, · line 135
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +10
-0+/** +* stack_trace_translate_fp_fn() - Translates a non-kernel frame pointer to +* a kernel address. +* +* @fp: the frame pointer to be updated to it's kernel address. +* @type: the stack type associated with frame pointer @fp +* +* Returns true and success and @fp is updated to the corresponding +* kernel virtual address; otherwise returns false. +*/
Please add a newline before the new block.
Also, something which you have done in comment blocks in this patch as well as future patches (so I won't mention them again) is use the opening comment mark /** , which is meant for kernel-doc comments
(https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html).
However, this block, and many if not most of the others don't seem to be conformant (scripts/kernel-doc -v -none arch/arm64/include/asm/stacktrace/common.h).
I think the easiest thing to do is to format them as a normal block: /*.
Quoted 14 lines
arch/arm64/include/asm/stacktrace/common.h +4
-1+typedef bool (*stack_trace_translate_fp_fn )(unsigned long *fp, +enum stack_type type);static inline int unwind_next_common (struct unwind_state *state, -struct stack_info *info) +struct stack_info *info, +stack_trace_translate_fp_fn translate_fp) {struct task_struct *tsk = state->task;unsigned long fp = state->fp;@@ -159,13 +172,22 @@ static inline int unwind_next_common(struct unwind_state *state,__set_bit (state->prev_type, state->stacks_done); }
arch/arm64/include/asm/stacktrace/common.h static inline int unwind_next_common(struct unwind_state *state, · line 184
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +10
-0+/* Record fp as prev_fp before attempting to get the next fp */ + state->prev_fp = fp; + +/* +* If fp is not from the current address space perform the necessary +* translation before dereferencing it to get the next fp. +*/ +if (translate_fp && !translate_fp (&fp, info->type)) +return -EINVAL ; +
A call to unwind_next_common could fail having updated state->prev_fp as well as state->stacks_done. I think that it might be better to rework it so that there aren't any side effects should a call fail.
Thanks,
/fuad
Quoted 26 lines
arch/arm64/include/asm/stacktrace/common.h +0
-1/* * Record this frame record's values and location. The prev_fp and * prev_type are only meaningful to the next unwind_next() invocation. */ state->fp =READ_ONCE (*(unsigned long *)(fp)); state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); - state->prev_fp = fp; state->prev_type = info->type;return 0 ;arch/arm64/kernel/stacktrace.c +1
-2@@ -87,7 +87,7 @@ static int notrace unwind_next(struct unwind_state *state)if (fp == (unsigned long )task_pt_regs (tsk)->stackframe)return -ENOENT ; - err =unwind_next_common (state, &info); + err =unwind_next_common (state, &info,NULL );if (err)return err; --2.37.0.170.g444d1eabd0-goog
Quoted 3 lines
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 04/18] arm64: stacktrace: Handle frame pointer from different address spaces
Quoted 70 lines · Fuad Tabba' via kernel-team
Hi Kalesh,
Quoted 5 lines · Kalesh Singh' via kernel-team
The unwinder code is made reusable so that it can be used to unwind various types of stacks. One usecase is unwinding the nVHE hyp stack from the host (EL1) in non-protected mode. This means that the unwinder must be able to tracnslate HYP stack
s/tracnslate/translate
Quoted 19 lines
addresses to kernel addresses.
Add a callback (
stack_trace_translate_fp_fn) to allow specifying the translation function.Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/common.h | 26 ++++++++++++++++++++-- arch/arm64/kernel/stacktrace.c | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-)arch/arm64/include/asm/stacktrace/common.h +0
-0@@ -123,9 +123,22 @@ static inline void unwind_init_common(struct unwind_state *state, state->prev_fp =0 ; state->prev_type =STACK_TYPE_UNKNOWN ; }arch/arm64/include/asm/stacktrace/common.h static inline void unwind_init_common(struct unwind_state *state, · line 135
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +10
-0+/** +* stack_trace_translate_fp_fn() - Translates a non-kernel frame pointer to +* a kernel address. +* +* @fp: the frame pointer to be updated to it's kernel address. +* @type: the stack type associated with frame pointer @fp +* +* Returns true and success and @fp is updated to the corresponding +* kernel virtual address; otherwise returns false. +*/ Please add a newline before the new block.
Also, something which you have done in comment blocks in this patch as well as future patches (so I won't mention them again) is use the opening comment mark /** , which is meant for kernel-doc comments
(https://www.kernel.org/doc/html/latest/doc-guide/kernel-doc.html).
However, this block, and many if not most of the others don't seem to be conformant (scripts/kernel-doc-v -nonearch/arm64/include/asm/stacktrace/common.h).I think the easiest thing to do is to format them as a normal block: /*.
Quoted 14 lines
arch/arm64/include/asm/stacktrace/common.h +4
-1+typedef bool (*stack_trace_translate_fp_fn )(unsigned long *fp, +enum stack_type type);static inline int unwind_next_common (struct unwind_state *state, -struct stack_info *info) +struct stack_info *info, +stack_trace_translate_fp_fn translate_fp) {struct task_struct *tsk = state->task;unsigned long fp = state->fp;@@ -159,13 +172,22 @@ static inline int unwind_next_common(struct unwind_state *state,__set_bit (state->prev_type, state->stacks_done); }
Quoted 14 lines
arch/arm64/include/asm/stacktrace/common.h static inline int unwind_next_common(struct unwind_state *state, · line 184
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +10
-0+/* Record fp as prev_fp before attempting to get the next fp */ + state->prev_fp = fp; + +/* +* If fp is not from the current address space perform the necessary +* translation before dereferencing it to get the next fp. +*/ +if (translate_fp && !translate_fp (&fp, info->type)) +return -EINVAL ; +A call to
unwind_next_commoncould fail having updatedstate->prev_fpas well asstate->stacks_done. I think that it might be better to rework it so that there aren't any side effects should a call fail.
Hi Fuad,
Thanks for the comments. I'll address them in the next version.
--Kalesh
Quoted 34 lines
Thanks,
/fuadQuoted 26 lines
arch/arm64/include/asm/stacktrace/common.h +0
-1/* * Record this frame record's values and location. The prev_fp and * prev_type are only meaningful to the next unwind_next() invocation. */ state->fp =READ_ONCE (*(unsigned long *)(fp)); state->pc =READ_ONCE (*(unsigned long *)(fp +8 )); - state->prev_fp = fp; state->prev_type = info->type;return 0 ;arch/arm64/kernel/stacktrace.c +1
-2@@ -87,7 +87,7 @@ static int notrace unwind_next(struct unwind_state *state)if (fp == (unsigned long )task_pt_regs (tsk)->stackframe)return -ENOENT ; - err =unwind_next_common (state, &info); + err =unwind_next_common (state, &info,NULL );if (err)return err; --2.37.0.170.g444d1eabd0-goog
Quoted 7 lines
Quoted 3 lines
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 5/18 arm64: stacktrace: Factor out common unwind()
In reply to Kalesh SinghMove unwind() to stacktrace/common.h, and as a result the kernel unwind_next() to asm/stacktrace.h. This allow reusing unwind() in the implementation of the nVHE HYP stack unwinder, later in the series.
--- arch/arm64/include/asm/stacktrace.h | 51 ++++++++++++++++ arch/arm64/include/asm/stacktrace/common.h | 19 ++++++ arch/arm64/kernel/stacktrace.c | 67 ---------------------- 3 files changed, 70 insertions(+), 67 deletions(-)
arch/arm64/include/asm/stacktrace.h +51 -0
@@ -11,6 +11,7 @@#include <linux/llist.h> #include <asm/memory.h> +#include <asm/pointer_auth.h> #include <asm/ptrace.h> #include <asm/sdei.h>
@@ -78,4 +79,54 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, return false; } + +/* +* Unwind from one frame record (A) to the next frame record (B). +* +* We terminate early if the location of B indicates a malformed chain of frame +* 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 inline int notrace unwind_next(struct unwind_state *state) +{ +struct task_struct *tsk = state->task; +unsigned long fp = state->fp; +struct stack_info info; +int err; + +/* Final frame; nothing to unwind */ +if (fp == (unsigned long )task_pt_regs (tsk)->stackframe) +return -ENOENT ; + + err =unwind_next_common (state, &info,NULL ); +if (err) +return err; + + state->pc =ptrauth_strip_insn_pac (state->pc); + +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +if (tsk->ret_stack && + (state->pc == (unsigned long )return_to_handler)) { +unsigned long orig_pc; +/* +* This is a case where function graph tracer has +* modified a return address (LR) in a stack frame +* to hook a function return. +* So replace it to an original value. +*/ + orig_pc =ftrace_graph_ret_addr (tsk,NULL , state->pc, + (void *)state->fp); +if (WARN_ON_ONCE (state->pc == orig_pc)) +return -EINVAL ; + state->pc = orig_pc; + } +#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ +#ifdef CONFIG_KRETPROBES +if (is_kretprobe_trampoline (state->pc)) + state->pc =kretprobe_find_ret_addr (tsk, (void *)state->fp, &state->kr_cur); +#endif + +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next);#endif /* __ASM_STACKTRACE_H */
arch/arm64/include/asm/stacktrace/common.h +19 -0
@@ -9,6 +9,7 @@#include <linux/bitmap.h> #include <linux/bitops.h> +#include <linux/kprobes.h> #include <linux/types.h> enum stack_type {
@@ -69,6 +70,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, unsigned long sp, unsigned long size, struct stack_info *info); +static inline int unwind_next (struct unwind_state *state); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)
@@ -192,4 +195,20 @@ static inline int unwind_next_common(struct unwind_state *state,return 0 ; } + +static inline void notrace unwind(struct unwind_state *state, +stack_trace_consume_fn consume_entry, +void *cookie) +{ +while (1 ) { +int ret; + +if (!consume_entry (cookie, state->pc)) +break ; + ret =unwind_next (state); +if (ret <0 ) +break ; + } +} +NOKPROBE_SYMBOL (unwind);#endif /* __ASM_STACKTRACE_COMMON_H */
arch/arm64/kernel/stacktrace.c +0 -67
85 lines not on this page · raw message
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 05/18] arm64: stacktrace: Factor out common unwind()
Hi Kalesh,
Quoted 8 lines · Kalesh Singh
Move
unwind()tostacktrace/common.h, and as a result the kernelunwind_next()toasm/stacktrace.h. This allow reusingunwind()in the implementation of the nVHE HYP stack unwinder, later in the series.Signed-off-by Kalesh Singh <[email protected]>---
Thanks,
/fuad
Quoted 206 lines
arch/arm64/include/asm/stacktrace.h | 51 ++++++++++++++++ arch/arm64/include/asm/stacktrace/common.h | 19 ++++++ arch/arm64/kernel/stacktrace.c | 67 ---------------------- 3 files changed, 70 insertions(+), 67 deletions(-)arch/arm64/include/asm/stacktrace.h +51
-0@@ -11,6 +11,7 @@#include <linux/llist.h> #include <asm/memory.h> +#include <asm/pointer_auth.h> #include <asm/ptrace.h> #include <asm/sdei.h> @@ -78,4 +79,54 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, return false; } + +/* +* Unwind from one frame record (A) to the next frame record (B). +* +* We terminate early if the location of B indicates a malformed chain of frame +* 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 inline int notrace unwind_next(struct unwind_state *state) +{ +struct task_struct *tsk = state->task; +unsigned long fp = state->fp; +struct stack_info info; +int err; + +/* Final frame; nothing to unwind */ +if (fp == (unsigned long )task_pt_regs (tsk)->stackframe) +return -ENOENT ; + + err =unwind_next_common (state, &info,NULL ); +if (err) +return err; + + state->pc =ptrauth_strip_insn_pac (state->pc); + +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +if (tsk->ret_stack && + (state->pc == (unsigned long )return_to_handler)) { +unsigned long orig_pc; +/* +* This is a case where function graph tracer has +* modified a return address (LR) in a stack frame +* to hook a function return. +* So replace it to an original value. +*/ + orig_pc =ftrace_graph_ret_addr (tsk,NULL , state->pc, + (void *)state->fp); +if (WARN_ON_ONCE (state->pc == orig_pc)) +return -EINVAL ; + state->pc = orig_pc; + } +#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ +#ifdef CONFIG_KRETPROBES +if (is_kretprobe_trampoline (state->pc)) + state->pc =kretprobe_find_ret_addr (tsk, (void *)state->fp, &state->kr_cur); +#endif + +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next);#endif /* __ASM_STACKTRACE_H */ arch/arm64/include/asm/stacktrace/common.h +19
-0@@ -9,6 +9,7 @@#include <linux/bitmap.h> #include <linux/bitops.h> +#include <linux/kprobes.h> #include <linux/types.h> enum stack_type {@@ -69,6 +70,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, unsigned long sp, unsigned long size, struct stack_info *info); +static inline int unwind_next (struct unwind_state *state); +static inline bool on_stack (unsigned long sp,unsigned long size,unsigned long low,unsigned long high,enum stack_type type,struct stack_info *info)@@ -192,4 +195,20 @@ static inline int unwind_next_common(struct unwind_state *state,return 0 ; } + +static inline void notrace unwind(struct unwind_state *state, +stack_trace_consume_fn consume_entry, +void *cookie) +{ +while (1 ) { +int ret; + +if (!consume_entry (cookie, state->pc)) +break ; + ret =unwind_next (state); +if (ret <0 ) +break ; + } +} +NOKPROBE_SYMBOL (unwind);#endif /* __ASM_STACKTRACE_COMMON_H */ arch/arm64/kernel/stacktrace.c +0
-68@@ -7,14 +7,12 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/ftrace.h> -#include <linux/kprobes.h> #include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <asm/irq.h> -#include <asm/pointer_auth.h> #include <asm/stack_pointer.h> #include <asm/stacktrace.h> @@ -69,71 +67,6 @@ static inline void unwind_init_from_task(struct unwind_state *state, state->pc =thread_saved_pc (task); } -/* -* Unwind from one frame record (A) to the next frame record (B). -* -* We terminate early if the location of B indicates a malformed chain of frame -* 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 unwind_state *state) -{ -struct task_struct *tsk = state->task; -unsigned long fp = state->fp; -struct stack_info info; -int err; - -/* Final frame; nothing to unwind */ -if (fp == (unsigned long )task_pt_regs (tsk)->stackframe) -return -ENOENT ; - - err =unwind_next_common (state, &info,NULL ); -if (err) -return err; - - state->pc =ptrauth_strip_insn_pac (state->pc); - -#ifdef CONFIG_FUNCTION_GRAPH_TRACER -if (tsk->ret_stack && - (state->pc == (unsigned long )return_to_handler)) { -unsigned long orig_pc; -/* -* This is a case where function graph tracer has -* modified a return address (LR) in a stack frame -* to hook a function return. -* So replace it to an original value. -*/ - orig_pc =ftrace_graph_ret_addr (tsk,NULL , state->pc, - (void *)state->fp); -if (WARN_ON_ONCE (state->pc == orig_pc)) -return -EINVAL ; - state->pc = orig_pc; - } -#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ -#ifdef CONFIG_KRETPROBES -if (is_kretprobe_trampoline (state->pc)) - state->pc =kretprobe_find_ret_addr (tsk, (void *)state->fp, &state->kr_cur); -#endif - -return 0 ; -} -NOKPROBE_SYMBOL (unwind_next); - -static void notrace unwind(struct unwind_state *state, -stack_trace_consume_fn consume_entry,void *cookie) -{ -while (1 ) { -int ret; - -if (!consume_entry (cookie, state->pc)) -break ; - ret =unwind_next (state); -if (ret <0 ) -break ; - } -} -NOKPROBE_SYMBOL (unwind); -static bool dump_backtrace_entry (void *arg,unsigned long where) {char *loglvl = arg; --
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 6/18 arm64: stacktrace: Add description of stacktrace/common.h
In reply to Kalesh SinghAdd brief description on how to use stacktrace/common.h to implement a stack unwinder.
--- arch/arm64/include/asm/stacktrace/common.h | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/include/asm/stacktrace/common.h +8 -0
@@ -2,6 +2,14 @@/* * Common arm64 stack unwinder code. * +* To implement a new arm64 stack unwinder: +* 1) Include this header +* +* 2) Provide implementations for the following functions: +* - on_overflow_stack() +* - on_accessible_stack() +* - unwind_next() +* * Copyright (C) 2012 ARM Ltd. */ #ifndef __ASM_STACKTRACE_COMMON_H
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 06/18] arm64: stacktrace: Add description of stacktrace/common.h
Hi Kalesh,
Quoted 19 lines · Kalesh Singh
Add brief description on how to use
stacktrace/common.hto implement a stack unwinder.Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/common.h | 8 ++++++++ 1 file changed, 8 insertions(+)arch/arm64/include/asm/stacktrace/common.h +2
-0@@ -2,6 +2,14 @@/* * Common arm64 stack unwinder code. * +* To implement a new arm64 stack unwinder: +* 1) Include this header
arch/arm64/include/asm/stacktrace/common.h
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +6
-1+* +* 2) Provide implementations for the following functions: +* - on_overflow_stack() +* - on_accessible_stack() +* - unwind_next() +* * Copyright (C) 2012 ARM Ltd. */ #ifndef __ASM_STACKTRACE_COMMON_H --
Ideally it would be nice to have a description of what these functions are expected to do, but that said,
Thanks,
/fuad
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 06/18] arm64: stacktrace: Add description of stacktrace/common.h
In reply to Kalesh SinghQuoted 14 lines · Kalesh Singh
Add brief description on how to use
stacktrace/common.hto implement a stack unwinder.Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/common.h | 8 ++++++++ 1 file changed, 8 insertions(+)arch/arm64/include/asm/stacktrace/common.h +0
-0
arch/arm64/include/asm/stacktrace/common.h line 11
Quoted 10 lines
arch/arm64/include/asm/stacktrace/common.h +7
-0@@ -2,6 +2,14 @@/* * Common arm64 stack unwinder code. * +* To implement a new arm64 stack unwinder: +* 1) Include this header +* +* 2) Provide implementations for the following functions: +* - on_overflow_stack() +* - on_accessible_stack() +* - unwind_next()
A short description of what these helpers are supposed to do would also be helpful.
Thanks,
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 06/18] arm64: stacktrace: Add description of stacktrace/common.h
Quoted 22 lines · Marc Zyngier
Quoted 19 lines · Kalesh Singh
Add brief description on how to use
stacktrace/common.hto implement a stack unwinder.Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/common.h | 8 ++++++++ 1 file changed, 8 insertions(+)arch/arm64/include/asm/stacktrace/common.h +2
-0@@ -2,6 +2,14 @@/* * Common arm64 stack unwinder code. * +* To implement a new arm64 stack unwinder: +* 1) Include this header
Quoted 8 lines
arch/arm64/include/asm/stacktrace/common.h line 11
Quoted 5 lines
arch/arm64/include/asm/stacktrace/common.h +5
-0+* +* 2) Provide implementations for the following functions: +* - on_overflow_stack() +* - on_accessible_stack() +* - unwind_next() A short description of what these helpers are supposed to do would also be helpful.
Thanks Fuad, Marc. I'll add descriptions in the next version.
Quoted 7 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 7/18 KVM: arm64: On stack overflow switch to hyp overflow_stack
In reply to Kalesh SinghOn hyp stack overflow switch to 16-byte aligned secondary stack. This provides us stack space to better handle overflows; and is used in a subsequent patch to dump the hypervisor stacktrace.
--- arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 ++------- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.c
arch/arm64/kvm/hyp/nvhe/Makefile +1 -1
@@ -14,7 +14,7 @@ lib-objs := $(addprefix ../../../lib/, $(lib-objs)) obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \ hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \ - cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o + cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o obj-$(CONFIG_DEBUG_LIST) += list_debug.o
arch/arm64/kvm/hyp/nvhe/host.S +2 -7
@@ -177,13 +177,8 @@ SYM_FUNC_END(__host_hvc) b hyp_panic .L__hyp_sp_overflow\@: - /* - * Reset SP to the top of the stack, to allow handling the hyp_panic. - * This corrupts the stack but is ok, since we won't be attempting - * any unwinding here. - */ - ldr_this_cpu x0, kvm_init_params + NVHE_INIT_STACK_HYP_VA, x1 - mov sp, x0 + /* Switch to the overflow stack */ + adr_this_cpu sp, overflow_stack + OVERFLOW_STACK_SIZE, x0 b hyp_panic_bad_stack ASM_BUG()
arch/arm64/kvm/hyp/nvhe/stacktrace.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* KVM nVHE hypervisor stack tracing support. +* +* Copyright (C) 2022 Google LLC +*/ +#include <asm/memory.h> +#include <asm/percpu.h> + +DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack) +__aligned(16) ;
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 07/18] KVM: arm64: On stack overflow switch to hyp overflow_stack
Hi Kalesh,
Quoted 6 lines · Kalesh Singh
On hyp stack overflow switch to 16-byte aligned secondary stack. This provides us stack space to better handle overflows; and is used in a subsequent patch to dump the hypervisor stacktrace.
Signed-off-by Kalesh Singh <[email protected]>
Thanks,
/fuad
Quoted 60 lines
--- arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 ++------- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.carch/arm64/kvm/hyp/nvhe/Makefile +1
-1@@ -14,7 +14,7 @@ lib-objs := $(addprefix ../../../lib/, $(lib-objs)) obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \ hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \ - cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o + cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o obj-$(CONFIG_DEBUG_LIST) += list_debug.oarch/arm64/kvm/hyp/nvhe/host.S +2
-7@@ -177,13 +177,8 @@ SYM_FUNC_END(__host_hvc) b hyp_panic .L__hyp_sp_overflow\@: - /* - * Reset SP to the top of the stack, to allow handling the hyp_panic. - * This corrupts the stack but is ok, since we won't be attempting - * any unwinding here. - */ - ldr_this_cpu x0, kvm_init_params + NVHE_INIT_STACK_HYP_VA, x1 - mov sp, x0 + /* Switch to the overflow stack */ + adr_this_cpu sp, overflow_stack + OVERFLOW_STACK_SIZE, x0 b hyp_panic_bad_stack ASM_BUG()arch/arm64/kvm/hyp/nvhe/stacktrace.c new file +11
-1@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* KVM nVHE hypervisor stack tracing support. +* +* Copyright (C) 2022 Google LLC +*/ +#include <asm/memory.h> +#include <asm/percpu.h> + +DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack) +__aligned(16) ; --2.37.0.170.g444d1eabd0-goog
PATCH v4 8/18 KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
In reply to Kalesh SinghThis can be used to disable stacktrace for the protected KVM nVHE hypervisor, in order to save on the associated memory usage.
This option is disabled by default, since protected KVM is not widely used on platforms other than Android currently.
--- arch/arm64/kvm/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm64/kvm/Kconfig +15 -0
@@ -46,6 +46,21 @@ menuconfig KVM If unsure, say N. +config PROTECTED_NVHE_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on KVM + default n + help + Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() + + If you are not using protected nVHE (pKVM), say N. + + If using protected nVHE mode, but cannot afford the associated + memory cost (less than 0.75 page per CPU) of pKVM stacktraces, + say N. + + If unsure, say N. + config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" depends on KVM
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 08/18] KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
[- Drew and android-mm, as both addresses bounce]
Quoted 25 lines · Kalesh Singh
This can be used to disable stacktrace for the protected KVM nVHE hypervisor, in order to save on the associated memory usage.
This option is disabled by default, since protected KVM is not widely used on platforms other than Android currently.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/kvm/Kconfig +5
-0@@ -46,6 +46,21 @@ menuconfig KVM If unsure, say N. +config PROTECTED_NVHE_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on KVM + default n + help
arch/arm64/kvm/Kconfig menuconfig KVM · line 63
Quoted 10 lines
arch/arm64/kvm/Kconfig +10
-0+ Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() + + If you are not using protected nVHE (pKVM), say N. + + If using protected nVHE mode, but cannot afford the associated + memory cost (less than 0.75 page per CPU) of pKVM stacktraces, + say N. + + If unsure, say N. +
Can we make this depend on NVHE_EL2_DEBUG instead? I'd like to keep the disclosing of EL2 information in protected mode a strict debug feature.
arch/arm64/kvm/Kconfig menuconfig KVM · line 66
Quoted 3 lines
arch/arm64/kvm/Kconfig +0
-0config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" depends on KVM
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH v4 08/18] KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
Quoted 36 lines · Marc Zyngier
[- Drew and android-mm, as both addresses bounce]
Quoted 31 lines · Kalesh Singh
This can be used to disable stacktrace for the protected KVM nVHE hypervisor, in order to save on the associated memory usage.
This option is disabled by default, since protected KVM is not widely used on platforms other than Android currently.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/kvm/Kconfig +11
-0@@ -46,6 +46,21 @@ menuconfig KVM If unsure, say N. +config PROTECTED_NVHE_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on KVM + default n + help + Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() + + If you are not using protected nVHE (pKVM), say N. + + If using protected nVHE mode, but cannot afford the associated + memory cost (less than 0.75 page per CPU) of pKVM stacktraces,
Quoted 8 lines
arch/arm64/kvm/Kconfig menuconfig KVM · line 63
Quoted 4 lines
arch/arm64/kvm/Kconfig +4
-0+ say N. + + If unsure, say N. +Can we make this depend on
NVHE_EL2_DEBUGinstead? I'd like to keep the disclosing of EL2 information in protected mode a strict debug feature.
Hi Marc,
An earlier version was similar to what you propose. The unwinding depended on NVHE_EL2_DEBUG and all unwinding was done from EL1 with host stage 2 being disabled. The reason the design was changed is because Android expressed the need for pKVM hyp stacktraces in production environments. [1]
[1] https://lore.kernel.org/all/CAC_TJveNRaDFcQGo9-eqKa3=1DnuVDs4U+ye795VcJ1ozVkMyg@mail.gmail.com/
--Kalesh
Quoted 11 lines
arch/arm64/kvm/Kconfig menuconfig KVM · line 66
Quoted 4 lines
arch/arm64/kvm/Kconfig +0
-0config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" depends on KVMThanks,
M.--
Without deviation from the norm, progress is not possible.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 08/18] KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
Quoted 47 lines · Kalesh Singh
Quoted 36 lines · Marc Zyngier
[- Drew and android-mm, as both addresses bounce]
Quoted 31 lines · Kalesh Singh
This can be used to disable stacktrace for the protected KVM nVHE hypervisor, in order to save on the associated memory usage.
This option is disabled by default, since protected KVM is not widely used on platforms other than Android currently.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/kvm/Kconfig +11
-0@@ -46,6 +46,21 @@ menuconfig KVM If unsure, say N. +config PROTECTED_NVHE_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on KVM + default n + help + Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() + + If you are not using protected nVHE (pKVM), say N. + + If using protected nVHE mode, but cannot afford the associated + memory cost (less than 0.75 page per CPU) of pKVM stacktraces,Quoted 8 lines
arch/arm64/kvm/Kconfig menuconfig KVM · line 63
Quoted 4 lines
arch/arm64/kvm/Kconfig +4
-0+ say N. + + If unsure, say N. +Can we make this depend on
NVHE_EL2_DEBUGinstead? I'd like to keep the disclosing of EL2 information in protected mode a strict debug feature.
Quoted 7 lines
Hi Marc,
An earlier version was similar to what you propose. The unwinding depended on
NVHE_EL2_DEBUGand all unwinding was done from EL1 with host stage 2 being disabled. The reason the design was changed is because Android expressed the need for pKVM hyp stacktraces in production environments. [1]
I think that's an Android-specific requirement that doesn't apply to upstream. If Android wants to enable this in production (and potentially leak details of the hypervisor address space), that's Android's business, and they can carry a patch for that. Upstream shouldn't have to cater for such a thing.
Thanks,
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 08/18] KVM: arm64: Add PROTECTED_NVHE_STACKTRACE Kconfig
Quoted 58 lines · Marc Zyngier
Quoted 47 lines · Kalesh Singh
Quoted 36 lines · Marc Zyngier
[- Drew and android-mm, as both addresses bounce]
Quoted 31 lines · Kalesh Singh
This can be used to disable stacktrace for the protected KVM nVHE hypervisor, in order to save on the associated memory usage.
This option is disabled by default, since protected KVM is not widely used on platforms other than Android currently.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/kvm/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/kvm/Kconfig +11
-0@@ -46,6 +46,21 @@ menuconfig KVM If unsure, say N. +config PROTECTED_NVHE_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on KVM + default n + help + Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() + + If you are not using protected nVHE (pKVM), say N. + + If using protected nVHE mode, but cannot afford the associated + memory cost (less than 0.75 page per CPU) of pKVM stacktraces,Quoted 8 lines
arch/arm64/kvm/Kconfig menuconfig KVM · line 63
Quoted 4 lines
arch/arm64/kvm/Kconfig +4
-0+ say N. + + If unsure, say N. +Can we make this depend on
NVHE_EL2_DEBUGinstead? I'd like to keep the disclosing of EL2 information in protected mode a strict debug feature.Quoted 7 lines
Hi Marc,
An earlier version was similar to what you propose. The unwinding depended on
NVHE_EL2_DEBUGand all unwinding was done from EL1 with host stage 2 being disabled. The reason the design was changed is because Android expressed the need for pKVM hyp stacktraces in production environments. [1]
Quoted 5 lines
I think that's an Android-specific requirement that doesn't apply to upstream. If Android wants to enable this in production (and potentially leak details of the hypervisor address space), that's Android's business, and they can carry a patch for that. Upstream shouldn't have to cater for such a thing.
Hi Marc,
For android it's important to be able to debug issues from the field. But I agree no need to subject upstream to the same requirements. I'll guard this with the NVHE_EL2_DEBUG config in the next version.
Thanks,
Kalesh
Quoted 7 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 9/18 KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
In reply to Kalesh SinghIn protected nVHE mode the host cannot directly access hypervisor memory, so we will dump the hypervisor stacktrace to a shared buffer with the host.
The minimum size do the buffer required, assuming the min frame size of [x29, x30] (2 * sizeof(long)), is half the combined size of the hypervisor and overflow stacks plus an additional entry to delimit the end of the stacktrace.
The stacktrace buffers are used later in the seried to dump the nVHE hypervisor stacktrace when using protected-mode.
--- arch/arm64/include/asm/memory.h | 7 +++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 4 ++++ 2 files changed, 11 insertions(+)
arch/arm64/include/asm/memory.h +7 -0
@@ -113,6 +113,13 @@#define OVERFLOW_STACK_SIZE SZ_4K +/* +* With the minimum frame size of [x29, x30], exactly half the combined +* sizes of the hyp and overflow stacks is needed to save the unwinded +* stacktrace; plus an additional entry to delimit the end. +*/ +#define NVHE_STACKTRACE_SIZE ((OVERFLOW_STACK_SIZE + PAGE_SIZE) / 2 + sizeof(long)) +/* * Alignment of kernel segments (e.g. .text, .data). *
arch/arm64/kvm/hyp/nvhe/stacktrace.c +4 -0
@@ -9,3 +9,7 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ; + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 09/18] KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
Quoted 6 lines · Kalesh Singh
In protected nVHE mode the host cannot directly access hypervisor memory, so we will dump the hypervisor stacktrace to a shared buffer with the host.
The minimum size do the buffer required, assuming the min frame
s/do/for/ ?
Quoted 3 lines
size of [x29, x30] (2 * sizeof(long)), is half the combined size of the hypervisor and overflow stacks plus an additional entry to delimit the end of the stacktrace.
Let me see if I understand this: the maximum stack size is the combination of the HYP and overflow stacks, and the smallest possible stack frame is 128bit (only FP+LR). The buffer thus needs to provide one 64bit entry per stack frame that fits in the combined stack, plus one entry as an end marker.
So the resulting size is half of the combined stack size, plus a single 64bit word. Is this correct?
Quoted 33 lines
The stacktrace buffers are used later in the seried to dump the nVHE hypervisor stacktrace when using protected-mode.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/memory.h | 7 +++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 4 ++++ 2 files changed, 11 insertions(+)arch/arm64/include/asm/memory.h +7
-0@@ -113,6 +113,13 @@#define OVERFLOW_STACK_SIZE SZ_4K +/* +* With the minimum frame size of [x29, x30], exactly half the combined +* sizes of the hyp and overflow stacks is needed to save the unwinded +* stacktrace; plus an additional entry to delimit the end. +*/ +#define NVHE_STACKTRACE_SIZE ((OVERFLOW_STACK_SIZE + PAGE_SIZE) / 2 + sizeof(long)) +/* * Alignment of kernel segments (e.g. .text, .data). * arch/arm64/kvm/hyp/nvhe/stacktrace.c +0
-0
arch/arm64/kvm/hyp/nvhe/stacktrace.c line 15
Quoted 7 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +4
-0@@ -9,3 +9,7 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ; + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */
OK, so the allocation exists even if KVM is not running in protected mode. I guess this is OK for now, but definitely reinforces my request that this is only there when compiled for debug mode.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH v4 09/18] KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
Quoted 11 lines · Marc Zyngier
Quoted 6 lines · Kalesh Singh
In protected nVHE mode the host cannot directly access hypervisor memory, so we will dump the hypervisor stacktrace to a shared buffer with the host.
The minimum size do the buffer required, assuming the min frame
s/do/for/ ?
Ack
Quoted 5 lines
Quoted 4 lines
size of [x29, x30] (2 * sizeof(long)), is half the combined size of the hypervisor and overflow stacks plus an additional entry to delimit the end of the stacktrace.
Quoted 8 lines
Let me see if I understand this: the maximum stack size is the combination of the HYP and overflow stacks, and the smallest possible stack frame is 128bit (only FP+LR). The buffer thus needs to provide one 64bit entry per stack frame that fits in the combined stack, plus one entry as an end marker.
So the resulting size is half of the combined stack size, plus a single 64bit word. Is this correct?
That understanding is correct. So for the 64 KB pages is slightly more than half a page (overflow stack is 4KB).
Quoted 35 lines
Quoted 35 lines
The stacktrace buffers are used later in the seried to dump the nVHE hypervisor stacktrace when using protected-mode.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/memory.h | 7 +++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 4 ++++ 2 files changed, 11 insertions(+)arch/arm64/include/asm/memory.h +7
-0@@ -113,6 +113,13 @@#define OVERFLOW_STACK_SIZE SZ_4K +/* +* With the minimum frame size of [x29, x30], exactly half the combined +* sizes of the hyp and overflow stacks is needed to save the unwinded +* stacktrace; plus an additional entry to delimit the end. +*/ +#define NVHE_STACKTRACE_SIZE ((OVERFLOW_STACK_SIZE + PAGE_SIZE) / 2 + sizeof(long)) +/* * Alignment of kernel segments (e.g. .text, .data). * arch/arm64/kvm/hyp/nvhe/stacktrace.c +0
-0@@ -9,3 +9,7 @@
Quoted 11 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c line 15
Quoted 6 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +4
-0DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ; + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ OK, so the allocation exists even if KVM is not running in protected mode. I guess this is OK for now, but definitely reinforces my request that this is only there when compiled for debug mode.
Yes, but in the case you aren't running protected mode you can avoid it by setting PROTECTED_NVHE_STACKTRACE=n.
Thanks,
Kalesh
Quoted 6 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 09/18] KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
In reply to Kalesh SinghHi Kalesh,
Quoted 24 lines · Kalesh Singh
In protected nVHE mode the host cannot directly access hypervisor memory, so we will dump the hypervisor stacktrace to a shared buffer with the host.
The minimum size do the buffer required, assuming the min frame size of [x29, x30] (2 * sizeof(long)), is half the combined size of the hypervisor and overflow stacks plus an additional entry to delimit the end of the stacktrace.
The stacktrace buffers are used later in the seried to dump the nVHE hypervisor stacktrace when using protected-mode.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/memory.h | 7 +++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 4 ++++ 2 files changed, 11 insertions(+)arch/arm64/include/asm/memory.h +0
-0
arch/arm64/include/asm/memory.h line 121
Quoted 9 lines
arch/arm64/include/asm/memory.h +6
-0@@ -113,6 +113,13 @@#define OVERFLOW_STACK_SIZE SZ_4K +/* +* With the minimum frame size of [x29, x30], exactly half the combined +* sizes of the hyp and overflow stacks is needed to save the unwinded +* stacktrace; plus an additional entry to delimit the end. +*/ +#define NVHE_STACKTRACE_SIZE ((OVERFLOW_STACK_SIZE + PAGE_SIZE) / 2 + sizeof(long))
I do find this computation to be a bit confusing, especially with the addition of the entry to delimit the end. Especially when considering that in patch 12, where you add pkvm_save_backtrace_entry(), you need to compensate for it again.
Not sure what the best way is, having two definitions, or something like that, with one for the size and one for the delimiter.
Thanks,
/fuad
Quoted 19 lines
arch/arm64/include/asm/memory.h +1
-0+/* * Alignment of kernel segments (e.g. .text, .data). * arch/arm64/kvm/hyp/nvhe/stacktrace.c +4
-1@@ -9,3 +9,7 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ; + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ --2.37.0.170.g444d1eabd0-goog
PATCH v4 10/18 KVM: arm64: Stub implementation of pKVM HYP stack unwinder
In reply to Kalesh SinghAdd some stub implementations of protected nVHE stack unwinder, for building. These are implemented later in this series.
--- arch/arm64/include/asm/stacktrace/nvhe.h | 57 ++++++++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 3 +- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.h
arch/arm64/include/asm/stacktrace/nvhe.h new file +57 -0
@@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* KVM nVHE hypervisor stack tracing support. +* +* The unwinder implementation depends on the nVHE mode: +* +* 1) pKVM (protected nVHE) mode - the host cannot directly access +* the HYP memory. The stack is unwinded in EL2 and dumped to a shared +* buffer where the host can read and print the stacktrace. +* +* Copyright (C) 2022 Google LLC +*/ +#ifndef __ASM_STACKTRACE_NVHE_H +#define __ASM_STACKTRACE_NVHE_H + +#include <asm/stacktrace/common.h> + +static inline bool on_accessible_stack (const struct task_struct *tsk, +unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +/* +* Protected nVHE HYP stack unwinder +*/ +#ifdef __KVM_NVHE_HYPERVISOR__ + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next); +#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next); +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ + +#endif /* __KVM_NVHE_HYPERVISOR__ */ +#endif /* __ASM_STACKTRACE_NVHE_H */
arch/arm64/kvm/hyp/nvhe/stacktrace.c +1 -2
@@ -4,8 +4,7 @@* * Copyright (C) 2022 Google LLC */ -#include <asm/memory.h> -#include <asm/percpu.h> +#include <asm/stacktrace/nvhe.h> DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ;
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 10/18] KVM: arm64: Stub implementation of pKVM HYP stack unwinder
Quoted 48 lines · Kalesh Singh
Add some stub implementations of protected nVHE stack unwinder, for building. These are implemented later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 57 ++++++++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 3 +- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.harch/arm64/include/asm/stacktrace/nvhe.h new file +31
-0@@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* KVM nVHE hypervisor stack tracing support. +* +* The unwinder implementation depends on the nVHE mode: +* +* 1) pKVM (protected nVHE) mode - the host cannot directly access +* the HYP memory. The stack is unwinded in EL2 and dumped to a shared +* buffer where the host can read and print the stacktrace. +* +* Copyright (C) 2022 Google LLC +*/ +#ifndef __ASM_STACKTRACE_NVHE_H +#define __ASM_STACKTRACE_NVHE_H + +#include <asm/stacktrace/common.h> + +static inline bool on_accessible_stack (const struct task_struct *tsk, +unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +/* +* Protected nVHE HYP stack unwinder +*/ +#ifdef __KVM_NVHE_HYPERVISOR__ + +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +static inline bool on_overflow_stack(unsigned long sp, unsigned long size,
arch/arm64/include/asm/stacktrace/nvhe.h line 41
Quoted 10 lines
arch/arm64/include/asm/stacktrace/nvhe.h new file +10
-0+ struct stack_info *info) +{ +return false; +} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next);
I find this rather dodgy. It means that every compilation unit that (indirectly) drags this include file may end-up with an 'unwind_next' function. At best this will be eliminated at compilation time, but it may also generate a warning.
Why can't this me made an 'inline' function? At the very least, it should have a __maybe_unused attribute.
arch/arm64/include/asm/stacktrace/nvhe.h line 53
Quoted 12 lines
arch/arm64/include/asm/stacktrace/nvhe.h new file +12
-0+#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next);
Same thing here.
Thanks,
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 11/18 KVM: arm64: Stub implementation of non-protected nVHE HYP stack unwinder
In reply to Kalesh SinghAdd stub implementations of non-protected nVHE stack unwinder, for building. These are implemented later in this series.
--- arch/arm64/include/asm/stacktrace/nvhe.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm64/include/asm/stacktrace/nvhe.h +22 -0
@@ -8,6 +8,12 @@* the HYP memory. The stack is unwinded in EL2 and dumped to a shared * buffer where the host can read and print the stacktrace. * +* 2) Non-protected nVHE mode - the host can directly access the +* HYP stack pages and unwind the HYP stack in EL1. This saves having +* to allocate shared buffers for the host to read the unwinded +* stacktrace. +* +* * Copyright (C) 2022 Google LLC */ #ifndef __ASM_STACKTRACE_NVHE_H
@@ -53,5 +59,21 @@ static int notrace unwind_next(struct unwind_state *state)NOKPROBE_SYMBOL (unwind_next);#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +/* +* Non-protected nVHE HYP stack unwinder +*/ +#else /* !__KVM_NVHE_HYPERVISOR__ */ +static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next); +#endif /* __KVM_NVHE_HYPERVISOR__ */ #endif /* __ASM_STACKTRACE_NVHE_H */
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 11/18] KVM: arm64: Stub implementation of non-protected nVHE HYP stack unwinder
Quoted 27 lines · Kalesh Singh
Add stub implementations of non-protected nVHE stack unwinder, for building. These are implemented later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +6
-0@@ -8,6 +8,12 @@* the HYP memory. The stack is unwinded in EL2 and dumped to a shared * buffer where the host can read and print the stacktrace. * +* 2) Non-protected nVHE mode - the host can directly access the +* HYP stack pages and unwind the HYP stack in EL1. This saves having +* to allocate shared buffers for the host to read the unwinded +* stacktrace. +* +* * Copyright (C) 2022 Google LLC */ #ifndef __ASM_STACKTRACE_NVHE_H
arch/arm64/include/asm/stacktrace/nvhe.h static int notrace unwind_next(struct unwind_state *state) · line 65
Quoted 7 lines
arch/arm64/include/asm/stacktrace/nvhe.h +4
-0@@ -53,5 +59,21 @@ static int notrace unwind_next(struct unwind_state *state)NOKPROBE_SYMBOL (unwind_next);#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +/* +* Non-protected nVHE HYP stack unwinder +*/ +#else /* !__KVM_NVHE_HYPERVISOR__ */
I don't get this path. This either represents the VHE hypervisor or the kernel proper. Which one is it?
Quoted 4 lines
arch/arm64/include/asm/stacktrace/nvhe.h +4
-0+static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false;
arch/arm64/include/asm/stacktrace/nvhe.h static int notrace unwind_next(struct unwind_state *state) · line 79
Quoted 10 lines
arch/arm64/include/asm/stacktrace/nvhe.h +8
-0+} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next); +#endif /* __KVM_NVHE_HYPERVISOR__ */ #endif /* __ASM_STACKTRACE_NVHE_H */
Thanks,
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 11/18] KVM: arm64: Stub implementation of non-protected nVHE HYP stack unwinder
Quoted 33 lines · Marc Zyngier
Quoted 30 lines · Kalesh Singh
Add stub implementations of non-protected nVHE stack unwinder, for building. These are implemented later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +6
-0@@ -8,6 +8,12 @@* the HYP memory. The stack is unwinded in EL2 and dumped to a shared * buffer where the host can read and print the stacktrace. * +* 2) Non-protected nVHE mode - the host can directly access the +* HYP stack pages and unwind the HYP stack in EL1. This saves having +* to allocate shared buffers for the host to read the unwinded +* stacktrace. +* +* * Copyright (C) 2022 Google LLC */ #ifndef __ASM_STACKTRACE_NVHE_H@@ -53,5 +59,21 @@ static int notrace unwind_next(struct unwind_state *state)NOKPROBE_SYMBOL (unwind_next);#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */
Quoted 7 lines
arch/arm64/include/asm/stacktrace/nvhe.h static int notrace unwind_next(struct unwind_state *state) · line 65
Quoted 4 lines
arch/arm64/include/asm/stacktrace/nvhe.h +4
-0+/* +* Non-protected nVHE HYP stack unwinder +*/ +#else /* !__KVM_NVHE_HYPERVISOR__ */ I don't get this path. This either represents the VHE hypervisor or the kernel proper. Which one is it?
Hi Marc. This is run from kernel proper context. And it's the unwinding for conventional nVHE (non-protected). The unwinding is done from the host kernel in EL1.
Quoted 26 lines
Quoted 5 lines
arch/arm64/include/asm/stacktrace/nvhe.h +4
-0+static inline bool on_overflow_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false;arch/arm64/include/asm/stacktrace/nvhe.h static int notrace unwind_next(struct unwind_state *state) · line 79
Quoted 10 lines
arch/arm64/include/asm/stacktrace/nvhe.h +8
-0+} + +static int notrace unwind_next(struct unwind_state *state) +{ +return 0 ; +} +NOKPROBE_SYMBOL (unwind_next); +#endif /* __KVM_NVHE_HYPERVISOR__ */ #endif /* __ASM_STACKTRACE_NVHE_H */ Thanks,
M.--
Without deviation from the norm, progress is not possible.--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Marc Zyngier
maintainerRe: [PATCH v4 11/18] KVM: arm64: Stub implementation of non-protected nVHE HYP stack unwinder
Quoted 42 lines · Kalesh Singh
Quoted 33 lines · Marc Zyngier
Quoted 30 lines · Kalesh Singh
Add stub implementations of non-protected nVHE stack unwinder, for building. These are implemented later in this series.
Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +6
-0@@ -8,6 +8,12 @@* the HYP memory. The stack is unwinded in EL2 and dumped to a shared * buffer where the host can read and print the stacktrace. * +* 2) Non-protected nVHE mode - the host can directly access the +* HYP stack pages and unwind the HYP stack in EL1. This saves having +* to allocate shared buffers for the host to read the unwinded +* stacktrace. +* +* * Copyright (C) 2022 Google LLC */ #ifndef __ASM_STACKTRACE_NVHE_H@@ -53,5 +59,21 @@ static int notrace unwind_next(struct unwind_state *state)NOKPROBE_SYMBOL (unwind_next);#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ Quoted 7 lines
arch/arm64/include/asm/stacktrace/nvhe.h static int notrace unwind_next(struct unwind_state *state) · line 65
Quoted 4 lines
arch/arm64/include/asm/stacktrace/nvhe.h +4
-0+/* +* Non-protected nVHE HYP stack unwinder +*/ +#else /* !__KVM_NVHE_HYPERVISOR__ */ I don't get this path. This either represents the VHE hypervisor or the kernel proper. Which one is it?
Quoted 3 lines
Hi Marc. This is run from kernel proper context. And it's the unwinding for conventional nVHE (non-protected). The unwinding is done from the host kernel in EL1.
This really deserves a comment here, as the one you currently have is a bit misleading (and you probably want to move it below the #else).
Thanks,
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 12/18 KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
In reply to Kalesh SinghIn protected nVHE mode, the host cannot access private owned hypervisor memory. Also the hypervisor aims to remains simple to reduce the attack surface and does not provide any printk support.
For the above reasons, the approach taken to provide hypervisor stacktraces in protected mode is:
1) Unwind and save the hyp stack addresses in EL2 to a shared buffer with the host (done in this patch).
2) Delegate the dumping and symbolization of the addresses to the host in EL1 (later patch in the series).
--- arch/arm64/include/asm/stacktrace/nvhe.h | 18 ++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 70 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+)
arch/arm64/include/asm/stacktrace/nvhe.h +18 -0
@@ -21,6 +21,22 @@#include <asm/stacktrace/common.h> +/** +* kvm_nvhe_unwind_init - Start an unwind from the given nVHE HYP fp and pc +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +*/ +static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, +unsigned long fp, +unsigned long pc) +{ +unwind_init_common (state,NULL ); + + state->fp = fp; + state->pc = pc; +} +static inline bool on_accessible_stack (const struct task_struct *tsk,unsigned long sp,unsigned long size,struct stack_info *info)
@@ -33,6 +49,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,*/ #ifdef __KVM_NVHE_HYPERVISOR__ +extern void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc); +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info)
arch/arm64/kvm/hyp/nvhe/stacktrace.c +70 -0
74 lines not on this page · raw message
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 12/18] KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
Quoted 27 lines · Kalesh Singh
In protected nVHE mode, the host cannot access private owned hypervisor memory. Also the hypervisor aims to remains simple to reduce the attack surface and does not provide any printk support.
For the above reasons, the approach taken to provide hypervisor stacktraces in protected mode is:
1) Unwind and save the hyp stack addresses in EL2 to a shared buffer with the host (done in this patch).
2) Delegate the dumping and symbolization of the addresses to the host in EL1 (later patch in the series).Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 18 ++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 70 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +1
-0@@ -21,6 +21,22 @@#include <asm/stacktrace/common.h> +/**
arch/arm64/include/asm/stacktrace/nvhe.h line 34
Quoted 10 lines
arch/arm64/include/asm/stacktrace/nvhe.h +10
-0+* kvm_nvhe_unwind_init - Start an unwind from the given nVHE HYP fp and pc +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +*/ +static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, +unsigned long fp, +unsigned long pc) +{ +unwind_init_common (state,NULL );
Huh. Be careful here. This function is only 'inline', which means it may not be really inlined. We've had tons of similar issues like this in the past, and although this will not break at runtime anymore, it will definitely stop the kernel from linking.
Thanks,
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 12/18] KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
Quoted 29 lines · Marc Zyngier
Quoted 26 lines · Kalesh Singh
In protected nVHE mode, the host cannot access private owned hypervisor memory. Also the hypervisor aims to remains simple to reduce the attack surface and does not provide any printk support.
For the above reasons, the approach taken to provide hypervisor stacktraces in protected mode is:
1) Unwind and save the hyp stack addresses in EL2 to a shared buffer with the host (done in this patch).
2) Delegate the dumping and symbolization of the addresses to the host in EL1 (later patch in the series).Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 18 ++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 70 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +0
-0@@ -21,6 +21,22 @@#include <asm/stacktrace/common.h>
Quoted 16 lines
arch/arm64/include/asm/stacktrace/nvhe.h line 34
Quoted 11 lines
arch/arm64/include/asm/stacktrace/nvhe.h +11
-0+/** +* kvm_nvhe_unwind_init - Start an unwind from the given nVHE HYP fp and pc +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +*/ +static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, +unsigned long fp, +unsigned long pc) +{ +unwind_init_common (state,NULL );Huh. Be careful here. This function is only 'inline', which means it may not be really inlined. We've had tons of similar issues like this in the past, and although this will not break at runtime anymore, it will definitely stop the kernel from linking.
Ahh, there are a few other always inline *unwind_init* functions that use this. I'll update in the next version.
Thanks,
Kalesh
Quoted 7 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.
Re: [PATCH v4 12/18] KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
In reply to Kalesh SinghHi Kalesh,
Quoted 69 lines · Kalesh Singh
In protected nVHE mode, the host cannot access private owned hypervisor memory. Also the hypervisor aims to remains simple to reduce the attack surface and does not provide any printk support.
For the above reasons, the approach taken to provide hypervisor stacktraces in protected mode is:
1) Unwind and save the hyp stack addresses in EL2 to a shared buffer with the host (done in this patch).
2) Delegate the dumping and symbolization of the addresses to the host in EL1 (later patch in the series).Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 18 ++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 70 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +18
-0@@ -21,6 +21,22 @@#include <asm/stacktrace/common.h> +/** +* kvm_nvhe_unwind_init - Start an unwind from the given nVHE HYP fp and pc +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +*/ +static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, +unsigned long fp, +unsigned long pc) +{ +unwind_init_common (state,NULL ); + + state->fp = fp; + state->pc = pc; +} +static inline bool on_accessible_stack (const struct task_struct *tsk,unsigned long sp,unsigned long size,struct stack_info *info)@@ -33,6 +49,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,*/ #ifdef __KVM_NVHE_HYPERVISOR__ +extern void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc); +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info)arch/arm64/kvm/hyp/nvhe/stacktrace.c +7
-0@@ -11,4 +11,74 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); + +/** +* pkvm_save_backtrace_entry - Saves a protected nVHE HYP stacktrace entry +* +* @arg : the position of the entry in the stacktrace buffer +* @where : the program counter corresponding to the stack frame +*
arch/arm64/kvm/hyp/nvhe/stacktrace.c DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack) · line 30
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +10
-0+* Save the return address of a stack frame to the shared stacktrace buffer. +* The host can access this shared buffer from EL1 to dump the backtrace. +*/ +static bool pkvm_save_backtrace_entry (void *arg,unsigned long where) +{ +unsigned long **stacktrace_pos = (unsigned long **)arg; +unsigned long stacktrace_start, stacktrace_end; + + stacktrace_start = (unsigned long )this_cpu_ptr (pkvm_stacktrace); + stacktrace_end = stacktrace_start +NVHE_STACKTRACE_SIZE - (2 *sizeof (long ));
I guess this is related to my comment in patch 9, but why does the end happen at 2 * instead of just 1 * before the actual end? I guess because it's inclusive. That said, a comment would be helpful.
Thanks,
/fuad
Quoted 55 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +53
-1+ +if ((unsigned long ) *stacktrace_pos > stacktrace_end) +return false; + +/* Save the entry to the current pos in stacktrace buffer */ + **stacktrace_pos = where; + +/* A zero entry delimits the end of the stacktrace. */ + *(*stacktrace_pos +1 ) =0UL ; + +/* Increment the current pos */ + ++*stacktrace_pos; + + return true; +} + +/** +* pkvm_save_backtrace - Saves the protected nVHE HYP stacktrace +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +* +* Save the unwinded stack addresses to the shared stacktrace buffer. +* The host can access this shared buffer from EL1 to dump the backtrace. +*/ +static void pkvm_save_backtrace (unsigned long fp,unsigned long pc) +{ +void *stacktrace_start = (void *)this_cpu_ptr (pkvm_stacktrace); +struct unwind_state state; + +kvm_nvhe_unwind_init (&state, fp, pc); + +unwind (&state, pkvm_save_backtrace_entry, &stacktrace_start); +} +#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +static void pkvm_save_backtrace (unsigned long fp,unsigned long pc) +{ +}#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ + +/** +* kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +* +* Saves the information needed by the host to dump the nVHE hypervisor +* backtrace. +*/ +void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc) +{ +if (is_protected_kvm_enabled ()) +pkvm_save_backtrace (fp, pc); +} --
Quoted 2 lines
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 12/18] KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
Quoted 79 lines · Fuad Tabba
Hi Kalesh,
Quoted 75 lines · Kalesh Singh
In protected nVHE mode, the host cannot access private owned hypervisor memory. Also the hypervisor aims to remains simple to reduce the attack surface and does not provide any printk support.
For the above reasons, the approach taken to provide hypervisor stacktraces in protected mode is:
1) Unwind and save the hyp stack addresses in EL2 to a shared buffer with the host (done in this patch).
2) Delegate the dumping and symbolization of the addresses to the host in EL1 (later patch in the series).Signed-off-by Kalesh Singh <[email protected]>--- arch/arm64/include/asm/stacktrace/nvhe.h | 18 ++++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 70 ++++++++++++++++++++++++ 2 files changed, 88 insertions(+)arch/arm64/include/asm/stacktrace/nvhe.h +18
-0@@ -21,6 +21,22 @@#include <asm/stacktrace/common.h> +/** +* kvm_nvhe_unwind_init - Start an unwind from the given nVHE HYP fp and pc +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +*/ +static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, +unsigned long fp, +unsigned long pc) +{ +unwind_init_common (state,NULL ); + + state->fp = fp; + state->pc = pc; +} +static inline bool on_accessible_stack (const struct task_struct *tsk,unsigned long sp,unsigned long size,struct stack_info *info)@@ -33,6 +49,8 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,*/ #ifdef __KVM_NVHE_HYPERVISOR__ +extern void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc); +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info)arch/arm64/kvm/hyp/nvhe/stacktrace.c +13
-0@@ -11,4 +11,74 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); + +/** +* pkvm_save_backtrace_entry - Saves a protected nVHE HYP stacktrace entry +* +* @arg : the position of the entry in the stacktrace buffer +* @where : the program counter corresponding to the stack frame +* +* Save the return address of a stack frame to the shared stacktrace buffer. +* The host can access this shared buffer from EL1 to dump the backtrace. +*/ +static bool pkvm_save_backtrace_entry (void *arg,unsigned long where) +{ +unsigned long **stacktrace_pos = (unsigned long **)arg;
Quoted 9 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack) · line 30
Quoted 4 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +4
-0+unsigned long stacktrace_start, stacktrace_end; + + stacktrace_start = (unsigned long )this_cpu_ptr (pkvm_stacktrace); + stacktrace_end = stacktrace_start +NVHE_STACKTRACE_SIZE - (2 *sizeof (long ));I guess this is related to my comment in patch 9, but why does the end happen at 2 * instead of just 1 * before the actual end? I guess because it's inclusive. That said, a comment would be helpful.
The intention is to check that we can fit 2 entries (the stacktrace entry and null entry). I think the "end" naming is a bit misleading. Let me try to clarify it better in the next version.
Thanks,
Kalesh
Quoted 60 lines
Thanks,
/fuadQuoted 57 lines
arch/arm64/kvm/hyp/nvhe/stacktrace.c +53
-1+ +if ((unsigned long ) *stacktrace_pos > stacktrace_end) +return false; + +/* Save the entry to the current pos in stacktrace buffer */ + **stacktrace_pos = where; + +/* A zero entry delimits the end of the stacktrace. */ + *(*stacktrace_pos +1 ) =0UL ; + +/* Increment the current pos */ + ++*stacktrace_pos; + + return true; +} + +/** +* pkvm_save_backtrace - Saves the protected nVHE HYP stacktrace +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +* +* Save the unwinded stack addresses to the shared stacktrace buffer. +* The host can access this shared buffer from EL1 to dump the backtrace. +*/ +static void pkvm_save_backtrace (unsigned long fp,unsigned long pc) +{ +void *stacktrace_start = (void *)this_cpu_ptr (pkvm_stacktrace); +struct unwind_state state; + +kvm_nvhe_unwind_init (&state, fp, pc); + +unwind (&state, pkvm_save_backtrace_entry, &stacktrace_start); +} +#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +static void pkvm_save_backtrace (unsigned long fp,unsigned long pc) +{ +}#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ + +/** +* kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +* +* Saves the information needed by the host to dump the nVHE hypervisor +* backtrace. +*/ +void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc) +{ +if (is_protected_kvm_enabled ()) +pkvm_save_backtrace (fp, pc); +} --2.37.0.170.g444d1eabd0-goog
PATCH v4 13/18 KVM: arm64: Prepare non-protected nVHE hypervisor stacktrace
In reply to Kalesh SinghIn non-protected nVHE mode (non-pKVM) the host can directly access hypervisor memory; and unwinding of the hypervisor stacktrace is done from EL1 to save on memory for shared buffers.
To unwind the hypervisor stack from EL1 the host needs to know the starting point for the unwind and information that will allow it to translate hypervisor stack addresses to the corresponding kernel addresses. This patch sets up this book keeping. It is made use of later in the series.
--- arch/arm64/include/asm/kvm_asm.h | 16 ++++++++++++++++ arch/arm64/include/asm/stacktrace/nvhe.h | 4 ++++ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 24 ++++++++++++++++++++++++ 3 files changed, 44 insertions(+)
arch/arm64/include/asm/kvm_asm.h +16 -0
@@ -176,6 +176,22 @@ struct kvm_nvhe_init_params {unsigned long vtcr; }; +/** +* Used by the host in EL1 to dump the nVHE hypervisor backtrace on +* hyp_panic() in non-protected mode. +* +* @stack_base: hyp VA of the hyp_stack base. +* @overflow_stack_base: hyp VA of the hyp_overflow_stack base. +* @fp: hyp FP where the backtrace begins. +* @pc: hyp PC where the backtrace begins. +*/ +struct kvm_nvhe_stacktrace_info { +unsigned long stack_base; +unsigned long overflow_stack_base; +unsigned long fp; +unsigned long pc; +}; +/* Translate a kernel address @ptr into its equivalent linear mapping */ #define kvm_ksym_ref (ptr) \ ({ \
arch/arm64/include/asm/stacktrace/nvhe.h +4 -0
@@ -19,6 +19,7 @@#ifndef __ASM_STACKTRACE_NVHE_H#define __ASM_STACKTRACE_NVHE_H +#include <asm/kvm_asm.h> #include <asm/stacktrace/common.h> /**
@@ -49,6 +50,9 @@ static inline bool on_accessible_stack(const struct task_struct *tsk,*/ #ifdef __KVM_NVHE_HYPERVISOR__ +DECLARE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack); +DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); +extern void kvm_nvhe_prepare_backtrace (unsigned long fp,unsigned long pc);#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE
arch/arm64/kvm/hyp/nvhe/stacktrace.c +24 -0
@@ -9,6 +9,28 @@ DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack)__aligned(16) ; +DEFINE_PER_CPU(struct kvm_nvhe_stacktrace_info, kvm_stacktrace_info); + +/** +* hyp_prepare_backtrace - Prepare non-protected nVHE backtrace. +* +* @fp : frame pointer at which to start the unwinding. +* @pc : program counter at which to start the unwinding. +* +* Save the information needed by the host to unwind the non-protected +* nVHE hypervisor stack in EL1. +*/ +static void hyp_prepare_backtrace (unsigned long fp,unsigned long pc) +{ +struct kvm_nvhe_stacktrace_info *stacktrace_info =this_cpu_ptr (&kvm_stacktrace_info); +struct kvm_nvhe_init_params *params =this_cpu_ptr (&kvm_init_params); + + stacktrace_info->stack_base = (unsigned long )(params->stack_hyp_va -PAGE_SIZE ); + stacktrace_info->overflow_stack_base = (unsigned long )this_cpu_ptr (overflow_stack); + stacktrace_info->fp = fp; + stacktrace_info->pc = pc; +} +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);
@@ -81,4 +103,6 @@ void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc) {if (is_protected_kvm_enabled ())pkvm_save_backtrace (fp, pc); +else +hyp_prepare_backtrace (fp, pc); }
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 14/18 KVM: arm64: Implement protected nVHE hyp stack unwinder
In reply to Kalesh SinghImplements the common framework necessary for unwind() to work in the protected nVHE context:
- on_accessible_stack()
- on_overflow_stack()
- unwind_next()
Protected nVHE unwind() is used to unwind and save the hyp stack addresses to the shared stacktrace buffer. The host reads the entries in this buffer, symbolizes and dumps the stacktrace (later patch in the series).
--- arch/arm64/include/asm/stacktrace/common.h | 2 ++ arch/arm64/include/asm/stacktrace/nvhe.h | 34 ++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-)
arch/arm64/include/asm/stacktrace/common.h +2 -0
@@ -27,6 +27,7 @@ enum stack_type {STACK_TYPE_OVERFLOW ,STACK_TYPE_SDEI_NORMAL ,STACK_TYPE_SDEI_CRITICAL , +STACK_TYPE_HYP , __NR_STACK_TYPES };
@@ -171,6 +172,7 @@ static inline int unwind_next_common(struct unwind_state *state,* * TASK -> IRQ -> OVERFLOW -> SDEI_NORMAL * TASK -> SDEI_NORMAL -> SDEI_CRITICAL -> OVERFLOW +* HYP -> OVERFLOW * * ... but the nesting itself is strict. Once we transition from one * stack to another, it's never valid to unwind back to that first
arch/arm64/include/asm/stacktrace/nvhe.h +32 -2
@@ -38,10 +38,19 @@ static __always_inline void kvm_nvhe_unwind_init(struct unwind_state *state, state->pc = pc; } +static inline bool on_hyp_stack (unsigned long sp,unsigned long size, +struct stack_info *info); +static inline bool on_accessible_stack (const struct task_struct *tsk,unsigned long sp,unsigned long size,struct stack_info *info) { +if (on_accessible_stack_common (tsk, sp, size, info)) +return true; + +if (on_hyp_stack (sp, size, info)) +return true; +return false; }
@@ -59,12 +68,27 @@ extern void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc);static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info) { -return false; +unsigned long low = (unsigned long )this_cpu_ptr (overflow_stack); +unsigned long high = low +OVERFLOW_STACK_SIZE ; + +return on_stack (sp, size, low, high,STACK_TYPE_OVERFLOW , info); +} + +static inline bool on_hyp_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +struct kvm_nvhe_init_params *params =this_cpu_ptr (&kvm_init_params); +unsigned long high = params->stack_hyp_va; +unsigned long low = high -PAGE_SIZE ; + +return on_stack (sp, size, low, high,STACK_TYPE_HYP , info); } static int notrace unwind_next(struct unwind_state *state) { -return 0 ; +struct stack_info info; + +return unwind_next_common (state, &info,NULL ); }NOKPROBE_SYMBOL (unwind_next);#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */
@@ -74,6 +98,12 @@ static inline bool on_overflow_stack(unsigned long sp, unsigned long size,return false; } +static inline bool on_hyp_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +return false; +} + static int notrace unwind_next(struct unwind_state *state) {return 0 ;
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 15/18 KVM: arm64: Implement non-protected nVHE hyp stack unwinder
In reply to Kalesh SinghImplements the common framework necessary for unwind() to work for non-protected nVHE mode:
- on_accessible_stack()
- on_overflow_stack()
- unwind_next()
Non-protected nVHE unwind() is used to unwind and dump the hypervisor stacktrace by the host in EL1
--- arch/arm64/include/asm/stacktrace/nvhe.h | 67 +++++++++++++++++++++++- arch/arm64/kvm/arm.c | 2 +- 2 files changed, 66 insertions(+), 3 deletions(-)
arch/arm64/include/asm/stacktrace/nvhe.h +65 -2
@@ -115,15 +115,78 @@ NOKPROBE_SYMBOL(unwind_next);* Non-protected nVHE HYP stack unwinder */ #else /* !__KVM_NVHE_HYPERVISOR__ */ +DECLARE_KVM_NVHE_PER_CPU(unsigned long [PAGE_SIZE/sizeof(long)], overflow_stack); +DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_stacktrace_info, kvm_stacktrace_info); +DECLARE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); + +/** +* kvm_nvhe_stack_kern_va - Convert KVM nVHE HYP stack addresses to a kernel VAs +* +* The nVHE hypervisor stack is mapped in the flexible 'private' VA range, to +* allow for guard pages below the stack. Consequently, the fixed offset address +* translation macros won't work here. +* +* The kernel VA is calculated as an offset from the kernel VA of the hypervisor +* stack base. +* +* Returns true on success and updates @addr to its corresponding kernel VA; +* otherwise returns false. +*/ +static inline bool kvm_nvhe_stack_kern_va (unsigned long *addr, +enum stack_type type) +{ +struct kvm_nvhe_stacktrace_info *stacktrace_info; +unsigned long hyp_base, kern_base, hyp_offset; + + stacktrace_info =this_cpu_ptr_nvhe_sym (kvm_stacktrace_info); + +switch (type) { +case STACK_TYPE_HYP : + kern_base = (unsigned long )*this_cpu_ptr (&kvm_arm_hyp_stack_page); + hyp_base = (unsigned long )stacktrace_info->stack_base; +break ; +case STACK_TYPE_OVERFLOW : + kern_base = (unsigned long )this_cpu_ptr_nvhe_sym (overflow_stack); + hyp_base = (unsigned long )stacktrace_info->overflow_stack_base; +break ; +default : +return false; + } + + hyp_offset = *addr - hyp_base; + + *addr = kern_base + hyp_offset; + +return true; +} +static inline bool on_overflow_stack (unsigned long sp,unsigned long size,struct stack_info *info) { -return false; +struct kvm_nvhe_stacktrace_info *stacktrace_info + =this_cpu_ptr_nvhe_sym (kvm_stacktrace_info); +unsigned long low = (unsigned long )stacktrace_info->overflow_stack_base; +unsigned long high = low +OVERFLOW_STACK_SIZE ; + +return on_stack (sp, size, low, high,STACK_TYPE_OVERFLOW , info); +} + +static inline bool on_hyp_stack (unsigned long sp,unsigned long size, +struct stack_info *info) +{ +struct kvm_nvhe_stacktrace_info *stacktrace_info + =this_cpu_ptr_nvhe_sym (kvm_stacktrace_info); +unsigned long low = (unsigned long )stacktrace_info->stack_base; +unsigned long high = low +PAGE_SIZE ; + +return on_stack (sp, size, low, high,STACK_TYPE_HYP , info); } static int notrace unwind_next(struct unwind_state *state) { -return 0 ; +struct stack_info info; + +return unwind_next_common (state, &info, kvm_nvhe_stack_kern_va); }NOKPROBE_SYMBOL (unwind_next);
arch/arm64/kvm/arm.c +1 -1
@@ -49,7 +49,7 @@ DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); DECLARE_KVM_HYP_PER_CPU(unsigned long, kvm_hyp_vector); -static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page); +DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);unsigned long kvm_arm_hyp_percpu_base[NR_CPUS ]; DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 16/18 KVM: arm64: Introduce pkvm_dump_backtrace()
In reply to Kalesh SinghDumps the pKVM hypervisor backtrace from EL1 by reading the unwinded addresses from the shared stacktrace buffer.
--- arch/arm64/include/asm/stacktrace/nvhe.h | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
arch/arm64/include/asm/stacktrace/nvhe.h +49 -0
@@ -190,5 +190,54 @@ static int notrace unwind_next(struct unwind_state *state) }NOKPROBE_SYMBOL (unwind_next); +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); + +/** +* pkvm_dump_backtrace - Dump the protected nVHE HYP backtrace. +* +* @hyp_offset: hypervisor offset, used for address translation. +* +* Dumping of the pKVM HYP backtrace is done by reading the +* stack addresses from the shared stacktrace buffer, since the +* host cannot direclty access hyperviosr memory in protected +* mode. +*/ +static inline void pkvm_dump_backtrace (unsigned long hyp_offset) +{ +unsigned long *stacktrace_pos; +unsigned long va_mask, pc; + + stacktrace_pos = (unsigned long *)this_cpu_ptr_nvhe_sym (pkvm_stacktrace); + va_mask =GENMASK_ULL (vabits_actual -1 ,0 ); + +kvm_err ("Protected nVHE HYP call trace:\n" ); + +/* The stack trace is terminated by a null entry */ +for (; *stacktrace_pos; stacktrace_pos++) { +/* Mask tags and convert to kern addr */ + pc = (*stacktrace_pos & va_mask) + hyp_offset; +kvm_err (" [<%016lx>] %pB\n" , pc, (void *)pc); + } + +kvm_err ("---- End of Protected nVHE HYP call trace ----\n" ); +} +#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +static inline void pkvm_dump_backtrace (unsigned long hyp_offset) +{ +kvm_err ("Cannot dump pKVM nVHE stacktrace: !CONFIG_PROTECTED_NVHE_STACKTRACE\n" ); +} +#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ + +/** +* kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace. +* +* @hyp_offset: hypervisor offset, used for address translation. +*/ +static inline void kvm_nvhe_dump_backtrace (unsigned long hyp_offset) +{ +if (is_protected_kvm_enabled ()) +pkvm_dump_backtrace (hyp_offset); +}#endif /* __KVM_NVHE_HYPERVISOR__ */ #endif /* __ASM_STACKTRACE_NVHE_H */
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 17/18 KVM: arm64: Introduce hyp_dump_backtrace()
In reply to Kalesh SinghIn non-protected nVHE mode, unwinds and dumps the hypervisor backtrace from EL1. This is possible beacuase the host can directly access the hypervisor stack pages in non-proteced mode.
--- arch/arm64/include/asm/stacktrace/nvhe.h | 64 +++++++++++++++++++++--- 1 file changed, 56 insertions(+), 8 deletions(-)
arch/arm64/include/asm/stacktrace/nvhe.h +56 -8
@@ -190,6 +190,56 @@ static int notrace unwind_next(struct unwind_state *state) }NOKPROBE_SYMBOL (unwind_next); +/** +* kvm_nvhe_print_backtrace_entry - Symbolizes and prints the HYP stack address +*/ +static inline void kvm_nvhe_print_backtrace_entry (unsigned long addr, +unsigned long hyp_offset) +{ +unsigned long va_mask =GENMASK_ULL (vabits_actual -1 ,0 ); + +/* Mask tags and convert to kern addr */ + addr = (addr & va_mask) + hyp_offset; +kvm_err (" [<%016lx>] %pB\n" , addr, (void *)addr); +} + +/** +* hyp_backtrace_entry - Dump an entry of the non-protected nVHE HYP stacktrace +* +* @arg : the hypervisor offset, used for address translation +* @where : the program counter corresponding to the stack frame +*/ +static inline bool hyp_dump_backtrace_entry (void *arg,unsigned long where) +{ +kvm_nvhe_print_backtrace_entry (where, (unsigned long )arg); + +return true; +} + +/** +* hyp_dump_backtrace - Dump the non-proteced nVHE HYP backtrace. +* +* @hyp_offset: hypervisor offset, used for address translation. +* +* The host can directly access HYP stack pages in non-protected +* mode, so the unwinding is done directly from EL1. This removes +* the need for shared buffers between host and hypervisor for +* the stacktrace. +*/ +static inline void hyp_dump_backtrace (unsigned long hyp_offset) +{ +struct kvm_nvhe_stacktrace_info *stacktrace_info; +struct unwind_state state; + + stacktrace_info =this_cpu_ptr_nvhe_sym (kvm_stacktrace_info); + +kvm_nvhe_unwind_init (&state, stacktrace_info->fp, stacktrace_info->pc); + +kvm_err ("Non-protected nVHE HYP call trace:\n" ); +unwind (&state, hyp_dump_backtrace_entry, (void *)hyp_offset); +kvm_err ("---- End of Non-protected nVHE HYP call trace ----\n" ); +} +#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);
@@ -206,22 +256,18 @@ DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvmstatic inline void pkvm_dump_backtrace (unsigned long hyp_offset) {unsigned long *stacktrace_pos; -unsigned long va_mask, pc; stacktrace_pos = (unsigned long *)this_cpu_ptr_nvhe_sym (pkvm_stacktrace); - va_mask =GENMASK_ULL (vabits_actual -1 ,0 );kvm_err ("Protected nVHE HYP call trace:\n" ); -/* The stack trace is terminated by a null entry */ -for (; *stacktrace_pos; stacktrace_pos++) { -/* Mask tags and convert to kern addr */ - pc = (*stacktrace_pos & va_mask) + hyp_offset; -kvm_err (" [<%016lx>] %pB\n" , pc, (void *)pc); - } +/* The saved stacktrace is terminated by a null entry */ +for (; *stacktrace_pos; stacktrace_pos++) +kvm_nvhe_print_backtrace_entry (*stacktrace_pos, hyp_offset);kvm_err ("---- End of Protected nVHE HYP call trace ----\n" ); } +#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ static inline void pkvm_dump_backtrace (unsigned long hyp_offset) {
@@ -238,6 +284,8 @@ static inline void kvm_nvhe_dump_backtrace(unsigned long hyp_offset) {if (is_protected_kvm_enabled ())pkvm_dump_backtrace (hyp_offset); +else +hyp_dump_backtrace (hyp_offset); }#endif /* __KVM_NVHE_HYPERVISOR__ */ #endif /* __ASM_STACKTRACE_NVHE_H */
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 18/18 KVM: arm64: Dump nVHE hypervisor stack on panic
In reply to Kalesh SinghOn hyp_panic(), unwind and dump the nVHE hypervisor stack trace. In protected nVHE mode, hypervisor stacktraces are only produced if CONFIG_PROTECTED_NVHE_STACKTRACE is enabled.
Example backtrace:
[ 126.862960] kvm [371]: nVHE hyp panic at: [<ffff8000090a51d0>] __kvm_nvhe_recursive_death+0x10/0x34! [ 126.869920] kvm [371]: Protected nVHE HYP call trace: [ 126.870528] kvm [371]: [<ffff8000090a5570>] __kvm_nvhe_hyp_panic+0xac/0xf8 [ 126.871342] kvm [371]: [<ffff8000090a55cc>] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 126.872174] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.872971] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 . . . [ 126.927314] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.927727] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.928137] kvm [371]: [<ffff8000090a4de4>] __kvm_nvhe___kvm_vcpu_run+0x30/0x40c [ 126.928561] kvm [371]: [<ffff8000090a7b64>] __kvm_nvhe_handle___kvm_vcpu_run+0x30/0x48 [ 126.928984] kvm [371]: [<ffff8000090a78b8>] __kvm_nvhe_handle_trap+0xc4/0x128 [ 126.929385] kvm [371]: [<ffff8000090a6864>] __kvm_nvhe___host_exit+0x64/0x64 [ 126.929804] kvm [371]: ---- End of Protected nVHE HYP call trace ----
--- arch/arm64/kvm/handle_exit.c | 4 ++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 +++++ 2 files changed, 9 insertions(+)
arch/arm64/kvm/handle_exit.c +4 -0
@@ -17,6 +17,7 @@#include <asm/kvm_emulate.h> #include <asm/kvm_mmu.h> #include <asm/debug-monitors.h> +#include <asm/stacktrace/nvhe.h> #include <asm/traps.h> #include <kvm/arm_hypercalls.h>
@@ -353,6 +354,9 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, (void *)panic_addr); } +/* Dump the nVHE hypervisor backtrace */ +kvm_nvhe_dump_backtrace (hyp_offset); +/* * Hyp has panicked and we're going to handle that by panicking the * kernel. The kernel offset will be revealed in the panic so we're
arch/arm64/kvm/hyp/nvhe/switch.c +5 -0
@@ -25,6 +25,7 @@#include <asm/fpsimd.h> #include <asm/debug-monitors.h> #include <asm/processor.h> +#include <asm/stacktrace/nvhe.h> #include <nvhe/fixed_config.h> #include <nvhe/mem_protect.h>
@@ -375,6 +376,10 @@ asmlinkage void __noreturn hyp_panic(void)__sysreg_restore_state_nvhe (host_ctxt); } +/* Prepare to dump kvm nvhe hyp stacktrace */ +kvm_nvhe_prepare_backtrace ((unsigned long )__builtin_frame_address (0 ), + _THIS_IP_); +__hyp_do_panic (host_ctxt, spsr, elr, par);unreachable (); }
Signature · 6 lines
2.37.0.170.g444d1eabd0-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Hi Kalesh,
Quoted 15 lines · Kalesh Singh
Hi all,
This is v4 of the series adding support for nVHE hypervisor stacktraces; and is based on arm64 for-next/stacktrace.
Thanks all for your feedback on previous revisions. Mark Brown, I appreciate your Reviewed-by on the v3, I have dropped the tags in this new verision since I think the series has changed quite a bit.
The previous versions were posted at:
v3: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/
Quoted 5 lines
The main updates in this version are to address concerens from Marc on the memory usage and reusing the common code by refactoring into a shared header.
Thanks,
Kalesh
I tested an earlier version of this patch series, and it worked fine, with symbolization. However, testing it now, both with nvhe and with pkvm the symbolization isn't working for me. e.g.
[ 32.986706] kvm [251]: Protected nVHE HYP call trace: [ 32.986796] kvm [251]: [<ffff800008f8b0e0>] 0xffff800008f8b0e0 [ 32.987391] kvm [251]: [<ffff800008f8b388>] 0xffff800008f8b388 [ 32.987493] kvm [251]: [<ffff800008f8d230>] 0xffff800008f8d230 [ 32.987591] kvm [251]: [<ffff800008f8d51c>] 0xffff800008f8d51c [ 32.987695] kvm [251]: [<ffff800008f8c064>] 0xffff800008f8c064 [ 32.987803] kvm [251]: ---- End of Protected nVHE HYP call trace ----
CONFIG_PROTECTED_NVHE_STACKTRACE CONFIG_NVHE_EL2_DEBUG and CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT are all enabled. Generating a backtrace in the host I get proper symbolisation.
Is there anything else you'd like to know about my setup that would help get to the bottom of this?
Thanks,
/fuad
Quoted 119 lines
============
KVM nVHE Stack unwinding.
===nVHE has two modes of operation: protected (pKVM) and unprotected (conventional nVHE). Depending on the mode, a slightly different approach is used to dump the hyperviosr stacktrace but the core unwinding logic remains the same.
Protected nVHE (pKVM) stacktraces
====In protected nVHE mode, the host cannot directly access hypervisor memory.
The hypervisor stack unwinding happens in EL2 and is made accessible to the host via a shared buffer. Symbolizing and printing the stacktrace addresses is delegated to the host and happens in EL1.
Non-protected (Conventional) nVHE stacktraces
====In non-protected mode, the host is able to directly access the hypervisor stack pages.
The hypervisor stack unwinding and dumping of the stacktrace is performed by the host in EL1, as this avoids the memory overhead of setting up shared buffers between the host and hypervisor.
Resuing the Core Unwinding Logic
====Since the hypervisor cannot link against the kernel code in proteced mode. The common stack unwinding code is moved to a shared header to allow reuse in the nVHE hypervisor.
Reducing the memory footprint
====In this version the below steps were taken to reduce the memory usage of nVHE stack unwinding:
1) The nVHE overflow stack is reduced from
PAGE_SIZEto 4KB; benificial for configurations with non 4KB pages (16KB or 64KB pages).
2) In protected nVHE mode (pKVM), the shared stacktrace buffers with the host are reduced fromPAGE_SIZEto the minimum size required.
3) In systems other than Android, conventional nVHE makes up the vast majority of use case. So the pKVM stack tracing is disabled by default (!CONFIG_PROTECTED_NVHE_STACKTRACE), which avoid the memory usage for setting up shared buffers.
4) In non-protected nVHE mode (conventional nVHE), the stack unwinding is done directly in EL1 by the host and no shared buffers with the hyperviosr are needed.Sample Output
====The below shows an example output from a simple stack overflow test:
[ 126.862960] kvm [371]: nVHE hyp panic at: [<ffff8000090a51d0>] __kvm_nvhe_recursive_death+0x10/0x34! [ 126.869920] kvm [371]: Protected nVHE HYP call trace: [ 126.870528] kvm [371]: [<ffff8000090a5570>] __kvm_nvhe_hyp_panic+0xac/0xf8 [ 126.871342] kvm [371]: [<ffff8000090a55cc>] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 126.872174] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.872971] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 . . .[ 126.927314] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.927727] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.928137] kvm [371]: [<ffff8000090a4de4>] __kvm_nvhe___kvm_vcpu_run+0x30/0x40c [ 126.928561] kvm [371]: [<ffff8000090a7b64>] __kvm_nvhe_handle___kvm_vcpu_run+0x30/0x48 [ 126.928984] kvm [371]: [<ffff8000090a78b8>] __kvm_nvhe_handle_trap+0xc4/0x128 [ 126.929385] kvm [371]: [<ffff8000090a6864>] __kvm_nvhe___host_exit+0x64/0x64 [ 126.929804] kvm [371]: ---- End of Protected nVHE HYP call trace ----============
Kalesh Singh (18):
arm64: stacktrace: Add shared header for common stack unwinding code
arm64: stacktrace: Factor outon_accessible_stack_common()
arm64: stacktrace: Factor outunwind_next_common()
arm64: stacktrace: Handle frame pointer from different address spaces
arm64: stacktrace: Factor out commonunwind()
arm64: stacktrace: Add description ofstacktrace/common.h
KVM: arm64: On stack overflow switch to hypoverflow_stack
KVM: arm64: AddPROTECTED_NVHE_STACKTRACEKconfig
KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
KVM: arm64: Stub implementation of pKVM HYP stack unwinder
KVM: arm64: Stub implementation of non-protected nVHE HYP stack
unwinder
KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
KVM: arm64: Prepare non-protected nVHE hypervisor stacktrace
KVM: arm64: Implement protected nVHE hyp stack unwinder
KVM: arm64: Implement non-protected nVHE hyp stack unwinder
KVM: arm64: Introducepkvm_dump_backtrace()
KVM: arm64: Introducehyp_dump_backtrace()
KVM: arm64: Dump nVHE hypervisor stack on panicarch/arm64/include/asm/kvm_asm.h | 16 ++ arch/arm64/include/asm/memory.h | 7 + arch/arm64/include/asm/stacktrace.h | 92 ++++--- arch/arm64/include/asm/stacktrace/common.h | 224 ++++++++++++++++ arch/arm64/include/asm/stacktrace/nvhe.h | 291 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 157 ----------- arch/arm64/kvm/Kconfig | 15 ++ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/handle_exit.c | 4 + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 108 ++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 + 13 files changed, 727 insertions(+), 205 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.h create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.h create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.c
Quoted 4 lines
base-commit:
82a592c13b0aeff94d84d54183dae0b26384c95f--
2.37.0.170.g444d1eabd0-goog
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 37 lines · Fuad Tabba' via kernel-team
Hi Kalesh,
Quoted 15 lines · Kalesh Singh
Hi all,
This is v4 of the series adding support for nVHE hypervisor stacktraces; and is based on arm64 for-next/stacktrace.
Thanks all for your feedback on previous revisions. Mark Brown, I appreciate your Reviewed-by on the v3, I have dropped the tags in this new verision since I think the series has changed quite a bit.
The previous versions were posted at:
v3: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/Quoted 5 lines
The main updates in this version are to address concerens from Marc on the memory usage and reusing the common code by refactoring into a shared header.
Thanks,
KaleshI tested an earlier version of this patch series, and it worked fine, with symbolization. However, testing it now, both with nvhe and with pkvm the symbolization isn't working for me. e.g.
[ 32.986706] kvm [251]: Protected nVHE HYP call trace: [ 32.986796] kvm [251]: [<ffff800008f8b0e0>] 0xffff800008f8b0e0 [ 32.987391] kvm [251]: [<ffff800008f8b388>] 0xffff800008f8b388 [ 32.987493] kvm [251]: [<ffff800008f8d230>] 0xffff800008f8d230 [ 32.987591] kvm [251]: [<ffff800008f8d51c>] 0xffff800008f8d51c [ 32.987695] kvm [251]: [<ffff800008f8c064>] 0xffff800008f8c064 [ 32.987803] kvm [251]: ---- End of Protected nVHE HYP call trace ----
Quoted 6 lines
CONFIG_PROTECTED_NVHE_STACKTRACECONFIG_NVHE_EL2_DEBUGandCONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULTare all enabled. Generating a backtrace in the host I get proper symbolisation.Is there anything else you'd like to know about my setup that would help get to the bottom of this?
Hi Fuad,
Thanks for reviewing it. Can you attach the .config when you have a chance please? I will try reproducing it on my end.
--Kalesh
Quoted 126 lines
Thanks,
/fuadQuoted 119 lines
============
KVM nVHE Stack unwinding.
===nVHE has two modes of operation: protected (pKVM) and unprotected (conventional nVHE). Depending on the mode, a slightly different approach is used to dump the hyperviosr stacktrace but the core unwinding logic remains the same.
Protected nVHE (pKVM) stacktraces
====In protected nVHE mode, the host cannot directly access hypervisor memory.
The hypervisor stack unwinding happens in EL2 and is made accessible to the host via a shared buffer. Symbolizing and printing the stacktrace addresses is delegated to the host and happens in EL1.
Non-protected (Conventional) nVHE stacktraces
====In non-protected mode, the host is able to directly access the hypervisor stack pages.
The hypervisor stack unwinding and dumping of the stacktrace is performed by the host in EL1, as this avoids the memory overhead of setting up shared buffers between the host and hypervisor.
Resuing the Core Unwinding Logic
====Since the hypervisor cannot link against the kernel code in proteced mode. The common stack unwinding code is moved to a shared header to allow reuse in the nVHE hypervisor.
Reducing the memory footprint
====In this version the below steps were taken to reduce the memory usage of nVHE stack unwinding:
1) The nVHE overflow stack is reduced from
PAGE_SIZEto 4KB; benificial for configurations with non 4KB pages (16KB or 64KB pages).
2) In protected nVHE mode (pKVM), the shared stacktrace buffers with the host are reduced fromPAGE_SIZEto the minimum size required.
3) In systems other than Android, conventional nVHE makes up the vast majority of use case. So the pKVM stack tracing is disabled by default (!CONFIG_PROTECTED_NVHE_STACKTRACE), which avoid the memory usage for setting up shared buffers.
4) In non-protected nVHE mode (conventional nVHE), the stack unwinding is done directly in EL1 by the host and no shared buffers with the hyperviosr are needed.Sample Output
====The below shows an example output from a simple stack overflow test:
[ 126.862960] kvm [371]: nVHE hyp panic at: [<ffff8000090a51d0>] __kvm_nvhe_recursive_death+0x10/0x34! [ 126.869920] kvm [371]: Protected nVHE HYP call trace: [ 126.870528] kvm [371]: [<ffff8000090a5570>] __kvm_nvhe_hyp_panic+0xac/0xf8 [ 126.871342] kvm [371]: [<ffff8000090a55cc>] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 126.872174] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.872971] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 . . .[ 126.927314] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.927727] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.928137] kvm [371]: [<ffff8000090a4de4>] __kvm_nvhe___kvm_vcpu_run+0x30/0x40c [ 126.928561] kvm [371]: [<ffff8000090a7b64>] __kvm_nvhe_handle___kvm_vcpu_run+0x30/0x48 [ 126.928984] kvm [371]: [<ffff8000090a78b8>] __kvm_nvhe_handle_trap+0xc4/0x128 [ 126.929385] kvm [371]: [<ffff8000090a6864>] __kvm_nvhe___host_exit+0x64/0x64 [ 126.929804] kvm [371]: ---- End of Protected nVHE HYP call trace ----============
Kalesh Singh (18):
arm64: stacktrace: Add shared header for common stack unwinding code
arm64: stacktrace: Factor outon_accessible_stack_common()
arm64: stacktrace: Factor outunwind_next_common()
arm64: stacktrace: Handle frame pointer from different address spaces
arm64: stacktrace: Factor out commonunwind()
arm64: stacktrace: Add description ofstacktrace/common.h
KVM: arm64: On stack overflow switch to hypoverflow_stack
KVM: arm64: AddPROTECTED_NVHE_STACKTRACEKconfig
KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
KVM: arm64: Stub implementation of pKVM HYP stack unwinder
KVM: arm64: Stub implementation of non-protected nVHE HYP stack
unwinder
KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
KVM: arm64: Prepare non-protected nVHE hypervisor stacktrace
KVM: arm64: Implement protected nVHE hyp stack unwinder
KVM: arm64: Implement non-protected nVHE hyp stack unwinder
KVM: arm64: Introducepkvm_dump_backtrace()
KVM: arm64: Introducehyp_dump_backtrace()
KVM: arm64: Dump nVHE hypervisor stack on panicarch/arm64/include/asm/kvm_asm.h | 16 ++ arch/arm64/include/asm/memory.h | 7 + arch/arm64/include/asm/stacktrace.h | 92 ++++--- arch/arm64/include/asm/stacktrace/common.h | 224 ++++++++++++++++ arch/arm64/include/asm/stacktrace/nvhe.h | 291 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 157 ----------- arch/arm64/kvm/Kconfig | 15 ++ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/handle_exit.c | 4 + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 108 ++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 + 13 files changed, 727 insertions(+), 205 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.h create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.h create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.c
Quoted 8 lines
Quoted 4 lines
base-commit:
82a592c13b0aeff94d84d54183dae0b26384c95f--
2.37.0.170.g444d1eabd0-goog--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 44 lines · Kalesh Singh
Quoted 41 lines · Fuad Tabba' via kernel-team
Hi Kalesh,
Quoted 15 lines · Kalesh Singh
Hi all,
This is v4 of the series adding support for nVHE hypervisor stacktraces; and is based on arm64 for-next/stacktrace.
Thanks all for your feedback on previous revisions. Mark Brown, I appreciate your Reviewed-by on the v3, I have dropped the tags in this new verision since I think the series has changed quite a bit.
The previous versions were posted at:
v3: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/Quoted 5 lines
The main updates in this version are to address concerens from Marc on the memory usage and reusing the common code by refactoring into a shared header.
Thanks,
KaleshI tested an earlier version of this patch series, and it worked fine, with symbolization. However, testing it now, both with nvhe and with pkvm the symbolization isn't working for me. e.g.
[ 32.986706] kvm [251]: Protected nVHE HYP call trace: [ 32.986796] kvm [251]: [<ffff800008f8b0e0>] 0xffff800008f8b0e0 [ 32.987391] kvm [251]: [<ffff800008f8b388>] 0xffff800008f8b388 [ 32.987493] kvm [251]: [<ffff800008f8d230>] 0xffff800008f8d230 [ 32.987591] kvm [251]: [<ffff800008f8d51c>] 0xffff800008f8d51c [ 32.987695] kvm [251]: [<ffff800008f8c064>] 0xffff800008f8c064 [ 32.987803] kvm [251]: ---- End of Protected nVHE HYP call trace ----
CONFIG_PROTECTED_NVHE_STACKTRACECONFIG_NVHE_EL2_DEBUGandCONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULTare all enabled. Generating a backtrace in the host I get proper symbolisation.
Quoted 7 lines
Quoted 2 lines
Is there anything else you'd like to know about my setup that would help get to the bottom of this?
Hi Fuad,
Thanks for reviewing it. Can you attach the .config when you have a chance please? I will try reproducing it on my end.
My local config had CONFIG_RANDOMIZE_BASE off. I have posted a fix for the existing occurrences [1]. I'll address those for the unwinder in the next version of this series.
[1] https://lore.kernel.org/r/[email protected]/
Thanks,
Kalesh
Quoted 137 lines
--Kalesh
Quoted 134 lines
Thanks,
/fuadQuoted 119 lines
============
KVM nVHE Stack unwinding.
===nVHE has two modes of operation: protected (pKVM) and unprotected (conventional nVHE). Depending on the mode, a slightly different approach is used to dump the hyperviosr stacktrace but the core unwinding logic remains the same.
Protected nVHE (pKVM) stacktraces
====In protected nVHE mode, the host cannot directly access hypervisor memory.
The hypervisor stack unwinding happens in EL2 and is made accessible to the host via a shared buffer. Symbolizing and printing the stacktrace addresses is delegated to the host and happens in EL1.
Non-protected (Conventional) nVHE stacktraces
====In non-protected mode, the host is able to directly access the hypervisor stack pages.
The hypervisor stack unwinding and dumping of the stacktrace is performed by the host in EL1, as this avoids the memory overhead of setting up shared buffers between the host and hypervisor.
Resuing the Core Unwinding Logic
====Since the hypervisor cannot link against the kernel code in proteced mode. The common stack unwinding code is moved to a shared header to allow reuse in the nVHE hypervisor.
Reducing the memory footprint
====In this version the below steps were taken to reduce the memory usage of nVHE stack unwinding:
1) The nVHE overflow stack is reduced from
PAGE_SIZEto 4KB; benificial for configurations with non 4KB pages (16KB or 64KB pages).
2) In protected nVHE mode (pKVM), the shared stacktrace buffers with the host are reduced fromPAGE_SIZEto the minimum size required.
3) In systems other than Android, conventional nVHE makes up the vast majority of use case. So the pKVM stack tracing is disabled by default (!CONFIG_PROTECTED_NVHE_STACKTRACE), which avoid the memory usage for setting up shared buffers.
4) In non-protected nVHE mode (conventional nVHE), the stack unwinding is done directly in EL1 by the host and no shared buffers with the hyperviosr are needed.Sample Output
====The below shows an example output from a simple stack overflow test:
[ 126.862960] kvm [371]: nVHE hyp panic at: [<ffff8000090a51d0>] __kvm_nvhe_recursive_death+0x10/0x34! [ 126.869920] kvm [371]: Protected nVHE HYP call trace: [ 126.870528] kvm [371]: [<ffff8000090a5570>] __kvm_nvhe_hyp_panic+0xac/0xf8 [ 126.871342] kvm [371]: [<ffff8000090a55cc>] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 126.872174] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.872971] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 . . .[ 126.927314] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.927727] kvm [371]: [<ffff8000090a51e4>] __kvm_nvhe_recursive_death+0x24/0x34 [ 126.928137] kvm [371]: [<ffff8000090a4de4>] __kvm_nvhe___kvm_vcpu_run+0x30/0x40c [ 126.928561] kvm [371]: [<ffff8000090a7b64>] __kvm_nvhe_handle___kvm_vcpu_run+0x30/0x48 [ 126.928984] kvm [371]: [<ffff8000090a78b8>] __kvm_nvhe_handle_trap+0xc4/0x128 [ 126.929385] kvm [371]: [<ffff8000090a6864>] __kvm_nvhe___host_exit+0x64/0x64 [ 126.929804] kvm [371]: ---- End of Protected nVHE HYP call trace ----============
Kalesh Singh (18):
arm64: stacktrace: Add shared header for common stack unwinding code
arm64: stacktrace: Factor outon_accessible_stack_common()
arm64: stacktrace: Factor outunwind_next_common()
arm64: stacktrace: Handle frame pointer from different address spaces
arm64: stacktrace: Factor out commonunwind()
arm64: stacktrace: Add description ofstacktrace/common.h
KVM: arm64: On stack overflow switch to hypoverflow_stack
KVM: arm64: AddPROTECTED_NVHE_STACKTRACEKconfig
KVM: arm64: Allocate shared pKVM hyp stacktrace buffers
KVM: arm64: Stub implementation of pKVM HYP stack unwinder
KVM: arm64: Stub implementation of non-protected nVHE HYP stack
unwinder
KVM: arm64: Save protected-nVHE (pKVM) hyp stacktrace
KVM: arm64: Prepare non-protected nVHE hypervisor stacktrace
KVM: arm64: Implement protected nVHE hyp stack unwinder
KVM: arm64: Implement non-protected nVHE hyp stack unwinder
KVM: arm64: Introducepkvm_dump_backtrace()
KVM: arm64: Introducehyp_dump_backtrace()
KVM: arm64: Dump nVHE hypervisor stack on panicarch/arm64/include/asm/kvm_asm.h | 16 ++ arch/arm64/include/asm/memory.h | 7 + arch/arm64/include/asm/stacktrace.h | 92 ++++--- arch/arm64/include/asm/stacktrace/common.h | 224 ++++++++++++++++ arch/arm64/include/asm/stacktrace/nvhe.h | 291 +++++++++++++++++++++ arch/arm64/kernel/stacktrace.c | 157 ----------- arch/arm64/kvm/Kconfig | 15 ++ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/handle_exit.c | 4 + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 9 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 108 ++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 + 13 files changed, 727 insertions(+), 205 deletions(-) create mode 100644 arch/arm64/include/asm/stacktrace/common.h create mode 100644 arch/arm64/include/asm/stacktrace/nvhe.h create mode 100644 arch/arm64/kvm/hyp/nvhe/stacktrace.cQuoted 4 lines
base-commit:
82a592c13b0aeff94d84d54183dae0b26384c95f--
2.37.0.170.g444d1eabd0-goog--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerQuoted 10 lines · Kalesh Singh
Hi all,
This is v4 of the series adding support for nVHE hypervisor stacktraces; and is based on arm64 for-next/stacktrace.
Thanks all for your feedback on previous revisions. Mark Brown, I appreciate your Reviewed-by on the v3, I have dropped the tags in this new verision since I think the series has changed quite a bit.
Quoted 7 lines
The previous versions were posted at:
v3: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/The main updates in this version are to address concerens from Marc on the memory usage and reusing the common code by refactoring into a shared header.
Overall, the series looks better. I've pointed out a few things that need changing, but my overall gripe is around the abuse the stacktrace/nvhe.h as a dumping ground. A lot of the code there could be pushed to handle_exit.c (or some other compilation unit).
I've pushed an example of a 10 minutes refactor in my tree (kvm-arm64/nvhe-stacktrace), and I'm sure these are the lowest hanging fruits.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.