From nobody Mon Feb 9 19:04:32 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 E63C33A0EBB for ; Wed, 14 Jan 2026 15:57:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768406267; cv=none; b=TNVu8FfH2xWgO282E6ih8/kvDWK50c/k4rOOzdLeFnkZmsPSrqb+5pi7u9qXrF4Y7uvydpkmHxBl5dXhrh28RtbAUYLOwS0I/dwkMh0TvSY0ih3blch0M8X7otq1yp4kmsgTocIFRHEoTlneSG1WEhXkt1KDFMVEV8/d3td+VcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768406267; c=relaxed/simple; bh=mrtxJ5M6SR3xdP9wSMg81zPVwvCfE9H+mEz/8/aLW+k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e84GXBw6GL0Q0rIjyGQVLQkp2pA4hjXjLdMfR2cDn8mw1JZLw4kZNGx0gNy1mW2mfnLI/RntfqfTMDTs/fsZ5F0DZ4i/ejpIP/Y/l50KdOqL/QXH9+PDSfOss7MoV+nBSaMpfekAezkeuOcFZUaUOPva1yTpHdEHhs4qKf2ulHU= 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=w2f3DJFE; arc=none smtp.client-ip=209.85.128.49 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="w2f3DJFE" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-47ee807a4c5so3876555e9.2 for ; Wed, 14 Jan 2026 07:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768406259; x=1769011059; 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=2iYsj2HXEXbwN0vBYKJUN3Lkbk015SqHZecYgVjo6J0=; b=w2f3DJFEBI31GHDJs9sGnwj219odQX4qDF8CzY3uvxFKPnmH/ldtWkPZcV6G9Q0I5W A/mVL2Mc1ix8mu979wFh1Vn+y0zIbicmA5BzxNBzmvA+rLz+MaBdAn7vPBZpUtIrsj4y bTvR5TAaBlyMXGC5a6qexvu/qTFFJoi/56+8p8jNz+tXAtWJeQS0UIe6nCKHsHSFw2ld 1CthWAga7WruZhu58jDBqOAtQ10FqFh1VAhiCK9i2FCrMKdBz32qirFeA7L951WxJZf6 f6i48GBxnMXaQeY3jwv8RhSkOziSTPUfBKQI5HTZwWMYfzkksUccx2AJlrHCkvt5LDia zXnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768406259; x=1769011059; 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=2iYsj2HXEXbwN0vBYKJUN3Lkbk015SqHZecYgVjo6J0=; b=QZdtrGJlcO1Df8sd0/J2QbElbteajSDAus6YjX7R4K3cwQ/ChD4yCs2SgdlYpjIIxg /mUmGiPWb4bFEfoR77ThJwx5E+uxJiTfojSesjsxUqg5F+6Fv0la8XAK97ne5J/8otq5 JHBBE9cgR+66GQ4Jia81ynSREHkWTe2FIZgAa1Co5d9Kx/ksKVqNVgDYGW+UsKN9hXua 2X1QTsKiyh12VaXV9ebaYmkKPB6QzvwU2mh/qF7IP747kw7a4slNiuLRE30QwGy/SlTE C5371qaSKYW4vDFwYzqF34oKPo+v+pIpyDnL6Jbk8U328uhuzm8eBW8Ehwl1YiyeMqTo NKtQ== X-Forwarded-Encrypted: i=1; AJvYcCWzHUqLVdI6SgqpEMQmdlWCfzAfmfAXPX61JcNj3X8fkoCVq8OP1rJyxGs2/MiGtB2CFo8WABw6GV3uRMg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz55ymcuNyLBO14pwXcbkDxvTQhOlPiVgDHJJjgDE8yETKdmpgn GW2mFmxVFLJU0SxrAng6CbtGct71LW3xNRM0ndCAyg6FfvUW5nStGo2InvUeEdCEqhQ= X-Gm-Gg: AY/fxX4tYP5iTVPx7fGanuCR7pR3A7zOdAMK0miT98FN7Y2C6LO+jVTpsNm2nKj1YQF 2fhMGIyozOXVOH2rWo9wUpRO+1TWGyG99EuJSqF2ij9cDCNU7khM3Fx51KR3AdNrjnhZxuX90SU XOvM0zyKfOulZeLJr0DQ1cVlFLYX/KCPAxvCClmC4it65qaxi7I6qmwOZF76AfSnmEilDM4bmpW Ay3XJwmzn1pSEXY51/QGEsKJhzK57U83+sQxM77Gf7M9k6RLqDyI9twjwyq9QN4mCxXfZ15cAPF DmsxOOtGOtNT1tA7YzmVf1UbES2nh7B/+ZlpTG3Fy2cmjZyQ/2L35LQ7K7QnqttlDDwfmFtnDx2 kwuZopwXnFWSEL3VHBXBErXmImZlNot3wSd4az+QkM9epGy1SJhHFi6LQlJFamBBHZMWWplZPmX B6fN4q0j36AtcH4AO/Xtuu+/CIzhh+S84= X-Received: by 2002:a05:600c:a46:b0:47a:975b:e3e6 with SMTP id 5b1f17b1804b1-47ee3371a0amr41542255e9.18.1768406259151; Wed, 14 Jan 2026 07:57:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:57:38 -0800 (PST) From: James Clark Date: Wed, 14 Jan 2026 15:57:14 +0000 Subject: [PATCH v5 02/14] perf evsel: Refactor evsel__set_config_if_unset() arguments 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-2-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 Make the evsel argument first to match the other evsel__* functions and remove the redundant pmu argument, which can be accessed via evsel. Signed-off-by: James Clark Reviewed-by: Ian Rogers --- tools/perf/arch/arm/util/cs-etm.c | 9 +++------ tools/perf/arch/arm64/util/arm-spe.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 3 +-- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/pmu.c | 6 +++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index ea891d12f8f4..c28208361d91 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -441,10 +441,8 @@ static int cs_etm_recording_options(struct auxtrace_re= cord *itr, * when a context switch happened. */ if (!perf_cpu_map__is_any_cpu_or_is_empty(cpus)) { - evsel__set_config_if_unset(cs_etm_pmu, cs_etm_evsel, - "timestamp", 1); - evsel__set_config_if_unset(cs_etm_pmu, cs_etm_evsel, - "contextid", 1); + evsel__set_config_if_unset(cs_etm_evsel, "timestamp", 1); + evsel__set_config_if_unset(cs_etm_evsel, "contextid", 1); } =20 /* @@ -453,8 +451,7 @@ static int cs_etm_recording_options(struct auxtrace_rec= ord *itr, * timestamp tracing. */ if (opts->sample_time_set) - evsel__set_config_if_unset(cs_etm_pmu, cs_etm_evsel, - "timestamp", 1); + evsel__set_config_if_unset(cs_etm_evsel, "timestamp", 1); =20 /* Add dummy event to keep tracking */ err =3D parse_event(evlist, "dummy:u"); diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/u= til/arm-spe.c index d5ec1408d0ae..51014f8bff97 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -274,7 +274,7 @@ static void arm_spe_setup_evsel(struct evsel *evsel, st= ruct perf_cpu_map *cpus) */ if (!perf_cpu_map__is_any_cpu_or_is_empty(cpus)) { evsel__set_sample_bit(evsel, CPU); - evsel__set_config_if_unset(evsel->pmu, evsel, "ts_enable", 1); + evsel__set_config_if_unset(evsel, "ts_enable", 1); } =20 /* diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util= /intel-pt.c index b394ad9cc635..c131a727774f 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -664,8 +664,7 @@ static int intel_pt_recording_options(struct auxtrace_r= ecord *itr, return 0; =20 if (opts->auxtrace_sample_mode) - evsel__set_config_if_unset(intel_pt_pmu, intel_pt_evsel, - "psb_period", 0); + evsel__set_config_if_unset(intel_pt_evsel, "psb_period", 0); =20 err =3D intel_pt_validate_config(intel_pt_pmu, intel_pt_evsel); if (err) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a08130ff2e47..2cf87bc67df7 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -575,8 +575,8 @@ void evsel__uniquify_counter(struct evsel *counter); ((((src) >> (pos)) & ((1ull << (size)) - 1)) << (63 - ((pos) + (size) - 1= ))) =20 u64 evsel__bitfield_swap_branch_flags(u64 value); -void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, - const char *config_name, u64 val); +void evsel__set_config_if_unset(struct evsel *evsel, const char *config_na= me, + u64 val); =20 bool evsel__is_offcpu_event(struct evsel *evsel); =20 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 956ea273c2c7..e87c12946d71 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1382,8 +1382,8 @@ bool evsel__is_aux_event(const struct evsel *evsel) * something to true, pass 1 for val rather than a pre shifted value. */ #define field_prep(_mask, _val) (((_val) << (ffsll(_mask) - 1)) & (_mask)) -void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, - const char *config_name, u64 val) +void evsel__set_config_if_unset(struct evsel *evsel, const char *config_na= me, + u64 val) { u64 user_bits =3D 0, bits; struct evsel_config_term *term =3D evsel__get_config_term(evsel, CFG_CHG); @@ -1391,7 +1391,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu,= struct evsel *evsel, if (term) user_bits =3D term->val.cfg_chg; =20 - bits =3D perf_pmu__format_bits(pmu, config_name); + bits =3D perf_pmu__format_bits(evsel->pmu, config_name); =20 /* Do nothing if the user changed the value */ if (bits & user_bits) --=20 2.34.1