diff options
| author | Marc Zyngier <maz@kernel.org> | 2023-08-15 19:38:58 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2023-08-17 10:00:27 +0100 |
| commit | ea3b27d8dea081f1693b310322ae71fa75d1875b (patch) | |
| tree | c711ee3a49cc3e62fa5ca49cf87531e514a31f94 | |
| parent | a77b31dce4375be15014b10e8f94a149592ea6b6 (diff) | |
| download | lwn-ea3b27d8dea081f1693b310322ae71fa75d1875b.tar.gz lwn-ea3b27d8dea081f1693b310322ae71fa75d1875b.zip | |
KVM: arm64: nv: Expand ERET trap forwarding to handle FGT
We already handle ERET being trapped from a L1 guest in hyp context.
However, with FGT, we can also have ERET being trapped from L2, and
this needs to be reinjected into L1.
Add the required exception routing.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Jing Zhang <jingzhangos@google.com>
Link: https://lore.kernel.org/r/20230815183903.2735724-25-maz@kernel.org
| -rw-r--r-- | arch/arm64/kvm/handle_exit.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 3b86d534b995..617ae6dea5d5 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -222,7 +222,22 @@ static int kvm_handle_eret(struct kvm_vcpu *vcpu) if (kvm_vcpu_get_esr(vcpu) & ESR_ELx_ERET_ISS_ERET) return kvm_handle_ptrauth(vcpu); - kvm_emulate_nested_eret(vcpu); + /* + * If we got here, two possibilities: + * + * - the guest is in EL2, and we need to fully emulate ERET + * + * - the guest is in EL1, and we need to reinject the + * exception into the L1 hypervisor. + * + * If KVM ever traps ERET for its own use, we'll have to + * revisit this. + */ + if (is_hyp_ctxt(vcpu)) + kvm_emulate_nested_eret(vcpu); + else + kvm_inject_nested_sync(vcpu, kvm_vcpu_get_esr(vcpu)); + return 1; } |