mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
LoongArch: KVM: Do not restart SW timer when it is expired
LoongArch VCPUs have their own separate HW timers. SW timer is to wake up blocked vcpu thread, rather than HW timer emulation. When blocking vcpu scheduled out, SW timer is used to wakeup blocked vcpu thread and injects timer interrupt. It does not care about whether guest timer is in period mode or oneshot mode, and SW timer needs not to be restarted since vcpu has been woken. This patch does not restart SW timer when it is expired. Signed-off-by: Bibo Mao <maobibo@loongson.cn> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
This commit is contained in:
parent
8bc15d02d5
commit
f66228053e
@ -23,24 +23,6 @@ static inline u64 tick_to_ns(struct kvm_vcpu *vcpu, u64 tick)
|
||||
return div_u64(tick * MNSEC_PER_SEC, vcpu->arch.timer_mhz);
|
||||
}
|
||||
|
||||
/*
|
||||
* Push timer forward on timeout.
|
||||
* Handle an hrtimer event by push the hrtimer forward a period.
|
||||
*/
|
||||
static enum hrtimer_restart kvm_count_timeout(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
unsigned long cfg, period;
|
||||
|
||||
/* Add periodic tick to current expire time */
|
||||
cfg = kvm_read_sw_gcsr(vcpu->arch.csr, LOONGARCH_CSR_TCFG);
|
||||
if (cfg & CSR_TCFG_PERIOD) {
|
||||
period = tick_to_ns(vcpu, cfg & CSR_TCFG_VAL);
|
||||
hrtimer_add_expires_ns(&vcpu->arch.swtimer, period);
|
||||
return HRTIMER_RESTART;
|
||||
} else
|
||||
return HRTIMER_NORESTART;
|
||||
}
|
||||
|
||||
/* Low level hrtimer wake routine */
|
||||
enum hrtimer_restart kvm_swtimer_wakeup(struct hrtimer *timer)
|
||||
{
|
||||
@ -50,7 +32,7 @@ enum hrtimer_restart kvm_swtimer_wakeup(struct hrtimer *timer)
|
||||
kvm_queue_irq(vcpu, INT_TI);
|
||||
rcuwait_wake_up(&vcpu->wait);
|
||||
|
||||
return kvm_count_timeout(vcpu);
|
||||
return HRTIMER_NORESTART;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user