tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: PROTECTED_NVHE_STACKTRACE to PKVM_STACKTRACE

Browse Source 
The mouthful PROTECTED_NVHE and now inaccurate prefix (the pKVM
hypervisor actually runs with hVHE) is on its way out in favor of PKVM.

Bug: 357781595
Change-Id: I5635f017a787c0675ba1533d2f4fc38638d31b74
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
This commit is contained in:
Vincent Donnefort
2025-02-21 10:57:01 +00:00
parent 8b2a8f6b2e
commit 386af809e4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/kvm/Kconfig
+1 -1
View File
@@ -79,7 +79,7 @@ config PKVM_DUMP_TRACE_ON_PANIC
page is dumped. It only has an effect if the command line option page is dumped. It only has an effect if the command line option
hyp_trace_printk is set. hyp_trace_printk is set.
config PROTECTED_NVHE_STACKTRACE config PKVM_STACKTRACE
bool "Protected KVM hypervisor stacktraces" bool "Protected KVM hypervisor stacktraces"
depends on NVHE_EL2_DEBUG depends on NVHE_EL2_DEBUG
default n default n
arch/arm64/kvm/hyp/nvhe/stacktrace.c
+3 -3
View File
@@ -34,7 +34,7 @@ static void hyp_prepare_backtrace(unsigned long fp, unsigned long pc)
stacktrace_info->pc = pc; stacktrace_info->pc = pc;
} }
#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE #ifdef CONFIG_PKVM_STACKTRACE
#include <asm/stacktrace/nvhe.h> #include <asm/stacktrace/nvhe.h>
DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);
@@ -134,11 +134,11 @@ static void pkvm_save_backtrace(unsigned long fp, unsigned long pc)
unwind(&state, pkvm_save_backtrace_entry, &idx); unwind(&state, pkvm_save_backtrace_entry, &idx);
} }
#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ #else /* !CONFIG_PKVM_STACKTRACE */
static void pkvm_save_backtrace(unsigned long fp, unsigned long pc) static void pkvm_save_backtrace(unsigned long fp, unsigned long pc)
{ {
} }
#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ #endif /* CONFIG_PKVM_STACKTRACE */
/* /*
* kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace * kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace
arch/arm64/kvm/pkvm.c
+1 -1
View File
@@ -1113,7 +1113,7 @@ static struct module *pkvm_el2_mod_to_module(struct pkvm_el2_module *hyp_mod)
return container_of(arch, struct module, arch); return container_of(arch, struct module, arch);
} }
#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE #ifdef CONFIG_PKVM_STACKTRACE
unsigned long pkvm_el2_mod_kern_va(unsigned long addr) unsigned long pkvm_el2_mod_kern_va(unsigned long addr)
{ {
struct pkvm_el2_module *mod; struct pkvm_el2_module *mod;
arch/arm64/kvm/stacktrace.c
+4 -4
View File
@@ -206,7 +206,7 @@ static void hyp_dump_backtrace(unsigned long hyp_offset)
kvm_nvhe_dump_backtrace_end(); kvm_nvhe_dump_backtrace_end();
} }
#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE #ifdef CONFIG_PKVM_STACKTRACE
DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)],
pkvm_stacktrace); pkvm_stacktrace);
@@ -234,12 +234,12 @@ static void pkvm_dump_backtrace(unsigned long hyp_offset)
kvm_nvhe_dump_backtrace_entry((void *)hyp_offset, stacktrace[i]); kvm_nvhe_dump_backtrace_entry((void *)hyp_offset, stacktrace[i]);
kvm_nvhe_dump_backtrace_end(); kvm_nvhe_dump_backtrace_end();
} }
#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ #else /* !CONFIG_PKVM_STACKTRACE */
static void pkvm_dump_backtrace(unsigned long hyp_offset) static void pkvm_dump_backtrace(unsigned long hyp_offset)
{ {
kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PROTECTED_NVHE_STACKTRACE\n"); kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PKVM_STACKTRACE\n");
} }
#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ #endif /* CONFIG_PKVM_STACKTRACE */
/* /*
* kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace. * kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace.