From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759370AbcBYG1J (ORCPT ); Thu, 25 Feb 2016 01:27:09 -0500 Received: from torg.zytor.com ([198.137.202.12]:54856 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759264AbcBYG1F (ORCPT ); Thu, 25 Feb 2016 01:27:05 -0500 Date: Wed, 24 Feb 2016 21:38:44 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, andi@firstfloor.org, mingo@kernel.org, namhyung@kernel.org, peterz@infradead.org, hpa@zytor.com, dsahern@gmail.com, acme@redhat.com Reply-To: mingo@kernel.org, namhyung@kernel.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, andi@firstfloor.org, acme@redhat.com, dsahern@gmail.com In-Reply-To: <1456064558-13086-1-git-send-email-namhyung@kernel.org> References: <1456064558-13086-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix assertion failure on dynamic entry Git-Commit-ID: dd42baf1f64d7257258fa4f20064aee5160df369 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd42baf1f64d7257258fa4f20064aee5160df369 Gitweb: http://git.kernel.org/tip/dd42baf1f64d7257258fa4f20064aee5160df369 Author: Namhyung Kim AuthorDate: Sun, 21 Feb 2016 23:22:34 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 22 Feb 2016 12:07:14 -0300 perf tools: Fix assertion failure on dynamic entry The dynamic entry is created for each field in a tracepoint event. Since they have no fixed hpp format index, it should skip when perf_hpp__reset_width() is called. This caused following assertion failure.. $ perf record -e sched:sched_switch -a sleep 1 $ perf report -s comm,next_pid --stdio perf: ui/hist.c:651: perf_hpp__reset_width: Assertion `!(fmt->idx >= PERF_HPP__MAX_INDEX)' failed. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1456064558-13086-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/hist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 1ba4117..12223d7 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -645,6 +645,9 @@ void perf_hpp__reset_width(struct perf_hpp_fmt *fmt, struct hists *hists) if (perf_hpp__is_sort_entry(fmt)) return perf_hpp__reset_sort_width(fmt, hists); + if (perf_hpp__is_dynamic_entry(fmt)) + return; + BUG_ON(fmt->idx >= PERF_HPP__MAX_INDEX); switch (fmt->idx) {