From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 782D1C3F2CF for ; Fri, 28 Feb 2020 07:57:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 507542467B for ; Fri, 28 Feb 2020 07:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582876672; bh=447A/1eVEf79zNA/V+pehDVUNQ6KKCGcSrLGSGA9AoU=; h=From:To:Cc:Subject:Date:List-ID:From; b=Yg1t2ai7WrXGznVOy/kim5RV6XmHNmADY1TCBYbSk4My1QC+VRy8GWcYPY2wnPbRm r7ScN0pNMxxhb5sgkKYMRXHqwOrVL+Dww5NsVrYs9OfCH4h6HTlvNyJi2yVwsyvbhZ GJqlqUNMIxD8glgG4pQmIjeUZVrqS9/UR5lq7wmQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726785AbgB1H5u (ORCPT ); Fri, 28 Feb 2020 02:57:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:49102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725928AbgB1H5t (ORCPT ); Fri, 28 Feb 2020 02:57:49 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF0C42467B; Fri, 28 Feb 2020 07:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582876668; bh=447A/1eVEf79zNA/V+pehDVUNQ6KKCGcSrLGSGA9AoU=; h=From:To:Cc:Subject:Date:From; b=RHtiadStP1W/S2hSUdKQj7XDq8rPJB682X4hV10pvYXtL9ykALtdjIWUE67xUbHWJ MczoDw0POlqK2SDp7oQ9vJqEnFLuOfsDH/szjaSIjWgOwrKkzbdppsIm6ngOTJWRul lJf/O15F8ZDHfdcjUGoBwDXTKQnyKd5OB0YCSC2c= From: Masami Hiramatsu To: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu , Adrian Hunter , Jiri Olsa , Namhyung Kim , Linux Kernel Mailing List , He Zhe , stable@vger.kernel.org Subject: [PATCH v2] perf probe: Fix to delete multiple probe event Date: Fri, 28 Feb 2020 16:57:42 +0900 Message-Id: <158287666197.16697.7514373548551863562.stgit@devnote2> X-Mailer: git-send-email 2.20.1 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 72363540c009 ("perf probe: Support multiprobe event") Reported-by: Arnaldo Carvalho de Melo Reported-by: He Zhe Signed-off-by: Masami Hiramatsu --- v2: - Forward port on the latest perf/urgent tree. - Add Fixes and Reporters. --- 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 0f5fda11675f..8c852948513e 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; }