From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbcCAXcq (ORCPT ); Tue, 1 Mar 2016 18:32:46 -0500 Received: from mga11.intel.com ([192.55.52.93]:17551 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850AbcCAXcp (ORCPT ); Tue, 1 Mar 2016 18:32:45 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,524,1449561600"; d="scan'208";a="927468032" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH] perf, tools, stat: Avoid crash with --per-thread Date: Tue, 1 Mar 2016 15:32:37 -0800 Message-Id: <1456875157-23263-1-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Bug fix: The earlier metrics changes broke --per-thread causing a segfault. Handle this case correctly. We actually don't print metrics in per thread mode, so using a 0 shadow CPU is fine. Could be folded into "perf, tools, stat: Support metrics in --per-core/socket mode" Signed-off-by: Andi Kleen --- tools/perf/builtin-stat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index c11374b..52a37a5 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -977,6 +977,9 @@ static int first_shadow_cpu(struct perf_evsel *evsel, int id) { int i; + if (!aggr_get_id) + return 0; + if (stat_config.aggr_mode == AGGR_NONE) return id; -- 2.5.0