Commit 7e5cb4da authored by Andrew Jones's avatar Andrew Jones Committed by Greg Kroah-Hartman

KVM: arm/arm64: Fix emulated ptimer irq injection

[ Upstream commit e4e5a865 ]

The emulated ptimer needs to track the level changes, otherwise the
the interrupt will never get deasserted, resulting in the guest getting
stuck in an interrupt storm if it enables ptimer interrupts. This was
found with kvm-unit-tests; the ptimer tests hung as soon as interrupts
were enabled. Typical Linux guests don't have a problem as they prefer
using the virtual timer.

Fixes: bee038a6 ("KVM: arm/arm64: Rework the timer code to use a timer_map")
Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
[Simplified the patch to res we only care about emulated timers here]
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3f14533a
...@@ -321,14 +321,15 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level, ...@@ -321,14 +321,15 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level,
} }
} }
/* Only called for a fully emulated timer */
static void timer_emulate(struct arch_timer_context *ctx) static void timer_emulate(struct arch_timer_context *ctx)
{ {
bool should_fire = kvm_timer_should_fire(ctx); bool should_fire = kvm_timer_should_fire(ctx);
trace_kvm_timer_emulate(ctx, should_fire); trace_kvm_timer_emulate(ctx, should_fire);
if (should_fire) { if (should_fire != ctx->irq.level) {
kvm_timer_update_irq(ctx->vcpu, true, ctx); kvm_timer_update_irq(ctx->vcpu, should_fire, ctx);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment