powerpc/64s/radix: Fix radix segment exception handling
Nicholas Piggin
reviewerPATCH 1/1 powerpc/64s/radix: Fix radix segment exception handling
Commit 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.
The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at arch/powerpc/mm/slb.c:639!
The original radix code would send faults to slb_miss_large_addr, which would end up faulting due to slb_addr_limit being 0. This patch sends radix directly to do_bad_slb_fault, which is a bit clearer.
--- arch/powerpc/kernel/exceptions-64s.S | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/powerpc/kernel/exceptions-64s.S +12 -0
@@ -656,11 +656,17 @@ EXC_COMMON_BEGIN(data_access_slb_common) ld r4,PACA_EXSLB+EX_DAR(r13) std r4,_DAR(r1) addi r3,r1,STACK_FRAME_OVERHEAD +BEGIN_MMU_FTR_SECTION + /* HPT case, do SLB fault */ bl do_slb_fault cmpdi r3,0 bne- 1f b fast_exception_return 1: /* Error case */ +MMU_FTR_SECTION_ELSE + /* Radix case, access is outside page table range */ + li r3,-EFAULT +ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) bl save_nvgprs RECONCILE_IRQ_STATE(r10, r11)
@@ -705,11 +711,17 @@ EXC_COMMON_BEGIN(instruction_access_slb_common) EXCEPTION_PROLOG_COMMON(0x480, PACA_EXSLB) ld r4,_NIP(r1) addi r3,r1,STACK_FRAME_OVERHEAD +BEGIN_MMU_FTR_SECTION + /* HPT case, do SLB fault */ bl do_slb_fault cmpdi r3,0 bne- 1f b fast_exception_return 1: /* Error case */ +MMU_FTR_SECTION_ELSE + /* Radix case, access is outside page table range */ + li r3,-EFAULT +ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) bl save_nvgprs RECONCILE_IRQ_STATE(r10, r11)
Signature · 1 line
2.20.1
Quoted 5 lines · Nicholas Piggin
Commit
48e7b76957("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.
Quoted 7 lines
The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at
arch/powerpc/mm/slb.c:639!The original radix code would send faults to
slb_miss_large_addr, which would end up faulting due toslb_addr_limitbeing 0. This patch sends radix directly todo_bad_slb_fault, which is a bit clearer.
Quoted 50 lines
Fixes 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C")Cc Aneesh Kumar K.V <[email protected]>Reported-by Anton Blanchard <[email protected]>Signed-off-by Nicholas Piggin <[email protected]>--- arch/powerpc/kernel/exceptions-64s.S | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/powerpc/kernel/exceptions-64s.S +12
-0@@ -656,11 +656,17 @@ EXC_COMMON_BEGIN(data_access_slb_common) ld r4,PACA_EXSLB+EX_DAR(r13) std r4,_DAR(r1) addi r3,r1,STACK_FRAME_OVERHEAD +BEGIN_MMU_FTR_SECTION + /* HPT case, do SLB fault */ bl do_slb_fault cmpdi r3,0 bne- 1f b fast_exception_return 1: /* Error case */ +MMU_FTR_SECTION_ELSE + /* Radix case, access is outside page table range */ + li r3,-EFAULT +ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) bl save_nvgprs RECONCILE_IRQ_STATE(r10, r11)@@ -705,11 +711,17 @@ EXC_COMMON_BEGIN(instruction_access_slb_common) EXCEPTION_PROLOG_COMMON(0x480, PACA_EXSLB) ld r4,_NIP(r1) addi r3,r1,STACK_FRAME_OVERHEAD +BEGIN_MMU_FTR_SECTION + /* HPT case, do SLB fault */ bl do_slb_fault cmpdi r3,0 bne- 1f b fast_exception_return 1: /* Error case */ +MMU_FTR_SECTION_ELSE + /* Radix case, access is outside page table range */ + li r3,-EFAULT +ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) std r3,RESULT(r1) bl save_nvgprs RECONCILE_IRQ_STATE(r10, r11)Signature · 1 line
2.20.1
Michael Ellerman
AppliedQuoted 12 lines · Nicholas Piggin
Commit
48e7b76957("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at
arch/powerpc/mm/slb.c:639!The original radix code would send faults to
slb_miss_large_addr, which would end up faulting due toslb_addr_limitbeing 0. This patch sends radix directly todo_bad_slb_fault, which is a bit clearer.
Quoted 5 lines
Fixes 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C")Cc Aneesh Kumar K.V <[email protected]>Reported-by Anton Blanchard <[email protected]>Signed-off-by Nicholas Piggin <[email protected]>Reviewed-by Aneesh Kumar K.V <[email protected]>
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/7100e8704b61247649c50551b965e71d
cheers
Nicholas Piggin
reviewerMichael Ellerman's on April 11, 2019 12:49 am:
Quoted 19 lines · Nicholas Piggin
Quoted 12 lines
Commit
48e7b76957("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at
arch/powerpc/mm/slb.c:639!The original radix code would send faults to
slb_miss_large_addr, which would end up faulting due toslb_addr_limitbeing 0. This patch sends radix directly todo_bad_slb_fault, which is a bit clearer.Quoted 5 lines
Fixes 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C")Cc Aneesh Kumar K.V <[email protected]>Reported-by Anton Blanchard <[email protected]>Signed-off-by Nicholas Piggin <[email protected]>Reviewed-by Aneesh Kumar K.V <[email protected]>
Quoted 3 lines
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/7100e8704b61247649c50551b965e71d
I sent a v2 with a selftests that triggers the crash if you want it. Code was unchanged to no big deal there.
Thanks,
Nick
Michael Ellerman
reviewerQuoted 20 lines · Nicholas Piggin
Michael Ellerman's on April 11, 2019 12:49 am:
Quoted 19 lines · Nicholas Piggin
Quoted 17 lines
Commit
48e7b76957("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at
arch/powerpc/mm/slb.c:639!The original radix code would send faults to
slb_miss_large_addr, which would end up faulting due toslb_addr_limitbeing 0. This patch sends radix directly todo_bad_slb_fault, which is a bit clearer.Fixes 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C")Cc Aneesh Kumar K.V <[email protected]>Reported-by Anton Blanchard <[email protected]>Signed-off-by Nicholas Piggin <[email protected]>Reviewed-by Aneesh Kumar K.V <[email protected]>
Quoted 6 lines
Quoted 3 lines
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/7100e8704b61247649c50551b965e71d
I sent a v2 with a selftests that triggers the crash if you want it. Code was unchanged to no big deal there.
Yeah I checked the kernel part was unchanged so stuck with v1.
I also sent a self test, which is similar but slightly different to yours, though yours is better in general. I'll try and merge them into one test.
cheers
Nicholas Piggin
reviewerMichael Ellerman's on April 13, 2019 1:39 pm:
Quoted 25 lines
Quoted 24 lines · Nicholas Piggin
Michael Ellerman's on April 11, 2019 12:49 am:
Quoted 22 lines · Nicholas Piggin
Quoted 12 lines
Commit
48e7b76957("powerpc/64s/hash: Convert SLB miss handlers to C") broke the radix-mode segment exception handler. In radix mode, this is exception is not an SLB miss, rather it signals that the EA is outside the range translated by any page table.The commit lost the radix feature alternate code patch, which can cause faults to some EAs to kernel BUG at
arch/powerpc/mm/slb.c:639!The original radix code would send faults to
slb_miss_large_addr, which would end up faulting due toslb_addr_limitbeing 0. This patch sends radix directly todo_bad_slb_fault, which is a bit clearer.Quoted 5 lines
Fixes 48e7b76957 ("powerpc/64s/hash: Convert SLB miss handlers to C")Cc Aneesh Kumar K.V <[email protected]>Reported-by Anton Blanchard <[email protected]>Signed-off-by Nicholas Piggin <[email protected]>Reviewed-by Aneesh Kumar K.V <[email protected]>Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/7100e8704b61247649c50551b965e71d
Quoted 8 lines
Quoted 2 lines
I sent a v2 with a selftests that triggers the crash if you want it. Code was unchanged to no big deal there.
Yeah I checked the kernel part was unchanged so stuck with v1.
I also sent a self test, which is similar but slightly different to yours, though yours is better in general. I'll try and merge them into one test.
If you don't mind that would be good. The siglongjmp handler is cleaner though, and should make it simpler to test ifetch accesses. We just need to get the sig info into yours, and an array of interesting addresses.
Thanks,
Nick