From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965506AbbI2TLY (ORCPT ); Tue, 29 Sep 2015 15:11:24 -0400 Received: from smtprelay0114.hostedemail.com ([216.40.44.114]:59382 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965334AbbI2TLQ (ORCPT ); Tue, 29 Sep 2015 15:11:16 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::,RULES_HIT:41:69:355:379:541:599:800:960:966:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2551:2553:2559:2562:2693:3138:3139:3140:3141:3142:3354:3622:3653:3865:3867:3870:3873:4362:4385:5007:6119:6261:7514:7875:7903:8957:10004:10400:10848:10967:11026:11232:11658:11914:12043:12050:12296:12438:12517:12519:12555:12663:12740:13069:13311:13357:13972:14096:14097:21080:21212,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: bomb77_7ebf76e745237 X-Filterd-Recvd-Size: 2841 Date: Tue, 29 Sep 2015 15:11:09 -0400 From: Steven Rostedt To: Dmitry Safonov <0x7f454c46@gmail.com> Cc: mingo@redhat.com, corbet@lwn.net, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/5] ftrace: remove redundant strsep in mod_callback Message-ID: <20150929151109.7cf518da@gandalf.local.home> In-Reply-To: <1443545176-3215-1-git-send-email-0x7f454c46@gmail.com> References: <1443545176-3215-1-git-send-email-0x7f454c46@gmail.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; 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 On Tue, 29 Sep 2015 19:46:12 +0300 Dmitry Safonov <0x7f454c46@gmail.com> wrote: > By now there isn't any subcommand for mod. > > Before: > sh$ echo '*:mod:ipv6:a' > set_ftrace_filter > sh$ echo '*:mod:ipv6' > set_ftrace_filter > had the same results, but now first will result in: > sh$ echo '*:mod:ipv6:a' > set_ftrace_filter > -bash: echo: write error: Invalid argument > > Also, I clarified ftrace_mod_callback code a little. Thanks for the patches. I don't have time to look at them at the moment as I'm trying to finish up some stuff before I leave for LinuxCon EU. If you don't hear from me by Monday, feel free to ping me again. I'll be in Dublin (for LinuxCon), but I should be able to take a look at the patches while I'm there. What do you think keynotes are for ;-) -- Steve > > Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com> > --- > kernel/trace/ftrace.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index b0623ac..f87401b 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c > @@ -3564,8 +3564,7 @@ static int > ftrace_mod_callback(struct ftrace_hash *hash, > char *func, char *cmd, char *param, int enable) > { > - char *mod; > - int ret = -EINVAL; > + int ret; > > /* > * cmd == 'mod' because we only registered this func > @@ -3576,16 +3575,12 @@ ftrace_mod_callback(struct ftrace_hash *hash, > */ > > /* we must have a module name */ > - if (!param) > - return ret; > - > - mod = strsep(¶m, ":"); > - if (!strlen(mod)) > - return ret; > + if (!param || !strlen(param)) > + return -EINVAL; > > - ret = ftrace_match_module_records(hash, func, mod); > - if (!ret) > - ret = -EINVAL; > + ret = ftrace_match_module_records(hash, func, param); > + if (ret == 0) > + return -EINVAL; > if (ret < 0) > return ret; >