Commit 63905bba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull powerpc fixes from Michael Ellerman:

 - fix for mm_dec_nr_pmds() from Scott.

 - fixes for oopses seen with KVM + THP from Aneesh.

 - build fixes from Aneesh & Shreyas.

* tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled
  powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error
  powerpc/mm/thp: Return pte address if we find trans_splitting.
  powerpc/mm/thp: Make page table walk safe against thp split/collapse
  KVM: PPC: Remove page table walk helpers
  KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer
  powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()
parents eadf16a9 2e826695

arch/powerpc/include/asm/kvm_book3s_64.h

+6 −11
Original line number Diff line number Diff line
@@ -295,16 +295,17 @@ static inline int hpte_cache_flags_ok(unsigned long ptel, unsigned long io_type) 


/*

 * If it's present and writable, atomically set dirty and referenced bits and

 * return the PTE, otherwise return 0. If we find a transparent hugepage

 * and if it is marked splitting we return 0;

 * return the PTE, otherwise return 0.

 */

static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing,

						 unsigned int hugepage)

static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing)

{

	pte_t old_pte, new_pte = __pte(0);



	while (1) {

		old_pte = *ptep;

		/*

		 * Make sure we don't reload from ptep

		 */

		old_pte = READ_ONCE(*ptep);

		/*

		 * wait until _PAGE_BUSY is clear then set it atomically

		 */
@@ -312,12 +313,6 @@ static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing, 
			cpu_relax();

			continue;

		}

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		/* If hugepage and is trans splitting return None */

		if (unlikely(hugepage &&

			     pmd_trans_splitting(pte_pmd(old_pte))))

			return __pte(0);

#endif

		/* If pte is not present return None */

		if (unlikely(!(pte_val(old_pte) & _PAGE_PRESENT)))

			return __pte(0);

arch/powerpc/include/asm/pgtable.h

+8 −20
Original line number Diff line number Diff line
@@ -247,28 +247,16 @@ extern int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, 
#define pmd_large(pmd)		0

#define has_transparent_hugepage() 0

#endif

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

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

				 unsigned *shift);



static inline pte_t *lookup_linux_ptep(pgd_t *pgdir, unsigned long hva,

				     unsigned long *pte_sizep)

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

					       unsigned *shift)

{

	pte_t *ptep;

	unsigned long ps = *pte_sizep;

	unsigned int shift;



	ptep = find_linux_pte_or_hugepte(pgdir, hva, &shift);

	if (!ptep)

		return NULL;

	if (shift)

		*pte_sizep = 1ul << shift;

	else

		*pte_sizep = PAGE_SIZE;



	if (ps > *pte_sizep)

		return NULL;



	return ptep;

	if (!arch_irqs_disabled()) {

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

		dump_stack();

	}

	return __find_linux_pte_or_hugepte(pgdir, ea, shift);

}

#endif /* __ASSEMBLY__ */

arch/powerpc/kernel/eeh.c

+4 −2
Original line number Diff line number Diff line
@@ -334,9 +334,11 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) 
	int hugepage_shift;



	/*

	 * We won't find hugepages here, iomem

	 * We won't find hugepages here(this is iomem). Hence we are not

	 * 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, &hugepage_shift);

	ptep = __find_linux_pte_or_hugepte(init_mm.pgd, token, &hugepage_shift);

	if (!ptep)

		return token;

	WARN_ON(hugepage_shift);

arch/powerpc/kernel/io-workarounds.c

+5 −5
Original line number Diff line number Diff line
@@ -71,15 +71,15 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr) 
		vaddr = (unsigned long)PCI_FIX_ADDR(addr);

		if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)

			return NULL;



		ptep = find_linux_pte_or_hugepte(init_mm.pgd, vaddr,

		/*

		 * We won't find huge pages here (iomem). Also can't hit

		 * a page table free due to init_mm

		 */

		ptep = __find_linux_pte_or_hugepte(init_mm.pgd, vaddr,

						 &hugepage_shift);

		if (ptep == NULL)

			paddr = 0;

		else {

			/*

			 * we don't have hugepages backing iomem

			 */

			WARN_ON(hugepage_shift);

			paddr = pte_pfn(*ptep) << PAGE_SHIFT;

		}

arch/powerpc/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ config KVM_BOOK3S_64 


config KVM_BOOK3S_64_HV

	tristate "KVM support for POWER7 and PPC970 using hypervisor mode in host"

	depends on KVM_BOOK3S_64

	depends on KVM_BOOK3S_64 && PPC_POWERNV

	select KVM_BOOK3S_HV_POSSIBLE

	select MMU_NOTIFIER

	select CMA

CRA Git | Maintained and supported by SUSTech CRA and CCSE