From 421a0016333bb6e476a0879025af7d6d31fd6d66 Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Mon, 18 Mar 2024 11:05:06 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Fix missing trace event for nVHE dyn HVCs The hyp event host_hcall was missing when a custom HVC runs. Bug: 278749606 Bug: 244543039 Bug: 244373730 Change-Id: I760cab4fbd36a13ad262842880d9ec484f23fd22 Signed-off-by: Vincent Donnefort (cherry picked from commit a1836ffbea9fcb70fa9d49af7382b9343285036f) --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 995c3a840010..87ca8cd735ea 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -1334,7 +1334,7 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) hcall_t hfn; if (handle_host_dynamic_hcall(host_ctxt) == HCALL_HANDLED) - return; + goto end; /* * If pKVM has been initialised then reject any calls to the @@ -1359,7 +1359,7 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 0) = SMCCC_RET_SUCCESS; hfn(host_ctxt); - +end: trace_host_hcall(id, 0); return;