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

Commit 54a1f393 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-ppc-next-5.1-1' of... 

Merge tag 'kvm-ppc-next-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next

PPC KVM update for 5.1

There are no major new features this time, just a collection of bug
fixes and improvements in various areas, including machine check
handling and context switching of protection-key-related registers.
parents a67794ca 0a0c50f7

arch/powerpc/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ struct kvm_nested_guest; 


struct kvm_vm_stat {

	ulong remote_tlb_flush;

	ulong num_2M_pages;

	ulong num_1G_pages;

};



struct kvm_vcpu_stat {
@@ -377,6 +379,7 @@ struct kvmppc_mmu { 
	void (*slbmte)(struct kvm_vcpu *vcpu, u64 rb, u64 rs);

	u64  (*slbmfee)(struct kvm_vcpu *vcpu, u64 slb_nr);

	u64  (*slbmfev)(struct kvm_vcpu *vcpu, u64 slb_nr);

	int  (*slbfee)(struct kvm_vcpu *vcpu, gva_t eaddr, ulong *ret_slb);

	void (*slbie)(struct kvm_vcpu *vcpu, u64 slb_nr);

	void (*slbia)(struct kvm_vcpu *vcpu);

	/* book3s */

arch/powerpc/include/asm/kvm_ppc.h

+16 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#endif

#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

#include <asm/paca.h>

#include <asm/xive.h>

#include <asm/cpu_has_feature.h>

#endif



/*
@@ -141,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);
@@ -616,6 +619,18 @@ static inline int kvmppc_xive_set_irq(struct kvm *kvm, int irq_source_id, u32 ir 
static inline void kvmppc_xive_push_vcpu(struct kvm_vcpu *vcpu) { }

#endif /* CONFIG_KVM_XIVE */



#ifdef CONFIG_PPC_POWERNV

static inline bool xics_on_xive(void)

{

	return xive_enabled() && cpu_has_feature(CPU_FTR_HVMODE);

}

#else

static inline bool xics_on_xive(void)

{

	return false;

}

#endif



/*

 * Prototypes for functions called only from assembler code.

 * Having prototypes reduces sparse errors.
@@ -632,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/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -10,11 +10,6 @@ common-objs-y = $(KVM)/kvm_main.o $(KVM)/eventfd.o 
common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o

common-objs-$(CONFIG_KVM_MMIO) += $(KVM)/coalesced_mmio.o



CFLAGS_e500_mmu.o := -I.

CFLAGS_e500_mmu_host.o := -I.

CFLAGS_emulate.o  := -I.

CFLAGS_emulate_loadstore.o  := -I.



common-objs-y += powerpc.o emulate_loadstore.o

obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o

obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o