From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965812AbdCXSqj (ORCPT ); Fri, 24 Mar 2017 14:46:39 -0400 Received: from terminus.zytor.com ([65.50.211.136]:56847 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964809AbdCXSqb (ORCPT ); Fri, 24 Mar 2017 14:46:31 -0400 Date: Fri, 24 Mar 2017 11:43:42 -0700 From: tip-bot for Kefeng Wang Message-ID: Cc: mingo@kernel.org, acme@redhat.com, wangnan0@huawei.com, jolsa@kernel.org, peterz@infradead.org, guohanjun@huawei.com, wangkefeng.wang@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, mhiramat@kernel.org Reply-To: guohanjun@huawei.com, jolsa@kernel.org, peterz@infradead.org, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, mhiramat@kernel.org, hpa@zytor.com, wangkefeng.wang@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <1489738592-61011-1-git-send-email-wangkefeng.wang@huawei.com> References: <1489738592-61011-1-git-send-email-wangkefeng.wang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Return errno when not hitting any event Git-Commit-ID: 70946723eeb859466f026274b29c6196e39149c4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 70946723eeb859466f026274b29c6196e39149c4 Gitweb: http://git.kernel.org/tip/70946723eeb859466f026274b29c6196e39149c4 Author: Kefeng Wang AuthorDate: Fri, 17 Mar 2017 16:16:32 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 21 Mar 2017 10:45:02 -0300 perf probe: Return errno when not hitting any event On old perf, when using 'perf probe -d' to delete an inexistent event, it returns 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 returns 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. Signed-off-by: Kefeng Wang Acked-by: Masami Hiramatsu Cc: Hanjun Guo Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Wang Nan Fixes: dddc7ee32fa1 ("perf probe: Fix an error when deleting probes successfully") Link: http://lkml.kernel.org/r/1489738592-61011-1-git-send-email-wangkefeng.wang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- 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)