diff options
author | Roman Kagan <rkagan@virtuozzo.com> | 2017-07-20 17:26:40 +0300 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-07-20 17:00:00 +0200 |
commit | f1ff89ec4447c4e39d275a1ca3de43eed2a92745 (patch) | |
tree | 63d4bf5301a833733d77cc55a560f76015320047 /arch/x86/kvm | |
parent | f244deed7a254b4a61333e6886575ce0102e8356 (diff) | |
download | op-kernel-dev-f1ff89ec4447c4e39d275a1ca3de43eed2a92745.zip op-kernel-dev-f1ff89ec4447c4e39d275a1ca3de43eed2a92745.tar.gz |
kvm: x86: hyperv: avoid livelock in oneshot SynIC timers
If the SynIC timer message delivery fails due to SINT message slot being
busy, there's no point to attempt starting the timer again until we're
notified of the slot being released by the guest (via EOM or EOI).
Even worse, when a oneshot timer fails to deliver its message, its
re-arming with an expiration time in the past leads to immediate retry
of the delivery, and so on, without ever letting the guest vcpu to run
and release the slot, which results in a livelock.
To avoid that, only start the timer when there's no timer message
pending delivery. When there is, meaning the slot is busy, the
processing will be restarted upon notification from the guest that the
slot is released.
Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/hyperv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 2695a34..337b6d2 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -649,9 +649,10 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu) } if ((stimer->config & HV_STIMER_ENABLE) && - stimer->count) - stimer_start(stimer); - else + stimer->count) { + if (!stimer->msg_pending) + stimer_start(stimer); + } else stimer_cleanup(stimer); } } |