Commit 34eb138e authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: don't use _PAGE_EXEC for calling hash_preload() 



The 'access' parameter of hash_preload() is either 0 or _PAGE_EXEC.
Among the two versions of hash_preload(), only the PPC64 one is
doing something with this 'access' parameter.

In order to remove the use of _PAGE_EXEC outside platform code,
'access' parameter is replaced by 'is_exec' which will be either
true of false, and the PPC64 version of hash_preload() creates
the access flag based on 'is_exec'.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent daba7902

arch/powerpc/mm/hash_utils_64.c

+2 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ static bool should_hash_preload(struct mm_struct *mm, unsigned long ea) 
#endif



void hash_preload(struct mm_struct *mm, unsigned long ea,

		  unsigned long access, unsigned long trap)

		  bool is_exec, unsigned long trap)

{

	int hugepage_shift;

	unsigned long vsid;
@@ -1490,6 +1490,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	pte_t *ptep;

	unsigned long flags;

	int rc, ssize, update_flags = 0;

	unsigned long access = _PAGE_PRESENT | _PAGE_READ | (is_exec ? _PAGE_EXEC : 0);



	BUG_ON(REGION_ID(ea) != USER_REGION_ID);

arch/powerpc/mm/mem.c

+5 −4
Original line number Diff line number Diff line
@@ -509,7 +509,8 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 
	 * We don't need to worry about _PAGE_PRESENT here because we are

	 * called with either mm->page_table_lock held or ptl lock held

	 */

	unsigned long access, trap;

	unsigned long trap;

	bool is_exec;



	if (radix_enabled()) {

		prefetch((void *)address);
@@ -531,16 +532,16 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 
	trap = current->thread.regs ? TRAP(current->thread.regs) : 0UL;

	switch (trap) {

	case 0x300:

		access = 0UL;

		is_exec = false;

		break;

	case 0x400:

		access = _PAGE_EXEC;

		is_exec = true;

		break;

	default:

		return;

	}



	hash_preload(vma->vm_mm, address, access, trap);

	hash_preload(vma->vm_mm, address, is_exec, trap);

#endif /* CONFIG_PPC_STD_MMU */

#if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \

	&& defined(CONFIG_HUGETLB_PAGE)

arch/powerpc/mm/mmu_decl.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline void _tlbivax_bcast(unsigned long address, unsigned int pid, 
#else /* CONFIG_PPC_MMU_NOHASH */



extern void hash_preload(struct mm_struct *mm, unsigned long ea,

			 unsigned long access, unsigned long trap);

			 bool is_exec, unsigned long trap);





extern void _tlbie(unsigned long address);

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top) 
		map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);

#ifdef CONFIG_PPC_STD_MMU_32

		if (ktext)

			hash_preload(&init_mm, v, 0, 0x300);

			hash_preload(&init_mm, v, false, 0x300);

#endif

		v += PAGE_SIZE;

		p += PAGE_SIZE;

arch/powerpc/mm/ppc_mmu_32.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys, 
 * Preload a translation in the hash table

 */

void hash_preload(struct mm_struct *mm, unsigned long ea,

		  unsigned long access, unsigned long trap)

		  bool is_exec, unsigned long trap)

{

	pmd_t *pmd;

CRA Git | Maintained and supported by SUSTech CRA and CCSE