From patchwork Wed Jan 10 20:31:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 124132 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp2084229edr; Wed, 10 Jan 2018 12:38:51 -0800 (PST) X-Google-Smtp-Source: ACJfBosEzhi1fXyOc21A4juLA1OF4jeaSOL+NmcTITfHGb2SRTW6tXS8QlYGyIpEGr1qoCf2D++t X-Received: by 10.101.75.204 with SMTP id p12mr15573460pgr.18.1515616731267; Wed, 10 Jan 2018 12:38:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515616731; cv=none; d=google.com; s=arc-20160816; b=nS/X/vCQCWEQgMUX+7MgsCOUnXDdDrDMaPbEP589WOeQQvVZuoSc7WrLl9NZmx1yk9 770xHtApQQ1qenQ6LFsJx0xETqhDUKl1DTHKMWbYxHMHvbkY92EvOhr9DXV6rb4rFWGM MCFAEpOfl4PgzNuWqXEP4iNwNPxE7kupGdwYWPhqrsPUoDEPXB1w+9op6qwNKtXbL3gw HH2BgFkGlxtyT9bzgAb5Yjt5L52zCXdv3aYj/qagX3bTDZTEBzBdhhPTMQhjxy0K5rwl os9pLwwViA7Z9nUxsKUs1kL16woMKqx2MzuESPPO/f5TOifdbW45N/+l0wnDLViJbNOx 0BgA== 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=X/6PGtRK89+7XlZK7OmxYQXnfaxZTzviYqBLDkOhShA=; b=ZbEP3yeX3rBClpqOuPqCiFbYrJ1aq2KAF64mCq7p4X/JGqWtCAyFhiUbSmxDzjRcAo 4RUJC1gONfBEiFFEl6YGBARO4ru6MmC7fZxqS6JKEG9Vt04U2/XeJX9SXzSTrzrbb78q rhn5H9X/M9KjJi9I5AobZSvMWunsGFLA9LJ/AFMNsUbFsZqwYRi6e8CHlFLVlsesks5t 9dkldltQh+QsZvssTyJ0dqVJT3P6CQj8m/Pbkx6WOGCfA4r6E+OWhgNC7AEGYV/SrGzV Tvvhqg0LOfhQNFTy7IFS5qsttW4X2XUz/F/eFrE7roBc+diLsPxrTG0NJfqR4HXePW9c Mdew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SmRHLT1J; 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 i2si3082233pfd.57.2018.01.10.12.38.51; Wed, 10 Jan 2018 12:38:51 -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=SmRHLT1J; 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 S1752434AbeAJUit (ORCPT + 28 others); Wed, 10 Jan 2018 15:38:49 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:45566 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbeAJUir (ORCPT ); Wed, 10 Jan 2018 15:38:47 -0500 Received: by mail-it0-f67.google.com with SMTP id x42so926519ita.4 for ; Wed, 10 Jan 2018 12:38:46 -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=X/6PGtRK89+7XlZK7OmxYQXnfaxZTzviYqBLDkOhShA=; b=SmRHLT1JXuKhwhRKI0LLaEbnuS9iyln8rQrjCwprPOPWnGR95qLCb0r50XQaZTnFNi W2gTdyxzZOPZHy3L4TGwUsobS51N409OqwBKdR2U07X//veU/WARqVKDgdEJqKDyPZI0 RMQ3p0X3XSoQvIzW2PXaP/ZjoYhvx5ZuF5PWA= 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=X/6PGtRK89+7XlZK7OmxYQXnfaxZTzviYqBLDkOhShA=; b=OUshEwt5IlKhqAOfR/tkP0r1GTZkxSEov/fng53DT2RYX4wVvhOTZFGtrLWTEi14Nz JhYPBVF8D/sCv8BsZS7K+2AZz/a/uRVHMurlgT+0j92+fIOtez8ANyGHee2Nixc7UatW goR22uEJ7WI2DS1FiSK1iE8igujJtrp6bara8WW+rwtEZfpWU8zppCIFQNtbG2Zq0/4m 9OuljU0kRS9hzTiVX/P/ii6GPiEo/0cv3JYpsd5iUDJcdgu3c+rtr9QrtwNJlnKoARt7 FtJbR12l3wWzfSNxlZ+oDNyJvHpkxUjt4gJ73y0gGzQlPOwxo3wxGx8HIKoB4yU6ZGjf Aaqg== X-Gm-Message-State: AKGB3mLBFPTuRyTfI2oajZlj9PRfu1th7j3Bs5PP5XLLcotG8kEKl++l dcNKMlicydPZu34gFqHlj9efAg== X-Received: by 10.36.227.76 with SMTP id d73mr13247265ith.26.1515616315924; Wed, 10 Jan 2018 12:31:55 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m63sm10337711itm.12.2018.01.10.12.31.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 12:31:54 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org Cc: jolsa@redhat.com, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH v4] perf report: Fix regression when decoding intelPT traces Date: Wed, 10 Jan 2018 13:31:52 -0700 Message-Id: <1515616312-27645-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 Acked-by: Jiri Olsa --- Changes for v4: - Rebased to latest perf/core branch - Added Jiri's ACK --- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 Acked-by: Adrian Hunter 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);