From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 F41E831D72B for ; Mon, 8 Dec 2025 14:23:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765203817; cv=none; b=Uqr2q6ewy3PY0QSh0L3GiySeCHGv4lfjvWbmbTbJk5GyciTbG1J2RmXpBdj6sf0Cr5QEgSCrGUYd+5CgvDK5xvU9wVlWXAAaR/xJ2y/8N28dK4Yv67NTvfenkzdhPL/+UtJwJf3Y4uwMQiV5X/t/VNAgujEeih+AtwV7iQXFiXE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765203817; c=relaxed/simple; bh=mEpxfkiT9R7sUWQ6ZKH/YPRS63jr9gZ8SH3kBajtofM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l7LYQ4uJBav9B7Kb3d0YTdEVTgw4HY/0DpoYfOuO91BacHIDBhqDHyFgk6iLRtSvstB+T+Q/dyhX832Me+Hh3Q4ceCSikq/RgbHoiRhAEJkslPVokbSkptGEpu4gnMtOI1uH1rj3ok7ejBGd12HWuQO0R32xyt17bIF9RyTma9E= 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=P7PEbsIK; arc=none smtp.client-ip=209.85.128.48 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="P7PEbsIK" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-47774d3536dso42815035e9.0 for ; Mon, 08 Dec 2025 06:23:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765203814; x=1765808614; 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=SsInU0t5SsRXwndpS/OaiCaWG6xiu+JNwIsRwUuzGhw=; b=P7PEbsIK12d57cfc7lzfpf93KpwC0x+uuLYD9bBJrhsFjhZBMkRzLhClhgZ6DO2af5 mEqtLNoKnsiaVoCJqEYIhtsJrj6I5qZapD8Hmx/gCWjNIV71uInVZGbKCbCNh3UXXQyB 6wcvWKu4RknicTdZ4YsC4hXa6SyV4DB7tnNw7+yhcSAcYOrOrxotwpsCaon9JZfDfLLI 5O3ovpTo9kDYnXFPMwzUlbLGs2mddmP21RSqQRLt2IZ/nkd0TwmTcnTN1SLIweV1TOTQ 4l/rowx73FiH9m3aHOnTc6zytKvUXhNFUnYlm6e7hDTdX+KLv5MqYNYGu1OB/Ca4HKyM WZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765203814; x=1765808614; 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=SsInU0t5SsRXwndpS/OaiCaWG6xiu+JNwIsRwUuzGhw=; b=MuMxU5jeNH6nEkmjHA03yfcIT1l26Lxod/gU0X5grvfNTkDARWjuewt0dENEG9J1/o bVyndD3oeO0MOvmXH3aHj/2iP7PSEik12IYDr/hmi5pBE7Zqwb5Qjv1sH3hwew46tl8h VojCekF6djgntw23NJj87df35PyiEtBV698qJfCMjhdqKIzQ5dlpHzLApYcOj+ZCFINE 4+Oys2vrdcHJOjLrCelYKZFB+6U8y2NCHhVGGXvPmOq4auNjqzKu3pGlJrksJKkxTuUK rquhJNDjLUu4rxPUmw0g7sC1Ju7gQ7ETgforWwkmWVW8dxO7IwmHd41HrNRj85Q5lz0U PuTg== X-Forwarded-Encrypted: i=1; AJvYcCVVhwWxVXpCyKW4qTwjBWMxuOD+/XEYDQs9wvFS47MGQn0StkoT2egNFIm5uR+MB/myKzMy31Z8xZPoLFQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyxvx2PbSOfBsi5lzQZ59qW5ecZ4KvZN3pHzCmzKAhOeek4Nh4O S9TxNCnqfNysVpPSsyk0VPw/VhXuQQkDF8Pd2bD305N6Mm4swQOC+R/hO/Y2R2Ng6vk= X-Gm-Gg: ASbGncvvs64zP/BiWcmLzzzoLPTPTgvPKq5Rv4iRUbcOCSMM2yqqY0zXWJiwgJD6Qwp CqeuK4pPV06PRAPe7iZ8CiU0O6ZKhS7Grh6Ofz/nvPf/izQY2UowDmDij/4jSJ0DnZiIdAOVoX3 MeTjDYvDFhmjpRqAz9K6xLqfdOe+t5Ms6APTwlT+ZY/DuzSsIaH6ttSuXFh02PhYHgsnTvwmAXH uTQhLMmqFFdIC4JlEAEFxcekTl/LshDyviGiFSeJB0opb4biGKgZ+jl6tRaZP5CUtaT2pyQvg5Y psVxZUPRQZ+GDyDhtDDgR0MkcqtWQkWIak6Svex1O/ZYKge1g9rv+ssqB0lUcWJdhOaH5DLPLpU lOSVSmX6vG0iac6xNH+8YcmkP6jGVV0EMae9/HOC0/fCCTzruoLjW7X2YSn2sbVIZwxz0IpPd2N 6ftt+uWvLt+3msYn46mgUP X-Google-Smtp-Source: AGHT+IFSZGwfFwJSYKaBVY3GQ2FBMVbPJczh0bZwQlbrmePS7rzEeSRqZHVvyMQWkuI4F0AEn+gDQg== X-Received: by 2002:a05:600c:8b6c:b0:477:9e0c:f59 with SMTP id 5b1f17b1804b1-47939df17f6mr81324235e9.2.1765203814305; Mon, 08 Dec 2025 06:23:34 -0800 (PST) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47930920e0dsm248561065e9.2.2025.12.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Dec 2025 06:23:33 -0800 (PST) From: James Clark Date: Mon, 08 Dec 2025 14:22:14 +0000 Subject: [PATCH v2 11/12] 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: 7bit Message-Id: <20251208-james-perf-config-bits-v2-11-4ac0281993b0@linaro.org> References: <20251208-james-perf-config-bits-v2-0-4ac0281993b0@linaro.org> In-Reply-To: <20251208-james-perf-config-bits-v2-0-4ac0281993b0@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 , leo.yan@arm.com 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 | 57 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index 4a606b1e90f2..bfb573cb5878 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -103,13 +103,14 @@ 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 = 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; - if (!contextid) + evsel__get_config_val(cs_etm_pmu, evsel, "contextid", &ctxt); + evsel__get_config_val(cs_etm_pmu, evsel, "contextid1", &ctxt1); + evsel__get_config_val(cs_etm_pmu, evsel, "contextid2", &ctxt2); + + if (!ctxt && !ctxt1 && !ctxt2) return 0; /* Not supported in etmv3 */ @@ -120,12 +121,11 @@ static int cs_etm_validate_context_id(struct perf_pmu *cs_etm_pmu, struct evsel } /* Get a handle on TRCIDR2 */ - err = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR2], &val); + err = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR2], &trcidr2); if (err) return err; - 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 +133,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) != 0x4) { + if (BMVAL(trcidr2, 5, 9) != 0x4) { pr_err("%s: CONTEXTIDR_EL1 isn't supported, disable with %s/contextid1=0/\n", CORESIGHT_ETM_PMU_NAME, CORESIGHT_ETM_PMU_NAME); return -EINVAL; } } - if (contextid & - perf_pmu__format_bits(cs_etm_pmu, "contextid2")) { + if (ctxt2) { /* * TRCIDR2.VMIDOPT[30:29] != 0 and * TRCIDR2.VMIDSIZE[14:10] == 0b00100 (32bit virtual contextid) @@ -149,7 +148,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 >= 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=0/\n", CORESIGHT_ETM_PMU_NAME, CORESIGHT_ETM_PMU_NAME); return -EINVAL; @@ -163,10 +162,11 @@ 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; - if (!(evsel->core.attr.config & - perf_pmu__format_bits(cs_etm_pmu, "timestamp"))) + evsel__get_config_val(cs_etm_pmu, evsel, "timestamp", &val); + if (!val) return 0; if (cs_etm_get_version(cs_etm_pmu, cpu) == CS_ETMV3) { @@ -176,7 +176,7 @@ static int cs_etm_validate_timestamp(struct perf_pmu *cs_etm_pmu, struct evsel * } /* Get a handle on TRCIRD0 */ - err = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR0], &val); + err = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR0], &trcidr0); if (err) return err; @@ -187,10 +187,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 &= GENMASK(28, 24); - if (!val) { + trcidr0 &= GENMASK(28, 24); + if (!trcidr0) return -EINVAL; - } return 0; } @@ -273,16 +272,20 @@ static int cs_etm_parse_snapshot_options(struct auxtrace_record *itr, return 0; } +/* + * The sink name format "@sink_name" is used, lookup the sink by name to convert + * to "sinkid=sink_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 = -EINVAL; u32 hash; - - if (evsel->core.attr.config2 & GENMASK(31, 0)) - return 0; + int ret; list_for_each_entry(term, &evsel->config_terms, list) { if (term->type != EVSEL__CONFIG_TERM_DRV_CFG) @@ -305,14 +308,10 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, return ret; } - evsel->core.attr.config2 |= hash; + evsel__set_config_if_unset(pmu, evsel, "sinkid", hash); return 0; } - /* - * No sink was provided on the command line - allow the CoreSight - * system to look for a default - */ return 0; } -- 2.34.1