arm64: consistently log ESR and page table

When we take a fault we can't handle, we try to dump some relevant
information, but we're not consistent about doing so.

In do_mem_abort(), we log the full ESR, but don't dump a page table
walk. In __do_kernel_fault, we dump an attempted decoding of the ESR
(but not the ESR itself) along with a page table walk.

Let's try to make things more consistent by dumping the full ESR in
mem_abort_decode(), and having do_mem_abort dump a page table walk. The
existing dump of the ESR in do_mem_abort() is rendered redundant, and
removed.

Tested-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Julien Thierry <julien.thierry@arm.com>
Cc: Kristina Martsenko <kristina.martsenko@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 84a586dd063a64e435284aa29c28e09f371f1021..6ee22cd8a24940ce657c45378ff6879709fad144 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -109,6 +109,7 @@ static void mem_abort_decode(unsigned int esr)
 {
        pr_alert("Mem abort info:\n");
 
+       pr_alert("  ESR = 0x%08x\n", esr);
        pr_alert("  Exception class = %s, IL = %u bits\n",
                 esr_get_class_string(esr),
                 (esr & ESR_ELx_IL) ? 32 : 16);
@@ -692,11 +693,13 @@ asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr,
        if (!inf->fn(addr, esr, regs))
                return;
 
-       pr_alert("Unhandled fault: %s (0x%08x) at 0x%016lx\n",
-                inf->name, esr, addr);
+       pr_alert("Unhandled fault: %s at 0x%016lx\n",
+                inf->name, addr);
 
        mem_abort_decode(esr);
 
+       show_pte(addr);
+
        info.si_signo = inf->sig;
        info.si_errno = 0;
        info.si_code  = inf->code;