From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758432AbbKHHbl (ORCPT ); Sun, 8 Nov 2015 02:31:41 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46040 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758413AbbKHHbg (ORCPT ); Sun, 8 Nov 2015 02:31:36 -0500 Date: Sat, 7 Nov 2015 23:31:22 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com, moagrawa@redhat.com, namhyung@kernel.org, mingo@kernel.org, jolsa@kernel.org, dsahern@gmail.com, tglx@linutronix.de Reply-To: tglx@linutronix.de, dsahern@gmail.com, jolsa@kernel.org, namhyung@kernel.org, mingo@kernel.org, moagrawa@redhat.com, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <1446462625-15807-1-git-send-email-jolsa@kernel.org> References: <1446462625-15807-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf sched latency: Fix thread pid reuse issue Git-Commit-ID: 0014de172d228e450377d1fd079d94e67128d27f 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: 0014de172d228e450377d1fd079d94e67128d27f Gitweb: http://git.kernel.org/tip/0014de172d228e450377d1fd079d94e67128d27f Author: Jiri Olsa AuthorDate: Mon, 2 Nov 2015 12:10:25 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 5 Nov 2015 12:51:00 -0300 perf sched latency: Fix thread pid reuse issue The latency subcommand holds a tree of working atoms sorted by thread's pid/tid. If there's new thread with same pid and tid, the old working atom is found and assert bug condition is hit in search function: thread_atoms_search: Assertion `!(thread != atoms->thread)' failed Changing the sort function to use thread object pointers together with pid and tid check. This way new thread will never find old one with same pid/tid. Link: http://lkml.kernel.org/n/tip-o4doazhhv0zax5zshkg8hnys@git.kernel.org Reported-by: Mohit Agrawal Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: David Ahern Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1446462625-15807-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-sched.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 0ee6d90..e3d3e32 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1203,12 +1203,13 @@ static void output_lat_thread(struct perf_sched *sched, struct work_atoms *work_ static int pid_cmp(struct work_atoms *l, struct work_atoms *r) { + if (l->thread == r->thread) + return 0; if (l->thread->tid < r->thread->tid) return -1; if (l->thread->tid > r->thread->tid) return 1; - - return 0; + return (int)(l->thread - r->thread); } static int avg_cmp(struct work_atoms *l, struct work_atoms *r)