From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19898C433DB for ; Sat, 6 Feb 2021 15:10:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D357D64E39 for ; Sat, 6 Feb 2021 15:10:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D357D64E39 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kNb2v5DXIjr6XfPpCVcbKJavNh0O+Px113jTcFLIFAM=; b=YP92V3LISyektca28DJwj8WqR k9rw2+m8lHNrCnmjsjISmKvWYVIt8krVRr5qYAQeTLqOEtdJpwJr50v76AlTHMQ5kDHsUlj2UeF76 YSUtJ6c3oIZLnlKlYZVGCdGgdR2Ygvz48keE/4pupTuy9E6R4B42WYKhFRRo7u3BujCRq2svmz9s3 mrWlYck0bTUx3eidlJtAPvzx9d58YjqgFn2NBMqec7BgeHbXz5iFuni1IKa8n0My9NcoM3gC98XdG eGAKLVY3I4mHtk/esH+yRPz5TpNCqSd2+6BRvrw82/PRJ0b6N8epdcaMVIO29p80jlXKO4TZ9B8To RzAg6ncXA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8PDA-0001GT-5R; Sat, 06 Feb 2021 15:09:24 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8PCn-00016r-SG for linux-arm-kernel@lists.infradead.org; Sat, 06 Feb 2021 15:09:05 +0000 Received: by mail-pg1-x530.google.com with SMTP id r38so6651942pgk.13 for ; Sat, 06 Feb 2021 07:09:01 -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 :mime-version:content-transfer-encoding; bh=Ky9/mb+HYy0WWl4mxlZ9J0RrhFZHwnjADbosyVIjsYk=; b=HlpA5GEVcrMJGPrmuM6bPK1RvfP8Fk+fycR62dEsBdXF53pY6j+1Sb5/XS92AH5O5J JS31C7oNrg1+xshAkDnrCGXJVOL6dSue/ewTIRfCfrblnpreLzYx+804qZRIXHvvSmH4 RPCaFIT9MIqlND2oO9WkqTnC1v7N+qfHQLJlTC5lqg6r9XDlpi6ytLo5mQtmCtUWRmLf pJYj0lks3nNgc3rGpLArT1S5IA2koPGBxqL2Gm1n25i1LxDNZNlckpZ9rrVw11WTSLbh ZLXwCx8ixCFAHdWz4GgAYkIrAejnUTJxIqDUd2PWa4KetiujY3DB3hVuN+0d7XGqM2DM +g3g== 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:mime-version:content-transfer-encoding; bh=Ky9/mb+HYy0WWl4mxlZ9J0RrhFZHwnjADbosyVIjsYk=; b=l9ochkN5FuetRZ479W4GcCuh/ydemOaT/XKIZChn64uwWs4llmfXf471oCVqQ8/7J7 Zi2uHb5zuLlfffIc4K8PLALaJ/tj6lvA2PoegBdX6D/OM30aGmhKR51tiCt97Iadlgt4 vEq9VvfjcvPI5S3oyU/yINAOwIYsCezlzwyvFF3jzZtyNQIDw8VL+6x+NQADeDDkDEqh BkJrbMfitGNaByO7pMkkpIwgylBIgz6s4rOTAuErYAT5sZVWdar5gv0Z8BjcTZrOTACD m1FElG5ryz21Po/ehmqvdouHP6liqRvm0MUFz7rceDBPww3hwzDBZGdFeRFpFnP27iUi /gzQ== X-Gm-Message-State: AOAM5310BybWV0VUKT+MEn3tGECCjcIbsLaOBhdsz9IL9O+jXgjkVn9f 3ohR/5Ihjh9Mx2oqOpDAZy6swg== X-Google-Smtp-Source: ABdhPJwbIxytbPlNskRr/JQoUDuGlqZ2DeCf+fQ8vnx5N4pgtsmSEDNr9ySkEA475x0amn6l6LzwUw== X-Received: by 2002:aa7:91cf:0:b029:1cb:1c6f:b77d with SMTP id z15-20020aa791cf0000b02901cb1c6fb77dmr9817288pfa.74.1612624139977; Sat, 06 Feb 2021 07:08:59 -0800 (PST) Received: from localhost ([45.137.216.202]) by smtp.gmail.com with ESMTPSA id t1sm3560253pfl.194.2021.02.06.07.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Feb 2021 07:08:59 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Jonathan Corbet , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Mark Rutland , Jiri Olsa , Namhyung Kim , Daniel Kiss , Denis Nikitin , Al Grant , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/8] perf cs-etm: Add helper cs_etm__get_pid_fmt() Date: Sat, 6 Feb 2021 23:08:31 +0800 Message-Id: <20210206150833.42120-7-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210206150833.42120-1-leo.yan@linaro.org> References: <20210206150833.42120-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_100902_019333_5820E09D X-CRM114-Status: GOOD ( 18.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch adds helper function cs_etm__get_pid_fmt(), by passing parameter "traceID", it returns the PID format. Signed-off-by: Leo Yan --- tools/perf/util/cs-etm.c | 42 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/cs-etm.h | 1 + 2 files changed, 43 insertions(+) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index a2a369e2fbb6..b9c1d329a7f1 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -156,6 +157,47 @@ int cs_etm__get_cpu(u8 trace_chan_id, int *cpu) return 0; } +/* + * The returned PID format is presented by two bits: + * + * Bit ETM_OPT_CTXTID: CONTEXTIDR or CONTEXTIDR_EL1 is traced; + * Bit ETM_OPT_CTXTID2: CONTEXTIDR_EL2 is traced. + * + * It's possible that the two bits ETM_OPT_CTXTID and ETM_OPT_CTXTID2 + * are enabled at the same time when the session runs on an EL2 kernel. + * This means the CONTEXTIDR_EL1 and CONTEXTIDR_EL2 both will be + * recorded in the trace data, the tool will selectively use + * CONTEXTIDR_EL2 as PID. + */ +int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt) +{ + struct int_node *inode; + u64 *metadata, val; + + inode = intlist__find(traceid_list, trace_chan_id); + if (!inode) + return -EINVAL; + + metadata = inode->priv; + + if (metadata[CS_ETM_MAGIC] == __perf_cs_etmv3_magic) { + val = metadata[CS_ETM_ETMCR]; + /* CONTEXTIDR is traced */ + if (val & BIT(ETM_OPT_CTXTID)) + *pid_fmt = BIT(ETM_OPT_CTXTID); + } else { + val = metadata[CS_ETMV4_TRCCONFIGR]; + /* CONTEXTIDR_EL2 is traced */ + if (val & (BIT(ETM4_CFG_BIT_VMID) | BIT(ETM4_CFG_BIT_VMID_OPT))) + *pid_fmt = BIT(ETM_OPT_CTXTID2); + /* CONTEXTIDR_EL1 is traced */ + else if (val & BIT(ETM4_CFG_BIT_CTXTID)) + *pid_fmt = BIT(ETM_OPT_CTXTID); + } + + return 0; +} + void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, u8 trace_chan_id) { diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index 4ad925d6d799..7cc3bba0017d 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -173,6 +173,7 @@ struct cs_etm_packet_queue { int cs_etm__process_auxtrace_info(union perf_event *event, struct perf_session *session); int cs_etm__get_cpu(u8 trace_chan_id, int *cpu); +int cs_etm__get_pid_fmt(u8 trace_chan_id, u64 *pid_fmt); int cs_etm__etmq_set_tid(struct cs_etm_queue *etmq, pid_t tid, u8 trace_chan_id); bool cs_etm__etmq_is_timeless(struct cs_etm_queue *etmq); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel