Commit 7706664d authored by Alexander Graf's avatar Alexander Graf Committed by Marcelo Tosatti
Browse files

KVM: powerpc: Improve DEC handling 



We treated the DEC interrupt like an edge based one. This is not true for
Book3s. The DEC keeps firing until mtdec is issued again and thus clears
the interrupt line.

So let's implement this logic in KVM too. This patch moves the line clearing
from the firing of the interrupt to the mtdec emulation.

This makes PPC64 guests work without AGGRESSIVE_DEC defined.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarAcked-by: Hollis Blanchard <hollis@penguinppc.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 583617b7

arch/powerpc/include/asm/kvm_ppc.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ extern void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu); 
extern int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_program(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                       struct kvm_interrupt *irq);

arch/powerpc/kvm/book3s.c

+15 −1
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ static int kvmppc_book3s_vec2irqprio(unsigned int vec) 
	return prio;

}



static void kvmppc_book3s_dequeue_irqprio(struct kvm_vcpu *vcpu,

					  unsigned int vec)

{

	clear_bit(kvmppc_book3s_vec2irqprio(vec),

		  &vcpu->arch.pending_exceptions);

}



void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)

{

	vcpu->stat.queue_intr++;
@@ -178,6 +185,11 @@ int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu) 
	return test_bit(BOOK3S_INTERRUPT_DECREMENTER >> 7, &vcpu->arch.pending_exceptions);

}



void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu)

{

	kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_DECREMENTER);

}



void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                struct kvm_interrupt *irq)

{
@@ -275,7 +287,9 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu) 
#endif

	priority = __ffs(*pending);

	while (priority <= (sizeof(unsigned int) * 8)) {

		if (kvmppc_book3s_irqprio_deliver(vcpu, priority)) {

		if (kvmppc_book3s_irqprio_deliver(vcpu, priority) &&

		    (priority != BOOK3S_IRQPRIO_DECREMENTER)) {

			/* DEC interrupts get cleared by mtdec */

			clear_bit(priority, &vcpu->arch.pending_exceptions);

			break;

		}

arch/powerpc/kvm/booke.c

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu) 
	return test_bit(BOOKE_IRQPRIO_DECREMENTER, &vcpu->arch.pending_exceptions);

}



void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu)

{

	clear_bit(BOOKE_IRQPRIO_DECREMENTER, &vcpu->arch.pending_exceptions);

}



void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                struct kvm_interrupt *irq)

{

arch/powerpc/kvm/emulate.c

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu) 


	pr_debug("mtDEC: %x\n", vcpu->arch.dec);

#ifdef CONFIG_PPC64

	/* mtdec lowers the interrupt line when positive. */

	kvmppc_core_dequeue_dec(vcpu);



	/* POWER4+ triggers a dec interrupt if the value is < 0 */

	if (vcpu->arch.dec & 0x80000000) {

		hrtimer_try_to_cancel(&vcpu->arch.dec_timer);

CRA Git | Maintained and supported by SUSTech CRA and CCSE