Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756681AbdLPCnC (ORCPT ); Fri, 15 Dec 2017 21:43:02 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:32943 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755976AbdLPCnA (ORCPT ); Fri, 15 Dec 2017 21:43:00 -0500 X-Google-Smtp-Source: ACJfBoufcjUMhxAXI8tjOxnQAJpNDK04RiLUd5dPxJPFYw0Z8qEt5ih2q8yZE8NPfGBI1IdLwPbI2A== From: Josef Bacik To: netdev@vger.kernel.org, mhiramat@kernel.org, ast@kernel.org, daniel@iogearbox.net, darrick.wong@oracle.com, linux-kernel@vger.kernel.org Cc: Josef Bacik Subject: [PATCH] trace: reenable preemption if we modify the ip Date: Fri, 15 Dec 2017 21:42:57 -0500 Message-Id: <1513392177-10298-1-git-send-email-josef@toxicpanda.com> X-Mailer: git-send-email 2.7.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1196 Lines: 36 From: Josef Bacik Things got moved around between the original bpf_override_return patches and the final version, and now the ftrace kprobe dispatcher assumes if you modified the ip that you also enabled preemption. Make a comment of this and enable preemption, this fixes the lockdep splat that happened when using this feature. Signed-off-by: Josef Bacik --- kernel/trace/trace_kprobe.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 5db849809a56..91f4b57dab82 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1322,8 +1322,15 @@ static int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs) if (tk->tp.flags & TP_FLAG_TRACE) kprobe_trace_func(tk, regs); #ifdef CONFIG_PERF_EVENTS - if (tk->tp.flags & TP_FLAG_PROFILE) + if (tk->tp.flags & TP_FLAG_PROFILE) { ret = kprobe_perf_func(tk, regs); + /* + * The ftrace kprobe handler leaves it up to us to re-enable + * preemption here before returning if we've modified the ip. + */ + if (ret) + preempt_enable_no_resched(); + } #endif return ret; } -- 2.7.5