diff options
| author |   Masami Hiramatsu <mhiramat@kernel.org> | 2018-06-20 01:16:17 +0900 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-06-21 12:33:20 +0200 |
| commit | 2bbda764d720aacabaad38374d26fcccb7843f17 (patch) | |
| tree | 25d60c92825b75c73362b455baafb5464aca07cc /arch/x86/kernel/kprobes/opt.c | |
| parent | bpf/error-inject/kprobes: Clear current_kprobe and enable preempt in kprobe (diff) | |
| download | linux-dev-2bbda764d720aacabaad38374d26fcccb7843f17.tar.xz linux-dev-2bbda764d720aacabaad38374d26fcccb7843f17.zip | |
kprobes/x86: Do not disable preempt on int3 path
Since int3 and debug exception(for singlestep) are run with
IRQ disabled and while running single stepping we drop IF
from regs->flags, that path must not be preemptible. So we
can remove the preempt disable/enable calls from that path.
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Link: https://lore.kernel.org/lkml/152942497779.15209.2879580696589868291.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/kprobes/opt.c')
| -rw-r--r-- | arch/x86/kernel/kprobes/opt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 203d398802a3..eaf02f2e7300 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -491,7 +491,6 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter) regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX; if (!reenter) reset_current_kprobe(); - preempt_enable_no_resched(); return 1; } return 0; |