From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932833AbcLGS03 (ORCPT ); Wed, 7 Dec 2016 13:26:29 -0500 Received: from terminus.zytor.com ([198.137.202.10]:53722 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932226AbcLGS01 (ORCPT ); Wed, 7 Dec 2016 13:26:27 -0500 Date: Wed, 7 Dec 2016 10:25:37 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: tglx@linutronix.de, minchan@kernel.org, hpa@zytor.com, jolsa@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org Reply-To: acme@redhat.com, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org, tglx@linutronix.de, minchan@kernel.org, hpa@zytor.com, jolsa@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <20161206034010.6499-4-namhyung@kernel.org> References: <20161206034010.6499-4-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf sched timehist: Handle zero sample->tid properly Git-Commit-ID: 5d92d96a947a5d0d83710d11750bb29a0c1b985d 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: 5d92d96a947a5d0d83710d11750bb29a0c1b985d Gitweb: http://git.kernel.org/tip/5d92d96a947a5d0d83710d11750bb29a0c1b985d Author: Namhyung Kim AuthorDate: Tue, 6 Dec 2016 12:40:03 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 7 Dec 2016 12:00:34 -0300 perf sched timehist: Handle zero sample->tid properly Sometimes samples have tid of 0 but non-0 pid. It ends up having a new thread of 0 tid/pid (instead of referring idle task) since tid is used to search matching task. But I guess it's wrong to use 0 as a tid when pid is set. This patch uses tid only if it has a non-zero value or same as pid (of 0). Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Minchan Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20161206034010.6499-4-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-sched.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 634d8cf..c8b3e6c 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -2118,7 +2118,9 @@ static struct thread *timehist_get_thread(struct perf_sched *sched, pr_err("Failed to get idle thread for cpu %d.\n", sample->cpu); } else { - thread = machine__findnew_thread(machine, sample->pid, sample->tid); + /* there were samples with tid 0 but non-zero pid */ + thread = machine__findnew_thread(machine, sample->pid, + sample->tid ?: sample->pid); if (thread == NULL) { pr_debug("Failed to get thread for tid %d. skipping sample.\n", sample->tid);