From nobody Mon Dec 1 21:31:20 2025 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3756335BBB for ; Mon, 1 Dec 2025 16:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764607313; cv=none; b=gKtonTJ6xbj9YL06HhwxhswJK0GFgUtfk0zCFjzytVII51D1IRTklpc3jgQJGf5/0TfhCmZM/OUqu7ifX/lg0jzm/E89n0J3WMFrzeeUuqF4EJ/ntqJNDT1LU+30mux4kDYbmf6z3d+K+0nZw2HMw6wTPFcwmEtvlG8qZYRbkPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764607313; c=relaxed/simple; bh=FcfDph9akWAhpmOmSa2BIV+EJ7RMAeS7smVRcRQOMOY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GXLfdvgSxH1bWXFQGQl8g6fT9QP2K7KVeV4SXOPDHjFOldIzwCpYsIjijeCkNi4nSwIVizcShdz6aJPRDuxHycnyw3Q+/VSpd14DBLX8PLwzMfTidmWLYsUFsSocQxvi3mrEUHwF07DlTtdlFag7Vi/kQxJMfgqDta3mBYBpSFw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RFVAmMy3; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RFVAmMy3" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-47118259fd8so42465345e9.3 for ; Mon, 01 Dec 2025 08:41:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764607310; x=1765212110; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wCK5jvjqS1OJSbH7Q8M4qbQBHOcn0cDJFYSc0X1U4g8=; b=RFVAmMy3Zw5gFcTpZJ4nDsuwIYs3DFnh5tp8Ut2Wl80GWOjHG2tqK7705lDuLhtdtR WapAhGhGqYumlKmVEMjHOH1Qwxdrb9g/xlUmiTNChV/yMNJFOvDIgYoE4cx+L1n9Y16N 0FHCNZBJnS+M7RJ+EQ92uQlxDgwsx8S0SRPFshr+eUAC/CGGv3jBDRTz05gW/iexOCJj s9Qea/tQehsl6VWGVqju+PqD8g0Yj5ZWYJqAR31U/2ywbIO7qs01f/sPHwL8yMHKyPyD IunPRUu98jIiOfmMc06A6l+m/WYL2yRdDpcFb9+EfjkQOyESu3QRPUzpLgI9zHNA0+oQ ESJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764607310; x=1765212110; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wCK5jvjqS1OJSbH7Q8M4qbQBHOcn0cDJFYSc0X1U4g8=; b=Daq2sa1SdJ/AcltrCMPahnrQZrl+lRAxAePWHYjFT6TXmEFhF4rx8ThGWhp7GvQxSm PqpDO6BSDNZf+wyuba1XPMKc/eEnCD0T8WtsihfapG+Kd0sInGrUBchrYBBH6/JhuQNZ zIt4EK0MwgSeRUjbXsHf1v+esstF8fyJjnbKH9sCp+2Jj8A2yNjQjVo+6sjHaHW58keq bFvW+/SMR5gP8/P0X1C7f9qABMysGXTLadns2eDQIZSihtQfetOnia5NEbalt8hHwSZM 3+Imo6qMXNTP8i6AiHIC77zoa3PEObjFTv5OGwRZNzZAqVBxHls8lBcRtPD5tTsi+ufr Q2uw== X-Forwarded-Encrypted: i=1; AJvYcCUnv168gA5QY8WGkFfPgOKh3VDu1d59CkN9XLIP0JxzEzbqLm6ZuhQqU5yi9B+kc2tFybfGe4V8vl6N2R4=@vger.kernel.org X-Gm-Message-State: AOJu0YznNgKQyzen3Z/wLMLL2dHtEvY+eLLaL59zoeJzFDuMCr/Er0sz Cs0yD/6mTa24NrdZAHnwTYI77WsXg2pxupVJlY8om/n0a8mqG8IypTS1LxYdhCOY06E= X-Gm-Gg: ASbGncs8GkYjixrkStnH4FlDYvWBpeiYB5ofbbuB3wKuhGZe0dHclpx8qVBpDELSuwp +x4pD+UAKvvJfN93t6PkpCdydioqWHrdAZszlHJGgoMOfgFyLSjdYfikna6ZdAbcW0YjMTtTw0V 4TVcuo/GbeGFq9sLCJvXhkShGqR23uKV5MeLQmRuyM++7e/IiFm/DZFyDpPeorXNc+fUcVqZjEq LIJokox4oGoFlVCzQOmNJze8ykzRgBIL5c8y3RM6azKT7UraBXDKyFMNojwUBkGE67JZb9VOWcz zC5S2/oVGk0p8Z16hnco8Dp80+Md2IxeRb7UDtLHyVF64LNLVGzB8SiolvHNJjhEnUYjusOcBEz 46tmC6t+wHQLwTsHaKMGJsIdcFBrCmUA93uZuLKMa7vWSgNnWDK/z5KpnBIwDLqiuTnYUA8uBmi BXie/EM+XwfQg91fF/V1p2 X-Google-Smtp-Source: AGHT+IEP/tNXfSvGkzJDnroSc7cg8nQooiX3N1v7Fw5uWyfNSqPrA6fMWwoGMhgB5DjA5qOUhENmxw== X-Received: by 2002:a05:600c:1c82:b0:477:9c73:268b with SMTP id 5b1f17b1804b1-47904b2b36amr283793595e9.33.1764607309963; Mon, 01 Dec 2025 08:41:49 -0800 (PST) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4791164d4f3sm255901275e9.13.2025.12.01.08.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 08:41:49 -0800 (PST) From: James Clark Date: Mon, 01 Dec 2025 16:41:08 +0000 Subject: [PATCH 5/7] perf cs-etm: Don't use hard coded config bits when setting up TRCCONFIGR Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251201-james-perf-config-bits-v1-5-22ecbbf8007c@linaro.org> References: <20251201-james-perf-config-bits-v1-0-22ecbbf8007c@linaro.org> In-Reply-To: <20251201-james-perf-config-bits-v1-0-22ecbbf8007c@linaro.org> To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Suzuki K Poulose , Mike Leach , John Garry , Will Deacon , Leo Yan Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, James Clark X-Mailer: b4 0.14.0 Perf only looks at attr.config when determining what was programmed into TRCCONFIGR. These bits could theoretically be in any of the config fields. Use the evsel__get_config_val() helper so it's agnostic to which config field they are in. The kernel will also stop publishing the TRCCONFIGR register bits in a header [1] so preempt that by defining them here. [1]: https://lore.kernel.org/linux-arm-kernel/20251128-james-cs-syncfreq-v8= -10-4d319764cc58@linaro.org/ Signed-off-by: James Clark --- tools/perf/arch/arm/util/cs-etm.c | 79 +++++++++++++++++------------------= ---- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index 414cafb21c98..51ca8fa66ef8 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -68,6 +68,14 @@ static const char * const metadata_ete_ro[] =3D { =20 enum cs_etm_version { CS_NOT_PRESENT, CS_ETMV3, CS_ETMV4, CS_ETE }; =20 +/* ETMv4 CONFIGR register bits */ +#define TRCCONFIGR_BB BIT(3) +#define TRCCONFIGR_CCI BIT(4) +#define TRCCONFIGR_CID BIT(6) +#define TRCCONFIGR_VMID BIT(7) +#define TRCCONFIGR_TS BIT(11) +#define TRCCONFIGR_RS BIT(12) +#define TRCCONFIGR_VMIDOPT BIT(15) =20 /* ETMv3 ETMCR register bits */ #define ETMCR_CYC_ACC BIT(12) @@ -520,56 +528,37 @@ static u64 cs_etm_guess_etmcr(struct auxtrace_record = *itr) return etmcr; } =20 -static u64 cs_etm_get_config(struct auxtrace_record *itr) +static u64 cs_etmv4_guess_trcconfigr(struct auxtrace_record *itr) { + u64 trcconfigr =3D 0; struct cs_etm_recording *ptr =3D - container_of(itr, struct cs_etm_recording, itr); + container_of(itr, struct cs_etm_recording, itr); struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; - struct evlist *evlist =3D ptr->evlist; - struct evsel *evsel =3D cs_etm_get_evsel(evlist, cs_etm_pmu); - - /* - * Variable perf_event_attr::config is assigned to - * ETMv3/PTM. The bit fields have been made to match - * the ETMv3.5 ETRMCR register specification. See the - * PMU_FORMAT_ATTR() declarations in - * drivers/hwtracing/coresight/coresight-perf.c for - * details. - */ - return evsel ? evsel->core.attr.config : 0; -} - -#ifndef BIT -#define BIT(N) (1UL << (N)) -#endif + struct evsel *evsel =3D cs_etm_get_evsel(ptr->evlist, cs_etm_pmu); + u64 val; =20 -static u64 cs_etmv4_get_config(struct auxtrace_record *itr) -{ - u64 config =3D 0; - u64 config_opts =3D 0; + if (!evsel) + return 0; =20 /* - * The perf event variable config bits represent both - * the command line options and register programming - * bits in ETMv3/PTM. For ETMv4 we must remap options - * to real bits + * Roughly guess what the kernel programmed into TRCCONFIGR based on + * what options the event was opened with. This doesn't have to be + * complete or 100% accurate, not all bits used by OpenCSD anyway. */ - config_opts =3D cs_etm_get_config(itr); - if (config_opts & BIT(ETM_OPT_CYCACC)) - config |=3D BIT(ETM4_CFG_BIT_CYCACC); - if (config_opts & BIT(ETM_OPT_CTXTID)) - config |=3D BIT(ETM4_CFG_BIT_CTXTID); - if (config_opts & BIT(ETM_OPT_TS)) - config |=3D BIT(ETM4_CFG_BIT_TS); - if (config_opts & BIT(ETM_OPT_RETSTK)) - config |=3D BIT(ETM4_CFG_BIT_RETSTK); - if (config_opts & BIT(ETM_OPT_CTXTID2)) - config |=3D BIT(ETM4_CFG_BIT_VMID) | - BIT(ETM4_CFG_BIT_VMID_OPT); - if (config_opts & BIT(ETM_OPT_BRANCH_BROADCAST)) - config |=3D BIT(ETM4_CFG_BIT_BB); - - return config; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "cycacc", &val) && val) + trcconfigr |=3D TRCCONFIGR_CCI; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "contextid1", &val) && val) + trcconfigr |=3D TRCCONFIGR_CID; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "timestamp", &val) && val) + trcconfigr |=3D TRCCONFIGR_TS; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "retstack", &val) && val) + trcconfigr |=3D TRCCONFIGR_RS; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "contextid2", &val) && val) + trcconfigr |=3D TRCCONFIGR_VMID | TRCCONFIGR_VMIDOPT; + if (!evsel__get_config_val(cs_etm_pmu, evsel, "branch_broadcast", &val) &= & val) + trcconfigr |=3D TRCCONFIGR_BB; + + return trcconfigr; } =20 static size_t @@ -691,7 +680,7 @@ static void cs_etm_save_etmv4_header(__u64 data[], stru= ct auxtrace_record *itr, struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; =20 /* Get trace configuration register */ - data[CS_ETMV4_TRCCONFIGR] =3D cs_etmv4_get_config(itr); + data[CS_ETMV4_TRCCONFIGR] =3D cs_etmv4_guess_trcconfigr(itr); /* traceID set to legacy version, in case new perf running on older syste= m */ data[CS_ETMV4_TRCTRACEIDR] =3D cs_etm_get_legacy_trace_id(cpu); =20 @@ -723,7 +712,7 @@ static void cs_etm_save_ete_header(__u64 data[], struct= auxtrace_record *itr, st struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; =20 /* Get trace configuration register */ - data[CS_ETE_TRCCONFIGR] =3D cs_etmv4_get_config(itr); + data[CS_ETE_TRCCONFIGR] =3D cs_etmv4_guess_trcconfigr(itr); /* traceID set to legacy version, in case new perf running on older syste= m */ data[CS_ETE_TRCTRACEIDR] =3D cs_etm_get_legacy_trace_id(cpu); =20 --=20 2.34.1