From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755618AbbICNhl (ORCPT ); Thu, 3 Sep 2015 09:37:41 -0400 Received: from mga02.intel.com ([134.134.136.20]:43148 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753910AbbICNhk (ORCPT ); Thu, 3 Sep 2015 09:37:40 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,462,1437462000"; d="scan'208";a="797046701" Subject: Re: [tip:perf/urgent] perf evlist: Open event on evsel cpus and threads To: acme@redhat.com, kan.liang@intel.com, mingo@kernel.org References: <1440138194-17001-1-git-send-email-kan.liang@intel.com> Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <55E84C60.4010309@intel.com> Date: Thu, 3 Sep 2015 16:34:24 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/09/15 11:31, tip-bot for Kan Liang wrote: > Commit-ID: d988d5ee647861706bc7a391ddbc29429b50f00e > Gitweb: http://git.kernel.org/tip/d988d5ee647861706bc7a391ddbc29429b50f00e > Author: Kan Liang > AuthorDate: Fri, 21 Aug 2015 02:23:14 -0400 > Committer: Arnaldo Carvalho de Melo > CommitDate: Mon, 31 Aug 2015 17:28:01 -0300 > > perf evlist: Open event on evsel cpus and threads > > An evsel may have different cpus and threads than the evlist it is in. > > Use it's own cpus and threads, when opening the evsel in 'perf record'. > > Signed-off-by: Kan Liang > Cc: Jiri Olsa > Link: http://lkml.kernel.org/r/1440138194-17001-1-git-send-email-kan.liang@intel.com > Signed-off-by: Arnaldo Carvalho de Melo Just noticed this breaks Intel PT. Will have to investigate further. > --- > tools/perf/builtin-record.c | 2 +- > tools/perf/util/evlist.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c > index a660022..1d14f38 100644 > --- a/tools/perf/builtin-record.c > +++ b/tools/perf/builtin-record.c > @@ -279,7 +279,7 @@ static int record__open(struct record *rec) > > evlist__for_each(evlist, pos) { > try_again: > - if (perf_evsel__open(pos, evlist->cpus, evlist->threads) < 0) { > + if (perf_evsel__open(pos, pos->cpus, pos->threads) < 0) { > if (perf_evsel__fallback(pos, errno, msg, sizeof(msg))) { > if (verbose) > ui__warning("%s\n", msg); > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c > index 8d00039..d51a520 100644 > --- a/tools/perf/util/evlist.c > +++ b/tools/perf/util/evlist.c > @@ -1181,6 +1181,10 @@ int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **e > if (evsel->filter == NULL) > continue; > > + /* > + * filters only work for tracepoint event, which doesn't have cpu limit. > + * So evlist and evsel should always be same. > + */ > err = perf_evsel__apply_filter(evsel, ncpus, nthreads, evsel->filter); > if (err) { > *err_evsel = evsel; >