powerpc/mm: Set fault flags earlier

Move out the code that sets FAULT_FLAG_WRITE so the block that check
access permissions can be extracted. While at it also set
FAULT_FLAG_INSTRUCTION which will be used for protection keys.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 572c8012958179c94c6d67e46f3b517b08fcbad5..ebe73c896aa84bfba4338d07ab7913f2d87ab933 100644 (file)
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -384,6 +384,10 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
 
        if (is_user)
                flags |= FAULT_FLAG_USER;
+       if (is_write)
+               flags |= FAULT_FLAG_WRITE;
+       if (is_exec)
+               flags |= FAULT_FLAG_INSTRUCTION;
 
        /* When running in the kernel we expect faults to occur only to
         * addresses in user space.  All other faults represent errors in the
@@ -476,7 +480,6 @@ good_area:
        } else if (is_write) {
                if (unlikely(!(vma->vm_flags & VM_WRITE)))
                        return bad_area(regs, address);
-               flags |= FAULT_FLAG_WRITE;
        /* a read */
        } else {
                if (unlikely(!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))))