On Fri, 17 Mar 2017 16:16:32 +0800
Kefeng Wang <wangkefeng.w...@huawei.com> wrote:
> On old perf, when using perf probe -d to delete an inexistent event,
> it return errno, eg,
>
> -bash-4.3# perf probe -d xxx || echo $?
> Info: Event "*:xxx" does not exist.
> Error: Failed to delete events.
> 255
>
> But now perf_del_probe_events() will always set ret = 0, different
> from previous del_perf_probe_events(). After this, it return errno
> again, eg,
>
> -bash-4.3# ./perf probe -d xxx || echo $?
> "xxx" does not hit any event.
> Error: Failed to delete events.
> 254
>
> And it is more appropriate to return -ENOENT instead of -EPERM.
Looks good to me.
Acked-by: Masami Hiramatsu <mhira...@kernel.org>
Thanks!
>
> Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
> Cc: Masami Hiramatsu <mhira...@kernel.org>
> Cc: Jiri Olsa <jo...@kernel.org>
> Cc: Peter Zijlstra <pet...@infradead.org>
> Cc: Wang Nan <wangn...@huawei.com>
>
> Fixes: dddc7ee32fa1 ("perf probe: Fix an error when deleting probes
> successfully")
> Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
> ---
>
> v1->v2:
> - Using pr_wanring to show warning infos and drop inappropriate comment
> suggested by Masami Hiramatsu.
>
> tools/perf/builtin-probe.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
> index 1fcebc3..51cdc23 100644
> --- a/tools/perf/builtin-probe.c
> +++ b/tools/perf/builtin-probe.c
> @@ -442,9 +442,9 @@ static int perf_del_probe_events(struct strfilter *filter)
> }
>
> if (ret == -ENOENT && ret2 == -ENOENT)
> - pr_debug("\"%s\" does not hit any event.\n", str);
> - /* Note that this is silently ignored */
> - ret = 0;
> + pr_warning("\"%s\" does not hit any event.\n", str);
> + else
> + ret = 0;
>
> error:
> if (kfd >= 0)
> --
> 1.7.12.4
>
--
Masami Hiramatsu <mhira...@kernel.org>
