Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754999AbbGUKFD (ORCPT ); Tue, 21 Jul 2015 06:05:03 -0400 Received: from mail9.hitachi.co.jp ([133.145.228.44]:35647 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754799AbbGUKFA (ORCPT ); Tue, 21 Jul 2015 06:05:00 -0400 Message-ID: <55AE1946.9090004@hitachi.com> Date: Tue, 21 Jul 2015 19:04:54 +0900 From: Masami Hiramatsu Organization: Hitachi, Ltd., Japan User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Tom Zanussi , rostedt@goodmis.org CC: daniel.wagner@bmw-carit.de, namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v9 01/22] tracing: Update cond flag when enabling or disabling a trigger References: <5c4a9b249f63929e47b45693a89d87a1a1aba077.1437066836.git.tom.zanussi@linux.intel.com> In-Reply-To: <5c4a9b249f63929e47b45693a89d87a1a1aba077.1437066836.git.tom.zanussi@linux.intel.com> Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2791 Lines: 87 On 2015/07/17 2:22, 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 Looks good to me :) Reviewed-by: Masami Hiramatsu Thanks, > --- > 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; > } > } > -- Masami HIRAMATSU Linux Technology Research Center, System Productivity Research Dept. Center for Technology Innovation - Systems Engineering Hitachi, Ltd., Research & Development Group E-mail: masami.hiramatsu.pt@hitachi.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/