From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752664AbaHMIHK (ORCPT ); Wed, 13 Aug 2014 04:07:10 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:56840 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752090AbaHMH6j (ORCPT ); Wed, 13 Aug 2014 03:58:39 -0400 From: Alexei Starovoitov To: "David S. Miller" Cc: Ingo Molnar , Linus Torvalds , Andy Lutomirski , Steven Rostedt , Daniel Borkmann , Chema Gonzalez , Eric Dumazet , Peter Zijlstra , "H. Peter Anvin" , Andrew Morton , Kees Cook , linux-api@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RFC v4 net-next 18/26] tracing: allow eBPF programs to be attached to kprobe/kretprobe Date: Wed, 13 Aug 2014 00:57:29 -0700 Message-Id: <1407916658-8731-19-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1407916658-8731-1-git-send-email-ast@plumgrid.com> References: <1407916658-8731-1-git-send-email-ast@plumgrid.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Alexei Starovoitov --- kernel/trace/trace_kprobe.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 282f6e4e5539..a71e3d521938 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -19,6 +19,7 @@ #include #include +#include #include "trace_probe.h" @@ -930,6 +931,18 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, if (ftrace_trigger_soft_disabled(ftrace_file)) return; + if (call->flags & TRACE_EVENT_FL_BPF) { + struct bpf_context __ctx = {}; + /* get first 3 arguments of the function. x64 syscall ABI uses + * the same 3 registers as x64 calling convention. + * todo: implement it cleanly via arch specific + * regs_get_argument_nth() helper + */ + syscall_get_arguments(current, regs, 0, 3, &__ctx.arg1); + trace_filter_call_bpf(ftrace_file->filter, &__ctx); + return; + } + local_save_flags(irq_flags); pc = preempt_count(); @@ -978,6 +991,17 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, if (ftrace_trigger_soft_disabled(ftrace_file)) return; + if (call->flags & TRACE_EVENT_FL_BPF) { + struct bpf_context __ctx = {}; + /* assume that register used to return a value from syscall is + * the same as register used to return a value from a function + * todo: provide arch specific helper + */ + __ctx.ret = syscall_get_return_value(current, regs); + trace_filter_call_bpf(ftrace_file->filter, &__ctx); + return; + } + local_save_flags(irq_flags); pc = preempt_count(); -- 1.7.9.5