Commit 465e333e authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge some KVM patches we are keeping in a topic branch in case there
are any merge conflicts that need resolving.
parents 806c0e6e 0c8fb653

arch/powerpc/include/asm/kvm_book3s_64.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct kvm_nested_guest { 
	pgd_t *shadow_pgtable;		/* our page table for this guest */

	u64 l1_gr_to_hr;		/* L1's addr of part'n-scoped table */

	u64 process_table;		/* process table entry for this guest */

	u64 hfscr;			/* HFSCR that the L1 requested for this nested guest */

	long refcnt;			/* number of pointers to this struct */

	struct mutex tlb_lock;		/* serialize page faults and tlbies */

	struct kvm_nested_guest *next;

arch/powerpc/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -811,6 +811,8 @@ struct kvm_vcpu_arch { 


	u32 online;



	u64 hfscr_permitted;	/* A mask of permitted HFSCR facilities */



	/* For support of nested guests */

	struct kvm_nested_guest *nested;

	u32 nested_vcpu_id;

arch/powerpc/include/asm/pmc.h

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ static inline void ppc_set_pmu_inuse(int inuse) 
#endif

}



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

static inline int ppc_get_pmu_inuse(void)

{

	return get_paca()->pmcregs_in_use;

}

#endif



extern void power4_enable_pmcs(void);



#else /* CONFIG_PPC64 */

arch/powerpc/include/asm/reg.h

+2 −1
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ 
#define   FSCR_TAR	__MASK(FSCR_TAR_LG)

#define   FSCR_EBB	__MASK(FSCR_EBB_LG)

#define   FSCR_DSCR	__MASK(FSCR_DSCR_LG)

#define   FSCR_INTR_CAUSE (ASM_CONST(0xFF) << 56)	/* interrupt cause */

#define SPRN_HFSCR	0xbe	/* HV=1 Facility Status & Control Register */

#define   HFSCR_PREFIX	__MASK(FSCR_PREFIX_LG)

#define   HFSCR_MSGP	__MASK(FSCR_MSGP_LG)
@@ -426,7 +427,7 @@ 
#define   HFSCR_DSCR	__MASK(FSCR_DSCR_LG)

#define   HFSCR_VECVSX	__MASK(FSCR_VECVSX_LG)

#define   HFSCR_FP	__MASK(FSCR_FP_LG)

#define   HFSCR_INTR_CAUSE (ASM_CONST(0xFF) << 56)	/* interrupt cause */

#define   HFSCR_INTR_CAUSE FSCR_INTR_CAUSE

#define SPRN_TAR	0x32f	/* Target Address Register */

#define SPRN_LPCR	0x13E	/* LPAR Control Register */

#define   LPCR_VPM0		ASM_CONST(0x8000000000000000)

arch/powerpc/kvm/book3s_64_mmu_radix.c

+7 −5
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid, 
					  (to != NULL) ? __pa(to): 0,

					  (from != NULL) ? __pa(from): 0, n);



	if (eaddr & (0xFFFUL << 52))

		return ret;



	quadrant = 1;

	if (!pid)

		quadrant = 2;
@@ -65,10 +68,12 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid, 
	}

	isync();



	pagefault_disable();

	if (is_load)

		ret = copy_from_user_nofault(to, (const void __user *)from, n);

		ret = __copy_from_user_inatomic(to, (const void __user *)from, n);

	else

		ret = copy_to_user_nofault((void __user *)to, from, n);

		ret = __copy_to_user_inatomic((void __user *)to, from, n);

	pagefault_enable();



	/* switch the pid first to avoid running host with unallocated pid */

	if (quadrant == 1 && pid != old_pid)
@@ -81,7 +86,6 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid, 


	return ret;

}

EXPORT_SYMBOL_GPL(__kvmhv_copy_tofrom_guest_radix);



static long kvmhv_copy_tofrom_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr,

					  void *to, void *from, unsigned long n)
@@ -117,14 +121,12 @@ long kvmhv_copy_from_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr, void *to, 


	return ret;

}

EXPORT_SYMBOL_GPL(kvmhv_copy_from_guest_radix);



long kvmhv_copy_to_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr, void *from,

			       unsigned long n)

{

	return kvmhv_copy_tofrom_guest_radix(vcpu, eaddr, NULL, from, n);

}

EXPORT_SYMBOL_GPL(kvmhv_copy_to_guest_radix);



int kvmppc_mmu_walk_radix_tree(struct kvm_vcpu *vcpu, gva_t eaddr,

			       struct kvmppc_pte *gpte, u64 root,