diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-11-09 20:15:00 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-13 06:12:48 -0500 |
| commit | f23ab3efb1b30cc5c5ef5ae4ef294ed467f30675 (patch) | |
| tree | dd9aecf344b59b5d75ad125a858649f07664e2df | |
| parent | 46725b17f1c6c815a41429259b3f070c01e71bc1 (diff) | |
powerpc: Fix DABR match on hash based systems
Commit 398a719d34a1 ("powerpc/mm: Update bits used to skip hash_page")
mistakenly dropped the DSISR_DABRMATCH bit from the mask of bit tested
to skip trying to hash a page.
As a result, the DABR matches would no longer be detected.
This adds it back. We open code it in the 2 places where it matters
rather than fold it into DSISR_BAD_FAULT_32S/64S because this isn't
technically a bad fault and while we would never hit it with the
current code, I prefer if page_fault_is_bad() didn't trigger on these.
Fixes: 398a719d34a1 ("powerpc/mm: Update bits used to skip hash_page")
Cc: stable@vger.kernel.org # v4.14
Tested-by: Pedro Miraglia Franco de Carvalho <pedromfc@br.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/head_32.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 6879aed47377..445137e2d0ca 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -1498,7 +1498,7 @@ USE_TEXT_SECTION() | |||
| 1498 | .balign IFETCH_ALIGN_BYTES | 1498 | .balign IFETCH_ALIGN_BYTES |
| 1499 | do_hash_page: | 1499 | do_hash_page: |
| 1500 | #ifdef CONFIG_PPC_BOOK3S_64 | 1500 | #ifdef CONFIG_PPC_BOOK3S_64 |
| 1501 | lis r0,DSISR_BAD_FAULT_64S@h | 1501 | lis r0,(DSISR_BAD_FAULT_64S|DSISR_DABRMATCH)@h |
| 1502 | ori r0,r0,DSISR_BAD_FAULT_64S@l | 1502 | ori r0,r0,DSISR_BAD_FAULT_64S@l |
| 1503 | and. r0,r4,r0 /* weird error? */ | 1503 | and. r0,r4,r0 /* weird error? */ |
| 1504 | bne- handle_page_fault /* if not, try to insert a HPTE */ | 1504 | bne- handle_page_fault /* if not, try to insert a HPTE */ |
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 8c54166491e7..29b2fed93289 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
| @@ -388,7 +388,7 @@ DataAccess: | |||
| 388 | EXCEPTION_PROLOG | 388 | EXCEPTION_PROLOG |
| 389 | mfspr r10,SPRN_DSISR | 389 | mfspr r10,SPRN_DSISR |
| 390 | stw r10,_DSISR(r11) | 390 | stw r10,_DSISR(r11) |
| 391 | andis. r0,r10,DSISR_BAD_FAULT_32S@h | 391 | andis. r0,r10,(DSISR_BAD_FAULT_32S|DSISR_DABRMATCH)@h |
| 392 | bne 1f /* if not, try to put a PTE */ | 392 | bne 1f /* if not, try to put a PTE */ |
| 393 | mfspr r4,SPRN_DAR /* into the hash table */ | 393 | mfspr r4,SPRN_DAR /* into the hash table */ |
| 394 | rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */ | 394 | rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */ |