From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100AbbK0HoV (ORCPT ); Fri, 27 Nov 2015 02:44:21 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42375 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbbK0HoR (ORCPT ); Fri, 27 Nov 2015 02:44:17 -0500 Date: Thu, 26 Nov 2015 23:43:29 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: namhyung@kernel.org, fweisbec@gmail.com, wangnan0@huawei.com, mingo@kernel.org, acme@redhat.com, kan.liang@intel.com, jolsa@redhat.com, a.p.zijlstra@chello.nl, andi@firstfloor.org, tglx@linutronix.de, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: a.p.zijlstra@chello.nl, andi@firstfloor.org, kan.liang@intel.com, jolsa@redhat.com, acme@redhat.com, mingo@kernel.org, wangnan0@huawei.com, fweisbec@gmail.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1448521700-32062-1-git-send-email-namhyung@kernel.org> References: <1448521700-32062-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Fix freeze on --call-graph flat/folded Git-Commit-ID: 0356218a68551f051998f4fb5074a1eed7a346fe 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: 0356218a68551f051998f4fb5074a1eed7a346fe Gitweb: http://git.kernel.org/tip/0356218a68551f051998f4fb5074a1eed7a346fe Author: Namhyung Kim AuthorDate: Thu, 26 Nov 2015 16:08:18 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 26 Nov 2015 13:32:08 -0300 perf top: Fix freeze on --call-graph flat/folded The callchain rbtree is rebuilt periodically, so it needs to reinitialize the root everytime. Otherwise it can be stuck in the rbtree insertion with stale pointers. Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Kan Liang Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1448521700-32062-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/callchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index fc3b1e0..564377d 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -290,6 +290,7 @@ static void sort_chain_flat(struct rb_root *rb_root, struct callchain_root *root, u64 min_hit, struct callchain_param *param __maybe_unused) { + *rb_root = RB_ROOT; __sort_chain_flat(rb_root, &root->node, min_hit); }