Commit 3c536423 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge some powerpc KVM patches from our topic branch.

In particular this brings in Nick's big series rewriting parts of the
guest entry/exit path in C.

Conflicts:
	arch/powerpc/kernel/security.c
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
parents 07d8ad6f fae5c9f3

arch/powerpc/include/asm/asm-prototypes.h

+2 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ extern s32 patch__call_flush_branch_caches3; 
extern s32 patch__flush_count_cache_return;

extern s32 patch__flush_link_stack_return;

extern s32 patch__call_kvm_flush_link_stack;

extern s32 patch__call_kvm_flush_link_stack_p9;

extern s32 patch__memset_nocache, patch__memcpy_nocache;



extern long flush_branch_caches;
@@ -140,7 +141,7 @@ void kvmhv_load_host_pmu(void); 
void kvmhv_save_guest_pmu(struct kvm_vcpu *vcpu, bool pmu_in_use);

void kvmhv_load_guest_pmu(struct kvm_vcpu *vcpu);



int __kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu);

void kvmppc_p9_enter_guest(struct kvm_vcpu *vcpu);



long kvmppc_h_set_dabr(struct kvm_vcpu *vcpu, unsigned long dabr);

long kvmppc_h_set_xdabr(struct kvm_vcpu *vcpu, unsigned long dabr,

arch/powerpc/include/asm/exception-64s.h

+13 −0
Original line number Diff line number Diff line
@@ -35,6 +35,19 @@ 
/* PACA save area size in u64 units (exgen, exmc, etc) */

#define EX_SIZE		10



/* PACA save area offsets */

#define EX_R9		0

#define EX_R10		8

#define EX_R11		16

#define EX_R12		24

#define EX_R13		32

#define EX_DAR		40

#define EX_DSISR	48

#define EX_CCR		52

#define EX_CFAR		56

#define EX_PPR		64

#define EX_CTR		72



/*

 * maximum recursive depth of MCE exceptions

 */

arch/powerpc/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
#define KVM_GUEST_MODE_SKIP	2

#define KVM_GUEST_MODE_GUEST_HV	3

#define KVM_GUEST_MODE_HOST_HV	4

#define KVM_GUEST_MODE_HV_P9	5 /* ISA >= v3.0 path */



#define KVM_INST_FETCH_FAILED	-1

arch/powerpc/include/asm/kvm_book3s_64.h

+8 −0
Original line number Diff line number Diff line
@@ -153,9 +153,17 @@ static inline bool kvmhv_vcpu_is_radix(struct kvm_vcpu *vcpu) 
	return radix;

}



int kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr);



#define KVM_DEFAULT_HPT_ORDER	24	/* 16MB HPT by default */

#endif



/*

 * Invalid HDSISR value which is used to indicate when HW has not set the reg.

 * Used to work around an errata.

 */

#define HDSISR_CANARY	0x7fff



/*

 * We use a lock bit in HPTE dword 0 to synchronize updates and

 * accesses to each HPTE, and another bit to indicate non-present

arch/powerpc/include/asm/kvm_host.h

+6 −2
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ struct kvm_arch { 
	u8 fwnmi_enabled;

	u8 secure_guest;

	u8 svm_enabled;

	bool threads_indep;

	bool nested_enable;

	bool dawr1_enabled;

	pgd_t *pgtable;
@@ -683,7 +682,12 @@ struct kvm_vcpu_arch { 
	ulong fault_dar;

	u32 fault_dsisr;

	unsigned long intr_msr;

	ulong fault_gpa;	/* guest real address of page fault (POWER9) */

	/*

	 * POWER9 and later: fault_gpa contains the guest real address of page

	 * fault for a radix guest, or segment descriptor (equivalent to result

	 * from slbmfev of SLB entry that translated the EA) for hash guests.

	 */

	ulong fault_gpa;

#endif



#ifdef CONFIG_BOOKE