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 84C3FC433F5 for ; Tue, 30 Nov 2021 21:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232800AbhK3Vrc (ORCPT ); Tue, 30 Nov 2021 16:47:32 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:54480 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344403AbhK3Vpj (ORCPT ); Tue, 30 Nov 2021 16:45:39 -0500 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 ams.source.kernel.org (Postfix) with ESMTPS id 3A04EB81D03 for ; Tue, 30 Nov 2021 21:42:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DD69C53FD0; Tue, 30 Nov 2021 21:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638308537; bh=JVXoenM53ogJxfhNA1GE7C/t2r5T+ogqyqsov8WWiDM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=f+o5BIrV37bgsrtaUUKFgxvcCe7d3Lxr4+KJpOCBOFhe92NZX/WScznZKtqwKS/6T gb8/MjflHx/UHUkQoRRBWmhFSlAsrzDY/aIPfeH6hPds4Jd47tCB+F1tfjYHXT9WY/ YlNhQxdRXiQaDrxgIcmv87njpNlBTAV3Rdf858cFfN8PyQ+1Ef5alMJzLU6G5SKeBP s+8QJj2+P82ogfxExAqrKsqwc2Qt1EMfovrbwqlKaU6BpGqSFAldezpcvxvDDI7WsV hP3+dVaJER/Ldm9NzLuSDZxuit51kcUe70KR/1E2IEya4Zpz2U+4i6HEfx0VmQSyu4 P0gb11a+2GUGQ== Message-ID: <953e64171a94b6ee6528f7b7441d73fda9d30657.camel@kernel.org> Subject: Re: [PATCH v3 2/2] tracing: Have existing event_command implementations use helpers From: Tom Zanussi To: Steven Rostedt Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org Date: Tue, 30 Nov 2021 15:42:16 -0600 In-Reply-To: <20211130163110.492a0df3@gandalf.local.home> References: <2b451d62e0b1a12fc99391dfdda9be2d8e9ca499.1637700535.git.zanussi@kernel.org> <20211130163110.492a0df3@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 Tue, 2021-11-30 at 16:31 -0500, Steven Rostedt wrote: > On Tue, 23 Nov 2021 14:53:54 -0600 > Tom Zanussi wrote: > > > > index a873f4e8be04..1d1716d5bee2 100644 > > --- a/kernel/trace/trace_events_trigger.c > > +++ b/kernel/trace/trace_events_trigger.c > > @@ -931,89 +931,47 @@ event_trigger_callback(struct event_command > > *cmd_ops, > > struct event_trigger_data *trigger_data; > > struct event_trigger_ops *trigger_ops; > > char *trigger = NULL; > > - char *number; > > + 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); > > + ret = event_trigger_separate_filter(&trigger, ¶m, false); > > + if (ret) > > + return ret; > > > > ret = -ENOMEM; > > - trigger_data = kzalloc(sizeof(*trigger_data), GFP_KERNEL); > > + trigger_data = event_trigger_alloc(cmd_ops, cmd, trigger, > > 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); > > - kfree(trigger_data); > > How is trigger_data freed on error here? You're right, that kfree() shouldn't have been removed, will add it back. Thanks for picking that up, Tom > > -- Steve > > > ret = 0; > > goto out; > > } > > > > - if (trigger) { > > - number = strsep(&trigger, ":"); > > - > > - ret = -EINVAL; > > - if (!strlen(number)) > > - goto out_free; > > - > > - /* > > - * We use the callback data field (which is a pointer) > > - * as our counter. > > - */ > > - ret = kstrtoul(number, 0, &trigger_data->count); > > - if (ret) > > - goto out_free; > > - } > > - > > - if (!param) /* if param is non-empty, it's supposed to be a > > filter */ > > - goto out_reg; > > - > > - if (!cmd_ops->set_filter) > > - goto out_reg; > > + ret = event_trigger_parse_num(trigger, trigger_data); > > + if (ret) > > + goto out_free; > > > > - ret = cmd_ops->set_filter(param, trigger_data, file); > > + ret = event_trigger_set_filter(cmd_ops, file, param, > > trigger_data); > > if (ret < 0) > > goto out_free; > > > > - out_reg: > > /* Up the trigger_data count to make sure reg doesn't free it > > on failure */ > > event_trigger_init(trigger_ops, trigger_data); > > - ret = cmd_ops->reg(glob, trigger_ops, trigger_data, file); > > - /* > > - * The above returns on success the # of functions enabled, > > - * but if it didn't find any functions it returns zero. > > - * Consider no functions a failure too. > > - */ > > - if (!ret) { > > - cmd_ops->unreg(glob, trigger_ops, trigger_data, file); > > - ret = -ENOENT; > > - } else if (ret > 0) > > - ret = 0; > > + > > + ret = event_trigger_register(cmd_ops, file, glob, cmd, trigger, > > trigger_data, NULL); > > + if (ret) > > + goto out_free; > > > > /* Down the counter of trigger_data or free it if not used > > anymore */ > > event_trigger_free(trigger_ops, trigger_data); > > out: > > return ret; > > - > > out_free: > > - if (cmd_ops->set_filter) > > - cmd_ops->set_filter(NULL, trigger_data, NULL); > > + event_trigger_reset_filter(cmd_ops, trigger_data); > > kfree(trigger_data); > > goto out; > > } > >