From patchwork Wed Jul 11 07:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 141685 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4803684ljj; Wed, 11 Jul 2018 00:46:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdLFFarNT4P/cOSlQstPOZS+L6vFXvR+hAzcLM5Mpt1DgDdtIcPQ/jffKcNRyfvekzVzhpJ X-Received: by 2002:a63:5c52:: with SMTP id n18-v6mr25236278pgm.360.1531295199537; Wed, 11 Jul 2018 00:46:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531295199; cv=none; d=google.com; s=arc-20160816; b=akohDoU5g8FlZvIInNCSNHhrJBRVZBOZgQWtHhSq0ZHlPM2N/xBoUIbRGHH02hcWJt nFm+H3fPa3NriyT+63RITjUiihYGpwp6UjC53A7xIq0kjl8gMLtVGlK8ynx4ER4vCush r5SVNcItxK2aFD3kaSDYoJo3CqE4aCdEOgPkODElcnwyhRjLuoCw0WcZ2d07xNo/oJzu ln2m0M/40Qu/cBpFEWcMdpEGPJvz71RZRJqE5ofBhBHMIGqbCeYE0FatKej9Biv/HPyN 2A4rf+0YQLJF+2Njsht6xWi02xYtbY48arNXlgLBDVzf7Iwp0PBh9qIl34k7e6s2wc6L erTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=nbQNDlVOGZy2QG4EsYIlFoYPd9+L5V/lXajEoE4/YUc=; b=cNGsI7mVVUqPQjFaukHiwObDCV9aejt5Yr2xryPAgWIQ8h1X52/kQyJcYgsjsMI9kw hDZKuCsPzKS2RvOK6auhzO/IxzKDokLznJ8QV7glUBAJsie6UEYU1LzuxQWNsn9Sn8ku GxBuwi1KPCgd1YBOo5i2bNbK9bEPM6xB1X1j0vZJHFFF0/Mgan9Cecn0P/8eZYJEd5RG C0RLHEJWw23lWlM8g8jnoDp+5IVfwdg/TAhBLo7cTVajuRRuzTw8OGWkVb8IcwXfWB0G +wv5+eTPXbtzYPMwxK4IiWVvWHdZtF2iF2TXyxjZyyTU0y5MJ1NoiYe0vDKSIhIZFp9G tYqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dtcGRB6h; 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 d11-v6si18314595pll.255.2018.07.11.00.46.39; Wed, 11 Jul 2018 00:46:39 -0700 (PDT) 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=dtcGRB6h; 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 S1726803AbeGKHte (ORCPT + 22 others); Wed, 11 Jul 2018 03:49:34 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:39531 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbeGKHte (ORCPT ); Wed, 11 Jul 2018 03:49:34 -0400 Received: by mail-pl0-f68.google.com with SMTP id s24-v6so8809272plq.6 for ; Wed, 11 Jul 2018 00:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nbQNDlVOGZy2QG4EsYIlFoYPd9+L5V/lXajEoE4/YUc=; b=dtcGRB6hcydihMoQVZY0RMpBmfyAotIfsyezFIcF054L0tdbd2UZCDdD0R071SnLwj +5atqBg/hulDdnSS5VbYCae5BrKzalC8tMAvU64cZ10rqJf7cJpj4zlVj9XgJP4CuWeZ OajHpvk9idG9XPyFCzfyyLo9OMzuIYtUna7p8= 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:in-reply-to :references; bh=nbQNDlVOGZy2QG4EsYIlFoYPd9+L5V/lXajEoE4/YUc=; b=X8kZaT+7BNbpt0akbMHKcrYhMNz7adosEshSJRVBA8GC364moeZywP+UXS468GOg0Y KxP9M9NxfJkdpdA7YspUA+rprygFCZseizmkaP7za45C5YSkgwbJylP1bHl2X0Eoj+Zx V6qgL/Sw8eX6qJae+Tx9pDsjdsk/Fg3usyB3FjdtB2eXdUfzP+giqPJ0ePBQo+69mw11 LLRHC8DrOMBgypyVhrqnnPx5qy2zgLt+Xpv81ckAKA5UbLefpNn4Z6LKLjtUaYsLGlBd tIKpeyCksP6BYRfeQpoMa8wrP5lah6r9NZgvHnU/cqmwdKPsqtEGPoUMSf+9bm4092zP XFBA== X-Gm-Message-State: APt69E0EEyT63F36az5M7eYFBaQ3GkP3vF2fViDFjMzpBpKyPP/1/QF5 9c/prrWQxhTDLi7p8vjm9IXtcA== X-Received: by 2002:a17:902:600d:: with SMTP id r13-v6mr27952076plj.70.1531295196100; Wed, 11 Jul 2018 00:46:36 -0700 (PDT) Received: from localhost.localdomain (li1192-169.members.linode.com. [45.79.93.169]) by smtp.gmail.com with ESMTPSA id 16-v6sm9260374pfp.6.2018.07.11.00.46.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Jul 2018 00:46:35 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mike Leach , Robert Walker , Kim Phillips Cc: Leo Yan Subject: [PATCH v2 3/6] perf cs-etm: Fix start tracing packet handling Date: Wed, 11 Jul 2018 15:45:42 +0800 Message-Id: <1531295145-596-4-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531295145-596-1-git-send-email-leo.yan@linaro.org> References: <1531295145-596-1-git-send-email-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Usually the start tracing packet is a CS_ETM_TRACE_ON packet, this packet is passed to cs_etm__flush(); cs_etm__flush() will check the condition 'prev_packet->sample_type == CS_ETM_RANGE' but 'prev_packet' is allocated by zalloc() so 'prev_packet->sample_type' is zero in initialization and this condition is false. So cs_etm__flush() will directly bail out without handling the start tracing packet. This patch is to introduce a new sample type CS_ETM_EMPTY, which is used to indicate the packet is an empty packet. cs_etm__flush() will swap packets when it finds the previous packet is empty, so this can record the start tracing packet into 'etmq->prev_packet'. Reviewed-by: Mathieu Poirier Signed-off-by: Leo Yan --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 1 + tools/perf/util/cs-etm.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h index 743f5f4..612b575 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h @@ -23,6 +23,7 @@ struct cs_etm_buffer { }; enum cs_etm_sample_type { + CS_ETM_EMPTY = 0, CS_ETM_RANGE = 1 << 0, CS_ETM_TRACE_ON = 1 << 1, }; diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 8b2c099..ae7c9c88 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -924,8 +924,14 @@ static int cs_etm__flush(struct cs_etm_queue *etmq) int err = 0; struct cs_etm_packet *tmp; + if (!etmq->prev_packet) + return 0; + + /* Handle start tracing packet */ + if (etmq->prev_packet->sample_type == CS_ETM_EMPTY) + goto swap_packet; + if (etmq->etm->synth_opts.last_branch && - etmq->prev_packet && etmq->prev_packet->sample_type == CS_ETM_RANGE) { /* * Generate a last branch event for the branches left in the @@ -944,6 +950,10 @@ static int cs_etm__flush(struct cs_etm_queue *etmq) etmq->period_instructions = 0; + } + +swap_packet: + if (etmq->etm->synth_opts.last_branch) { /* * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for * the next incoming packet. @@ -1023,6 +1033,13 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) */ cs_etm__flush(etmq); break; + case CS_ETM_EMPTY: + /* + * Should not receive empty packet, + * report error. + */ + pr_err("CS ETM Trace: empty packet\n"); + return -EINVAL; default: break; }