Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011da899 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: BookE: Handle alignment interrupts 



When the guest triggers an alignment interrupt, we don't handle it properly
today and instead BUG_ON(). This really shouldn't happen.

Instead, we should just pass the interrupt back into the guest so it can deal
with it.

Reported-by: default avatarGao Guanhua-B22826 <B22826@freescale.com>
Tested-by: default avatarGao Guanhua-B22826 <B22826@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent ee53e560

arch/powerpc/kvm/booke.c

+15 −1
Original line number Diff line number Diff line
@@ -182,6 +182,14 @@ static void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, 
	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_INST_STORAGE);

}



static void kvmppc_core_queue_alignment(struct kvm_vcpu *vcpu, ulong dear_flags,

					ulong esr_flags)

{

	vcpu->arch.queued_dear = dear_flags;

	vcpu->arch.queued_esr = esr_flags;

	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ALIGNMENT);

}



void kvmppc_core_queue_program(struct kvm_vcpu *vcpu, ulong esr_flags)

{

	vcpu->arch.queued_esr = esr_flags;
@@ -345,6 +353,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	switch (priority) {

	case BOOKE_IRQPRIO_DTLB_MISS:

	case BOOKE_IRQPRIO_DATA_STORAGE:

	case BOOKE_IRQPRIO_ALIGNMENT:

		update_dear = true;

		/* fall through */

	case BOOKE_IRQPRIO_INST_STORAGE:
@@ -358,7 +367,6 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	case BOOKE_IRQPRIO_SPE_FP_DATA:

	case BOOKE_IRQPRIO_SPE_FP_ROUND:

	case BOOKE_IRQPRIO_AP_UNAVAIL:

	case BOOKE_IRQPRIO_ALIGNMENT:

		allowed = 1;

		msr_mask = MSR_CE | MSR_ME | MSR_DE;

		int_class = INT_CLASS_NONCRIT;
@@ -971,6 +979,12 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		r = RESUME_GUEST;

		break;



	case BOOKE_INTERRUPT_ALIGNMENT:

		kvmppc_core_queue_alignment(vcpu, vcpu->arch.fault_dear,

		                            vcpu->arch.fault_esr);

		r = RESUME_GUEST;

		break;



#ifdef CONFIG_KVM_BOOKE_HV

	case BOOKE_INTERRUPT_HV_SYSCALL:

		if (!(vcpu->arch.shared->msr & MSR_PR)) {

arch/powerpc/kvm/booke_interrupts.S

+4 −2
Original line number Diff line number Diff line
@@ -45,12 +45,14 @@ 
                        (1<<BOOKE_INTERRUPT_DEBUG))



#define NEED_DEAR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \

                        (1<<BOOKE_INTERRUPT_DTLB_MISS))

                        (1<<BOOKE_INTERRUPT_DTLB_MISS) | \

                        (1<<BOOKE_INTERRUPT_ALIGNMENT))



#define NEED_ESR_MASK ((1<<BOOKE_INTERRUPT_DATA_STORAGE) | \

                       (1<<BOOKE_INTERRUPT_INST_STORAGE) | \

                       (1<<BOOKE_INTERRUPT_PROGRAM) | \

                       (1<<BOOKE_INTERRUPT_DTLB_MISS))

                       (1<<BOOKE_INTERRUPT_DTLB_MISS) | \

                       (1<<BOOKE_INTERRUPT_ALIGNMENT))



.macro KVM_HANDLER ivor_nr scratch srr0

_GLOBAL(kvmppc_handler_\ivor_nr)