From: David Miller <da...@redhat.com>
Date: Thu, 16 Oct 2014 16:20:01 -0400 (EDT)

> So I'm going to audit all the code paths to make sure we don't put garbage
> into the fault_code value.

There are two code paths where we can put garbage into the fault_code
value.  And for the dtlb_prot.S case, the value we put in there is
TLB_TAG_ACCESS which is 0x30, which include bit 0x20 which is that
FAULT_CODE_BAD_RA indication which is erroneously triggering.

The other path is via hugepage TLB misses, for the situation where
we haven't allocated the huge TSB for the thread yet.  That might
explain some other longer-term problems we've had.

I'm about to test the following fix:

diff --git a/arch/sparc/kernel/dtlb_prot.S b/arch/sparc/kernel/dtlb_prot.S
index b2c2c5b..d668ca14 100644
--- a/arch/sparc/kernel/dtlb_prot.S
+++ b/arch/sparc/kernel/dtlb_prot.S
@@ -24,11 +24,11 @@
        mov             TLB_TAG_ACCESS, %g4             ! For reload of vaddr
 
 /* PROT ** ICACHE line 2: More real fault processing */
+       ldxa            [%g4] ASI_DMMU, %g5             ! Put tagaccess in %g5
        bgu,pn          %xcc, winfix_trampoline         ! Yes, perform winfixup
-        ldxa           [%g4] ASI_DMMU, %g5             ! Put tagaccess in %g5
-       ba,pt           %xcc, sparc64_realfault_common  ! Nope, normal fault
         mov            FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4
-       nop
+       ba,pt           %xcc, sparc64_realfault_common  ! Nope, normal fault
+        nop
        nop
        nop
        nop
diff --git a/arch/sparc/kernel/tsb.S b/arch/sparc/kernel/tsb.S
index 14158d4..be98685 100644
--- a/arch/sparc/kernel/tsb.S
+++ b/arch/sparc/kernel/tsb.S
@@ -162,10 +162,10 @@ tsb_miss_page_table_walk_sun4v_fastpath:
        nop
        .previous
 
-       rdpr    %tl, %g3
-       cmp     %g3, 1
+       rdpr    %tl, %g7
+       cmp     %g7, 1
        bne,pn  %xcc, winfix_trampoline
-        nop
+        mov    %g3, %g4
        ba,pt   %xcc, etrap
         rd     %pc, %g7
        call    hugetlb_setup
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to