From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: benh@kernel.crashing.org, paulus@samba.org
Cc: linuxppc-dev@lists.ozlabs.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [RFC PATCH 08/17] powerpc: print both base and actual page size on hash failure
Date: Mon, 18 Feb 2013 15:58:06 +0530 [thread overview]
Message-ID: <1361183295-6958-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1361183295-6958-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/mmu-hash64.h | 3 ++-
arch/powerpc/mm/hash_utils_64.c | 12 +++++++-----
arch/powerpc/mm/hugetlbpage-hash64.c | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index 6290e26..6ec65b6 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -321,7 +321,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);
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 48edb46..df48ba5 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -917,14 +917,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:
@@ -1097,7 +1097,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
@@ -1175,7 +1175,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);
}
diff --git a/arch/powerpc/mm/hugetlbpage-hash64.c b/arch/powerpc/mm/hugetlbpage-hash64.c
index cecad34..af98ee8 100644
--- a/arch/powerpc/mm/hugetlbpage-hash64.c
+++ b/arch/powerpc/mm/hugetlbpage-hash64.c
@@ -129,7 +129,7 @@ repeat:
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;
}
--
1.7.10
next prev parent reply other threads:[~2013-02-18 10:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 10:27 [RFC PATCH 00/17] THP support for PPC64 Aneesh Kumar K.V
2013-02-18 10:27 ` [RFC PATCH 01/17] powerpc: Don't hard code the size of pte page Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 02/17] arch/powerpc: Reduce the PTE_INDEX_SIZE Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 03/17] powerpc: Reduce PTE table memory wastage Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 04/17] mm/THP: Add pmd args to pgtable deposit and withdraw APIs Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 05/17] powerpc: Add size argument to pgtable_cache_add Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 06/17] powerpc/mm: Decode the pte-lp-encoding bits correctly Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 07/17] powerpc: Update tlbie/tlbiel as per ISA doc Aneesh Kumar K.V
2013-02-18 10:28 ` Aneesh Kumar K.V [this message]
2013-02-18 10:28 ` [RFC PATCH 09/17] powerpc/mm: Use encode avpn where we need only avpn values Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 10/17] powerpc/mm: Fix hpte_decode to use the correct decoding for page sizes Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 11/17] powerpc: Print page size info during boot Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 12/17] powerpc/THP: Implement transparent huge pages for ppc64 Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 13/17] powerpc/THP: Add code to handle HPTE faults for large pages Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 14/17] powerpc: support for zerout withdraw Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 15/17] powerpc: hypervisor require few WIMG bit set Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 16/17] powerpc: get_user_pages_fast changes Aneesh Kumar K.V
2013-02-18 10:28 ` [RFC PATCH 17/17] powerpc: Save DAR and DSISR in pt_regs on MCE Aneesh Kumar K.V
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361183295-6958-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).