KVM: arm64: nVHE: Simplify invalid_host_el2_vect

The invalid_host_el2_vect macro is used by EL2{t,h} handlers in nVHE
*host* context, which should never run with a guest context loaded.
Therefore, remove the superfluous vCPU context check and branch
unconditionally to hyp_panic.

Signed-off-by: Pierre-Clément Tosi <ptosi@google.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20240610063244.2828978-4-ptosi@google.com
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S
index 135cfb294ee51f96c3578450f90daf8925b3a255..3d610fc51f4d33545b1eaee0b2ec09bb0b9b521b 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/host.S
+++ b/arch/arm64/kvm/hyp/nvhe/host.S
@@ -197,12 +197,6 @@ SYM_FUNC_END(__host_hvc)
        sub     x0, sp, x0                      // x0'' = sp' - x0' = (sp + x0) - sp = x0
        sub     sp, sp, x0                      // sp'' = sp' - x0 = (sp + x0) - x0 = sp
 
-       /* If a guest is loaded, panic out of it. */
-       stp     x0, x1, [sp, #-16]!
-       get_loaded_vcpu x0, x1
-       cbnz    x0, __guest_exit_panic
-       add     sp, sp, #16
-
        /*
         * The panic may not be clean if the exception is taken before the host
         * context has been saved by __host_exit or after the hyp context has