]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Fix DABR match on hash based systems
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 10 Nov 2017 01:15:00 +0000 (12:15 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Nov 2017 11:12:48 +0000 (22:12 +1100)
commitf23ab3efb1b30cc5c5ef5ae4ef294ed467f30675
treedd9aecf344b59b5d75ad125a858649f07664e2df
parent46725b17f1c6c815a41429259b3f070c01e71bc1
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>
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/head_32.S