From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932088AbdL1PdA (ORCPT ); Thu, 28 Dec 2017 10:33:00 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54031 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862AbdL1Pc7 (ORCPT ); Thu, 28 Dec 2017 10:32:59 -0500 Date: Thu, 28 Dec 2017 07:30:49 -0800 From: tip-bot for Masami Hiramatsu Message-ID: Cc: bhargavaramudu@gmail.com, tmricht@linux.vnet.ibm.com, pc@us.ibm.com, ravi.bangoria@linux.vnet.ibm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mhiramat@kernel.org, acme@redhat.com Reply-To: mhiramat@kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, ravi.bangoria@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, bhargavaramudu@gmail.com, tmricht@linux.vnet.ibm.com, pc@us.ibm.com In-Reply-To: <151275040665.24652.5188568529237584489.stgit@devbox> References: <151275040665.24652.5188568529237584489.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Add warning message if there is unexpected event name Git-Commit-ID: 9f5c6d8777a2d962b0eeacb2a16f37da6bea545b 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: 9f5c6d8777a2d962b0eeacb2a16f37da6bea545b Gitweb: https://git.kernel.org/tip/9f5c6d8777a2d962b0eeacb2a16f37da6bea545b Author: Masami Hiramatsu AuthorDate: Sat, 9 Dec 2017 01:26:46 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 Dec 2017 12:15:53 -0300 perf probe: Add warning message if there is unexpected event name This improve the error message so that user can know event-name error before writing new events to kprobe-events interface. E.g. ====== #./perf probe -x /lib64/libc-2.25.so malloc_get_state* Internal error: "malloc_get_state@GLIBC_2" is an invalid event name. Error: Failed to add events. ====== Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Acked-by: Ravi Bangoria Reviewed-by: Thomas Richter Tested-by: Arnaldo Carvalho de Melo Cc: Paul Clarke Cc: bhargavb Cc: linux-rt-users@vger.kernel.org Link: http://lkml.kernel.org/r/151275040665.24652.5188568529237584489.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index b7aaf9b..262d5da 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2625,6 +2625,14 @@ static int get_new_event_name(char *buf, size_t len, const char *base, out: free(nbase); + + /* Final validation */ + if (ret >= 0 && !is_c_func_name(buf)) { + pr_warning("Internal error: \"%s\" is an invalid event name.\n", + buf); + ret = -EINVAL; + } + return ret; }