From patchwork Mon Dec 18 18:17:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 122293 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3161730qgn; Mon, 18 Dec 2017 10:18:01 -0800 (PST) X-Google-Smtp-Source: ACJfBotdcxS71uMf1eZ6acyYJq+29rV3wQM/3yckmNC0ki+BFS8DkbyQSd53RjDlL88nq7nopSgc X-Received: by 10.84.240.203 with SMTP id l11mr537729plt.211.1513621081505; Mon, 18 Dec 2017 10:18:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513621081; cv=none; d=google.com; s=arc-20160816; b=a4kogWWPf8PpbvemwljDSyyWJX2QIwjNvgfynnkyE7LXG62p/Xxt9VkR5vRGP5Dccd gr1NDdfNLvHaWNgpEnnQ3WaGALQzLdV0PuVZxzcG7MLmbSu9BwnCT4jFi3j+KE1NyiXl HBG0SmSZM6dzKw1K3IzT/G/QI/MlkfBwr4K71qtObsg+pXUWssTHO04jH7vqwLN4G2yc Ui8PrkevvZ95jYi6EeLG4tLeJ6GlimXnDiU9nIpvj0Fw3wPOihJhY/Cm8ZomEAzNUE5R 4hU5aXCauJYcdhaAJECGdS9ghQjFyUpx8H7qL4Ds7S5qPQdc+dk7wypydxA0cAK+2QZs o4XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=YlP9NWPBRlKKBasox+E9SCaAdfwSqBcHLhwQkyD79Ng=; b=N4+qF3nC8Dv1ahJQgCBCOfQmioN8/VpPi+zNCeMISjWydysxmNp5a5SxVxedOiP60T bUMYbvUWJmiGBcimi2ByblpBNY8BZH36ZMyD+xFj89QZCer/mcggVErs2NwmVlYcfRoN IT2J2202wixwQqV0qHVkTT1IcBTrhOfC3B6hTA+2VAGwobSvvzKYux5FIpZR9Moyk0y+ 6qwbTIHNf2C0+BEXZtwaLY4Cq4Pwpko2oodMi6p5pTZEkmm6o8mQ7kq77XYr3FJLRQir Href/VnbHkzLARxljfDjjL9VSrKfBRbpRtOhvPKqXP2EKprAQms69qVCMwBDm9u65Op2 +IlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JAH/HP7o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v18si3234752pgb.303.2017.12.18.10.18.01; Mon, 18 Dec 2017 10:18:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JAH/HP7o; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937988AbdLRSR5 (ORCPT + 28 others); Mon, 18 Dec 2017 13:17:57 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:34862 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933364AbdLRSRx (ORCPT ); Mon, 18 Dec 2017 13:17:53 -0500 Received: by mail-it0-f66.google.com with SMTP id f143so28698145itb.0 for ; Mon, 18 Dec 2017 10:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=YlP9NWPBRlKKBasox+E9SCaAdfwSqBcHLhwQkyD79Ng=; b=JAH/HP7oOkAwcbFlMT5hpfZ7HOpPtajAkPSLCw8zMTL5bBPs0YigoIBVIa60ct0XIY aV7AfgpfdDxmHM7MbDAoc/b2zReRnkTtEMyxbX1//fT3ffY4e328bwl5feqGTWjfJeAR HdkD/gE3JGlPkGJA/SIyTWtPBiQMK6D9SA5Rs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YlP9NWPBRlKKBasox+E9SCaAdfwSqBcHLhwQkyD79Ng=; b=f5Adj61ohkxfrakT4grzZlsuoYEr9L7XJGk8FWVHgm3XOok4vj3Cd8v7v6VT8K3+48 0Ww4EWv6WcsXPiT6fXM5hgJ/qOuUghG5CkF1MC9PxJiK2FeX/zm2NFq3H07V/PPrJRc+ SYNmhiDKmOzXYRawOfAQ5+61DTo5exyn+zjnUdecsXL3i03tGEJl8t00kRInWeoZKrzi R5QjR+6ovq7B88XBlAuQ9IaCE3UNfcyi0Z5trjvs6tn7XBPJkmFLKP22yFd/Sty9ouhi vNyYTOrHT/uE2b2WruwnGnYjxeQPAyJT1TL7r5uvSLNhNATmJBgwEw1Lq2JIEaFaS6+Y hU/A== X-Gm-Message-State: AKGB3mIqFZS9MIudIgSDHQZ2cSYELmB8JViLl1Sn85u3Kly/Hp54yMwg tmu5zQIo/Yl9pSm3ExOARjExDg== X-Received: by 10.36.87.131 with SMTP id u125mr705344ita.45.1513621072724; Mon, 18 Dec 2017 10:17:52 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f11sm6612059iob.52.2017.12.18.10.17.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 10:17:51 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org, jolsa@redhat.com Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH v3] perf report: Fix regression when decoding intelPT traces Date: Mon, 18 Dec 2017 11:17:50 -0700 Message-Id: <1513621070-4799-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit (93d10af26bb7 perf tools: Optimize sample parsing for ordered events) breaks intelPT trace decoding by invariably returning an error if the event type isn't a PERF_SAMPLE_TIME. With this patch the timestamp is initialised and processing is allowed to continue if the error returned by function perf_evlist__parse_sample_timestamp() is not a fault. Signed-off-by: Mathieu Poirier --- Change for v3: - Fixed brain bug code spotted by Adrian. --- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 54e30f1bcbd7..07221884f725 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1508,10 +1508,10 @@ static s64 perf_session__process_event(struct perf_session *session, return perf_session__process_user_event(session, event, file_offset); if (tool->ordered_events) { - u64 timestamp; + u64 timestamp = -1ULL; ret = perf_evlist__parse_sample_timestamp(evlist, event, ×tamp); - if (ret) + if (ret && ret != -1) return ret; ret = perf_session__queue_event(session, event, timestamp, file_offset);