From nobody Sun Dec 14 11:53:49 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 DB9EC2F60A1 for ; Fri, 12 Dec 2025 15:32:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553581; cv=none; b=f7tWNW2b82TQTKuMrYah97wwjBOg/GTNx+q4cWeBnAJEOMR6c68vODp2Ymii1hyivmOn8cOhNaRtS2HVHIyD6KuGKlDP/Qtsh9Pvr7coZ1sVkPLVYGGvRs4job80r9HeXYfzC0gL2CmS1BwIBzIndZNp6APdbF1qJ/J2Csfp81c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765553581; c=relaxed/simple; bh=UW8aZJ/wrytG8nQKXwmbp89xjQYr1P2Ou6Va12MmDEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rqmn+w8An0CsubdZbpNSlUi9J4zbSRVwD80QRZfWbtaYQ0+aLsgtoVwh2NaBWCHt67xEY+kNYiWLLvLnyr4orkiyX0PCjMmpIXspRM0oM6TohpHQw9/qfrfiYcNE4eZutxBDKgPlHm7AmIwH/bblIBpFSQjUETf/orcHLSGOtEM= 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=EkKVPayn; arc=none smtp.client-ip=209.85.218.43 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="EkKVPayn" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-b7636c96b9aso223153566b.2 for ; Fri, 12 Dec 2025 07:32:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765553577; x=1766158377; 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=e7fahmTBI9kipCQMheuyeZUpREbzXH29kA76YEVRHtk=; b=EkKVPaynJYTxdVOY5CRXddG5B79ItU2QesDWOd3Y71Caarr0b4uKyIZ7tgkCk3sDEe zywluPK8JhOo4R3Fd4qFGbuAVbEeIYV6MpiHbWkmDJi9KnyB0f/oCvCeVxZ86V4+ZGcF 8OrfKZRYZD1GY7NfkTJ2AYoIbxaGcksgUDJSIBsn8ivwVZsygEsv70FDPAZjko+gM6Nl PTh6TTNpHbVEs3/2nPIWlTCHJl5RJ8dnUQhOyJ0AATKDZlOnFn0KQXpXSwZGEcNRRO4q t1VRhFRge11kPxAwkDwVfD85VAdUxBA72BApsyazVfPvzcteF45993ujn2Yw0iO/I48a cWNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765553577; x=1766158377; 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=e7fahmTBI9kipCQMheuyeZUpREbzXH29kA76YEVRHtk=; b=J5nYP/TFSs6L/pJw4tXU7ErU3h2NaSTx3qiwKebTQUfhFSBhCylgyFeRctRy5d7aQA aLzhO9S6VXPhdbOA/8Zp1oTpmhQds+G6s5MIYMKGMYfR04zSHSxSlpFBiE2balSmNMrb 2bjPvR1Kc0+KwLbFQbUD9oukDlH6o6SQbmEzwa+ptBa3dA4Kn48jyTqujBQhvPyNPF+Q QSt+0WvH4yQc0u01uw18WalsoboVYL+uw9LVhgNic+R+kFIbwcHALyRlUSNm9YnYDWA5 KtKzqUjkhWuP6Bnapw6o3W5rH1QqwX5SZxOWFX12pyEHODFxL2XnHMcAPekKWLfEidR6 rdMQ== X-Forwarded-Encrypted: i=1; AJvYcCWxKCkI0vbaAwnm8OIAqK3XXwRz3Dmxqba0hOoL8ruUURBmtLVF2Mo3BWw7ZcWRBuHyjj8joTXW/O+yoao=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0ZGqWNWGpP/izhmPMM7MdtcRzgdI7H/EOgAuKmtGAQI8n8VFP VBQCeakGQFVo7dOzBhHwH9HXzuVinqadAUKFRJnoqIPUdQ0Ldm69fnv0Inqbut5dEtY= X-Gm-Gg: AY/fxX6/DoxKm+ky4g2FL1tHIRXTaf4sTQ7eWeCY3xA+f9P/dcSod540e2aIeJAe23h QdEuvs5zevuERZUh3/ypY2QWtsSgwFD7o410GlduXhqjeKT+/tZzBpGsgRtCFFropbiEy5DbksU Xp1Klstz1TCGoHe9Y6wP2awMhNP4SETUOA+4FEJhVTCUAXbARb+5H3dwZqVK+UUMhrO3BbCutB7 Na6F5eFpGencmrvfuTvILGaS3V2sQNnNdhsUvBXNRxIV2S/gM1WzwLRyskhUW+omWlpVtIJ6rDV Lis9EoCcc2aDvyxOKcwtiKTFWaMhn4dqG1QJpB3k5Wkg1/VSylwM1AaNK7/vM7vbb+Br/G1Nvhr Gxe/CuFlh4jPaYOF1DiHH3kP2f0/smnrY3Y+ua1F9CHNGEDIVtCNIoOU2zNaP+5syIIm8OckUyz KF22Q9CRXh4IIa8rwqYpOI X-Google-Smtp-Source: AGHT+IEQFiVpXtjTbT1nEBymPVvwKhgGbHnTLlvzOpyqaM6FBur+TFlEfnGCvotgjkxj0qijhEHzow== X-Received: by 2002:a17:907:6095:b0:b72:3765:eda9 with SMTP id a640c23a62f3a-b7d23a7988cmr220274966b.60.1765553577012; Fri, 12 Dec 2025 07:32:57 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 07:32:56 -0800 (PST) From: James Clark Date: Fri, 12 Dec 2025 17:32:24 +0200 Subject: [PATCH v3 07/12] perf tests: Test evsel__set_config_if_unset() and config change tracking 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-7-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 Test that evsel__set_config_if_unset() behaves as expected. This also tests the user config change tracking mechanism as it depends on it. Signed-off-by: James Clark --- tools/perf/tests/pmu.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 91 insertions(+) diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index cbded2c6faa4d5b422936e81bde83bc328fcdfe7..9e313a9a44fdebd0d417c7558b1= 5e5db89241867 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -192,12 +192,102 @@ static int test__pmu_format(struct test_suite *test = __maybe_unused, int subtest } if (attr.config2 !=3D 0x0400000020041d07) { pr_err("Unexpected config2 value %llx\n", attr.config2); + } + + ret =3D TEST_OK; +err_out: + parse_events_terms__exit(&terms); + test_pmu_put(dir, pmu); + return ret; +} + +static int test__pmu_usr_chgs(struct test_suite *test __maybe_unused, int = subtest __maybe_unused) +{ + const char *event =3D "perf-pmu-test/config=3D15,config1=3D4,krava02=3D17= 0," + "krava03=3D1,krava11=3D27,krava12=3D1/"; + struct parse_events_terms terms; + struct parse_events_error err; + LIST_HEAD(config_terms); + struct evlist *evlist; + struct perf_pmu *pmu; + struct evsel *evsel; + int ret =3D TEST_FAIL; + char dir[PATH_MAX]; + u64 val; + + pmu =3D test_pmu_get(dir, sizeof(dir)); + if (!pmu) + return TEST_FAIL; + + evlist =3D evlist__new(); + if (evlist =3D=3D NULL) { + pr_err("Failed allocation"); + goto err_out; + } + + parse_events_terms__init(&terms); + ret =3D parse_events(evlist, event, &err); + if (ret) { + pr_debug("failed to parse event '%s', err %d\n", event, ret); + parse_events_error__print(&err, event); + if (parse_events_error__contains(&err, "can't access trace events")) + ret =3D TEST_SKIP; goto err_out; } + evsel =3D evlist__first(evlist); + + /* + * Set via config=3D15, krava01 bits 0-1 + * Set via config1=3D4, krava11 bit 1 + * Set values: krava02=3D170, krava03=3D1, krava11=3D27, krava12=3D1 + * + * Test that already set values aren't overwritten. + */ + evsel__set_config_if_unset(pmu, evsel, "krava01", 16); + evsel__get_config_val(pmu, evsel, "krava01", &val); + TEST_ASSERT_EQUAL("krava01 overwritten", (int) val, (15 & 0b11)); + + evsel__set_config_if_unset(pmu, evsel, "krava11", 45); + evsel__get_config_val(pmu, evsel, "krava11", &val); + TEST_ASSERT_EQUAL("krava11 overwritten", (int) val, (27 | (4 << 1))); + + evsel__set_config_if_unset(pmu, evsel, "krava02", 32); + evsel__get_config_val(pmu, evsel, "krava02", &val); + TEST_ASSERT_EQUAL("krava02 overwritten", (int) val, 170); + + evsel__set_config_if_unset(pmu, evsel, "krava03", 0); + evsel__get_config_val(pmu, evsel, "krava03", &val); + TEST_ASSERT_EQUAL("krava03 overwritten", (int) val, 1); + + /* + * krava13 doesn't have any bits set by either krava13=3D or config1=3D + * but setting _any_ raw value for config1 implies that krava13 + * shouldn't be overwritten. So it's value should remain as 0. + */ + evsel__set_config_if_unset(pmu, evsel, "krava13", 5); + evsel__get_config_val(pmu, evsel, "krava13", &val); + TEST_ASSERT_EQUAL("krava13 overwritten", (int) val, 0); + + /* + * Unset values: krava21, krava22, krava23 + * + * Test that unset values are overwritten. + */ + evsel__set_config_if_unset(pmu, evsel, "krava21", 13905); + evsel__get_config_val(pmu, evsel, "krava21", &val); + TEST_ASSERT_EQUAL("krava21 not overwritten", (int) val, 13905); + + evsel__set_config_if_unset(pmu, evsel, "krava22", 11); + evsel__get_config_val(pmu, evsel, "krava22", &val); + TEST_ASSERT_EQUAL("krava22 not overwritten", (int) val, 11); =20 + evsel__set_config_if_unset(pmu, evsel, "krava23", 0); + evsel__get_config_val(pmu, evsel, "krava23", &val); + TEST_ASSERT_EQUAL("krava23 not overwritten", (int) val, 0); ret =3D TEST_OK; err_out: parse_events_terms__exit(&terms); + evlist__delete(evlist); test_pmu_put(dir, pmu); return ret; } @@ -539,6 +629,7 @@ static struct test_case tests__pmu[] =3D { TEST_CASE("PMU name combining", name_len), TEST_CASE("PMU name comparison", name_cmp), TEST_CASE("PMU cmdline match", pmu_match), + TEST_CASE("PMU user config changes", pmu_usr_chgs), { .name =3D NULL, } }; =20 --=20 2.34.1