From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAF9DC76191 for ; Fri, 26 Jul 2019 15:27:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 754EC22CBD for ; Fri, 26 Jul 2019 15:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154869; bh=MCUL7sTU/DfR1NNw9dpHQY2ENyUBKOeryycYkC5qzuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pBZSTf4Lt8wn/2wfJB+hN8N07Cnd03TvwqPAe6XYsW3tLHIw8LTm/I8s/jzuSZfrT fORrkmI2gBL9445Yas6UFKk1IFPJyxhb65RsAEB3GSLFkdhTA9j4hFRYgYYsA84ytK 2Sh7/ODgDVT8LLPh9j5vGr/lz7wa2omU9DGYedrM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388296AbfGZP1s (ORCPT ); Fri, 26 Jul 2019 11:27:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:42080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728599AbfGZP1q (ORCPT ); Fri, 26 Jul 2019 11:27:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E5033218D4; Fri, 26 Jul 2019 15:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154865; bh=MCUL7sTU/DfR1NNw9dpHQY2ENyUBKOeryycYkC5qzuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BffGdCM8BmRrr5F5hF9CHYLvTX2MZBpeEdUDf/xaAygwgeQi/Q/txMyx5uFZDE1c9 7YlscmgTLUL5FYZksv7pDc15Dg73oaOW16ydvBT9UZiHUukmRjl3ALltvTRd9Jl83R DRv1RaUBE3I24+qg1mS1NLi6Ebe0uZZXfwuDZw48= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Carrillo Cisneros , Song Liu , Arnaldo Carvalho de Melo , Andi Kleen , Jiri Olsa , Namhyung Kim , kernel-team@fb.com Subject: [PATCH 5.2 53/66] perf script: Assume native_arch for pipe mode Date: Fri, 26 Jul 2019 17:24:52 +0200 Message-Id: <20190726152307.658883500@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152301.936055394@linuxfoundation.org> References: <20190726152301.936055394@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Song Liu commit 9d49169c5958e429ffa6874fbef734ae7502ad65 upstream. In pipe mode, session->header.env.arch is not populated until the events are processed. Therefore, the following command crashes: perf record -o - | perf script (gdb) bt It fails when we try to compare env.arch against uts.machine: if (!strcmp(uts.machine, session->header.env.arch) || (!strcmp(uts.machine, "x86_64") && !strcmp(session->header.env.arch, "i386"))) native_arch = true; In pipe mode, it is tricky to find env.arch at this stage. To keep it simple, let's just assume native_arch is always true for pipe mode. Reported-by: David Carrillo Cisneros Signed-off-by: Song Liu Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: Jiri Olsa Cc: Namhyung Kim Cc: kernel-team@fb.com Cc: stable@vger.kernel.org #v5.1+ Fixes: 3ab481a1cfe1 ("perf script: Support insn output for normal samples") Link: http://lkml.kernel.org/r/20190621014438.810342-1-songliubraving@fb.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/builtin-script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3669,7 +3669,8 @@ int cmd_script(int argc, const char **ar goto out_delete; uname(&uts); - if (!strcmp(uts.machine, session->header.env.arch) || + if (data.is_pipe || /* assume pipe_mode indicates native_arch */ + !strcmp(uts.machine, session->header.env.arch) || (!strcmp(uts.machine, "x86_64") && !strcmp(session->header.env.arch, "i386"))) native_arch = true;