From nobody Mon Feb 9 18:19:27 2026 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 53434326925 for ; Mon, 22 Dec 2025 15:14:55 +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=1766416499; cv=none; b=M/4t4ii5PEA7/Bwxmk9Z+DNvxX69msqNBRe/xA4QFzzx9Qrq5EpXZDnfuGJqiwt8UOElSgjVUO/PJJ/jDVT/DPnBxb9RE2Rc9s6KJexrzky7Bo4m36cyQkkFfBWelzTjxBlh8iHmlzc4yJnpIGer+npBLmV2X4t7IUMWUimHSWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766416499; c=relaxed/simple; bh=dtSxRObzl9Igu3Uf4jC/9ZgVZUFaci2xTk7imj99J5A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LjZ1f3TaLDIjItisWWjthbqRH8yDnFlc1VoxuTXY9+lxd8G/1hsrDFjDZK6Mo3IF3nCpO6oxsv3OeU+KEV6cl99VqQ0gYM91YkNxqlat/b+iXQ5s9Slegm9+so1D/pdNd+K6zep9Q/q+UHee/FYcwEYFdzSYQaMlO0ftoDKuY6Q= 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=MGaMR9uT; 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="MGaMR9uT" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-47789cd2083so21450215e9.2 for ; Mon, 22 Dec 2025 07:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766416493; x=1767021293; 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=Tc92yWKQZM+B64gHggXneBOLYCdgUjGdgIDlKi2hgGI=; b=MGaMR9uTwog9ZE2BgTOpDHeCG/mmVs9L5inxIpvHLrOa9HDFUfnbaeTWyd/EpIBkIv EboPBF/+HPu8/wo/wl4Oqu+wmLjRxs6bOoOzPxk0TueMB38Le6QXJObLJqr5OSAoZ4XL Ahq96e46NIOvoGYKaVDpwxXV4dHxVd1CblxYjFwAHhRBQOBUNZHN3Tlc4tILBvPczwXi XPuR5eJbz/ufwmlpLrP2EQiH56rNScrHEmQwl9dS5ZEbVP2FhV+0/LxaCIzStDM4nct5 sCzcWbE8ZyBiRj1W1K1Xfeot7I8JNtKFIxXb4sUA+LCDIgLeCzX93fmr/qS+24uzsYPx kk7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766416493; x=1767021293; 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=Tc92yWKQZM+B64gHggXneBOLYCdgUjGdgIDlKi2hgGI=; b=hojggMAtXRobN0ZVY340Gu2ZTUxKCV0Xs1Q9cx6o2YjM1Ex8d9jP+Ufk/sEzWXtRRm UdRBEt6hy/IecMX4EddC4FCg9fpiUT5ykrEdCeFeysQ/qsikJI1bYU48jXDfaFV+6/Dj bVfFXMexXsPvAmsJsJAWpL0erBbh589fFUhBXejHvVDovQhJkAKkMZE5lkYFV55Az9zt 1MpQzSsP9WuR8p7Wyjo8xYxN/cYsPRXSV/OvFhNVLenFZuZBZ9/Q+hlYiOxN8AEYjAIv apPVqIp2bS94d3qwEWJqg0dTbBpBWibed6rpdXD+ozooGRDiI+cwNbyiFJADpZuUVFwj vh3A== X-Forwarded-Encrypted: i=1; AJvYcCUB0K3KL2y+FiPJ3ALyhDHpIbwQOl6fA9BFEEzG13PeFKQPqMwWGHYMy56vAAEDrIwmgWUXgmPpYGeHDmM=@vger.kernel.org X-Gm-Message-State: AOJu0YzdDBbW6E23UnNoDv8PZ8eBWkn/uR9QUgnTtSotg775gYQeGdDp 0ZodDYMPneT/3Q0Xdsm1Jnu56vGs9kWJuyxbgQuQFVtEUcZdakgL63IrkckmZynnZgY= X-Gm-Gg: AY/fxX4v7fWo01DR2OGNS2yvDkQ8cGX7nSZPRihlVQPegWam9necIubJRFSW4wQ1mNN uaiJZHoyjMJ/iFpEdL3bfOpJ9LzeEGMJn9IHzfDKFuq3N8om6RhcnH2JtBzXaAvlyXtZZUh0GTR j2UrfckYBeYK3CWOHHPlqvH8H5P09FQQXhcVO6uOBvolK5NWsg9psM2PKaGQXBrAbf8IuDgEHnw dqdyBr8wC8r009WtSGceYNXcAp8lmloXqN+rh83hg+SMLpgUfJFQ+RlIXybv7UIzmWg7Rldj/o5 OCG8+DIWJ0buBWrmTIdzR/bFmQsrSZjJ3RNUAtUaAGrvNLG89nn09Zu3bOe3NmEPSCKGqUMsyIK v71zjdbPX1e8mSXWKDIMxlv/mG7XuwaTksQRdSwH8QBNOhdj1AieDgmWFzaz4M9GgVAaFznRb2y IiS0M786mrWFQjsGafSAmXpQmFke4IxEg= X-Google-Smtp-Source: AGHT+IH+XDMQ3rlxuM0Gvuwq8tNBEur+OrwI+FlxYWbuxE83bWivfEIsy6eHbB5jrKNX77vHoZIFOQ== X-Received: by 2002:a05:600c:348a:b0:46e:1a5e:211 with SMTP id 5b1f17b1804b1-47d1958a755mr124164345e9.21.1766416493331; Mon, 22 Dec 2025 07:14:53 -0800 (PST) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324ea830fesm22750093f8f.20.2025.12.22.07.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Dec 2025 07:14:52 -0800 (PST) From: James Clark Date: Mon, 22 Dec 2025 15:14:31 +0000 Subject: [PATCH v4 06/14] perf evsel: apply evsel__set_config_if_unset() to all config fields 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: <20251222-james-perf-config-bits-v4-6-0608438186fc@linaro.org> References: <20251222-james-perf-config-bits-v4-0-0608438186fc@linaro.org> In-Reply-To: <20251222-james-perf-config-bits-v4-0-0608438186fc@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 Misleadingly, evsel__set_config_if_unset() only works with the config field and not config1, config2, etc. This is fine at the moment because all users of it happen to operate on bits that are in that config field. Fix it before there are any new users of the function which operate on bits in different config fields. In theory it's also possible for a driver to move an existing bit to another config field and this fixes that scenario too, although this hasn't happened yet either. Reviewed-by: Ian Rogers Signed-off-by: James Clark --- tools/perf/util/evsel.c | 37 ++++++++++++++++++++++++++++++++++--- tools/perf/util/pmu.c | 29 ++--------------------------- tools/perf/util/pmu.h | 27 +++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 30 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 354e28e94523..b863096ed568 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1330,8 +1330,39 @@ void evsel__set_config_if_unset(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, - USR_CHG_CONFIG); + struct evsel_config_term *term; + struct perf_pmu_format *format =3D pmu_find_format(&evsel->pmu->format, + config_name); + __u64 *vp; + + if (!format) + return; + + switch (format->value) { + case PERF_PMU_FORMAT_VALUE_CONFIG: + term =3D evsel__get_config_term(evsel, USR_CHG_CONFIG); + vp =3D &evsel->core.attr.config; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG1: + term =3D evsel__get_config_term(evsel, USR_CHG_CONFIG1); + vp =3D &evsel->core.attr.config1; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG2: + term =3D evsel__get_config_term(evsel, USR_CHG_CONFIG2); + vp =3D &evsel->core.attr.config2; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG3: + term =3D evsel__get_config_term(evsel, USR_CHG_CONFIG3); + vp =3D &evsel->core.attr.config3; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG4: + term =3D evsel__get_config_term(evsel, USR_CHG_CONFIG4); + vp =3D &evsel->core.attr.config4; + break; + default: + pr_err("Unknown format value: %d\n", format->value); + return; + } =20 if (term) user_bits =3D term->val.cfg_chg; @@ -1343,7 +1374,7 @@ void evsel__set_config_if_unset(struct evsel *evsel, = const char *config_name, return; =20 /* Otherwise replace it */ - pmu_format_value(&bits, val, &evsel->core.attr.config, /*zero=3D*/true); + pmu_format_value(&bits, val, vp, /*zero=3D*/true); } =20 void __weak arch_evsel__set_sample_weight(struct evsel *evsel) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 2fe92b4b6e02..dc5dab69151f 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -118,31 +118,6 @@ struct perf_pmu_alias { bool info_loaded; }; =20 -/** - * struct perf_pmu_format - Values from a format file read from - * /devices/cpu/format/ held in struct perf_pmu. - * - * For example, the contents of /devices/cpu/format/event may be - * "config:0-7" and will be represented here as name=3D"event", - * value=3DPERF_PMU_FORMAT_VALUE_CONFIG and bits 0 to 7 will be set. - */ -struct perf_pmu_format { - /** @list: Element on list within struct perf_pmu. */ - struct list_head list; - /** @bits: Which config bits are set by this format value. */ - DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS); - /** @name: The modifier/file name. */ - char *name; - /** - * @value : Which config value the format relates to. Supported values - * are from PERF_PMU_FORMAT_VALUE_CONFIG to - * PERF_PMU_FORMAT_VALUE_CONFIG_END. - */ - u16 value; - /** @loaded: Has the contents been loaded/parsed. */ - bool loaded; -}; - static int pmu_aliases_parse(struct perf_pmu *pmu); =20 static struct perf_pmu_format *perf_pmu__new_format(struct list_head *list= , char *name) @@ -1362,8 +1337,8 @@ void perf_pmu__warn_invalid_formats(struct perf_pmu *= pmu) } } =20 -static struct perf_pmu_format * -pmu_find_format(const struct list_head *formats, const char *name) +struct perf_pmu_format *pmu_find_format(const struct list_head *formats, + const char *name) { struct perf_pmu_format *format; =20 diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 7bf5b23d0ea1..7655d996090a 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -233,6 +233,31 @@ struct pmu_event_info { bool deprecated; }; =20 +/** + * struct perf_pmu_format - Values from a format file read from + * /devices/cpu/format/ held in struct perf_pmu. + * + * For example, the contents of /devices/cpu/format/event may be + * "config:0-7" and will be represented here as name=3D"event", + * value=3DPERF_PMU_FORMAT_VALUE_CONFIG and bits 0 to 7 will be set. + */ +struct perf_pmu_format { + /** @list: Element on list within struct perf_pmu. */ + struct list_head list; + /** @bits: Which config bits are set by this format value. */ + DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS); + /** @name: The modifier/file name. */ + char *name; + /** + * @value : Which config value the format relates to. Supported values + * are from PERF_PMU_FORMAT_VALUE_CONFIG to + * PERF_PMU_FORMAT_VALUE_CONFIG_END. + */ + u16 value; + /** @loaded: Has the contents been loaded/parsed. */ + bool loaded; +}; + typedef int (*pmu_event_callback)(void *state, struct pmu_event_info *info= ); typedef int (*pmu_format_callback)(void *state, const char *name, int conf= ig, const unsigned long *bits); @@ -255,6 +280,8 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct = parse_events_terms *head_ int perf_pmu__find_event(struct perf_pmu *pmu, const char *event, void *st= ate, pmu_event_callback cb); =20 void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, bool z= ero); +struct perf_pmu_format *pmu_find_format(const struct list_head *formats, + const char *name); void perf_pmu_format__set_value(void *format, int config, unsigned long *b= its); bool perf_pmu__has_format(const struct perf_pmu *pmu, const char *name); int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_forma= t_callback cb); --=20 2.34.1