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

Commit 8de12015 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: Expose helper functions for data/inst faults 



We're going to implement guest code interpretation in KVM for some rare
corner cases. This code needs to be able to inject data and instruction
faults into the guest when it encounters them.

Expose generic APIs to do this in a reasonably subarch agnostic fashion.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent d69614a2

arch/powerpc/include/asm/kvm_ppc.h

+8 −0
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ extern void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu); 
extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                       struct kvm_interrupt *irq);

extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu, ulong dear_flags,

					ulong esr_flags);

extern void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,

					   ulong dear_flags,

					   ulong esr_flags);

extern void kvmppc_core_queue_itlb_miss(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu,

					   ulong esr_flags);

extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);

extern int kvmppc_core_check_requests(struct kvm_vcpu *vcpu);

arch/powerpc/kvm/book3s.c

+17 −0
Original line number Diff line number Diff line
@@ -230,6 +230,23 @@ void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu) 
	kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_EXTERNAL_LEVEL);

}



void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu, ulong dar,

				    ulong flags)

{

	kvmppc_set_dar(vcpu, dar);

	kvmppc_set_dsisr(vcpu, flags);

	kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_DATA_STORAGE);

}



void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong flags)

{

	u64 msr = kvmppc_get_msr(vcpu);

	msr &= ~(SRR1_ISI_NOPT | SRR1_ISI_N_OR_G | SRR1_ISI_PROT);

	msr |= flags & (SRR1_ISI_NOPT | SRR1_ISI_N_OR_G | SRR1_ISI_PROT);

	kvmppc_set_msr_fast(vcpu, msr);

	kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);

}



int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority)

{

	int deliver = 1;

arch/powerpc/kvm/booke.c

+10 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static void kvmppc_booke_queue_irqprio(struct kvm_vcpu *vcpu, 
	set_bit(priority, &vcpu->arch.pending_exceptions);

}



static void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu,

void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu,

				 ulong dear_flags, ulong esr_flags)

{

	vcpu->arch.queued_dear = dear_flags;
@@ -193,7 +193,7 @@ static void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu, 
	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS);

}



static void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,

void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,

				    ulong dear_flags, ulong esr_flags)

{

	vcpu->arch.queued_dear = dear_flags;
@@ -201,8 +201,12 @@ static void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu, 
	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DATA_STORAGE);

}



static void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu,

                                           ulong esr_flags)

void kvmppc_core_queue_itlb_miss(struct kvm_vcpu *vcpu)

{

	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS);

}



void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong esr_flags)

{

	vcpu->arch.queued_esr = esr_flags;

	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_INST_STORAGE);