From nobody Thu Nov 19 17:40:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jVm2M3KN6z71Wvg for ; Thu, 19 Nov 2026 17:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVm2M1qW0z4Q1f for ; Thu, 19 Nov 2026 17:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795110011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpUuLf7yOrXmSzQfAWs2X2oAepUqGv+e8dtoMDCYZWo=; b=CXNW5wPgjoVK0wpZ+nFchOmeOVc+L7oHNTNv8ECsi4Ccu963bly0YVN4vZoyvxsQmADviO B+o/koqy6cdlngUX/1XO8TTHbC3o+fNPdGrAVljgE28Gd2HwBeagLG3QcEFI21geJxac67 1fYXey+BDqdELwJDHsVvh1u5Mz3BwRwOmLGVcDFTOs5WM4P8KKiBNRRQYJfq3VSwIPFaLS XBmmasM0TGHvDBFpSrD6sASUcjsu8SAeNE5t36j4C9kgMD6KkKsSiQV6qJ3zEPSfp/vNUv 2meCkhZD2rmeMQuflWCjEJng7YQblpfYgQKfphJqFf/CnLSGWokC3MkTcFZdaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795110011; b=jcWMCGQ9Sn0MTxXTxBJ9QAiCwobbM94fQTAT6SCf2SRC8jLjdJcYLd1NgY11WWwetPUUPb Tj/dHvXy3/hAPo+LcH8t8PJySErPOZgXbrADPu/hpThPR06KsIQfMjE+fKvVYXdVQhlq0x 2PAtO3rrs/sNs6MEP8MpLaM1W9qf/zsKvUi6O+uZEVLoNruQ1cmR321qiXILzD5kfpd/65 Z4D4TtDbSH+X1eLvN+2kmse64csjdiCMr3SPdWk9h2ukcIq8aqUpkvRXQk/aGJyG3pgB4x grxzE2Lu8D8RMyuKs0A3n3zArXnql9G7GmDjXx560tiuGZj4P6mparp/Q1LYGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795110011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpUuLf7yOrXmSzQfAWs2X2oAepUqGv+e8dtoMDCYZWo=; b=OyqhtmSYgCy9Sjg1E9+BjK7IAVXXS3gtbH+pjNyTsSXheC82MnCf3tLL7It9ObegTzmYtE WgtoQbOco0hRvmyqJrORoJj2prJVkBqD1wU9zIK78NJgDGZDk/RXR7AtFaVKHfaPYkNADp RnsxgvYl8o83UXwnwqjZ3svOwLeYMJ4NUJC2+VrIceWj9YhIxHxXffe7r+tJKloxwPu1Qn Ihgyq3HBKk9bzc4CxT8w1lCQU7bnjRhVz8BscEWbOMoyY/9TinV2xW4WcsQFT/GtvTMGfk A8R12+OAlBzfj3GMHUPp/ZR1kbFe/Mzi2ats+0SfCymr5g+TxEx4AUblKgur1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVm2M1PLMz19b9 for ; Thu, 19 Nov 2026 17:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19e2e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 17:40:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mitchell Horne Subject: git: 457873bda393 - main - tests/sys/pmc: Skip pmc_ss and getmsr_refusals without a hardware PMC List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 457873bda393224f2f7f95f93dbb4d2d52520b25 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 17:40:11 +0000 Message-Id: <6aff347b.19e2e.7122e823@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=457873bda393224f2f7f95f93dbb4d2d52520b25 commit 457873bda393224f2f7f95f93dbb4d2d52520b25 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-19 17:38:25 +0000 Commit: Mitchell Horne CommitDate: 2026-11-19 17:38:26 +0000 tests/sys/pmc: Skip pmc_ss and getmsr_refusals without a hardware PMC In a guest without a PMU, hwpmc(4) registers only the SOFT class, but the "instructions" alias still resolves from the pmu-events tables, so pmc_allocate() fails with EINVAL. pmc_ss_test checked only the alias and getmsr_refusals required the allocation, so both failed in CI instead of skipping. Probe the allocation the tests make and skip if it fails, as rdpmc_reads_own_counter already does. PR: 300856 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=300856) Reported by: ngie Reviewed by: mhorne, ngie Fixes: d546356523f3 ("tests/sys/pmc: add PERF, RDPMC, row, sampling and unload tests") Sponsored by: Advanced Micro Devices, Inc. Signed-off-by: Osvaldo Janeri Filho Differential Revision: https://reviews.freebsd.org/D61689 --- tests/sys/pmc/pmc_rdpmc_test.c | 4 +++- tests/sys/pmc/pmc_ss_test.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/sys/pmc/pmc_rdpmc_test.c b/tests/sys/pmc/pmc_rdpmc_test.c index a79ef7b6e7bd..53064c98b8ec 100644 --- a/tests/sys/pmc/pmc_rdpmc_test.c +++ b/tests/sys/pmc/pmc_rdpmc_test.c @@ -126,7 +126,9 @@ ATF_TC_BODY(getmsr_refusals, tc) setup(); id = PMC_ID_INVALID; - ATF_REQUIRE(pmc_allocate(EVENT, PMC_MODE_SC, 0, 0, &id, 0) == 0); + if (pmc_allocate(EVENT, PMC_MODE_SC, 0, 0, &id, 0) != 0) + atf_tc_skip("pmc_allocate(%s) failed: %s", EVENT, + strerror(errno)); error = getmsr_errno(id); ATF_CHECK_MSG(error == EINVAL, "system mode: errno %d", error); ATF_CHECK(pmc_release(id) == 0); diff --git a/tests/sys/pmc/pmc_ss_test.c b/tests/sys/pmc/pmc_ss_test.c index 4716080903ab..3ed9d9c4cd76 100644 --- a/tests/sys/pmc/pmc_ss_test.c +++ b/tests/sys/pmc/pmc_ss_test.c @@ -213,23 +213,27 @@ run_owner(int cpu, struct result *r) static int sample(struct result *r) { - struct pmc_op_pmcallocate cfg; cpuset_t mask; + pmc_id_t id; pid_t child; ssize_t n; int cpu, fds[2], status; if (pmc_init() != 0) atf_tc_skip("hwpmc(4) is not loaded: %s", strerror(errno)); - memset(&cfg, 0, sizeof(cfg)); - if (pmc_pmu_pmcallocate(EVENT, &cfg) != 0) - atf_tc_skip("no %s event in the pmu-events tables", EVENT); ATF_REQUIRE(cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(mask), &mask) == 0); cpu = CPU_FFS(&mask) - 1; ATF_REQUIRE(cpu >= 0); + /* A guest without a PMU has the event name but no counter for it. */ + id = PMC_ID_INVALID; + if (pmc_allocate(EVENT, PMC_MODE_SS, 0, cpu, &id, PERIOD) != 0) + atf_tc_skip("pmc_allocate(%s) failed: %s", EVENT, + strerror(errno)); + ATF_REQUIRE(pmc_release(id) == 0); + ATF_REQUIRE(pipe(fds) == 0); child = fork(); ATF_REQUIRE(child >= 0);