From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754693AbbFLSBO (ORCPT ); Fri, 12 Jun 2015 14:01:14 -0400 Received: from smtprelay0067.hostedemail.com ([216.40.44.67]:35914 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750898AbbFLSBN (ORCPT ); Fri, 12 Jun 2015 14:01:13 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3353:3865:3867:3870:3871:3872:3874:5007:6119:6261:7875:7903:9010:10004:10400:10848:10967:11026:11232:11658:11914:12043:12296:12438:12517:12519:12555:12740:13255:13972:14096:14097:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: dirt15_a2e10b82ba0f X-Filterd-Recvd-Size: 3497 Date: Fri, 12 Jun 2015 14:01:07 -0400 From: Steven Rostedt To: Tom Zanussi Cc: daniel.wagner@bmw-carit.de, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 01/10] tracing: Update cond flag when enabling or disabling a trigger Message-ID: <20150612140107.4ced7f75@gandalf.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Why v3 in the subject? On Mon, 8 Jun 2015 16:32:00 -0500 Tom Zanussi wrote: > When a trigger is enabled, the cond flag should be set beforehand, > otherwise a trigger that's expecting to process a trace record > (e.g. one with post_trigger set) could be invoked without one. > > Likewise a trigger's cond flag should be reset after it's disabled, > not before. > > Signed-off-by: Tom Zanussi > Signed-off-by: Daniel Wagner Why is Daniel signed off by here? -- Steve > --- > kernel/trace/trace_events_trigger.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c > index 42a4009..4d2f3cc 100644 > --- a/kernel/trace/trace_events_trigger.c > +++ b/kernel/trace/trace_events_trigger.c > @@ -543,11 +543,12 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops, > list_add_rcu(&data->list, &file->triggers); > ret++; > > + update_cond_flag(file); > if (trace_event_trigger_enable_disable(file, 1) < 0) { > list_del_rcu(&data->list); > + update_cond_flag(file); > ret--; > } > - update_cond_flag(file); > out: > return ret; > } > @@ -575,8 +576,8 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops, > if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) { > unregistered = true; > list_del_rcu(&data->list); > - update_cond_flag(file); > trace_event_trigger_enable_disable(file, 0); > + update_cond_flag(file); > break; > } > } > @@ -1319,11 +1320,12 @@ static int event_enable_register_trigger(char *glob, > list_add_rcu(&data->list, &file->triggers); > ret++; > > + update_cond_flag(file); > if (trace_event_trigger_enable_disable(file, 1) < 0) { > list_del_rcu(&data->list); > + update_cond_flag(file); > ret--; > } > - update_cond_flag(file); > out: > return ret; > } > @@ -1344,8 +1346,8 @@ static void event_enable_unregister_trigger(char *glob, > (enable_data->file == test_enable_data->file)) { > unregistered = true; > list_del_rcu(&data->list); > - update_cond_flag(file); > trace_event_trigger_enable_disable(file, 0); > + update_cond_flag(file); > break; > } > }