From nobody Sun Dec 14 11:59:45 2025 Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) (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 D746B322B9E for ; Fri, 12 Dec 2025 15:33:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553586; cv=none; b=hPfjGZ1WP2Gw29DcqiIvkJUTxKfa5aVt2sr+9VBhg8CfkXfDrc/11pC0WBCU/GsZ/j3ge0bvknr+hzRuLQR0ybUcAEEOsTO7abx0M+Z0zR+R7HCXvufMXUDAmy0nKLCdGXgDCYcmT9H96cJOWuH17jHrLJz3h+WfiFLAKU02XM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553586; c=relaxed/simple; bh=CnG0U9L2o0XGUE2E9XPt0sxgf+zgqbEhTP9i+gzCgnM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DY9asAhjF03uo/2/3ZTtFTGLj5X3A8BaDix5Dmu8UPxQjd5xoLLIpw7lYYbE8/O6twRGybGZXobyRHawrCfhj7UcWSGkmw/ttauQuqCzCJtJSw/rqVqxODFK0CWTRw8PTFlEFHEtkSvVBCmoyhyinhy1/VeTFNMWH2O5NwGbXwE= 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=Ro0A0d//; arc=none smtp.client-ip=209.85.208.68 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="Ro0A0d//" Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-6419aaced59so2124347a12.0 for ; Fri, 12 Dec 2025 07:33:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765553582; x=1766158382; 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=kIyylrKuVnmfqhBbx84gIScsHXdr4noRfgmns9UOCBc=; b=Ro0A0d//Lb61kONtE/ao7WV4yefPMrlMnNuZL6WrJtlx02MCnpxCRX2OcBy+vWiBzW gQio1NBk2goVVz2zPsNJ8E9b/nkZp75jxbUXrZqMm1KfMA3TvOZExN7qwFeatUH4hQBM 4eRvA4zQK9O4pa8pXNTl34Y8Je1Eju8dBJXKO31Y4zsFvwRwU0vzaWEModQaLzIgZ3Pf 7NABhCaR0emphM1+3EbXjTXsaLXt8mk4JIvQEMIxVUPsnG9FWuYPJkBoAAfheg7Ss4Sm o7olm6TG7GTdN0vFw4ETWvpAoLz8J/dbl3V6T8mBuAUkvBmBVNwnkXisEbCC3viTNxbb 0j/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765553582; x=1766158382; 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=kIyylrKuVnmfqhBbx84gIScsHXdr4noRfgmns9UOCBc=; b=ecc0fRLNwj8jYL67tTRp7iFOUkuDSgykk7cAC7u83p3WrfdyjBfRCvbaJwSM75UGMU fajwXItYmprgxafjdokE2+pvSTpCg6/t5PRrrMI4rdD8uiEURMZR+OyW9DzJtgXWhcNV ZFNducwB9GAcYqOp68X//kqOlpATmy8wwUcaEH9/2wnHcfvCNqZt0zquAAULFZ1HllzT 1plba9QN2cDDbeS/Vj/It1krIPHJSSeUtpuqi1poD40giCaKunKK8Z/a9K06b1lLmxMT X0W6t/0A75EOegZ30EbxIjZPvMMWad7s3JM79GgMjMx6u3frTgc0UNy6WX5rc1/37P8n /yKg== X-Forwarded-Encrypted: i=1; AJvYcCWK0CPyVCTUoGdSE6G85DXnNPjs4bCf9e+7XdW5Ptfi3qbyb3q+oZaKjwQIdYk/n+wGfErbbhoMjpEkwlg=@vger.kernel.org X-Gm-Message-State: AOJu0YzwJ2XhxtP+OrqwZvNBFLOBI0CUiWAKt8FlE+0pwOAu1po1Ijcz /hJOU9Mk+SiCi4kdLjBvOZaALbgzaDBTIbW4q++pglX1FsH/A3ogl972q7INcjxpDkY= X-Gm-Gg: AY/fxX5IHlvqh8m4z06lPu9NPvVctNwwMKFeaRfULILDrZrRyMIGR4J+q4MsZQQPAkW o9UKgQGefvU4YrlcfKaO42zaa9GTWFMSnpYWjbbJaBX8xxpVOGeTOTZKMEjXQ1t9JZ5no9GeD0b v5mBhbLeznh0ANm512T/ab0AVyDewfkwTz13pPx+8hE9fl4cLbPkmXWb9yaSV94qcNhM3oHWbOH uiOpZwC+RdHse3ckFXfYkWWxHqgP3Ms3kz+VKQMXLmAviNSJsy6fmaMKhL5rvkq+hmjJg6hccOS hUanf+4bxK1jyxVAOZppUYIueCV7I+lFmDqB1r4ue4n5o9PgbwDTuEx1OxmeUh5IRrAR6TcsNLs dCxdKroGTpQ91CLbkV7RsHpIU2/EjRJFn8QjBigkkJ/MzxDUeWCqBFDz97di4K2K/yD9z1CHSwl 4ac10coZiEoc+qQhwA+5Jv X-Google-Smtp-Source: AGHT+IGnR0gQMQNB1+wHObkuQkoO/WDhs9GeM7GP+ll44IR076qgwRjFu3Xp62OThbWfaYmyOQtqjA== X-Received: by 2002:a05:6402:518b:b0:63c:690d:6a46 with SMTP id 4fb4d7f45d1cf-6499b190338mr2329332a12.13.1765553582073; Fri, 12 Dec 2025 07:33:02 -0800 (PST) Received: from e133063.arm.com ([130.185.218.160]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6498210ed32sm5433234a12.29.2025.12.12.07.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 07:33:01 -0800 (PST) From: James Clark Date: Fri, 12 Dec 2025 17:32:27 +0200 Subject: [PATCH v3 10/12] 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: <20251212-james-perf-config-bits-v3-10-aa36a4846776@linaro.org> References: <20251212-james-perf-config-bits-v3-0-aa36a4846776@linaro.org> In-Reply-To: <20251212-james-perf-config-bits-v3-0-aa36a4846776@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 , Leo Yan X-Mailer: b4 0.14.2 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/ Reviewed-by: Leo Yan 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 a5135b743e6f18789026323ea75b2a78d6495d73..4a606b1e90f227aef9915e90439= b2a024eeabcfe 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_synth_etmcr(struct auxtrace_record = *itr) return etmcr; } =20 -static u64 cs_etm_get_config(struct auxtrace_record *itr) +static u64 cs_etmv4_synth_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 + * Synthesize 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_synth_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_synth_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