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

ANDROID: KVM: arm64: PROTECTED_NVHE_TESTING to PKVM_SELFTESTS

Browse Source 
Merge the hyp tracing related option PROTECTED_NVHE_TESTING into
PKVM_SELFTESTS.

Bug: 357781595
Bug: 273748186
Change-Id: Iacf9562ea4dae2159fe3ed72abeabf7d92e5e886
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
This commit is contained in:
Vincent Donnefort
2025-02-17 13:29:10 +00:00
parent b526a11319
commit 8b2a8f6b2e
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/include/asm/kvm_hypevents.h
+1 -1
View File
@@ -142,7 +142,7 @@ HYP_EVENT(vcpu_illegal_trap,
HE_PRINTK("esr_el2=%llx", __entry->esr) HE_PRINTK("esr_el2=%llx", __entry->esr)
); );
#ifdef CONFIG_PROTECTED_NVHE_TESTING #ifdef CONFIG_PKVM_SELFTESTS
HYP_EVENT(selftest, HYP_EVENT(selftest,
HE_PROTO(void), HE_PROTO(void),
HE_STRUCT(), HE_STRUCT(),
arch/arm64/kvm/Kconfig
-9
View File
@@ -122,15 +122,6 @@ config PTDUMP_STAGE2_DEBUGFS
If in doubt, say N. If in doubt, say N.
config PROTECTED_NVHE_TESTING
bool "Protected KVM hypervisor testing infrastructure"
depends on KVM
default n
help
Say Y here to enable pKVM hypervisor testing infrastructure.
If unsure, say N.
config PROTECTED_NVHE_FTRACE config PROTECTED_NVHE_FTRACE
bool "Protected KVM hypervisor function tracing" bool "Protected KVM hypervisor function tracing"
depends on KVM depends on KVM
arch/arm64/kvm/hyp/nvhe/hyp-main.c
+1 -1
View File
@@ -1594,7 +1594,7 @@ static void handle___pkvm_selftest_event(struct kvm_cpu_context *host_ctxt)
{ {
int smc_ret = SMCCC_RET_NOT_SUPPORTED, ret = -EOPNOTSUPP; int smc_ret = SMCCC_RET_NOT_SUPPORTED, ret = -EOPNOTSUPP;
#ifdef CONFIG_PROTECTED_NVHE_TESTING #ifdef CONFIG_PKVM_SELFTESTS
trace_selftest(); trace_selftest();
smc_ret = SMCCC_RET_SUCCESS; smc_ret = SMCCC_RET_SUCCESS;
ret = 0; ret = 0;
arch/arm64/kvm/hyp_trace.c
+1 -1
View File
@@ -884,7 +884,7 @@ static int hyp_trace_clock_show(struct seq_file *m, void *v)
} }
DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock); DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock);
#ifdef CONFIG_PROTECTED_NVHE_TESTING #ifdef CONFIG_PKVM_SELFTESTS
static int selftest_event_open(struct inode *inode, struct file *file) static int selftest_event_open(struct inode *inode, struct file *file)
{ {
if (file->f_mode & FMODE_WRITE) if (file->f_mode & FMODE_WRITE)