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

Commit 4dafecde 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 from the powerpc tree in
order to bring in some fixes which touch both powerpc and KVM code.

Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parents e3bfed1d 94a04bc2

arch/powerpc/include/asm/kvm_book3s_asm.h

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ struct kvmppc_host_state { 
	u8 napping;



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	/*

	 * hwthread_req/hwthread_state pair is used to pull sibling threads

	 * out of guest on pre-ISAv3.0B CPUs where threads share MMU.

	 */

	u8 hwthread_req;

	u8 hwthread_state;

	u8 host_ipi;

arch/powerpc/include/asm/pgtable.h

+1 −9
Original line number Diff line number Diff line
@@ -66,16 +66,8 @@ extern int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, 
#ifndef CONFIG_TRANSPARENT_HUGEPAGE

#define pmd_large(pmd)		0

#endif

pte_t *__find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea,

				   bool *is_thp, unsigned *shift);

static inline pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea,

					       bool *is_thp, unsigned *shift)

{

	VM_WARN(!arch_irqs_disabled(),

		"%s called with irq enabled\n", __func__);

	return __find_linux_pte_or_hugepte(pgdir, ea, is_thp, shift);

}



/* can we use this in kvm */

unsigned long vmalloc_to_phys(void *vmalloc_addr);



void pgtable_cache_add(unsigned shift, void (*ctor)(void *));

arch/powerpc/include/asm/pte-walk.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_PTE_WALK_H

#define _ASM_POWERPC_PTE_WALK_H



#include <linux/sched.h>



/* Don't use this directly */

extern pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,

			       bool *is_thp, unsigned *hshift);



static inline pte_t *find_linux_pte(pgd_t *pgdir, unsigned long ea,

				    bool *is_thp, unsigned *hshift)

{

	VM_WARN(!arch_irqs_disabled(), "%s called with irq enabled\n", __func__);

	return __find_linux_pte(pgdir, ea, is_thp, hshift);

}



static inline pte_t *find_init_mm_pte(unsigned long ea, unsigned *hshift)

{

	pgd_t *pgdir = init_mm.pgd;

	return __find_linux_pte(pgdir, ea, NULL, hshift);

}

/*

 * This is what we should always use. Any other lockless page table lookup needs

 * careful audit against THP split.

 */

static inline pte_t *find_current_mm_pte(pgd_t *pgdir, unsigned long ea,

					 bool *is_thp, unsigned *hshift)

{

	VM_WARN(!arch_irqs_disabled(), "%s called with irq enabled\n", __func__);

	VM_WARN(pgdir != current->mm->pgd,

		"%s lock less page table lookup called on wrong mm\n", __func__);

	return __find_linux_pte(pgdir, ea, is_thp, hshift);

}



#endif /* _ASM_POWERPC_PTE_WALK_H */

arch/powerpc/kernel/eeh.c

+2 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <asm/machdep.h>

#include <asm/ppc-pci.h>

#include <asm/rtas.h>

#include <asm/pte-walk.h>





/** Overview:
@@ -352,8 +353,7 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) 
	 * worried about _PAGE_SPLITTING/collapse. Also we will not hit

	 * page table free, because of init_mm.

	 */

	ptep = __find_linux_pte_or_hugepte(init_mm.pgd, token,

					   NULL, &hugepage_shift);

	ptep = find_init_mm_pte(token, &hugepage_shift);

	if (!ptep)

		return token;

	WARN_ON(hugepage_shift);

arch/powerpc/kernel/idle_book3s.S

+24 −11
Original line number Diff line number Diff line
@@ -242,13 +242,20 @@ enter_winkle: 
/*

 * r3 - PSSCR value corresponding to the requested stop state.

 */

power_enter_stop:

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	/* Tell KVM we're entering idle */

power_enter_stop_kvm_rm:

	/*

	 * This is currently unused because POWER9 KVM does not have to

	 * gather secondary threads into sibling mode, but the code is

	 * here in case that function is required.

	 *

	 * Tell KVM we're entering idle.

	 */

	li	r4,KVM_HWTHREAD_IN_IDLE

	/* DO THIS IN REAL MODE!  See comment above. */

	stb	r4,HSTATE_HWTHREAD_STATE(r13)

#endif

power_enter_stop:

/*

 * Check if we are executing the lite variant with ESL=EC=0

 */
@@ -411,6 +418,18 @@ pnv_powersave_wakeup_mce: 


	b	pnv_powersave_wakeup



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

kvm_start_guest_check:

	li	r0,KVM_HWTHREAD_IN_KERNEL

	stb	r0,HSTATE_HWTHREAD_STATE(r13)

	/* Order setting hwthread_state vs. testing hwthread_req */

	sync

	lbz	r0,HSTATE_HWTHREAD_REQ(r13)

	cmpwi	r0,0

	beqlr

	b	kvm_start_guest

#endif



/*

 * Called from reset vector for powersave wakeups.

 * cr3 - set to gt if waking up with partial/complete hypervisor state loss
@@ -435,15 +454,9 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_300) 
	mr	r3,r12



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	li	r0,KVM_HWTHREAD_IN_KERNEL

	stb	r0,HSTATE_HWTHREAD_STATE(r13)

	/* Order setting hwthread_state vs. testing hwthread_req */

	sync

	lbz	r0,HSTATE_HWTHREAD_REQ(r13)

	cmpwi	r0,0

	beq	1f

	b	kvm_start_guest

1:

BEGIN_FTR_SECTION

	bl	kvm_start_guest_check

END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)

#endif



	/* Return SRR1 from power7_nap() */