From patchwork Fri Feb 15 00:45:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 158465 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp104016jaa; Thu, 14 Feb 2019 16:48:23 -0800 (PST) X-Google-Smtp-Source: AHgI3IZce/8MibGAGGnWVj/8z5VKcKhLTsF9pxForTconUlUgdKerj0PEFZzvWea8btXG7uvP3TF X-Received: by 2002:a17:902:e090:: with SMTP id cb16mr6989285plb.32.1550191703794; Thu, 14 Feb 2019 16:48:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550191703; cv=none; d=google.com; s=arc-20160816; b=PSaKMk0kWspa81I/IB7LnEBiBS5aSU7/BRqpLsci2YMhUtCcgOm5h3jHO91ibRBHGR rbHx1Hq4of/yZjhuSLMWwAoNsRcpQ2/5QwQdmkW+4/fuMKMwLZ2mMlsq5DUQdjnpJj06 EO9TH/iKuoIGw0oTSpIEWF0wpKr7ADVooxtF0GRRJI4v8Rsa05Al9nSBn3ioaXcVSvSO WuSgsDjAyQyzcYV8zc9mSR6U0ml3bjWzCGF8BbCXAGr3h7OXi3laUdHbBW8zsUiHmO/q Pdgmgq1oGeP45iGd40WZDOkxTTk7+f8LgJ80o/oE/jNK0VUgmTdbUWO0eO0e6rx/jhEo uIwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mAKqKCdIedvBU5z58Bx1wa3QWnWNhA22kc7xmYj+kzQ=; b=Zkg3HGhobeI4Ckb0nZetVBEB1lWgNn81EA2tKiMsw8c0ncF1iOLYvoifBpKho1EOUM bxJ9le26AhCPfffpgdgBYVrrXbEv3JJmEzqA/S5YfUhpxvEZBRoiGv0w8d1JvCd8K/JB MAj8PV6qIvTnlqqTW4OTH7UwFKdJEhzOfx6t7TmMhO+h7C9pPb/zy524LDInEtJxSqtq 2Ey0gMsbfnnhpF/TsHTthjg7RX5HYDHLfyUW4Ii7v7eyuw+MpI7wqAHV9vXR1NFELdEP X5StytGw9o3sEUnU2qQy06RsJwhvIB7PNNub/vYLPs6gAgUsUYETJHq5W/f75B1MJwSj LZGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FDWsvz9f; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z8si3595040pgv.204.2019.02.14.16.48.23; Thu, 14 Feb 2019 16:48:23 -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=@kernel.org header.s=default header.b=FDWsvz9f; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389607AbfBOAsW (ORCPT + 31 others); Thu, 14 Feb 2019 19:48:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:47406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730541AbfBOAsU (ORCPT ); Thu, 14 Feb 2019 19:48:20 -0500 Received: from quaco.ghostprotocols.net (unknown [189.40.103.31]) (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 3BEDC21B68; Fri, 15 Feb 2019 00:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550191699; bh=uluH9qSfxO6EQEq/VO78WgaeQTFAb4ZY5Ks+LwjnaMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDWsvz9feKOzTn+FMPbyrODlbK8NOBPudaX396ldiJbDkBmE5QBGdHb4joUgl6YV7 1U6Ayk2cglka4/1CMgFR9I0m723lXzR5TQYEvxJrXWYsYPyrMhJE2vtHdvOuhRj+dr pmRMnWXYiTA0Lz4gmjs70maH0eC7NofU319p+t3I= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Mathieu Poirier , Jiri Olsa , Leo Yan , Peter Zijlstra , Suzuki K Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 34/43] perf cs-etm: Modularize main packet processing loop Date: Thu, 14 Feb 2019 21:45:30 -0300 Message-Id: <20190215004539.23571-35-acme@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215004539.23571-1-acme@kernel.org> References: <20190215004539.23571-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathieu Poirier Making the main packet processing loop modular so that it can be called from different decoding context (timeless vs. non-timless), avoiding to repeat code. Signed-off-by: Mathieu Poirier Cc: Jiri Olsa Cc: Leo Yan Cc: Peter Zijlstra Cc: Suzuki K Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190212171618.25355-13-mathieu.poirier@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cs-etm.c | 129 ++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 57 deletions(-) -- 2.19.1 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index cfa686fe223e..f607bc58bd03 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1519,6 +1519,72 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq) return ret; } +static int cs_etm__process_decoder_queue(struct cs_etm_queue *etmq) +{ + int ret; + + /* Process each packet in this chunk */ + while (1) { + ret = cs_etm_decoder__get_packet(etmq->decoder, + etmq->packet); + if (ret <= 0) + /* + * Stop processing this chunk on + * end of data or error + */ + break; + + /* + * Since packet addresses are swapped in packet + * handling within below switch() statements, + * thus setting sample flags must be called + * prior to switch() statement to use address + * information before packets swapping. + */ + ret = cs_etm__set_sample_flags(etmq); + if (ret < 0) + break; + + switch (etmq->packet->sample_type) { + case CS_ETM_RANGE: + /* + * If the packet contains an instruction + * range, generate instruction sequence + * events. + */ + cs_etm__sample(etmq); + break; + case CS_ETM_EXCEPTION: + case CS_ETM_EXCEPTION_RET: + /* + * If the exception packet is coming, + * make sure the previous instruction + * range packet to be handled properly. + */ + cs_etm__exception(etmq); + break; + case CS_ETM_DISCONTINUITY: + /* + * Discontinuity in trace, flush + * previous branch stack + */ + 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; + } + } + + return ret; +} + static int cs_etm__run_decoder(struct cs_etm_queue *etmq) { int err = 0; @@ -1544,64 +1610,13 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) if (err) return err; - /* Process each packet in this chunk */ - while (1) { - err = cs_etm_decoder__get_packet(etmq->decoder, - etmq->packet); - if (err <= 0) - /* - * Stop processing this chunk on - * end of data or error - */ - break; + /* + * Process each packet in this chunk, nothing to do if + * an error occurs other than hoping the next one will + * be better. + */ + err = cs_etm__process_decoder_queue(etmq); - /* - * Since packet addresses are swapped in packet - * handling within below switch() statements, - * thus setting sample flags must be called - * prior to switch() statement to use address - * information before packets swapping. - */ - err = cs_etm__set_sample_flags(etmq); - if (err < 0) - break; - - switch (etmq->packet->sample_type) { - case CS_ETM_RANGE: - /* - * If the packet contains an instruction - * range, generate instruction sequence - * events. - */ - cs_etm__sample(etmq); - break; - case CS_ETM_EXCEPTION: - case CS_ETM_EXCEPTION_RET: - /* - * If the exception packet is coming, - * make sure the previous instruction - * range packet to be handled properly. - */ - cs_etm__exception(etmq); - break; - case CS_ETM_DISCONTINUITY: - /* - * Discontinuity in trace, flush - * previous branch stack - */ - 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; - } - } } while (etmq->buf_len); if (err == 0)