From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932658AbcETPFU (ORCPT ); Fri, 20 May 2016 11:05:20 -0400 Received: from mail.kernel.org ([198.145.29.136]:42184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbcETPFS (ORCPT ); Fri, 20 May 2016 11:05:18 -0400 Date: Fri, 20 May 2016 12:05:14 -0300 From: Arnaldo Carvalho de Melo To: Ingo Molnar , He Kuang Cc: linux-kernel@vger.kernel.org, Adrian Hunter , Alexander Shishkin , Alexei Starovoitov , Andi Kleen , Brendan Gregg , Chris Ryder , David Ahern , Ekaterina Tumanova , Frederic Weisbecker , Jiri Olsa , Josh Poimboeuf , Kan Liang , Mark Rutland , Masami Hiramatsu , Milian Wolff , Namhyung Kim , Pawel Moll , Pekka Enberg , Peter Zijlstra , Stephane Eranian , Sukadev Bhattiprolu , Thomas Gleixner , Vince Weaver , Wang Nan , Will Deacon , Zefan Li , Arnaldo Carvalho de Melo Subject: Re: [GIT PULL 00/11] perf/core improvements and fixes Message-ID: <20160520150514.GA8897@kernel.org> References: <1463696493-27528-1-git-send-email-acme@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1463696493-27528-1-git-send-email-acme@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, May 19, 2016 at 07:21:22PM -0300, Arnaldo Carvalho de Melo escreveu: > Hi Ingo, > > Please consider pulling, this is on top of my previous pull > request (perf-core-for-mingo-20160516). So, here is a new pull req, removing the following patch, due to that segfault you noticed while testing 'perf top' on an ubuntu system: > He Kuang (2): > perf tools: Find vdso supporting cross-platform analysis The new tag is perf-core-for-mingo-20160520. Kuang, Ingo proposed the patch below to fix the problem he noticed (notice the 'dso && ' part, as __dsos__find() may return NULL), but he had several other issues with code touched by this patch, I'll try to address those, please check the patch below and resubmit. - Arnaldo tools/perf/util/vdso.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c index 8f81c415723d..3a9321f83d00 100644 --- a/tools/perf/util/vdso.c +++ b/tools/perf/util/vdso.c @@ -293,12 +293,12 @@ static struct dso *machine__find_vdso(struct machine *machine, switch (dso_type) { case DSO__TYPE_32BIT: dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO32, true); - if (!dso) { - dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO, - true); - if (dso_type != dso__type(dso, machine)) - dso = NULL; - } + if (dso) + break; + + dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO, true); + if (dso && dso_type != dso__type(dso, machine)) + dso = NULL; break; case DSO__TYPE_X32BIT: dso = __dsos__find(&machine->dsos, DSO__NAME_VDSOX32, true);