From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 295A4C433EF for ; Sun, 9 Jan 2022 04:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234856AbiAIEXI (ORCPT ); Sat, 8 Jan 2022 23:23:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232666AbiAIEXH (ORCPT ); Sat, 8 Jan 2022 23:23:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E35C0C06173F for ; Sat, 8 Jan 2022 20:23:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2461F60C0F for ; Sun, 9 Jan 2022 04:23:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AA48C36AE5; Sun, 9 Jan 2022 04:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641702185; bh=4W3k8FdPcqQIH2C5xA4zp9axIzUwMzpEFbgT1noGXs8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=XPHJ2D8vYrh3nnxPeWKfUayoaXSbPJgyAXmqShMp1QEldemGt+aaGQ+u3ZTjAe9fb PCWqOuEy8k+7RfAketjlV7zuo880SyyGGU4BQEEk06IHtfT4TRh44Rsu46kvOpfwSE or1Br1RCuddYZgyHK3aQDMti1JNii63+swSZ1C191WwhVQm/KXZiqcBauxFFTvx5HW V+r19quFZNffwXyXf33b61Yqi9SDQwTA69RVNdHmpU/koGCRqq8IMAcrEXmyxMTCxQ S5FLcOsSRbXNhobk7lZm3u68djNfYOYaSRXliPTf58AiCAkqTT8NiWNJv0WZAaD7G3 lXXbyNS9wyqnw== Message-ID: Subject: Re: [PATCH v5 4/4] tracing: Have existing event_command.parse() implementations use helpers From: Tom Zanussi To: Steven Rostedt Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org Date: Sat, 08 Jan 2022 22:23:03 -0600 In-Reply-To: <20220108195406.0c4f659d@gandalf.local.home> References: <20220108195406.0c4f659d@gandalf.local.home> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Steve, On Sat, 2022-01-08 at 19:54 -0500, Steven Rostedt wrote: > On Tue, 14 Dec 2021 12:57:32 -0600 > Tom Zanussi wrote: > > > index da103826f27e..e6a48e8c79eb 100644 > > --- a/kernel/trace/trace_events_trigger.c > > +++ b/kernel/trace/trace_events_trigger.c > > @@ -973,7 +973,7 @@ int event_trigger_register(struct event_command > > *cmd_ops, > > * @file: The trace_event_file associated with the event > > * @glob: The raw string used to register the trigger > > * @cmd: The cmd portion of the string used to register the > > trigger > > - * @param: The params portion of the string used to register the > > trigger > > + * @param_and_filter: The param and filter portion of the string > > used to register the trigger > > * > > * Common implementation for event command parsing and trigger > > * instantiation. > > @@ -986,94 +986,53 @@ int event_trigger_register(struct > > event_command *cmd_ops, > > static int > > event_trigger_parse(struct event_command *cmd_ops, > > struct trace_event_file *file, > > - char *glob, char *cmd, char *param) > > + char *glob, char *cmd, char *param_and_filter) > > { > > struct event_trigger_data *trigger_data; > > struct event_trigger_ops *trigger_ops; > > - char *trigger = NULL; > > - char *number; > > + char *param, *filter; > > + bool remove; > > int ret; > > > > - /* separate the trigger from the filter (t:n [if filter]) */ > > - if (param && isdigit(param[0])) { > > - trigger = strsep(¶m, " \t"); > > - if (param) { > > - param = skip_spaces(param); > > - if (!*param) > > - param = NULL; > > - } > > - } > > + remove = event_trigger_check_remove(glob); > > > > - trigger_ops = cmd_ops->get_trigger_ops(cmd, trigger); > > Did you mean to remove the assignment of trigger_ops here? Hmm, yeah, that shouldn't have been removed, but... > > > + ret = event_trigger_separate_filter(param_and_filter, ¶m, > > &filter, false); > > + if (ret) > > + return ret; > > > > ret = -ENOMEM; > > - trigger_data = kzalloc(sizeof(*trigger_data), GFP_KERNEL); > > + trigger_data = event_trigger_alloc(cmd_ops, cmd, param, file); > > if (!trigger_data) > > goto out; > > > > - trigger_data->count = -1; > > - trigger_data->ops = trigger_ops; > > - trigger_data->cmd_ops = cmd_ops; > > - trigger_data->private_data = file; > > - INIT_LIST_HEAD(&trigger_data->list); > > - INIT_LIST_HEAD(&trigger_data->named_list); > > - > > - if (glob[0] == '!') { > > + if (remove) { > > cmd_ops->unreg(glob+1, trigger_ops, trigger_data, > > file); > > It's still used here and below. > > I get a warning on this. I'm not getting a warning, and remove should have crashed the testcases, but I'm not seeing that either. Will have to investigate tomorrow.. Tom > > Thanks, > > -- Steve > > > kfree(trigger_data);