From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934938AbbIVVab (ORCPT ); Tue, 22 Sep 2015 17:30:31 -0400 Received: from mga11.intel.com ([192.55.52.93]:25758 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934910AbbIVVaL (ORCPT ); Tue, 22 Sep 2015 17:30:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,574,1437462000"; d="scan'208";a="810764269" From: kan.liang@intel.com To: acme@kernel.org Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, mingo@redhat.com, namhyung@kernel.org, ak@linux.intel.com, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH RFC 03/10] perf,tools: don't validate counter read event Date: Tue, 22 Sep 2015 10:13:36 -0400 Message-Id: <1442931223-51708-4-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1442931223-51708-1-git-send-email-kan.liang@intel.com> References: <1442931223-51708-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang Counter read event (:C) doesn't do sampling. So perf tool should not validate its sample_type, read_format and sample_id_all. Signed-off-by: Kan Liang --- tools/perf/util/evlist.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 603ee3e..af6215f 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1258,6 +1258,17 @@ int perf_evlist__set_filter_pid(struct perf_evlist *evlist, pid_t pid) return perf_evlist__set_filter_pids(evlist, 1, &pid); } +static inline bool is_counter_read_event(struct perf_event_attr *attr) +{ + if ((attr->read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) && + (attr->read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) && + !attr->sample_freq && !attr->sample_period && + !attr->sample_type) + return true; + + return false; +} + bool perf_evlist__valid_sample_type(struct perf_evlist *evlist) { struct perf_evsel *pos; @@ -1269,6 +1280,8 @@ bool perf_evlist__valid_sample_type(struct perf_evlist *evlist) return false; evlist__for_each(evlist, pos) { + if (is_counter_read_event(&pos->attr)) + continue; if (pos->id_pos != evlist->id_pos || pos->is_pos != evlist->is_pos) return false; @@ -1313,6 +1326,8 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist) u64 sample_type = first->attr.sample_type; evlist__for_each(evlist, pos) { + if (is_counter_read_event(&pos->attr)) + continue; if (read_format != pos->attr.read_format) return false; } @@ -1370,6 +1385,8 @@ bool perf_evlist__valid_sample_id_all(struct perf_evlist *evlist) struct perf_evsel *first = perf_evlist__first(evlist), *pos = first; evlist__for_each_continue(evlist, pos) { + if (is_counter_read_event(&pos->attr)) + continue; if (first->attr.sample_id_all != pos->attr.sample_id_all) return false; } -- 1.8.3.1