shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Save/restore virtual timer state from the shadow vcpu"

Browse Source 
This reverts commit 6696aa13c7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I75811464cb5ab603631a61cd4b5800cd7bae1c1c
This commit is contained in:
Will Deacon
2022-07-07 15:51:37 +01:00
parent f0f89c1ecf
commit 6c8d7e0937
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/kvm/arch_timer.c
View File

@@ -88,9 +88,7 @@ static u64 timer_get_offset(struct arch_timer_context *ctxt)
switch(arch_timer_ctx_index(ctxt)) {
case TIMER_VTIMER:
if (likely(!kvm_vm_is_protected(vcpu->kvm)))
return __vcpu_sys_reg(vcpu, CNTVOFF_EL2);
fallthrough;
return __vcpu_sys_reg(vcpu, CNTVOFF_EL2);
default:
return 0;
}
@@ -756,9 +754,6 @@ static void update_vtimer_cntvoff(struct kvm_vcpu *vcpu, u64 cntvoff)
struct kvm *kvm = vcpu->kvm;
struct kvm_vcpu *tmp;
if (unlikely(kvm_vm_is_protected(vcpu->kvm)))
cntvoff = 0;
mutex_lock(&kvm->lock);
kvm_for_each_vcpu(i, tmp, kvm)
timer_set_offset(vcpu_vtimer(tmp), cntvoff);

24
arch/arm64/kvm/hyp/nvhe/hyp-main.c
View File

@@ -253,28 +253,6 @@ static void sync_vgic_state(struct kvm_vcpu *host_vcpu,
host_cpu_if->vgic_lr[i] = shadow_cpu_if->vgic_lr[i];
}
static void flush_timer_state(struct kvm_vcpu *shadow_vcpu)
{
/*
* A shadow vcpu has no offset, and sees vtime == ptime. The
* ptimer is fully emulated by EL1 and cannot be trusted.
*/
write_sysreg(0, cntvoff_el2);
isb();
write_sysreg_el0(__vcpu_sys_reg(shadow_vcpu, CNTV_CVAL_EL0), SYS_CNTV_CVAL);
write_sysreg_el0(__vcpu_sys_reg(shadow_vcpu, CNTV_CTL_EL0), SYS_CNTV_CTL);
}
static void sync_timer_state(struct kvm_vcpu *shadow_vcpu)
{
/*
* Preserve the vtimer state so that it is always correct,
* even if the host tries to make a mess.
*/
__vcpu_sys_reg(shadow_vcpu, CNTV_CVAL_EL0) = read_sysreg_el0(SYS_CNTV_CVAL);
__vcpu_sys_reg(shadow_vcpu, CNTV_CTL_EL0) = read_sysreg_el0(SYS_CNTV_CTL);
}
static bool handle_shadow_entry(struct kvm_vcpu *shadow_vcpu)
{
struct kvm_vcpu *host_vcpu = shadow_vcpu->arch.pkvm.host_vcpu;
@@ -282,7 +260,6 @@ static bool handle_shadow_entry(struct kvm_vcpu *shadow_vcpu)
shadow_entry_exit_handler_fn ec_handler;
flush_vgic_state(host_vcpu, shadow_vcpu);
flush_timer_state(shadow_vcpu);
switch (ARM_EXCEPTION_CODE(shadow_vcpu->arch.pkvm.exit_code)) {
case ARM_EXCEPTION_IRQ:
@@ -309,7 +286,6 @@ static void handle_shadow_exit(struct kvm_vcpu *shadow_vcpu)
shadow_entry_exit_handler_fn ec_handler;
sync_vgic_state(host_vcpu, shadow_vcpu);
sync_timer_state(shadow_vcpu);
switch (shadow_vcpu->arch.pkvm.exit_code) {
case ARM_EXCEPTION_IRQ: