Commit 0b1c524c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32: refactor pmd_offset(pud_offset(pgd_offset... 



At several places pmd pointer is retrieved through the same action:

	pmd = pmd_offset(pud_offset(pgd_offset(mm, addr), addr), addr);

or

	pmd = pmd_offset(pud_offset(pgd_offset_k(addr), addr), addr);

Refactor this by implementing two helpers pmd_ptr() and pmd_ptr_k()

This will help when adding the p4d level.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7b065c5be35726af4066cab238ee35cabceda1fa.1578558199.git.christophe.leroy@c-s.fr
parent 05642cf7

arch/powerpc/include/asm/pgtable.h

+12 −0
Original line number Diff line number Diff line
@@ -41,6 +41,18 @@ struct mm_struct; 


#ifndef __ASSEMBLY__



#ifdef CONFIG_PPC32

static inline pmd_t *pmd_ptr(struct mm_struct *mm, unsigned long va)

{

	return pmd_offset(pud_offset(pgd_offset(mm, va), va), va);

}



static inline pmd_t *pmd_ptr_k(unsigned long va)

{

	return pmd_offset(pud_offset(pgd_offset_k(va), va), va);

}

#endif



#include <asm/tlbflush.h>



/* Keep these as a macros to avoid include dependency mess */

arch/powerpc/mm/book3s32/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea) 


	if (!Hash)

		return;

	pmd = pmd_offset(pud_offset(pgd_offset(mm, ea), ea), ea);

	pmd = pmd_ptr(mm, ea);

	if (!pmd_none(*pmd))

		add_hash_page(mm->context.id, ea, pmd_val(*pmd));

}

arch/powerpc/mm/book3s32/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start, 
	if (start >= end)

		return;

	end = (end - 1) | ~PAGE_MASK;

	pmd = pmd_offset(pud_offset(pgd_offset(mm, start), start), start);

	pmd = pmd_ptr(mm, start);

	for (;;) {

		pmd_end = ((start + PGDIR_SIZE) & PGDIR_MASK) - 1;

		if (pmd_end > end)
@@ -148,7 +148,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr) 
		return;

	}

	mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm;

	pmd = pmd_offset(pud_offset(pgd_offset(mm, vmaddr), vmaddr), vmaddr);

	pmd = pmd_ptr(mm, vmaddr);

	if (!pmd_none(*pmd))

		flush_hash_pages(mm->context.id, vmaddr, pmd_val(*pmd), 1);

}

arch/powerpc/mm/kasan/kasan_init_32.c

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int __init kasan_init_shadow_page_tables(unsigned long k_start, unsigned 
	unsigned long k_cur, k_next;

	pte_t *new = NULL;



	pmd = pmd_offset(pud_offset(pgd_offset_k(k_start), k_start), k_start);

	pmd = pmd_ptr_k(k_start);



	for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd++) {

		k_next = pgd_addr_end(k_cur, k_end);
@@ -78,7 +78,7 @@ static int __init kasan_init_region(void *start, size_t size) 
	block = memblock_alloc(k_end - k_start, PAGE_SIZE);



	for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {

		pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);

		pmd_t *pmd = pmd_ptr_k(k_cur);

		void *va = block + k_cur - k_start;

		pte_t pte = pfn_pte(PHYS_PFN(__pa(va)), PAGE_KERNEL);
@@ -102,7 +102,7 @@ static void __init kasan_remap_early_shadow_ro(void) 
	kasan_populate_pte(kasan_early_shadow_pte, prot);



	for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {

		pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);

		pmd_t *pmd = pmd_ptr_k(k_cur);

		pte_t *ptep = pte_offset_kernel(pmd, k_cur);



		if ((pte_val(*ptep) & PTE_RPN_MASK) != pa)
@@ -202,7 +202,7 @@ void __init kasan_early_init(void) 
	unsigned long addr = KASAN_SHADOW_START;

	unsigned long end = KASAN_SHADOW_END;

	unsigned long next;

	pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(addr), addr), addr);

	pmd_t *pmd = pmd_ptr_k(addr);



	BUILD_BUG_ON(KASAN_SHADOW_START & ~PGDIR_MASK);

arch/powerpc/mm/mem.c

+1 −2
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ EXPORT_SYMBOL(kmap_prot); 


static inline pte_t *virt_to_kpte(unsigned long vaddr)

{

	return pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr),

			vaddr), vaddr), vaddr);

	return pte_offset_kernel(pmd_ptr_k(vaddr), vaddr);

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE