From 56ad021f7aaf7349d82d55c71b2019ba55c547bd Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Thu, 22 May 2025 19:20:48 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Disallow #include trace.h for pKVM. pKVM modules must use #include "nvhe/trace.h" instead of a simple "trace.h". This is clearer. Fix pkvm-smc to use nvhe/trace.h. Bug: 416603216 Bug: 357781595 Change-Id: Iccb1c182dc98dc27f8b462bad572e2544f44dce1 Signed-off-by: HONG Yifan --- arch/arm64/kvm/hyp/nvhe/Makefile.module | 3 --- drivers/misc/pkvm-smc/pkvm/events.h | 2 +- drivers/misc/pkvm-smc/pkvm/pkvm-smc.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile.module b/arch/arm64/kvm/hyp/nvhe/Makefile.module index 749d1ee90d79..9875abd0dc24 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile.module +++ b/arch/arm64/kvm/hyp/nvhe/Makefile.module @@ -5,9 +5,6 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe -# Deprecated; subject to removal. -ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe - # LINT.IfChange(includes) ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module # LINT.ThenChange(/BUILD.bazel:pkvm_includes) diff --git a/drivers/misc/pkvm-smc/pkvm/events.h b/drivers/misc/pkvm-smc/pkvm/events.h index 9db1f021dcd0..74bb6e356c1f 100644 --- a/drivers/misc/pkvm-smc/pkvm/events.h +++ b/drivers/misc/pkvm-smc/pkvm/events.h @@ -3,7 +3,7 @@ #define __PKVM_SMC_FILTER_HYPEVENTS_H_ #ifdef __KVM_NVHE_HYPERVISOR__ -#include +#include #endif HYP_EVENT(filtered_smc, diff --git a/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c b/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c index 5681aef227aa..c679aaf48f68 100644 --- a/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c +++ b/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c @@ -11,7 +11,7 @@ #include "events.h" #define HYP_EVENT_FILE ../../../../drivers/misc/pkvm-smc/pkvm/events.h -#include +#include const struct pkvm_module_ops *pkvm_ops; bool permissive;