From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755505AbcIRBDE (ORCPT ); Sat, 17 Sep 2016 21:03:04 -0400 Received: from mga03.intel.com ([134.134.136.65]:18749 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754857AbcIRBC4 (ORCPT ); Sat, 17 Sep 2016 21:02:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,353,1470726000"; d="scan'208";a="1052588749" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , wangnan0@huawei.com, sukadev@linux.vnet.ibm.com Subject: [PATCH] perf, tools: Handle events including .c and .o Date: Sat, 17 Sep 2016 18:02:46 -0700 Message-Id: <1474160566-8955-1-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen. Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used. Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable. Cc: wangnan0@huawei.com Cc: sukadev@linux.vnet.ibm.com Signed-off-by: Andi Kleen --- tools/perf/util/parse-events.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 7a2519435da0..64ca26e4ed2d 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -162,8 +162,8 @@ modifier_bp [rwx]{1,3} } {event_pmu} | -{bpf_object} | -{bpf_source} | +({bpf_object}$) | +({bpf_source}$) | {event} { BEGIN(INITIAL); REWIND(1); -- 2.5.5