lkml.org 
[lkml]   [2019]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/15] powerpc/32: Add early stack overflow detection with VMAP stack.
    Date
    To avoid recursive faults, stack overflow detection has to be
    performed before writing in the stack in exception prologs.

    Do it by checking the alignment. If the stack pointer alignment is
    wrong, it means it is pointing to the following or preceding page.

    Without VMAP stack, a stack overflow is catastrophic. With VMAP
    stack, a stack overflow isn't destructive, so don't panic. Kill
    the task with SIGSEGV instead.

    A dedicated overflow stack is set up for each CPU.

    lkdtm: Performing direct entry EXHAUST_STACK
    lkdtm: Calling function with 512 frame size to depth 32 ...
    lkdtm: loop 32/32 ...
    lkdtm: loop 31/32 ...
    lkdtm: loop 30/32 ...
    lkdtm: loop 29/32 ...
    lkdtm: loop 28/32 ...
    lkdtm: loop 27/32 ...
    lkdtm: loop 26/32 ...
    lkdtm: loop 25/32 ...
    lkdtm: loop 24/32 ...
    lkdtm: loop 23/32 ...
    lkdtm: loop 22/32 ...
    lkdtm: loop 21/32 ...
    lkdtm: loop 20/32 ...
    Kernel stack overflow in process test[359], r1=c900c008
    Oops: Kernel stack overflow, sig: 6 [#1]
    BE PAGE_SIZE=4K MMU=Hash PowerMac
    Modules linked in:
    CPU: 0 PID: 359 Comm: test Not tainted 5.3.0-rc7+ #2225
    NIP: c0622060 LR: c0626710 CTR: 00000000
    REGS: c0895f48 TRAP: 0000 Not tainted (5.3.0-rc7+)
    MSR: 00001032 <ME,IR,DR,RI> CR: 28004224 XER: 00000000
    GPR00: c0626ca4 c900c008 c783c000 c07335cc c900c010 c07335cc c900c0f0 c07335cc
    GPR08: c900c0f0 00000001 00000000 00000000 28008222 00000000 00000000 00000000
    GPR16: 00000000 00000000 10010128 10010000 b799c245 10010158 c07335cc 00000025
    GPR24: c0690000 c08b91d4 c068f688 00000020 c900c0f0 c068f668 c08b95b4 c08b91d4
    NIP [c0622060] format_decode+0x0/0x4d4
    LR [c0626710] vsnprintf+0x80/0x5fc
    Call Trace:
    [c900c068] [c0626ca4] vscnprintf+0x18/0x48
    [c900c078] [c007b944] vprintk_store+0x40/0x214
    [c900c0b8] [c007bf50] vprintk_emit+0x90/0x1dc
    [c900c0e8] [c007c5cc] printk+0x50/0x60
    [c900c128] [c03da5b0] recursive_loop+0x44/0x6c
    [c900c338] [c03da5c4] recursive_loop+0x58/0x6c
    [c900c548] [c03da5c4] recursive_loop+0x58/0x6c
    [c900c758] [c03da5c4] recursive_loop+0x58/0x6c
    [c900c968] [c03da5c4] recursive_loop+0x58/0x6c
    [c900cb78] [c03da5c4] recursive_loop+0x58/0x6c
    [c900cd88] [c03da5c4] recursive_loop+0x58/0x6c
    [c900cf98] [c03da5c4] recursive_loop+0x58/0x6c
    [c900d1a8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900d3b8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900d5c8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900d7d8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900d9e8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900dbf8] [c03da5c4] recursive_loop+0x58/0x6c
    [c900de08] [c03da67c] lkdtm_EXHAUST_STACK+0x30/0x4c
    [c900de18] [c03da3e8] direct_entry+0xc8/0x140
    [c900de48] [c029fb40] full_proxy_write+0x64/0xcc
    [c900de68] [c01500f8] __vfs_write+0x30/0x1d0
    [c900dee8] [c0152cb8] vfs_write+0xb8/0x1d4
    [c900df08] [c0152f7c] ksys_write+0x58/0xe8
    [c900df38] [c0014208] ret_from_syscall+0x0/0x34
    --- interrupt: c01 at 0xf806664
    LR = 0x1000c868
    Instruction dump:
    4bffff91 80010014 7c832378 7c0803a6 38210010 4e800020 3d20c08a 3ca0c089
    8089a0cc 38a58f0c 38600001 4ba2d494 <9421ffe0> 7c0802a6 bfc10018 7c9f2378

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/include/asm/irq.h | 1 +
    arch/powerpc/kernel/entry_32.S | 25 +++++++++++++++++++++++++
    arch/powerpc/kernel/head_32.h | 4 ++++
    arch/powerpc/kernel/irq.c | 1 +
    arch/powerpc/kernel/setup_32.c | 1 +
    arch/powerpc/kernel/traps.c | 15 ++++++++++++---
    6 files changed, 44 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
    index 814dfab7e392..ec74ced2437d 100644
    --- a/arch/powerpc/include/asm/irq.h
    +++ b/arch/powerpc/include/asm/irq.h
    @@ -55,6 +55,7 @@ extern void *mcheckirq_ctx[NR_CPUS];
    */
    extern void *hardirq_ctx[NR_CPUS];
    extern void *softirq_ctx[NR_CPUS];
    +extern void *stackovf_ctx[NR_CPUS];

    void call_do_softirq(void *sp);
    void call_do_irq(struct pt_regs *regs, void *sp);
    diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
    index 2a26fe19f0b1..00fcf954e742 100644
    --- a/arch/powerpc/kernel/entry_32.S
    +++ b/arch/powerpc/kernel/entry_32.S
    @@ -184,9 +184,11 @@ transfer_to_handler:
    */
    kuap_save_and_lock r11, r12, r9, r2, r0
    addi r2, r12, -THREAD
    +#ifndef CONFIG_VMAP_STACK
    lwz r9,KSP_LIMIT(r12)
    cmplw r1,r9 /* if r1 <= ksp_limit */
    ble- stack_ovf /* then the kernel stack overflowed */
    +#endif
    5:
    #if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500)
    lwz r12,TI_LOCAL_FLAGS(r2)
    @@ -298,6 +300,28 @@ reenable_mmu:
    * On kernel stack overflow, load up an initial stack pointer
    * and call StackOverflow(regs), which should not return.
    */
    +#ifdef CONFIG_VMAP_STACK
    +_GLOBAL(stack_ovf)
    + li r11, 0
    +#ifdef CONFIG_SMP
    + mfspr r11, SPRN_SPRG_THREAD
    + tovirt(r11, r11)
    + lwz r11, TASK_CPU - THREAD(r11)
    + slwi r11, r11, 3
    +#endif
    + addis r11, r11, stackovf_ctx@ha
    + addi r11, r11, stackovf_ctx@l
    + lwz r11, 0(r11)
    + cmpwi cr1, r11, 0
    + addi r11, r11, THREAD_SIZE - INT_FRAME_SIZE
    + bne cr1, 1f
    + lis r11, init_thread_union + THREAD_SIZE - INT_FRAME_SIZE@ha
    + addi r11, r11, init_thread_union + THREAD_SIZE - INT_FRAME_SIZE@l
    +1: EXCEPTION_PROLOG_2
    + SAVE_NVGPRS(r11)
    + addi r3, r1, STACK_FRAME_OVERHEAD
    + EXC_XFER_STD(0, StackOverflow)
    +#else
    stack_ovf:
    /* sometimes we use a statically-allocated stack, which is OK. */
    lis r12,_end@h
    @@ -319,6 +343,7 @@ stack_ovf:
    mtspr SPRN_SRR1,r10
    SYNC
    RFI
    +#endif

    #ifdef CONFIG_TRACE_IRQFLAGS
    trace_syscall_entry_irq_off:
    diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h
    index 59e775930be8..283d4298d555 100644
    --- a/arch/powerpc/kernel/head_32.h
    +++ b/arch/powerpc/kernel/head_32.h
    @@ -58,6 +58,10 @@
    tophys(r11,r11)
    #endif
    1:
    +#ifdef CONFIG_VMAP_STACK
    + mtcrf 0x7f, r11
    + bt 32 - THREAD_ALIGN_SHIFT, stack_ovf_trampoline
    +#endif
    .endm

    .macro EXCEPTION_PROLOG_2 ext
    diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
    index 5645bc9cbc09..48aadc033e4a 100644
    --- a/arch/powerpc/kernel/irq.c
    +++ b/arch/powerpc/kernel/irq.c
    @@ -678,6 +678,7 @@ void *mcheckirq_ctx[NR_CPUS] __read_mostly;

    void *softirq_ctx[NR_CPUS] __read_mostly;
    void *hardirq_ctx[NR_CPUS] __read_mostly;
    +void *stackovf_ctx[NR_CPUS] __read_mostly;

    void do_softirq_own_stack(void)
    {
    diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
    index 180e658c1a6b..0e5b59daf2df 100644
    --- a/arch/powerpc/kernel/setup_32.c
    +++ b/arch/powerpc/kernel/setup_32.c
    @@ -155,6 +155,7 @@ void __init irqstack_early_init(void)
    for_each_possible_cpu(i) {
    softirq_ctx[i] = alloc_stack();
    hardirq_ctx[i] = alloc_stack();
    + stackovf_ctx[i] = alloc_stack();
    }
    }

    diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
    index 11caa0291254..8fe2553481f4 100644
    --- a/arch/powerpc/kernel/traps.c
    +++ b/arch/powerpc/kernel/traps.c
    @@ -1622,11 +1622,20 @@ void alignment_exception(struct pt_regs *regs)

    void StackOverflow(struct pt_regs *regs)
    {
    + enum ctx_state prev_state = exception_enter();
    +
    pr_crit("Kernel stack overflow in process %s[%d], r1=%lx\n",
    current->comm, task_pid_nr(current), regs->gpr[1]);
    - debugger(regs);
    - show_regs(regs);
    - panic("kernel stack overflow");
    +
    + if (IS_ENABLED(CONFIG_VMAP_STACK)) {
    + die("Kernel stack overflow", regs, SIGSEGV);
    + } else {
    + debugger(regs);
    + show_regs(regs);
    + panic("kernel stack overflow");
    + }
    +
    + exception_exit(prev_state);
    }

    void kernel_fp_unavailable_exception(struct pt_regs *regs)
    --
    2.13.3
    \
     
     \ /
      Last update: 2019-09-10 11:18    [W:4.239 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site