From nobody Mon Dec 1 21:31:20 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 DD0DA336EE2 for ; Mon, 1 Dec 2025 16:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764607315; cv=none; b=j42A2z7uW7kkjcB/e6ZQF2KAdAadXM2pjnW9RKe2tqHLcPZefkhiRMQaP6uUSISKh8NWdRSA8wZj0ttVP9xRPbwb/SMlugcLz5stZnx5CQrxpMJFKbi6zOeuFlZG4Vux1Y5PhciMiDM1mVG3lUNMMarHJiLqMTso00SWQAsw9Ng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764607315; c=relaxed/simple; bh=6J8uBrrUyjtu+YlsylOUKYoPIhBIrTUDwfva8KvLpCk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OSVHzi4nOb9SVvR3q6gbOL2n4bg6ljgnQHzEVsx1ogPMmFBUO60PEMvedbT8GdciuhG2Lk+w9OnIiw5vfWNd9mfOGSQlmUSHaBQuQy1knFd1SJlVpJJVnl2MaxsCjsTdCns5Oh/QtmZO7UXxydruJ+kxSq+vhX0SECtlBuOhpR4= 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=k57PuznO; arc=none smtp.client-ip=209.85.128.46 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="k57PuznO" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47775fb6c56so40474115e9.1 for ; Mon, 01 Dec 2025 08:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764607312; x=1765212112; 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=cKUhf7S/zq7XInwoT4BCbYa77L5aJsIA3yCxD0J3mf4=; b=k57PuznOjxo1un4C2tM7GWkMOMnvBu9S/MU8YqX4u/YT6NBAdh6um5Z/qiwsKgJts8 YrxhnMui7s3IOFCm894wbyqMr28h5FcEJbMyojo+AMMdFWx2Cnsy8/HlnBdXrwwxsKPM QGIQQ67OFYWEAqilowIdv0gDGTNYwiq8OJDIJDPH+RBP0GX4gY1KuKcUFxWC+pA0ybaZ wl+D9TvYkBYbLLVclZhBeaPoeZPu4IVUPN7XRBaUDK4J7PrgzZ0r4+WUwa8i3IBoKOtB TL6oWbCeHrEO4u9kdq/5EyM3F+mpOarZD3lA4amunBBsfrmzRpcqeBTBkog00igAJcg+ +wPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764607312; x=1765212112; 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=cKUhf7S/zq7XInwoT4BCbYa77L5aJsIA3yCxD0J3mf4=; b=S0cAZrw68zQLvjfEK1WNpvAzwq3L46EzFB478xS2oyY7eGTL2u+tvu5fT7CudYqhi8 iyIZs0Iymeg1q0jJhxyYi0W1xynBNsbF5CtG6LuLe///n6Ggfhj6XQDOudnlXlkzmqPn OvoH23NiFwmhJbTAE4NWb1yjJ998mb2JSHfOVf1BO8RXZLKeYFlFEF6sD3fQzT4fXJ6b kEIcs6Dhr3TC44yP9i5Jlr0p8ww+vd566dSWLrqMF8x0dZaXhZ64ELo++uJRL0uQrOrY fHY7dUFfi4gipfzu81w9HxLNW5cNzRm8AK19dkmCHdRsRTD3P7smNR6UxDMObtrgOTn6 5xTQ== X-Forwarded-Encrypted: i=1; AJvYcCUcwizmSpBCLuMjk5ATgeyvNegQnUcYOyiIIYcFu/W1Djnppe8Ue4BnF8+jUf5KerFok4c95yhQpHNKWrg=@vger.kernel.org X-Gm-Message-State: AOJu0YzPRBt4dpt/IB/n/yHU+yA0BE4ESCpFFzX4qZUv3T6aFkmhyw6w gvQK2HW19cMduC7+2V3k4YXgE1R5JOOrCmKxU96rRdt+2TJNHw7NIeVXAVYHtM4UepM= X-Gm-Gg: ASbGncvExqcRm/Z8H1EnJNo7HFjMZQ+dV4AkTrO3TAIRkiy0uq8iU7PZPTJRxaYWQ1E sTsB6yLTOggpLYsydYrFsL7g1DYIGb+KXTUuywa+PRpYil76Sbj8he9WZEOFd4VwbimuZlZfezy guV17kgBPG4Bo44crcCdSlJZlFZM/IFxsnS4GVyb49CKXkVa5Fq6Aditv36R3Eq+Vdu9wYHbQnf J3tvrUWpxqTV7fmfqdpWpQlSqHB5DUdh2WTChpEEgd4VhVtTxpc9CqPjaBloAKtdvTAxB+2RKwy 4QoEUDqauR3/0MXYSy3jlSY/dnIuvWWHa65RINRetEWo19KWaUjC1B79y06Qx7/+IwWNkvMjIwk dThg71Mf7GW3HnFD8Q9TTx4dJBq7YkK1Lm633kwLJRT1uyfLnksgoP7SZvPxgok35LIPaq37fsB 1Ha0recgvA/JiuXZh6CjKa X-Google-Smtp-Source: AGHT+IEY4wsnu5t7RxRAb+lDOwrk2bVHKf8Daq/FFegD/RxGqBitL9q7Mn4TMWImABd/xtV4q+gq4A== X-Received: by 2002:a05:600c:19ce:b0:477:79c7:8994 with SMTP id 5b1f17b1804b1-47904b25e63mr271343655e9.30.1764607311924; Mon, 01 Dec 2025 08:41:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 08:41:50 -0800 (PST) From: James Clark Date: Mon, 01 Dec 2025 16:41:09 +0000 Subject: [PATCH 6/7] perf cs-etm: Don't hard code config attribute when configuring the event 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-6-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 These instances of hard coded config attributes are used for configuring and validating the event options. Use the config attribute that's published by the driver by replacing the open coded operations with evsel__get_config_val() and evsel__set_config_if_unset(). Signed-off-by: James Clark --- tools/perf/arch/arm/util/cs-etm.c | 66 ++++++++++++++++++++++-------------= ---- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index 51ca8fa66ef8..52e304584095 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -103,13 +103,20 @@ static int cs_etm_validate_context_id(struct perf_pmu= *cs_etm_pmu, struct evsel struct perf_cpu cpu) { int err; - __u64 val; - u64 contextid =3D evsel->core.attr.config & - (perf_pmu__format_bits(cs_etm_pmu, "contextid") | - perf_pmu__format_bits(cs_etm_pmu, "contextid1") | - perf_pmu__format_bits(cs_etm_pmu, "contextid2")); + u64 ctxt, ctxt1, ctxt2; + __u64 trcidr2; =20 - if (!contextid) + err =3D evsel__get_config_val(cs_etm_pmu, evsel, "contextid", &ctxt); + if (err) + return err; + err =3D evsel__get_config_val(cs_etm_pmu, evsel, "contextid1", &ctxt1); + if (err) + return err; + err =3D evsel__get_config_val(cs_etm_pmu, evsel, "contextid2", &ctxt2); + if (err) + return err; + + if (!ctxt && !ctxt1 && !ctxt2) return 0; =20 /* Not supported in etmv3 */ @@ -120,12 +127,11 @@ static int cs_etm_validate_context_id(struct perf_pmu= *cs_etm_pmu, struct evsel } =20 /* Get a handle on TRCIDR2 */ - err =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR2= ], &val); + err =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR2= ], &trcidr2); if (err) return err; =20 - if (contextid & - perf_pmu__format_bits(cs_etm_pmu, "contextid1")) { + if (ctxt1) { /* * TRCIDR2.CIDSIZE, bit [9-5], indicates whether contextID * tracing is supported: @@ -133,15 +139,14 @@ static int cs_etm_validate_context_id(struct perf_pmu= *cs_etm_pmu, struct evsel * 0b00100 Maximum of 32-bit Context ID size. * All other values are reserved. */ - if (BMVAL(val, 5, 9) !=3D 0x4) { + if (BMVAL(trcidr2, 5, 9) !=3D 0x4) { pr_err("%s: CONTEXTIDR_EL1 isn't supported, disable with %s/contextid1= =3D0/\n", CORESIGHT_ETM_PMU_NAME, CORESIGHT_ETM_PMU_NAME); return -EINVAL; } } =20 - if (contextid & - perf_pmu__format_bits(cs_etm_pmu, "contextid2")) { + if (ctxt2) { /* * TRCIDR2.VMIDOPT[30:29] !=3D 0 and * TRCIDR2.VMIDSIZE[14:10] =3D=3D 0b00100 (32bit virtual contextid) @@ -149,7 +154,7 @@ static int cs_etm_validate_context_id(struct perf_pmu *= cs_etm_pmu, struct evsel * virtual context id is < 32bit. * Any value of VMIDSIZE >=3D 4 (i.e, > 32bit) is fine for us. */ - if (!BMVAL(val, 29, 30) || BMVAL(val, 10, 14) < 4) { + if (!BMVAL(trcidr2, 29, 30) || BMVAL(trcidr2, 10, 14) < 4) { pr_err("%s: CONTEXTIDR_EL2 isn't supported, disable with %s/contextid2= =3D0/\n", CORESIGHT_ETM_PMU_NAME, CORESIGHT_ETM_PMU_NAME); return -EINVAL; @@ -163,10 +168,14 @@ static int cs_etm_validate_timestamp(struct perf_pmu = *cs_etm_pmu, struct evsel * struct perf_cpu cpu) { int err; - __u64 val; + u64 val; + __u64 trcidr0; =20 - if (!(evsel->core.attr.config & - perf_pmu__format_bits(cs_etm_pmu, "timestamp"))) + err =3D evsel__get_config_val(cs_etm_pmu, evsel, "timestamp", &val); + if (err) + return err; + + if (!val) return 0; =20 if (cs_etm_get_version(cs_etm_pmu, cpu) =3D=3D CS_ETMV3) { @@ -176,7 +185,7 @@ static int cs_etm_validate_timestamp(struct perf_pmu *c= s_etm_pmu, struct evsel * } =20 /* Get a handle on TRCIRD0 */ - err =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR0= ], &val); + err =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR0= ], &trcidr0); if (err) return err; =20 @@ -187,10 +196,9 @@ static int cs_etm_validate_timestamp(struct perf_pmu *= cs_etm_pmu, struct evsel * * 0b00110 Implementation supports a maximum timestamp of 48bits. * 0b01000 Implementation supports a maximum timestamp of 64bits. */ - val &=3D GENMASK(28, 24); - if (!val) { + trcidr0 &=3D GENMASK(28, 24); + if (!trcidr0) return -EINVAL; - } =20 return 0; } @@ -273,16 +281,20 @@ static int cs_etm_parse_snapshot_options(struct auxtr= ace_record *itr, return 0; } =20 +/* + * The sink name format "@sink_name" is used, lookup the sink by name to c= onvert + * to "sinkid=3Dsink_hash" format. + * + * If the user has already manually provided a hash then "sinkid" isn't + * overwritten. If neither are provided then the driver will pick the best= sink. + */ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, struct evsel *evsel) { char msg[BUFSIZ], path[PATH_MAX], *sink; struct evsel_config_term *term; - int ret =3D -EINVAL; u32 hash; - - if (evsel->core.attr.config2 & GENMASK(31, 0)) - return 0; + int ret; =20 list_for_each_entry(term, &evsel->config_terms, list) { if (term->type !=3D EVSEL__CONFIG_TERM_DRV_CFG) @@ -305,14 +317,10 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, return ret; } =20 - evsel->core.attr.config2 |=3D hash; + evsel__set_config_if_unset(pmu, evsel, "sinkid", hash); return 0; } =20 - /* - * No sink was provided on the command line - allow the CoreSight - * system to look for a default - */ return 0; } =20 --=20 2.34.1