diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-10-14 12:12:45 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-10 08:34:25 +0000 |
| commit | defe21f49bc98b095300752aa1e19bb608f3e97d (patch) | |
| tree | 8b2b5fb1ce92055a1fcde8a08e2076285e28b5bb /arch/arm64/kvm/handle_exit.c | |
| parent | KVM: arm64: Make kvm_skip_instr() and co private to HYP (diff) | |
| download | linux-dev-defe21f49bc98b095300752aa1e19bb608f3e97d.tar.xz linux-dev-defe21f49bc98b095300752aa1e19bb608f3e97d.zip | |
KVM: arm64: Move PC rollback on SError to HYP
Instead of handling the "PC rollback on SError during HVC" at EL1 (which
requires disclosing PC to a potentially untrusted kernel), let's move
this fixup to ... fixup_guest_exit(), which is where we do all fixups.
Isn't that neat?
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/handle_exit.c')
| -rw-r--r-- | arch/arm64/kvm/handle_exit.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index d4e00a864ee6..f79137ee4274 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -241,23 +241,6 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index) { struct kvm_run *run = vcpu->run; - if (ARM_SERROR_PENDING(exception_index)) { - u8 esr_ec = ESR_ELx_EC(kvm_vcpu_get_esr(vcpu)); - - /* - * HVC already have an adjusted PC, which we need to - * correct in order to return to after having injected - * the SError. - * - * SMC, on the other hand, is *trapped*, meaning its - * preferred return address is the SMC itself. - */ - if (esr_ec == ESR_ELx_EC_HVC32 || esr_ec == ESR_ELx_EC_HVC64) - *vcpu_pc(vcpu) -= 4; - - return 1; - } - exception_index = ARM_EXCEPTION_CODE(exception_index); switch (exception_index) { |