From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755576AbbIITzo (ORCPT ); Wed, 9 Sep 2015 15:55:44 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:59923 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbbIITuo (ORCPT ); Wed, 9 Sep 2015 15:50:44 -0400 From: Arnaldo Carvalho de Melo To: Kan Liang Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Borislav Petkov , David Ahern , Frederic Weisbecker , Namhyung Kim , Stephane Eranian , Wang Nan Subject: [PATCH 10/13] perf report: Do not blindly use env->cpu[al.cpu].socket_id Date: Wed, 9 Sep 2015 16:50:22 -0300 Message-Id: <1441828225-667-11-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1441828225-667-1-git-send-email-acme@kernel.org> References: <1441828225-667-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo As al.cpu may be -1, i.e. no PERF_SAMPLE_CPU, and env->cpu may be NULL. Rely instead on the work now done in perf_event__preprocess_sample(), that does all those checks. Reported-by: Wang Nan Based-on-a-patch-by: Jiri Olsa Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Kan Liang Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-2lw80g5ehsrec7tozhmnjgxw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 4b432453922f..9b5083630a56 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -150,7 +150,6 @@ static int process_sample_event(struct perf_tool *tool, .add_entry_cb = hist_iter__report_callback, }; int ret = 0; - struct perf_env *env = evsel->evlist->env; if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { pr_debug("problem processing %d event, skipping it.\n", @@ -158,9 +157,6 @@ static int process_sample_event(struct perf_tool *tool, return -1; } - /* read socket id from perf.data for perf report */ - al.socket = env->cpu[al.cpu].socket_id; - if (rep->hide_unresolved && al.sym == NULL) goto out_put; -- 2.1.0