From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbdBCTrL (ORCPT ); Fri, 3 Feb 2017 14:47:11 -0500 Received: from terminus.zytor.com ([65.50.211.136]:52742 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751154AbdBCTrK (ORCPT ); Fri, 3 Feb 2017 14:47:10 -0500 Date: Fri, 3 Feb 2017 11:46:47 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: a.p.zijlstra@chello.nl, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, jolsa@kernel.org, hpa@zytor.com In-Reply-To: <20170118051457.30946-1-namhyung@kernel.org> References: <20170118051457.30946-1-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf diff: Fix segfault on 'perf diff -o N' option Git-Commit-ID: 8381cdd0e32dd748bd34ca3ace476949948bd793 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: 8381cdd0e32dd748bd34ca3ace476949948bd793 Gitweb: http://git.kernel.org/tip/8381cdd0e32dd748bd34ca3ace476949948bd793 Author: Namhyung Kim AuthorDate: Wed, 18 Jan 2017 14:14:56 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 2 Feb 2017 11:39:04 -0300 perf diff: Fix segfault on 'perf diff -o N' option The -o/--order option is to select column number to sort a diff result. It does the job by adding a hpp field at the beginning of the sort list. But it should not be added to the output field list as it has no callbacks required by a output field. During the setup_sorting(), the perf_hpp__setup_output_field() appends the given sort keys to the output field if it's not there already. Originally it was checked by fmt->list being non-empty. But commit 3f931f2c4274 ("perf hists: Make hpp setup function generic") changed it to check the ->equal callback. Anyways, we don't need to add the pseudo hpp field to the output field list since it won't be used for output. So just skip fields if they have no ->color or ->entry callbacks. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Peter Zijlstra Fixes: 3f931f2c4274 ("perf hists: Make hpp setup function generic") Link: http://lkml.kernel.org/r/20170118051457.30946-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/hist.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 3738839..4ec79b2 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -560,6 +560,10 @@ void perf_hpp__setup_output_field(struct perf_hpp_list *list) perf_hpp_list__for_each_sort_list(list, fmt) { struct perf_hpp_fmt *pos; + /* skip sort-only fields ("sort_compute" in perf diff) */ + if (!fmt->entry && !fmt->color) + continue; + perf_hpp_list__for_each_format(list, pos) { if (fmt_equal(fmt, pos)) goto next;