From patchwork Mon Jan 16 12:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 13102977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6524AC54EBE for ; Mon, 16 Jan 2023 12:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bLhdza3xAxdxUqCdKNEOrRLe+rf/jSaf6NTIcV2xxOc=; b=El7ppCqu6kwhWw 9asbGSC/o8AAuxVMlKw9fjZSS65LxqAkv3v7TMet20Q7x4wMjzbquM8NUVWJVSR3h4JIS66MYrveA qVR97HG+PooxjBeXyFPALm9GYT7CcYDYZYv80puqlDga7hOHNhsq6Ekbw/+GdreX4BPKjWQLSIgdg qinmm33RFYXshmdAPu6hbM5HUawlyQHnUtteCMr3Z+mFQE3SjAJ2PZv8lzBKMygw+P+e1cCHME5x5 kD+kHorHHQ/cjwO9syKoJJS2knVnzKXIYDqIkIvO4FQU1xYVyur4MRIxaoxbjBiiTYcU4S0UBnIEi PYgMIXk4IPj1XHlj8BoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHOyG-00AAvd-Jk; Mon, 16 Jan 2023 12:52:16 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHOvt-00A9iZ-AQ for linux-arm-kernel@lists.infradead.org; Mon, 16 Jan 2023 12:49:50 +0000 Received: by mail-wm1-x329.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso2165655wms.3 for ; Mon, 16 Jan 2023 04:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=yRqldm/FdfNyFbQj65h6UroAtQ4UGZzHEB+lTVOfKUo=; b=RTazewCDt7PYy4w/Wc5EYm3tsrt6KRpq2PkaAVUcWur8/UQtzYyyx+vg/1Ty6bkU6J rKXhstIpe7q7oRTp/E2S1u5RX8c9oRu1P9EWE9qVc6RY/9ARmVYwm9zbjOjfUzcw7M9L U+dkulDVVKrmO6k3lsDxZhkdnVUuOxiEHlYAoArnZ7AO/dDAw+UGI2Ywy2m9xesjdEdG jkCqpFDCT4uNcZB7aqya3x96sm5cYzXPMuPPiWTnuFmOEjLPCAOxal56mdUXfejySDnB Ppq+TWhoIC+TFHLruaIPKS4EdxuUnFe95o2F/Q5yKdpvOYbOrh4pPOYfiJ1UebTeqzEY lPnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yRqldm/FdfNyFbQj65h6UroAtQ4UGZzHEB+lTVOfKUo=; b=nzbMiRdB4juGkEjpTn6NKLR1/NP06EuPTFUx7fcPGsIpWz5cCXUBSddPqQhOinvXDI p8FV9Urb0zDS23MRgkKn3iwbAPu57pm8kO0nBK2OBxdtvRhs33bbQ/cPccT77vgJuK5V /byBFta6+CP7PgjoBD4xMhCRRmrHx4lppODo7rmY9+tutd7FUb6R2kIkipVtjv9x4zbT Cv9JymsYDzz0PDLeWtCEwSnGDc8iO5Wo/DNNudqmjYQws4HS2UdEH5u89ZCIx6hNI0r/ 4Nmu5N0XvxFSpqeFgs2pZTY95GaBLE7/Xzq8YJNNezyWaBr+CGm+oHMMdzipS8qXi4JM ubcQ== X-Gm-Message-State: AFqh2kq2lDo0axWrJjtIz6RAQECFIeV67EDdA2IFIHwvljXKj7v8oha7 OVmy1YmQ8hxRo1bZsLGvRez2FA== X-Google-Smtp-Source: AMrXdXs43SWhFn/7m7DB3+ZNzDpjKw8fEfKEbJIvF7MMXBjE24bq6qlX3joVhBO59EKBEtc41Glqcw== X-Received: by 2002:a05:600c:8505:b0:3da:f89:bc46 with SMTP id gw5-20020a05600c850500b003da0f89bc46mr15180383wmb.17.1673873388912; Mon, 16 Jan 2023 04:49:48 -0800 (PST) Received: from linaro.org ([2a00:23c5:6809:2201:6c91:710d:9433:e868]) by smtp.gmail.com with ESMTPSA id fl12-20020a05600c0b8c00b003dab40f9eafsm6896832wmb.35.2023.01.16.04.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:49:48 -0800 (PST) From: Mike Leach To: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: mathieu.poirier@linaro.org, suzuki.poulose@arm.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, linux-perf-users@vger.kernel.org, leo.yan@linaro.org, quic_jinlmao@quicinc.com, Mike Leach Subject: [PATCH v7 13/15] coresight: events: PERF_RECORD_AUX_OUTPUT_HW_ID used for Trace ID Date: Mon, 16 Jan 2023 12:49:26 +0000 Message-Id: <20230116124928.5440-14-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230116124928.5440-1-mike.leach@linaro.org> References: <20230116124928.5440-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230116_044949_416963_7D03C23F X-CRM114-Status: GOOD ( 13.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use the perf_report_aux_output_id() call to output the CoreSight trace ID and associated CPU as a PERF_RECORD_AUX_OUTPUT_HW_ID record in the perf.data file. Signed-off-by: Mike Leach Reviewed-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-etm-perf.c | 7 +++++++ include/linux/coresight-pmu.h | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index bdb9ab86173a..12fff661456e 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -4,6 +4,7 @@ * Author: Mathieu Poirier */ +#include #include #include #include @@ -448,6 +449,7 @@ static void etm_event_start(struct perf_event *event, int flags) struct perf_output_handle *handle = &ctxt->handle; struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu); struct list_head *path; + u64 hw_id; if (!csdev) goto fail; @@ -493,6 +495,11 @@ static void etm_event_start(struct perf_event *event, int flags) if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF)) goto fail_disable_path; + /* output cpu / trace ID in perf record */ + hw_id = FIELD_PREP(CS_AUX_HW_ID_VERSION_MASK, CS_AUX_HW_ID_CURR_VERSION); + hw_id |= FIELD_PREP(CS_AUX_HW_ID_TRACE_ID_MASK, coresight_trace_id_read_cpu_id(cpu)); + perf_report_aux_output_id(event, hw_id); + out: /* Tell the perf core the event is alive */ event->hw.state = 0; diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h index 624f4843453e..51ac441a37c3 100644 --- a/include/linux/coresight-pmu.h +++ b/include/linux/coresight-pmu.h @@ -7,6 +7,8 @@ #ifndef _LINUX_CORESIGHT_PMU_H #define _LINUX_CORESIGHT_PMU_H +#include + #define CORESIGHT_ETM_PMU_NAME "cs_etm" /* @@ -43,4 +45,16 @@ #define ETM4_CFG_BIT_RETSTK 12 #define ETM4_CFG_BIT_VMID_OPT 15 +/* + * Interpretation of the PERF_RECORD_AUX_OUTPUT_HW_ID payload. + * Used to associate a CPU with the CoreSight Trace ID. + * [07:00] - Trace ID - uses 8 bits to make value easy to read in file. + * [59:08] - Unused (SBZ) + * [63:60] - Version + */ +#define CS_AUX_HW_ID_TRACE_ID_MASK GENMASK_ULL(7, 0) +#define CS_AUX_HW_ID_VERSION_MASK GENMASK_ULL(63, 60) + +#define CS_AUX_HW_ID_CURR_VERSION 0 + #endif