kvm: arm/arm64: Fold VHE entry/exit work into kvm_vcpu_run_vhe()
authorMark Rutland <mark.rutland@arm.com>
Mon, 10 Feb 2020 11:47:57 +0000 (11:47 +0000)
committerMarc Zyngier <maz@kernel.org>
Mon, 17 Feb 2020 14:38:37 +0000 (14:38 +0000)
commitb3f15ec3d809ccf2e171ca4e272a220d3c1a3e05
tree3f90acd70858633bb741849a5f5f55177e7e398f
parent51b2569402a38e206d26728b0099eb059ab315b5
kvm: arm/arm64: Fold VHE entry/exit work into kvm_vcpu_run_vhe()

With VHE, running a vCPU always requires the sequence:

1. kvm_arm_vhe_guest_enter();
2. kvm_vcpu_run_vhe();
3. kvm_arm_vhe_guest_exit()

... and as we invoke this from the shared arm/arm64 KVM code, 32-bit arm
has to provide stubs for all three functions.

To simplify the common code, and make it easier to make further
modifications to the arm64-specific portions in the near future, let's
fold kvm_arm_vhe_guest_enter() and kvm_arm_vhe_guest_exit() into
kvm_vcpu_run_vhe().

The 32-bit stubs for kvm_arm_vhe_guest_enter() and
kvm_arm_vhe_guest_exit() are removed, as they are no longer used. The
32-bit stub for kvm_vcpu_run_vhe() is left as-is.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200210114757.2889-1-mark.rutland@arm.com
arch/arm/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/hyp/switch.c
virt/kvm/arm/arm.c