lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -tip v4 21/27] s390/kprobes: Don't call the ->break_handler() in s390 kprobes code
    Date
    Don't call the ->break_handler() from the s390 kprobes code,
    because it was only used by jprobes which got removed.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    ---
    arch/s390/kernel/kprobes.c | 20 --------------------
    1 file changed, 20 deletions(-)

    diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
    index 0967de19f53d..3e34018960b5 100644
    --- a/arch/s390/kernel/kprobes.c
    +++ b/arch/s390/kernel/kprobes.c
    @@ -332,26 +332,6 @@ static int kprobe_handler(struct pt_regs *regs)
    }
    enable_singlestep(kcb, regs, (unsigned long) p->ainsn.insn);
    return 1;
    - } else if (kprobe_running()) {
    - p = __this_cpu_read(current_kprobe);
    - if (p->break_handler && p->break_handler(p, regs)) {
    - /*
    - * Continuation after the jprobe completed and
    - * caused the jprobe_return trap. The jprobe
    - * break_handler "returns" to the original
    - * function that still has the kprobe breakpoint
    - * installed. We continue with single stepping.
    - */
    - kcb->kprobe_status = KPROBE_HIT_SS;
    - enable_singlestep(kcb, regs,
    - (unsigned long) p->ainsn.insn);
    - return 1;
    - } /* else:
    - * No kprobe at this address and the current kprobe
    - * has no break handler (no jprobe!). The kernel just
    - * exploded, let the standard trap handler pick up the
    - * pieces.
    - */
    } /* else:
    * No kprobe at this address and no active kprobe. The trap has
    * not been caused by a kprobe breakpoint. The race of breakpoint
    \
     
     \ /
      Last update: 2018-05-28 09:11    [W:4.215 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site