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

Commit 0a0c50f7 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next 



This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code.  These commits will be merged both via the KVM tree and the
powerpc tree.

Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parents 716cb116 c3c7470c

arch/powerpc/include/asm/kvm_ppc.h

+2 −1
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ extern void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu); 


extern int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu);

extern int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_machine_check(struct kvm_vcpu *vcpu, ulong flags);

extern void kvmppc_core_queue_program(struct kvm_vcpu *vcpu, ulong flags);

extern void kvmppc_core_queue_fpunavail(struct kvm_vcpu *vcpu);

extern void kvmppc_core_queue_vec_unavail(struct kvm_vcpu *vcpu);
@@ -646,7 +647,7 @@ long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target, 
                            unsigned int yield_count);

long kvmppc_h_random(struct kvm_vcpu *vcpu);

void kvmhv_commence_exit(int trap);

long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);

void kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);

void kvmppc_subcore_enter_guest(void);

void kvmppc_subcore_exit_guest(void);

long kvmppc_realmode_hmi_handler(void);

arch/powerpc/include/asm/mce.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ extern int get_mce_event(struct machine_check_event *mce, bool release); 
extern void release_mce_event(void);

extern void machine_check_queue_event(void);

extern void machine_check_print_event_info(struct machine_check_event *evt,

					   bool user_mode);

					   bool user_mode, bool in_guest);

#ifdef CONFIG_PPC_BOOK3S_64

void flush_and_reload_slb(void);

#endif /* CONFIG_PPC_BOOK3S_64 */

arch/powerpc/kernel/mce.c

+5 −3
Original line number Diff line number Diff line
@@ -301,13 +301,13 @@ static void machine_check_process_queued_event(struct irq_work *work) 
	while (__this_cpu_read(mce_queue_count) > 0) {

		index = __this_cpu_read(mce_queue_count) - 1;

		evt = this_cpu_ptr(&mce_event_queue[index]);

		machine_check_print_event_info(evt, false);

		machine_check_print_event_info(evt, false, false);

		__this_cpu_dec(mce_queue_count);

	}

}



void machine_check_print_event_info(struct machine_check_event *evt,

				    bool user_mode)

				    bool user_mode, bool in_guest)

{

	const char *level, *sevstr, *subtype;

	static const char *mc_ue_types[] = {
@@ -387,7 +387,9 @@ void machine_check_print_event_info(struct machine_check_event *evt, 
	       evt->disposition == MCE_DISPOSITION_RECOVERED ?

	       "Recovered" : "Not recovered");



	if (user_mode) {

	if (in_guest) {

		printk("%s  Guest NIP: %016llx\n", level, evt->srr0);

	} else if (user_mode) {

		printk("%s  NIP: [%016llx] PID: %d Comm: %s\n", level,

			evt->srr0, current->pid, current->comm);

	} else {

arch/powerpc/kvm/book3s.c

+7 −0
Original line number Diff line number Diff line
@@ -195,6 +195,13 @@ void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec) 
}

EXPORT_SYMBOL_GPL(kvmppc_book3s_queue_irqprio);



void kvmppc_core_queue_machine_check(struct kvm_vcpu *vcpu, ulong flags)

{

	/* might as well deliver this straight away */

	kvmppc_inject_interrupt(vcpu, BOOK3S_INTERRUPT_MACHINE_CHECK, flags);

}

EXPORT_SYMBOL_GPL(kvmppc_core_queue_machine_check);



void kvmppc_core_queue_program(struct kvm_vcpu *vcpu, ulong flags)

{

	/* might as well deliver this straight away */

arch/powerpc/kvm/book3s_hv.c

+21 −4
Original line number Diff line number Diff line
@@ -1217,6 +1217,22 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		r = RESUME_GUEST;

		break;

	case BOOK3S_INTERRUPT_MACHINE_CHECK:

		/* Print the MCE event to host console. */

		machine_check_print_event_info(&vcpu->arch.mce_evt, false, true);



		/*

		 * If the guest can do FWNMI, exit to userspace so it can

		 * deliver a FWNMI to the guest.

		 * Otherwise we synthesize a machine check for the guest

		 * so that it knows that the machine check occurred.

		 */

		if (!vcpu->kvm->arch.fwnmi_enabled) {

			ulong flags = vcpu->arch.shregs.msr & 0x083c0000;

			kvmppc_core_queue_machine_check(vcpu, flags);

			r = RESUME_GUEST;

			break;

		}



		/* Exit to guest with KVM_EXIT_NMI as exit reason */

		run->exit_reason = KVM_EXIT_NMI;

		run->hw.hardware_exit_reason = vcpu->arch.trap;
@@ -1229,8 +1245,6 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			run->flags |= KVM_RUN_PPC_NMI_DISP_NOT_RECOV;



		r = RESUME_HOST;

		/* Print the MCE event to host console. */

		machine_check_print_event_info(&vcpu->arch.mce_evt, false);

		break;

	case BOOK3S_INTERRUPT_PROGRAM:

	{
@@ -1394,7 +1408,7 @@ static int kvmppc_handle_nested_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) 
		/* Pass the machine check to the L1 guest */

		r = RESUME_HOST;

		/* Print the MCE event to host console. */

		machine_check_print_event_info(&vcpu->arch.mce_evt, false);

		machine_check_print_event_info(&vcpu->arch.mce_evt, false, true);

		break;

	/*

	 * We get these next two if the guest accesses a page which it thinks
@@ -3457,6 +3471,7 @@ int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, 
	unsigned long host_dscr = mfspr(SPRN_DSCR);

	unsigned long host_tidr = mfspr(SPRN_TIDR);

	unsigned long host_iamr = mfspr(SPRN_IAMR);

	unsigned long host_amr = mfspr(SPRN_AMR);

	s64 dec;

	u64 tb;

	int trap, save_pmu;
@@ -3573,13 +3588,15 @@ int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, 


	mtspr(SPRN_PSPB, 0);

	mtspr(SPRN_WORT, 0);

	mtspr(SPRN_AMR, 0);

	mtspr(SPRN_UAMOR, 0);

	mtspr(SPRN_DSCR, host_dscr);

	mtspr(SPRN_TIDR, host_tidr);

	mtspr(SPRN_IAMR, host_iamr);

	mtspr(SPRN_PSPB, 0);



	if (host_amr != vcpu->arch.amr)

		mtspr(SPRN_AMR, host_amr);



	msr_check_and_set(MSR_FP | MSR_VEC | MSR_VSX);

	store_fp_state(&vcpu->arch.fp);

#ifdef CONFIG_ALTIVEC