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

Commit 12bc9f6f authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Benjamin Herrenschmidt
Browse files

powerpc: Replace find_linux_pte with find_linux_pte_or_hugepte 



Replace find_linux_pte with find_linux_pte_or_hugepte and explicitly
document why we don't need to handle transparent hugepages at callsites.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ac52ae47

arch/powerpc/include/asm/pgtable-ppc64.h

+0 −24
Original line number Diff line number Diff line
@@ -344,30 +344,6 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry) 


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

void pgtable_cache_init(void);



/*

 * find_linux_pte returns the address of a linux pte for a given

 * effective address and directory.  If not found, it returns zero.

 */

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

{

	pgd_t *pg;

	pud_t *pu;

	pmd_t *pm;

	pte_t *pt = NULL;



	pg = pgdir + pgd_index(ea);

	if (!pgd_none(*pg)) {

		pu = pud_offset(pg, ea);

		if (!pud_none(*pu)) {

			pm = pmd_offset(pu, ea);

			if (pmd_present(*pm))

				pt = pte_offset_kernel(pm, ea);

		}

	}

	return pt;

}



#endif /* __ASSEMBLY__ */



/*

arch/powerpc/kernel/eeh.c

+6 −1
Original line number Diff line number Diff line
@@ -260,10 +260,15 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) 
{

	pte_t *ptep;

	unsigned long pa;

	int hugepage_shift;



	ptep = find_linux_pte(init_mm.pgd, token);

	/*

	 * We won't find hugepages here, iomem

	 */

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

	if (!ptep)

		return token;

	WARN_ON(hugepage_shift);

	pa = pte_pfn(*ptep) << PAGE_SHIFT;



	return pa | (token & (PAGE_SIZE-1));

arch/powerpc/kernel/io-workarounds.c

+9 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static struct iowa_bus *iowa_pci_find(unsigned long vaddr, unsigned long paddr) 


struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)

{

	unsigned hugepage_shift;

	struct iowa_bus *bus;

	int token;
@@ -70,11 +71,17 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr) 
		if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)

			return NULL;



		ptep = find_linux_pte(init_mm.pgd, vaddr);

		ptep = find_linux_pte_or_hugepte(init_mm.pgd, vaddr,

						 &hugepage_shift);

		if (ptep == NULL)

			paddr = 0;

		else

		else {

			/*

			 * we don't have hugepages backing iomem

			 */

			WARN_ON(hugepage_shift);

			paddr = pte_pfn(*ptep) << PAGE_SHIFT;

		}

		bus = iowa_pci_find(vaddr, paddr);



		if (bus == NULL)

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static void *real_vmalloc_addr(void *x) 
	unsigned long addr = (unsigned long) x;

	pte_t *p;



	p = find_linux_pte(swapper_pg_dir, addr);

	p = find_linux_pte_or_hugepte(swapper_pg_dir, addr, NULL);

	if (!p || !pte_present(*p))

		return NULL;

	/* assume we don't have huge pages in vmalloc space... */

arch/powerpc/mm/hash_utils_64.c

+7 −1
Original line number Diff line number Diff line
@@ -1145,6 +1145,7 @@ EXPORT_SYMBOL_GPL(hash_page); 
void hash_preload(struct mm_struct *mm, unsigned long ea,

		  unsigned long access, unsigned long trap)

{

	int hugepage_shift;

	unsigned long vsid;

	pgd_t *pgdir;

	pte_t *ptep;
@@ -1166,10 +1167,15 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	pgdir = mm->pgd;

	if (pgdir == NULL)

		return;

	ptep = find_linux_pte(pgdir, ea);

	/*

	 * THP pages use update_mmu_cache_pmd. We don't do

	 * hash preload there. Hence can ignore THP here

	 */

	ptep = find_linux_pte_or_hugepte(pgdir, ea, &hugepage_shift);

	if (!ptep)

		return;



	WARN_ON(hugepage_shift);

#ifdef CONFIG_PPC_64K_PAGES

	/* If either _PAGE_4K_PFN or _PAGE_NO_CACHE is set (and we are on

	 * a 64K kernel), then we don't preload, hash_page() will take