Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755061AbcJETrX (ORCPT ); Wed, 5 Oct 2016 15:47:23 -0400 Received: from mga04.intel.com ([192.55.52.120]:60069 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647AbcJETrU (ORCPT ); Wed, 5 Oct 2016 15:47:20 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,302,1473145200"; d="scan'208";a="1049950635" From: Andi Kleen To: acme@kernel.org Cc: sukadev@linux.vnet.ibm.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, Andi Kleen , wangnan0@huawei.com Subject: [PATCH 1/3] perf, tools: Handle events including .c and .o Date: Wed, 5 Oct 2016 12:47:10 -0700 Message-Id: <1475696832-9188-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1475696832-9188-1-git-send-email-andi@firstfloor.org> References: <1475696832-9188-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1053 Lines: 37 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 9f43fda2570f..377147088a46 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -183,8 +183,8 @@ modifier_bp [rwx]{1,3} } {event_pmu} | -{bpf_object} | -{bpf_source} | +({bpf_object}$) | +({bpf_source}$) | {event} { BEGIN(INITIAL); REWIND(1); -- 2.5.5