From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755523AbaAFQK6 (ORCPT ); Mon, 6 Jan 2014 11:10:58 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:26701 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754557AbaAFQK5 (ORCPT ); Mon, 6 Jan 2014 11:10:57 -0500 Date: Mon, 6 Jan 2014 11:10:55 -0500 From: Steven Rostedt To: Tom Zanussi Cc: Masami Hiramatsu , Jean-Jacques Hiblot , Linux Kernel Mailing List Subject: Re: [PATCH] tracing/kprobes: Add trace event trigger invocations Message-ID: <20140106111055.2cf828f7@gandalf.local.home> In-Reply-To: <1388283848.3048.1.camel@empanada> References: <1388283848.3048.1.camel@empanada> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.22; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 28 Dec 2013 20:24:08 -0600 Tom Zanussi wrote: > Add code to the kprobe/kretprobe event functions that will invoke any > event triggers associated with a probe's ftrace_event_file. > > The code to do this is very similar to the invocation code already > used to invoke the triggers associated with static events and > essentially replaces the existing soft-disable checks with a superset > that preserves the original behavior but adds the bits needed to > support event triggers. > > Signed-off-by: Tom Zanussi > --- > kernel/trace/trace_kprobe.c | 42 ++++++++++++++++++++++++++++++++++++------ > 1 file changed, 36 insertions(+), 6 deletions(-) > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index dae9541..1ee13eb 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -812,12 +812,20 @@ __kprobe_trace_func(struct trace_probe *tp, struct pt_regs *regs, > struct ring_buffer *buffer; > int size, dsize, pc; > unsigned long irq_flags; > + unsigned long eflags; > + enum event_trigger_type __tt = ETT_NONE; What's the significance of the "__" in the variable? Looks as if you copied it from the ftrace_raw_event_* macro. The "__" there is usually recommended because it is a macro and we try to avoid namespace collisions by adding the "__". This is a proper function, please remove the "__" from it. Thanks, -- Steve > struct ftrace_event_call *call = &tp->call; > > WARN_ON(call != ftrace_file->event_call); > > - if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) > - return; > + eflags = ftrace_file->flags; > + > + if (!(eflags & FTRACE_EVENT_FL_TRIGGER_COND)) { > + if (eflags & FTRACE_EVENT_FL_TRIGGER_MODE) > + event_triggers_call(ftrace_file, NULL); > + if (eflags & FTRACE_EVENT_FL_SOFT_DISABLED) > + return; > + } > > local_save_flags(irq_flags); > pc = preempt_count();