From patchwork Wed Jan 17 17:52:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 124894 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp131579lja; Wed, 17 Jan 2018 09:52:46 -0800 (PST) X-Google-Smtp-Source: ACJfBotjShv8oKeqrgq41OaJI9lSH2PS0EKues4ohf9O/l41NKvNBNDHSVP6Yjys/szsMfkXV3RF X-Received: by 10.99.120.203 with SMTP id t194mr7691079pgc.39.1516211566320; Wed, 17 Jan 2018 09:52:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516211566; cv=none; d=google.com; s=arc-20160816; b=f4um2GzfXy5EjR6i+iSslsORuXyrX+qAMkCUWvpHcyPGDTuvFZLHNy3/2Mfug0Ncb1 ja+l8TbBwGPK30it76gbr5Ge8EFr0pw7u6fII0CPiRoa3U8jh0Qc+pLNbm7qBneAeyA2 qZYYvsmEuO/RcbLANY0JJdcO2Vl7bjPXL2v6DU9aWXk0PXSxoOj3fHp7laXfLrzEPSHO B9LFM5ETHAXyo+UR+989n/aR4hu2hderurD8Lmf3eISfP6WLAEHAjx40aiOjA9yH3Crt APg3VvA+fEAhy6MEz2lFM8Oc2tJhGYgiyiRUSkAeTxS31+Aw0GN9K17To9TL/KWm5nwh OIBA== 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=/ZMSClb7LNeJt9fnv4WSWglgut3CZtYd6v/jP/IUU9w=; b=ftsm+k3m4CVhL04P6fzJmkwYy+M2xUXq7EFCxHFnkTVrl3N3gSgG5O6WjXcXzbyai9 zSfcq91p7AdJOxISQKl1FyVqm5xgkIixbIP4HR6hZhLtv9mxKLc/YqykeVa6p2gh8Kxy fSypDdmP4YB53/Qe7rOKvdAHaoZ5ki7HC2zmG1f1lHOmccvqamCcyp7ImyhjF7/wEVJw qtPfVS4oOyGUyiyyQRUsH71qVOqBsUZPi0CTMsRBFNCRa5EfLyV2xKPDjTIb8jVfLA94 sbokpxfXld5cEyE5MClWZ8CKn1O+BN+ywW778kPiXDMapqF3n+Wq9xnYoqzv5bdCRbTY 1YvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RkYR82if; 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 m64si4278678pgm.88.2018.01.17.09.52.45; Wed, 17 Jan 2018 09:52:46 -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=RkYR82if; 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 S1754482AbeAQRwn (ORCPT + 28 others); Wed, 17 Jan 2018 12:52:43 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:46934 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754432AbeAQRwi (ORCPT ); Wed, 17 Jan 2018 12:52:38 -0500 Received: by mail-it0-f66.google.com with SMTP id c16so10187451itc.5 for ; Wed, 17 Jan 2018 09:52:37 -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:in-reply-to:references; bh=/ZMSClb7LNeJt9fnv4WSWglgut3CZtYd6v/jP/IUU9w=; b=RkYR82ifdLKCrUBQwY8ytfrBAjwoVSczG27OE51wfMHsTlthy/UvW+QmtzoYFpTlzS qAe41ThRxzwDBt8mxrbl4LWE0GDMUhwkkPTGv8blKiJMOn8hNl+34752ZmcCSpOzWonn 2sG9nWWVbkCAmu7crU6QrQekPWdNiY2asXKNI= 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=/ZMSClb7LNeJt9fnv4WSWglgut3CZtYd6v/jP/IUU9w=; b=U31Zrn24Pf2FY7zdwDUruJ5kfEau1+V6z9Um74qpx1hsk58xCl9lEBJpZhgupozsfN 1fjTKYKK8ZeGlM5P1zKqtXOkWWeZPbl1rnTBFo4XBcU8jhy4+5Mr7/M7GeX1cFs5yrJn Q9xUHKbzYYIbgSF/9SPuJsgWlaf4qLUDYjDWt+ADp752NGtdDnLS0EVQ+CZPE64FjdpJ VaQ1t+SAQRJr4ahBC11ilaHHZy2YWxYyUW0ReJtqyTPVXnGVXu15MMt8uH7W+Jr8t9wz UbE8iJLaiJW/5OteK1WYAqAfkMwGpboftwNKi6CeHX7mVnLhI96ufB+OyEbID6LIwVpO MTBg== X-Gm-Message-State: AKwxytdt0qExkxxAKZV5LqmNRLH6x4w0Sfw1aC6c/pTyjxbJUR8yo2nT MeoKEUgCx4+T4Kj0fG5SruKxGixbNks= X-Received: by 10.36.118.77 with SMTP id z74mr22715404itb.37.1516211557215; Wed, 17 Jan 2018 09:52:37 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id h72sm2694392ioe.61.2018.01.17.09.52.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jan 2018 09:52:36 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, adrian.hunter@intel.com, mike.leach@arm.com, suzuki.poulosi@arm.com, jolsa@redhat.com, kim.phillips@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 06/10] perf tools: Add functionality to communicate with the openCSD decoder Date: Wed, 17 Jan 2018 10:52:15 -0700 Message-Id: <1516211539-5166-7-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516211539-5166-1-git-send-email-mathieu.poirier@linaro.org> References: <1516211539-5166-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds functions to communicate with the openCSD trace decoder, more specifically to access program memory, fetch trace packets and reset the decoder. Co-authored-by: Tor Jeremiassen Signed-off-by: Mathieu Poirier --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 60 +++++++++++++++++++++++++ tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 9 ++++ 2 files changed, 69 insertions(+) -- 2.7.4 diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index 57b020b0b36f..1fb01849f1c7 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -45,6 +45,66 @@ struct cs_etm_decoder { struct cs_etm_packet packet_buffer[MAX_BUFFER]; }; +static u32 +cs_etm_decoder__mem_access(const void *context, + const ocsd_vaddr_t address, + const ocsd_mem_space_acc_t mem_space __maybe_unused, + const u32 req_size, + u8 *buffer) +{ + struct cs_etm_decoder *decoder = (struct cs_etm_decoder *) context; + + return decoder->mem_access(decoder->data, + address, + req_size, + buffer); +} + +int cs_etm_decoder__add_mem_access_cb(struct cs_etm_decoder *decoder, + u64 start, u64 end, + cs_etm_mem_cb_type cb_func) +{ + decoder->mem_access = cb_func; + + if (ocsd_dt_add_callback_mem_acc(decoder->dcd_tree, start, end, + OCSD_MEM_SPACE_ANY, + cs_etm_decoder__mem_access, decoder)) + return -1; + + return 0; +} + +int cs_etm_decoder__reset(struct cs_etm_decoder *decoder) +{ + ocsd_datapath_resp_t dp_ret; + + dp_ret = ocsd_dt_process_data(decoder->dcd_tree, OCSD_OP_RESET, + 0, 0, NULL, NULL); + if (OCSD_DATA_RESP_IS_FATAL(dp_ret)) + return -1; + + return 0; +} + +int cs_etm_decoder__get_packet(struct cs_etm_decoder *decoder, + struct cs_etm_packet *packet) +{ + if (!decoder || !packet) + return -EINVAL; + + /* Nothing to do, might as well just return */ + if (decoder->packet_count == 0) + return 0; + + *packet = decoder->packet_buffer[decoder->head]; + + decoder->head = (decoder->head + 1) & (MAX_BUFFER - 1); + + decoder->packet_count--; + + return 1; +} + static void cs_etm_decoder__gen_etmv4_config(struct cs_etm_trace_params *params, ocsd_etmv4_cfg *config) { 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 a1e9b0ac5965..3d2e6205d186 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h @@ -93,4 +93,13 @@ cs_etm_decoder__new(int num_cpu, void cs_etm_decoder__free(struct cs_etm_decoder *decoder); +int cs_etm_decoder__add_mem_access_cb(struct cs_etm_decoder *decoder, + u64 start, u64 end, + cs_etm_mem_cb_type cb_func); + +int cs_etm_decoder__get_packet(struct cs_etm_decoder *decoder, + struct cs_etm_packet *packet); + +int cs_etm_decoder__reset(struct cs_etm_decoder *decoder); + #endif /* INCLUDE__CS_ETM_DECODER_H__ */