From nobody Tue Feb 10 07:41:32 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 87A293A0EBE for ; Wed, 14 Jan 2026 15:57:47 +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=1768406270; cv=none; b=gxNeqnkwLnP9QdtbhGwIdE7j7uaLspPHLEKBnNiPp9hXa000F3SDHEd6AxRytZhOMvp/Vyj+2FqFk3xf71SOl079HI50ZSq3rid2IGBgTXaXC0A54P7LvwvYo4wqAK83XHLs64JKmDDxT/ROql4dCSGzs0GIEAQRMIJUUCf+kTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768406270; c=relaxed/simple; bh=m5ZHZ9nlMYrdHDXfhPH8Iav+WkxMm0bekJS47cvRmyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EAYu/9Mn8uX1w23VJJ7ythuXwcd/uPzLaQqOOcwbcCW2g/5jBeja0crDp8xqJ8opReu6K1Y4zt1NBatxFNcpimww+FQX0JhuIHuKSUbl3tPLqz7GYzShwCLJubAEQB54A2j/qEZ3Mz0lzkmvQY4AA8FXr7jUdzaGyIMcPfA4JnY= 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=mRvm+DFK; 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="mRvm+DFK" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-477a2ab455fso81987055e9.3 for ; Wed, 14 Jan 2026 07:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768406265; x=1769011065; 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=WFM04/cBVS3JjjnsemivS8mMLgjxey36ij8/+pN2RLY=; b=mRvm+DFKrnTlAP4OHOr8p8mybSHdNz9QR0pb214UdNjYo7MLP0vCA8BovKwQj8h77V tzid+xJFGZpbFnYTeasNHQ6of09Z7um5pRzWxFvjPb+PHWX+QV5CBOJLMehXpw5li6zz X+ph36dYlxKZU3F8rxMIJVnknM6oVJGFvwORB4DUWJixDN7o+7TIhq/NO7mSGFTLg+Zi CUX1+tGCQP4gihjlQaFW81M5Lxkb0TNodFqh8vKG3k17aLosMCQSP4+WnAwk5QN0Y6PP 2UkLUuGuZyEo4EdjXw+yZv2HvlfuPN13SaUNrwn0cjKqnaGYTRdeCbmQOimyV9C9rhLC NDyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768406265; x=1769011065; 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=WFM04/cBVS3JjjnsemivS8mMLgjxey36ij8/+pN2RLY=; b=geOkd2PlQyAiVwpskk/4X/ek3Gxd+n90XBkerm3lIK2ZASLRQyMKxWgsFcen80dwcK wftpW5yFaiQEl4Xhn68x9nFVLng3EcF6/x2kBif+yWSigmS8Yqfgc68AXN0WQYC4biJs xEEIWvNaJsZzR35bTd+Q/IER4em3ypT74T+DNyHBrag6QU2COJY/CE0CCbk3CXktoy8J w+B15D6G5G5pF3ayiDUppBpf8k2bYjmn005uRHm8I0asNU+rkI4NT9nKq6FWS7S6Kpaf 0dFXeMCdCYO3a3BDaSlSHkaH0o7AZCDGB65lL1/SLFUOPo5GwlV5Q/3KhZbT1NRU4BuN QsQg== X-Forwarded-Encrypted: i=1; AJvYcCVoz3522Z3BZLLs8JdPdXIgRv1Pkwnf8Fy7jx3c2/HMa7ty6dEjCQ8ZGDO42yJpeAD4m1hXUKEYPNCegj4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9QLl/VC+KbP+/m22N0UTNBNpckv49+PglHIkqg8KtT/rhFeGg boWMBtqvyFOz81n3foj8/ekmahzCJKpw3UvWvK8wkqjRlw4PDuLKz1JX5gK2ihD+41M= X-Gm-Gg: AY/fxX5z0y1jEQtQjS0lIDnXdpNxBBo0pHX+NgJc8r+MKDi5oaAyxdmtvL8IFGJGK2F 9nk3ABUUulLjsFa5QhoK9tV9jClrbi+mFdbwY475xugpbRWSctlxaAHlcGNlQklaNTvwZUOk1ld MpD9K5euYuW501NPeAvaVA3h8yA6JgRD1UVtrT+l+Rtxo+Lw+9pX3j7LtxqrylMqzSC8OFL9AqK mubFgriI+PmD34TyGS3FK2oimea3pf2i2MZXdIDqdXDkOuJ/qUbvkUgmRwjnDnYQLeV5B6qusIw hIMVkJlRj7iWrun2wHtSgOJBhSm+7itwPah3vWKNp7hqm3malB2z5mhH4S9bD0+zHOEXCDkYkEq 11tK2w07Me+YHAiHx8/S+ktsm5UYZNSRCTkbmH1NfbDevHP0MZLO+rAvkH03zr53z6xj3osWb92 EV5AfEzFtPnGOmn8G7VbAl X-Received: by 2002:a05:600c:34cd:b0:479:2a3c:f31a with SMTP id 5b1f17b1804b1-47ee32e94acmr41043225e9.1.1768406264600; Wed, 14 Jan 2026 07:57:44 -0800 (PST) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47ee85e8807sm7426475e9.16.2026.01.14.07.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:57:43 -0800 (PST) From: James Clark Date: Wed, 14 Jan 2026 15:57:18 +0000 Subject: [PATCH v5 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: <20260114-james-perf-config-bits-v5-6-0ef97aaf1ac0@linaro.org> References: <20260114-james-perf-config-bits-v5-0-0ef97aaf1ac0@linaro.org> In-Reply-To: <20260114-james-perf-config-bits-v5-0-0ef97aaf1ac0@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 | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 27f4b5212dc6..3162bfc0ccfe 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1335,6 +1335,36 @@ void evsel__set_config_if_unset(struct evsel *evsel,= const char *config_name, struct perf_pmu_format *format =3D pmu_find_format(&evsel->pmu->format, config_name); int fbit; + __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 (!format) return; @@ -1348,7 +1378,7 @@ void evsel__set_config_if_unset(struct evsel *evsel, = const char *config_name, return; =20 /* Otherwise replace it */ - pmu_format_value(format->bits, val, &evsel->core.attr.config, /*zero=3D*/= true); + pmu_format_value(format->bits, val, vp, /*zero=3D*/true); } =20 void __weak arch_evsel__set_sample_weight(struct evsel *evsel) --=20 2.34.1