From mboxrd@z Thu Jan 1 00:00:00 1970 From: Masami Hiramatsu Subject: Re: [PATCH] perf probe: Fix to delete multiple probe event Date: Wed, 8 Jan 2020 11:36:50 +0900 Message-ID: <20200108113650.a625f11c3cfa510d41edbd63@kernel.org> References: <157536011452.29277.3647564438675346431.stgit@devnote2> <20191204112952.7b7d61feb2b14173ae625378@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20191204112952.7b7d61feb2b14173ae625378@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Masami Hiramatsu Cc: Ravi Bangoria , Sandipan Das , linux-perf-users@vger.kernel.org, "Naveen N. Rao" , Arnaldo Carvalho de Melo , Adrian Hunter , Jiri Olsa , Namhyung Kim , Linux Kernel Mailing List List-Id: linux-perf-users.vger.kernel.org Hi Arnaldo, Could you pick this fix? Sandipan, could you also test this? Thank you, On Wed, 4 Dec 2019 11:29:52 +0900 Masami Hiramatsu wrote: > On Tue, 3 Dec 2019 17:01:54 +0900 > Masami Hiramatsu wrote: > > > Fix to delete multiple probe event with filter correctly. > > > > When we put an event with multiple probes, perf-probe fails > > to delete with filters. This comes from a failure to list > > up the event name because of overwrapping its name. > > > > To fix this issue, skip to list up the event which has > > same name. > > > > Without this patch: > > # perf probe -l \* > > probe_perf:map__map_ip (on perf_sample__fprintf_brstackoff:21@ > > probe_perf:map__map_ip (on perf_sample__fprintf_brstackoff:25@ > > probe_perf:map__map_ip (on append_inlines:12@util/machine.c in > > probe_perf:map__map_ip (on unwind_entry:19@util/machine.c in / > > probe_perf:map__map_ip (on map__map_ip@util/map.h in /home/mhi > > probe_perf:map__map_ip (on map__map_ip@util/map.h in /home/mhi > > # perf probe -d \* > > "*" does not hit any event. > > Error: Failed to delete events. Reason: No such file or directory (Code: -2) > > > > With this: > > # perf probe -d \* > > Removed event: probe_perf:map__map_ip > > > > Oops, I missed Fixed tag. > > Fixes: 72363540c009 ("perf probe: Support multiprobe event") > > Thanks, > > > Reported-by: Arnaldo Carvalho de Melo > > Signed-off-by: Masami Hiramatsu > > --- > > tools/perf/util/probe-file.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c > > index 5003ba403345..c03a591d41a4 100644 > > --- a/tools/perf/util/probe-file.c > > +++ b/tools/perf/util/probe-file.c > > @@ -206,6 +206,9 @@ static struct strlist *__probe_file__get_namelist(int fd, bool include_group) > > } else > > ret = strlist__add(sl, tev.event); > > clear_probe_trace_event(&tev); > > + /* Skip if there is same name multi-probe event in the list */ > > + if (ret == -EEXIST) > > + ret = 0; > > if (ret < 0) > > break; > > } > > > > > -- > Masami Hiramatsu -- Masami Hiramatsu