From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470AbdCFQdD (ORCPT ); Mon, 6 Mar 2017 11:33:03 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33027 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753596AbdCFQbm (ORCPT ); Mon, 6 Mar 2017 11:31:42 -0500 From: Ravi Bangoria To: mingo@redhat.com, acme@kernel.org, mhiramat@kernel.org Cc: brendan.d.gregg@gmail.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, jolsa@kernel.org, ak@linux.intel.com, treeze.taeung@gmail.com, mathieu.poirier@linaro.org, hekuang@huawei.com, sukadev@linux.vnet.ibm.com, ananth@in.ibm.com, naveen.n.rao@linux.vnet.ibm.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, hemant@linux.vnet.ibm.com, Ravi Bangoria Subject: [PATCH v4 4/7] perf/sdt: Clean uprobe_events when event(out of multiple events) parsing fails Date: Mon, 6 Mar 2017 18:43:01 +0530 X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170306131304.1625-1-ravi.bangoria@linux.vnet.ibm.com> References: <20170306131304.1625-1-ravi.bangoria@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030613-0008-0000-0000-000005388C2A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030613-0009-0000-0000-00001342F897 Message-Id: <20170306131304.1625-5-ravi.bangoria@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-06_11:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703060111 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org User may ask for multiple events in the same record command like, perf record -a -e sdt_1:* -e sdt_2:* If sdt_1:* events are already added to uprobe_events and sdt_2:* event parsing fails, clean sdt_1:* events from uprobe_events. Signed-off-by: Ravi Bangoria --- tools/perf/builtin-record.c | 7 +++---- tools/perf/perf.h | 1 + tools/perf/util/probe-file.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index e87b19b..46d447e 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1517,11 +1517,10 @@ bool is_cmd_record(void) return (record.evlist != NULL); } -static void -sdt_event_list__remove(struct list_head *sdt_event_list __maybe_unused) +void sdt_event_list__remove(void) { #ifdef HAVE_LIBELF_SUPPORT - return remove_sdt_event_list(sdt_event_list); + return remove_sdt_event_list(&record.sdt_event_list); #endif } @@ -1864,7 +1863,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) perf_evlist__delete(rec->evlist); symbol__exit(); auxtrace_record__free(rec->itr); - sdt_event_list__remove(&rec->sdt_event_list); + sdt_event_list__remove(); return err; } diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 9d8e5fe..8a411f1 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -77,4 +77,5 @@ struct option; extern const char * const *record_usage; extern struct option *record_options; bool is_cmd_record(void); +void sdt_event_list__remove(void); #endif diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 47b624a..358ca98 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -1192,8 +1192,10 @@ int add_sdt_event(char *event, struct list_head *sdt_evlist) ret = 0; free_pev: - if (ret < 0) + if (ret < 0) { free_sdt_list(sdt_evlist); + sdt_event_list__remove(); + } cleanup_perf_probe_events(pev, 1); clear_probe_trace_events(exst_tevs, exst_ntevs); free(pev); -- 2.9.3