powerpc/ptdump: Fix display of RW pages on FSL_BOOK3E

commit dd8de84b57b02ba9c1fe530a6d916c0853f136bd upstream.

On FSL_BOOK3E, _PAGE_RW is defined with two bits, one for user and one
for supervisor. As soon as one of the two bits is set, the page has
to be display as RW. But the way it is implemented today requires both
bits to be set in order to display it as RW.

Instead of display RW when _PAGE_RW bits are set and R otherwise,
reverse the logic and display R when _PAGE_RW bits are all 0 and
RW otherwise.

This change has no impact on other platforms as _PAGE_RW is a single
bit on all of them.

Fixes: 8eb07b187000 ("powerpc/mm: Dump linux pagetables")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0c33b96317811edf691e81698aaee8fa45ec3449.1656427391.git.christophe.leroy@csgroup.eu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/powerpc/mm/dump_linuxpagetables.c b/arch/powerpc/mm/dump_linuxpagetables.c
index 0bbaf73448724b36148e6a467a8464864041611f..07541d322b56f8050e2d0da9d3d4e7013507325d 100644 (file)
--- a/arch/powerpc/mm/dump_linuxpagetables.c
+++ b/arch/powerpc/mm/dump_linuxpagetables.c
@@ -123,15 +123,10 @@ static const struct flag_info flag_array[] = {
                .set    = "user",
                .clear  = "    ",
        }, {
-#if _PAGE_RO == 0
-               .mask   = _PAGE_RW,
-               .val    = _PAGE_RW,
-#else
-               .mask   = _PAGE_RO,
-               .val    = 0,
-#endif
-               .set    = "rw",
-               .clear  = "ro",
+               .mask   = _PAGE_RW | _PAGE_RO,
+               .val    = _PAGE_RO,
+               .set    = "ro",
+               .clear  = "rw",
        }, {
                .mask   = _PAGE_EXEC,
                .val    = _PAGE_EXEC,