From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 72A18314D14 for ; Mon, 8 Dec 2025 14:23:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765203806; cv=none; b=WXdtzT7hN3wLgdUsZ92Z0x0/B2FsjFakTxl+CPqAPaxQdYo08BcgEDbCQJEp2WQfb9L0Eh9sdcUTRRz2Yp18CnK1edvsUeNdobNSJfl4uflnXw6CSDCv5s1kLUPFaEHhU8PQzxxiHD3iyqg8fIpOnFvfZPta377OeIwl8O+rfUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765203806; c=relaxed/simple; bh=G91PVNHfi0QYrYWGktdjTNJ/Okf/P/cyrGTlMeXq90I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s9P9veqkB3YyUIrDG9dLPZP/yEW8Gg7fchLMfP0fUUPPjnG7g9PALFQrzSvjuHe05r5OpKJ1WFppXobb8PuqRNh7Xl4e3GJNmHQ+Pr995QnaHDgBKnGCB8rLetAYCZYgzFN8slHv0lNNaUm5GyxVoI0/pU6gJCMQbLH8qUngcww= 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=eDq8/R/J; arc=none smtp.client-ip=209.85.128.46 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="eDq8/R/J" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47775fb6cb4so37917715e9.0 for ; Mon, 08 Dec 2025 06:23:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765203803; x=1765808603; 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=ZRhf5LqtwI1BCs/MXxqcrvCOGauWve2lGZSZRvbtNrM=; b=eDq8/R/JfzeeH6y8BF+AWTwQINiTl38oUMd7dpbuLjNjbCzcOhPMX8Rp+877/Be1dR Qazyg3IO5gQuECgkSDh0E1EQhaw/kQN8at2kwBGSgJeCiiIreSNK7Gn0d4LydSeMqvQ+ Nvl/b8S+6ju+Aa7a9fLH8Ol46bGGq1WBixI/ocuAdPB7SmLFXrMiSFa8BzoFkLPUcyFm 7yRyn+0xgw9e+yUZcj+a3zBcDEE1iEHbr+3BdrsdCS2B8laDhgZ86AZER+nlxSpr4MZl /lUDaHIZNK1EWnLpVOfvawwcCm4CsEaDjWrOmBDpsFdA8bmUJyxBniidXka1B+ID2z9v WnFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765203803; x=1765808603; 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=ZRhf5LqtwI1BCs/MXxqcrvCOGauWve2lGZSZRvbtNrM=; b=s3CG0sA1fo9ATDB6UNX2GhkWbRdfdD30zNUtBN+2iZmUAEFmuNWI/FwC8pNr507BlE yVNE8CkPWMsaHCp/Q6XP1EfzIOAuydetffgV/PbVPKLCx1hF/ZiAxgzdS4SOAOCi406C 6YCjgpNXGfkMHdVTkZXxUuh0ZhHz+OcIPbcFMpLs4xO4AmY2Ca+DTOwt+7oi3jDquAIT eVJHQlnSokCUGfSxg7mVtB3+yciY/s3e51iO7d2KEtaDvJ0iBMnlhATpYnf/xdpMljet Ku3ORL8BJ+eHjmOJMkDtxAig5uH9krDeG9D4XmFPRLbl7SUfQ78Z0oNmOsFMrbmWQoCk iEqA== X-Forwarded-Encrypted: i=1; AJvYcCX31yl01VTNtNTQ6SXCahLYwQUJVCAYeV+xZl2Exq4ddfDf4+W+55nL3/IEl1WJiE6gdFVbPRaody41MsI=@vger.kernel.org X-Gm-Message-State: AOJu0YySc/g7RquVxXEpZAwKaKPtzmxXfk0mp7+LcwHxNG1enz3ePBV4 ynu8UNn8M1C1k09TcqOJuMo1/nL8LRHz3XZKHG3akb5XzdUzK77jt8Vh6l5CsE1Srm5U2BB4XgD lV/ur X-Gm-Gg: ASbGnct2RrDplpzysggrmpKvTtNN+3smICJPf8c/lclqjVke4aDCGhNE4oAhpjkLe7g h8nklqpOGzT1fzCcc7ZBPsY18EKR9vqhhnOTO9S93UgzXaOaU6b6dIkkwQSG3RjYX1JUJJpvKvq dIjM2nUNIbE+mVgIEiCtBZ7igUsFOGdneVHfo+cKU23luVWjEMdeWWx5S4O0jqOSA0EMSh5Skzr tposkhMOo+gK9VaMe1SGmeTch+q21tY4+CoiKPmm/9CsRn28KfvyqNPp1GzhXBuso98FZlDDxcA 8e7m1/IkoZfLt2IDB9lAqSHT9MWtr9/UvkW4hVv9pCE1Ga0El01BREALlJ+EwmqvvYA4aOctzYH nhPVgEEbK4JCK7ijFcI9USCuc0tvtOrNPtqu23MQzOMCB5i8t8Xv6YAaiOnPs+WWP3DHhnV9YdG VAPUKrUHQptjBSk9bR+ysB X-Google-Smtp-Source: AGHT+IEhpoMN4+zTETFkcztiEWYM4FtF59nv9AEONwYh8tAIN/5BaZy8msPhg0ncsD8sYg+q3JZCMw== X-Received: by 2002:a05:600c:3514:b0:477:7768:8da4 with SMTP id 5b1f17b1804b1-47939deac5bmr91892805e9.7.1765203802717; Mon, 08 Dec 2025 06:23:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Dec 2025 06:23:22 -0800 (PST) From: James Clark Date: Mon, 08 Dec 2025 14:22:07 +0000 Subject: [PATCH v2 04/12] 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: 7bit Message-Id: <20251208-james-perf-config-bits-v2-4-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 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. Signed-off-by: James Clark --- tools/perf/util/pmu.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index e02f74d4020c..514cba91f5d9 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -146,6 +146,8 @@ struct perf_pmu_format { static int pmu_aliases_parse(struct perf_pmu *pmu); static void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, bool zero); +static struct perf_pmu_format *pmu_find_format(const struct list_head *formats, + const char *name); static struct perf_pmu_format *perf_pmu__new_format(struct list_head *list, char *name) { @@ -1387,7 +1389,38 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, const char *config_name, u64 val) { u64 user_bits = 0, bits; - struct evsel_config_term *term = evsel__get_config_term(evsel, USR_CHG_CONFIG); + struct evsel_config_term *term; + struct perf_pmu_format *format = pmu_find_format(&pmu->format, config_name); + __u64 *vp; + + if (!format) + return; + + switch (format->value) { + case PERF_PMU_FORMAT_VALUE_CONFIG: + term = evsel__get_config_term(evsel, USR_CHG_CONFIG); + vp = &evsel->core.attr.config; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG1: + term = evsel__get_config_term(evsel, USR_CHG_CONFIG1); + vp = &evsel->core.attr.config1; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG2: + term = evsel__get_config_term(evsel, USR_CHG_CONFIG2); + vp = &evsel->core.attr.config2; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG3: + term = evsel__get_config_term(evsel, USR_CHG_CONFIG3); + vp = &evsel->core.attr.config3; + break; + case PERF_PMU_FORMAT_VALUE_CONFIG4: + term = evsel__get_config_term(evsel, USR_CHG_CONFIG4); + vp = &evsel->core.attr.config4; + break; + default: + pr_err("Unknown format value: %d\n", format->value); + return; + } if (term) user_bits = term->val.cfg_chg; @@ -1399,7 +1432,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, return; /* Otherwise replace it */ - pmu_format_value(&bits, val, &evsel->core.attr.config, /*zero=*/true); + pmu_format_value(&bits, val, vp, /*zero=*/true); } static struct perf_pmu_format * -- 2.34.1