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

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

powerpc: print both base and actual page size on hash failure 



Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
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 7e74c392

arch/powerpc/include/asm/mmu-hash64.h

+2 −1
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid, 
		     unsigned int shift, unsigned int mmu_psize);

extern void hash_failure_debug(unsigned long ea, unsigned long access,

			       unsigned long vsid, unsigned long trap,

			       int ssize, int psize, unsigned long pte);

			       int ssize, int psize, int lpsize,

			       unsigned long pte);

extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,

			     unsigned long pstart, unsigned long prot,

			     int psize, int ssize);

arch/powerpc/mm/hash_utils_64.c

+7 −5
Original line number Diff line number Diff line
@@ -936,14 +936,14 @@ static inline int subpage_protection(struct mm_struct *mm, unsigned long ea) 


void hash_failure_debug(unsigned long ea, unsigned long access,

			unsigned long vsid, unsigned long trap,

			int ssize, int psize, unsigned long pte)

			int ssize, int psize, int lpsize, unsigned long pte)

{

	if (!printk_ratelimit())

		return;

	pr_info("mm: Hashing failure ! EA=0x%lx access=0x%lx current=%s\n",

		ea, access, current->comm);

	pr_info("    trap=0x%lx vsid=0x%lx ssize=%d psize=%d pte=0x%lx\n",

		trap, vsid, ssize, psize, pte);

	pr_info("    trap=0x%lx vsid=0x%lx ssize=%d base psize=%d psize %d pte=0x%lx\n",

		trap, vsid, ssize, psize, lpsize, pte);

}



/* Result code is:
@@ -1116,7 +1116,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
	 */

	if (rc == -1)

		hash_failure_debug(ea, access, vsid, trap, ssize, psize,

				   pte_val(*ptep));

				   psize, pte_val(*ptep));

#ifndef CONFIG_PPC_64K_PAGES

	DBG_LOW(" o-pte: %016lx\n", pte_val(*ptep));

#else
@@ -1194,7 +1194,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	 */

	if (rc == -1)

		hash_failure_debug(ea, access, vsid, trap, ssize,

				   mm->context.user_psize, pte_val(*ptep));

				   mm->context.user_psize,

				   mm->context.user_psize,

				   pte_val(*ptep));



	local_irq_restore(flags);

}

arch/powerpc/mm/hugetlbpage-hash64.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid, 
		if (unlikely(slot == -2)) {

			*ptep = __pte(old_pte);

			hash_failure_debug(ea, access, vsid, trap, ssize,

					   mmu_psize, old_pte);

					   mmu_psize, mmu_psize, old_pte);

			return -1;

		}