From nobody Sun Dec 14 11:53:49 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 226FB2F60A1 for ; Fri, 12 Dec 2025 15:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553571; cv=none; b=GLM342svghwOFIkR4E8D085hN1pKwG9R6Z3O7bu+43YiHI0O7T2hT0DLL6Fdj+hJs9Mvr7EhRJIcPhyV5RagGWAAFlh1YZnbUMLa5i/Iy4m45z7pA8EUL4MU3XXrPkvR64cmBc2LsiYNLpSKXBzUIsnTny7MQsgbGMt4q8tnf1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553571; c=relaxed/simple; bh=vWZqMcToevyun2DaJzmwXDwT5hN4jpmu6pxtripRP0Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tTyHvq1jDHiHwi0TL4a1jje3vCqApvugXw97sjU/y/hyYZysxv/vTotkiWjI+aNeWQhS5kjFHrBbI12UY980jYCxfRCQZYRpQWaLSGLTyAcLLyfGCBMjthZKp8084Xq1U8m+sReN7Z6bH8ebQEow3i7p2Rdj1WpxsRdKWFjTADA= 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=aSjFq0le; arc=none smtp.client-ip=209.85.208.42 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="aSjFq0le" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-64165cd689eso2157107a12.0 for ; Fri, 12 Dec 2025 07:32:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765553567; x=1766158367; 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=xSulanRhWm+TOJEsIJX6kByj32cTVV8wVNthl+pdTvs=; b=aSjFq0ler4sXWOBOeLIgy20ZRgKhLxaS/E4bBC6+GKKhbTWkhLJCQmqtuoqkLibUu5 Lw6wKnJDuh45R8wybS1DaDAfK7bzuUTm+leX8qH9qL0ASInFQB+0+jVL2RoNoo/ESkKI e7ZKSULG7D/eh7Jalew4rhUgC9D48sH8ZZZnSPhpKxIY6XWBgj/6RnXBrae55V0OuBQ2 ZZpTG43uzOwXOBkcsn2NbW8N6GFVbCZgdRqqh/eHCdPk/5ugnENPZn65SJrtJhmfsJQ7 bSSaxMVApFoGyXp9VFWAAPdbdJsQHTVsxpu0C+j8KOledF7c7wIZn0CU2icrN9J14xMa gI/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765553567; x=1766158367; 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=xSulanRhWm+TOJEsIJX6kByj32cTVV8wVNthl+pdTvs=; b=lM0vLNIMr3wbK18rv8JQimthqpMg4QYSYG3Y2oANJ8DGxHwIgRjMg4Shmm83YaN0wl ur6Kt8AN2njL9M3WVEbNM4+vFhcCf1B7jsuvEVmSotsc/aWe7vwceb4aHN0TcXpXR0Mg Exmq0+KW+X/FI8NM8paHZ+9OeP6qAegita3UM/RK4fGeSgqt1vGUCa1NPB2K8ywNJV94 14bOeLiNTrymG/yR1Yv8LlOTw1gNTOGwbvXFeAca0mZp2ewIxf3GlzylxQLAi/sEQvaU 8wR6Rv/iy4WIS+1f6FtnfxvquSti7J64ZrcHEFVpVjk49a0MgRwK/7huey/sAXBU5m87 R27A== X-Forwarded-Encrypted: i=1; AJvYcCURnObuxijJ0wQA0K2XPpuG3D6ZpDSxR1Ja/iywW64UeCE22a8P8ZoGtApJkJ7JJ4evM6pQtG6qHIdEzxc=@vger.kernel.org X-Gm-Message-State: AOJu0YwIbzIBtwa6B5P6LYrYNhWJ0gsu8opyb9BKECT7rHPJfDiBBH5f F06JvR9ZFJNI5Z8JdH3ibgpdShXy+zEbEsV5cMzCRIbz9LptX5epSzyxL7GCtXn49Yg= X-Gm-Gg: AY/fxX4zh0X1p0zsYgffIpwyemtWx/iUtj+V260Yq1QgnDMPBH3hhbq5EoajwaLMOlV jOz33uSxGGoda3C1xuwdOdfbhQwqbLXErYrHEmokYXKC0o8oJXBx/HCr6OKRzYOrLWXx3Hcj/FJ U+6SYgye+eph3cIAkq0HBr1dXL5zZ3codiGA21ZRLSyTRXsgHF7Z82T26UnkIn7lPufIfY+8PWx JWf2Sqr0oLs14fBSiusQSPmri9t0dU336i3p6rizxI16QrpOp5gU/LnlPn3YKwF0TnWKuVGnUpL H88RxAEACby6VrmX7Dm/eDqK7EhbNcVFCYbZodraehp3dlaSUfLOsHPLiPDMGykJmMsyyOY0abO PkPg3Ru419MpLEWgyG6giMIZQK+IiZzCCtCWnzzqO2Rmdqd5YZEv0GIrgZrDVzAzB+vZGdGKCgo xFABgJiwAdb9zNJc2Lj8cu X-Google-Smtp-Source: AGHT+IE0jsBzIwoiXf1j1BrrX+hYReRJK59uu92Fpw79dVuN+GXXuARzuNi4SxAAGM0C7gWCzIiRtA== X-Received: by 2002:aa7:c642:0:b0:640:931e:ccac with SMTP id 4fb4d7f45d1cf-6498745a2a9mr3880322a12.7.1765553567457; Fri, 12 Dec 2025 07:32:47 -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.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 07:32:46 -0800 (PST) From: James Clark Date: Fri, 12 Dec 2025 17:32:20 +0200 Subject: [PATCH v3 03/12] perf parse-events: Track all user changed config bits 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-3-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 X-Mailer: b4 0.14.2 Currently we only track which bits were set by the user in attr->config. But all configN fields should be treated equally as they can all have default and user overridden values. Track them all by making get_config_chgs() generic and calling it once for each config value. Signed-off-by: James Clark --- tools/perf/util/evsel.c | 6 ++- tools/perf/util/evsel_config.h | 6 ++- tools/perf/util/parse-events.c | 98 +++++++++++++++++++++++---------------= ---- tools/perf/util/pmu.c | 2 +- 4 files changed, 65 insertions(+), 47 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 9cd706f6279313c2cc53eba1adbd45f352090f75..dcadf022405d398bf394b3da7f0= db5c81a3ec268 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1242,7 +1242,11 @@ static void evsel__apply_config_terms(struct evsel *= evsel, case EVSEL__CONFIG_TERM_AUX_SAMPLE_SIZE: /* Already applied by auxtrace */ break; - case EVSEL__CONFIG_TERM_CFG_CHG: + case EVSEL__CONFIG_TERM_USR_CHG_CONFIG: + case EVSEL__CONFIG_TERM_USR_CHG_CONFIG1: + case EVSEL__CONFIG_TERM_USR_CHG_CONFIG2: + case EVSEL__CONFIG_TERM_USR_CHG_CONFIG3: + case EVSEL__CONFIG_TERM_USR_CHG_CONFIG4: break; case EVSEL__CONFIG_TERM_RATIO_TO_PREV: rtp_buf =3D term->val.str; diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h index 685fd8d5c4a88fb8ae601ded60c1fc36dde73403..7b565d76c0bc4277effbbf95011= 0986b423f571c 100644 --- a/tools/perf/util/evsel_config.h +++ b/tools/perf/util/evsel_config.h @@ -27,7 +27,11 @@ enum evsel_term_type { EVSEL__CONFIG_TERM_AUX_OUTPUT, EVSEL__CONFIG_TERM_AUX_ACTION, EVSEL__CONFIG_TERM_AUX_SAMPLE_SIZE, - EVSEL__CONFIG_TERM_CFG_CHG, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG1, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG2, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG3, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG4, EVSEL__CONFIG_TERM_RATIO_TO_PREV, }; =20 diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 46422286380f33a48087e7079a45bb21beb2d573..7ef63b808d0542999fd1303b9f9= 4cae68e38030f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1253,66 +1253,32 @@ static int get_config_terms(const struct parse_even= ts_terms *head_config, return 0; } =20 -/* - * Add EVSEL__CONFIG_TERM_CFG_CHG where cfg_chg will have a bit set for - * each bit of attr->config that the user has changed. - */ -static int get_config_chgs(struct perf_pmu *pmu, struct parse_events_terms= *head_config, - struct list_head *head_terms) +static int add_cfg_chg(struct perf_pmu *pmu, + struct parse_events_terms *head_config, + struct list_head *head_terms, + int format_type, + enum parse_events__term_type term_type, + enum evsel_term_type new_term_type) { struct parse_events_term *term; u64 bits =3D 0; int type; =20 list_for_each_entry(term, &head_config->terms, list) { - switch (term->type_term) { - case PARSE_EVENTS__TERM_TYPE_USER: + if (term->type_term =3D=3D PARSE_EVENTS__TERM_TYPE_USER) { type =3D perf_pmu__format_type(pmu, term->config); - if (type !=3D PERF_PMU_FORMAT_VALUE_CONFIG) + if (type !=3D format_type) continue; bits |=3D perf_pmu__format_bits(pmu, term->config); - break; - case PARSE_EVENTS__TERM_TYPE_CONFIG: + } else if (term->type_term =3D=3D term_type) { bits =3D ~(u64)0; - break; - case PARSE_EVENTS__TERM_TYPE_CONFIG1: - case PARSE_EVENTS__TERM_TYPE_CONFIG2: - case PARSE_EVENTS__TERM_TYPE_CONFIG3: - case PARSE_EVENTS__TERM_TYPE_CONFIG4: - case PARSE_EVENTS__TERM_TYPE_LEGACY_HARDWARE_CONFIG: - case PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE_CONFIG: - case PARSE_EVENTS__TERM_TYPE_NAME: - case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD: - case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ: - case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE: - case PARSE_EVENTS__TERM_TYPE_TIME: - case PARSE_EVENTS__TERM_TYPE_CALLGRAPH: - case PARSE_EVENTS__TERM_TYPE_STACKSIZE: - case PARSE_EVENTS__TERM_TYPE_NOINHERIT: - case PARSE_EVENTS__TERM_TYPE_INHERIT: - case PARSE_EVENTS__TERM_TYPE_MAX_STACK: - case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS: - case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE: - case PARSE_EVENTS__TERM_TYPE_OVERWRITE: - case PARSE_EVENTS__TERM_TYPE_DRV_CFG: - case PARSE_EVENTS__TERM_TYPE_PERCORE: - case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT: - case PARSE_EVENTS__TERM_TYPE_AUX_ACTION: - case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE: - case PARSE_EVENTS__TERM_TYPE_METRIC_ID: - case PARSE_EVENTS__TERM_TYPE_RAW: - case PARSE_EVENTS__TERM_TYPE_CPU: - case PARSE_EVENTS__TERM_TYPE_RATIO_TO_PREV: - default: - break; } } =20 if (bits) { struct evsel_config_term *new_term; =20 - new_term =3D add_config_term(EVSEL__CONFIG_TERM_CFG_CHG, - head_terms, false); + new_term =3D add_config_term(new_term_type, head_terms, false); if (!new_term) return -ENOMEM; new_term->val.cfg_chg =3D bits; @@ -1321,6 +1287,50 @@ static int get_config_chgs(struct perf_pmu *pmu, str= uct parse_events_terms *head return 0; } =20 +/* + * Add EVSEL__CONFIG_TERM_USR_CFG_CONFIGn where cfg_chg will have a bit se= t for + * each bit of attr->configN that the user has changed. + */ +static int get_config_chgs(struct perf_pmu *pmu, + struct parse_events_terms *head_config, + struct list_head *head_terms) +{ + int ret; + + ret =3D add_cfg_chg(pmu, head_config, head_terms, + PERF_PMU_FORMAT_VALUE_CONFIG, + PARSE_EVENTS__TERM_TYPE_CONFIG, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG); + if (ret) + return ret; + + ret =3D add_cfg_chg(pmu, head_config, head_terms, + PERF_PMU_FORMAT_VALUE_CONFIG1, + PARSE_EVENTS__TERM_TYPE_CONFIG1, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG1); + if (ret) + return ret; + + ret =3D add_cfg_chg(pmu, head_config, head_terms, + PERF_PMU_FORMAT_VALUE_CONFIG2, + PARSE_EVENTS__TERM_TYPE_CONFIG2, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG2); + if (ret) + return ret; + + ret =3D add_cfg_chg(pmu, head_config, head_terms, + PERF_PMU_FORMAT_VALUE_CONFIG3, + PARSE_EVENTS__TERM_TYPE_CONFIG3, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG3); + if (ret) + return ret; + + return add_cfg_chg(pmu, head_config, head_terms, + PERF_PMU_FORMAT_VALUE_CONFIG4, + PARSE_EVENTS__TERM_TYPE_CONFIG4, + EVSEL__CONFIG_TERM_USR_CHG_CONFIG4); +} + int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list, const char *sys, const char *event, diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 2c26c8d76bed920c7b5b43beb867e4d1bcaa2970..e02f74d4020c151082ecc434c29= c0ec4c2c9b2c8 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1387,7 +1387,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu,= struct evsel *evsel, const char *config_name, u64 val) { u64 user_bits =3D 0, bits; - struct evsel_config_term *term =3D evsel__get_config_term(evsel, CFG_CHG); + struct evsel_config_term *term =3D evsel__get_config_term(evsel, USR_CHG_= CONFIG); =20 if (term) user_bits =3D term->val.cfg_chg; --=20 2.34.1