From nobody Tue Nov 17 13:49:14 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 4jTR0q1cDtz713Mk for ; Tue, 17 Nov 2026 13:49:15 +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 4jTR0p4mHSz4ZDH for ; Tue, 17 Nov 2026 13:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794923354; 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=gYUApcYGv9+k05LwmV3bGZ0zPkikjKqs4+aRkpip39I=; b=s+Z6iVIwondUdD0aEtJBhA4Ei95VpeE1bO8m1PQZAy2KzfUlnOV1I/AETZkcPj8/GFW873 OWatSJCXSQNNaLhk4DUe2WI3SbUykoiLf3ZKgTJRHl42yYuAlv+Fmsq3/FwtdV/e6JQDfI g5Y7eagfQkUqqj/r6+gG3689k+74yT0FXrPsNpGgyBUn8I+VA6ar62beN9Y4w1l8H4UFee zYfqhO4aQFQJsEY9M82dGWlQllZBQQQyT32PKLTBatq3VtLRCDrtTLqDgunDtfhYPZY1a/ cZUZgRbsBnmUL28/lBytw0aRgfWjY4jBD1pmMkqNuF1UX7xC3LqUlHz/uWyrWg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794923354; b=tjWvG/YRkBxjVQl9plP3g7tJ7rkcWkUzDOi85dlcBL12737jpdpfLkhckmJ1oU6XH7wh5u CyCdlTjVKqNwIZFIOVMLo6Dg0jOZ0U92NZa7IslSEch+O89W7ab5D5jFDB83QEqIqcultf vTH9DJzNPFJNTMmSjHvNY257QowoDDLuuv9pi1LtRUn2TUYwLz5s4ORPlvie7rMZCt8ox6 LniZ2kDTJTWHNv5JlTl1Un2FLf2Y1bb8LFWobaJ+/tF5jhqezVSbdPmOlGC18Kog13sTGJ rU+ZveElXiUp+hkc5va/txnvOktfrn1Z3hSjQ0r2E2hp9aokxFjmvahOM1SzFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794923354; 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=gYUApcYGv9+k05LwmV3bGZ0zPkikjKqs4+aRkpip39I=; b=A/O63ka5m8vyz5KwkJZ6sYmzmisGxiev3Vd2ExlPPwzCN7CR54VeXPTI4kppPlMd7HOpTt WWEE9Ci4lGgLhieFlHmVT4MCQJ6HADckOXNuYXIJXkPlXFav6gaLQIDEg29CjwN/TW4pP7 nuOMD9bC/kHzU5OXZF4m80tbQqvtulAS42WfGSRRaBZthHiMqEDWRZGTpnsJrIZiTbasWE +V0S4XdkTV3cUJ19evYanuA3daW5Q7NnOnAEFmpPl5KNdpMCAU9oMMvH1xPUHCzCKgVr/0 tHuzCdid5fpFpfcjFVcLUctuiAgLrQjjfy4qR/TzWhj8makoJlg76BYzmAJPHg== 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 4jTR0p4BBszl5d for ; Tue, 17 Nov 2026 13:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 94be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 13:49:14 +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: c1b40aa4b6b3 - main - pmc: Exit with EX_OK when the pmc record time limit ends the capture 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: c1b40aa4b6b31aa3c09eeb863cf1f1151cd95b0b Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 13:49:14 +0000 Message-Id: <6afc5b5a.94be.61df9fa1@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b40aa4b6b31aa3c09eeb863cf1f1151cd95b0b commit c1b40aa4b6b31aa3c09eeb863cf1f1151cd95b0b Author: Osvaldo Janeri Filho AuthorDate: 2026-11-17 13:43:40 +0000 Commit: Mitchell Horne CommitDate: 2026-11-17 13:49:08 +0000 pmc: Exit with EX_OK when the pmc record time limit ends the capture cmd_pmc_record() stores the return value of kevent() in status, which is also its exit status. When the -t time limit elapses, the EVFILT_TIMER branch jumps to done with status still holding kevent()'s result, 1, so a timed recording exits with status 1, while one interrupted with SIGINT exits with EX_OK. Keep kevent()'s return value in its own variable and start status at EX_OK. The kevent() failure and unknown signal cases called err() and exited without stopping and releasing the PMCs; set status to EX_OSERR and go through done instead, as the SIGIO case does. pmc_cli_test and amd/pmc_frontend_test accepted status 1 to work around this; make them require 0. Reported by: llm-postcr Reviewed by: mhorne Fixes: a79a051e7d16 ("pmc: pmc record command") Sponsored by: Advanced Micro Devices, Inc. Signed-off-by: Osvaldo Janeri Filho Differential Revision: https://reviews.freebsd.org/D61457 --- tests/sys/pmc/amd/pmc_frontend_test.sh | 4 +--- tests/sys/pmc/pmc_cli_test.sh | 8 +------- usr.sbin/pmc/cmd_pmc_record.cc | 33 ++++++++++++++++++++++----------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/sys/pmc/amd/pmc_frontend_test.sh b/tests/sys/pmc/amd/pmc_frontend_test.sh index c3fe8215ec21..97964bebead0 100644 --- a/tests/sys/pmc/amd/pmc_frontend_test.sh +++ b/tests/sys/pmc/amd/pmc_frontend_test.sh @@ -32,13 +32,11 @@ pmc_frontend_ibs_body() # Keep a CPU busy so that samples are taken while recording. sh -c 'i=0; while [ $i -lt 3000000 ]; do i=$((i + 1)); done' & load=$! - # pmc record returns kevent()'s result (1) when the -t timer ends - # the capture and 0 when it is interrupted. pmc record -s frontend -t 3 frontend.pmc > record.out 2>&1 rc=$? kill "$load" 2>/dev/null wait - [ "$rc" -le 1 ] || \ + [ "$rc" -eq 0 ] || \ atf_fail "pmc record -s frontend failed: $(cat record.out)" # Each decoded sample row of the analysis carries miss percentages. diff --git a/tests/sys/pmc/pmc_cli_test.sh b/tests/sys/pmc/pmc_cli_test.sh index eb824afd920d..e59e83370709 100644 --- a/tests/sys/pmc/pmc_cli_test.sh +++ b/tests/sys/pmc/pmc_cli_test.sh @@ -23,16 +23,10 @@ pmc_cli_setup() atf_skip "libpmc has no pmu-events table for this CPU" } -# Run pmc record, saving its output in record.out. pmc record returns -# kevent()'s result (1) when the -t timer ends the capture and 0 when it is -# interrupted; any other status means the capture failed. +# Run pmc record, saving its output in record.out. pmc_record() { pmc record "$@" > record.out 2>&1 - case $? in - 0|1) return 0 ;; - *) return 1 ;; - esac } atf_test_case pmc_info_missing_file diff --git a/usr.sbin/pmc/cmd_pmc_record.cc b/usr.sbin/pmc/cmd_pmc_record.cc index cff0db7fc9c7..fc1f099c5179 100644 --- a/usr.sbin/pmc/cmd_pmc_record.cc +++ b/usr.sbin/pmc/cmd_pmc_record.cc @@ -604,7 +604,7 @@ cmd_pmc_record(int argc, char **argv) uint64_t rate = DEFAULT_RATE; const char *logfile = "default.log"; int status; - int option, logfd, kq; + int n, option, logfd, kq; CPU_ZERO(&mask); if (cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1, @@ -693,8 +693,11 @@ cmd_pmc_record(int argc, char **argv) p.start(); } - if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) - err(EX_OSERR, "ERROR: Could not get the current time"); + if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) { + warn("ERROR: Could not get the current time"); + status = EX_OSERR; + goto done; + } printf("Recording performance trace press Ctrl-C to stop\n"); @@ -702,17 +705,22 @@ cmd_pmc_record(int argc, char **argv) * loop till either the target process (if any) exits, or we * are killed by a SIGINT or we reached the time duration. */ + status = EX_OK; while (1) { - status = kevent(kq, NULL, 0, &kev, 1, NULL); - if (status <= 0) { - if (errno != EINTR) - err(EX_OSERR, "ERROR: kevent failed"); - else + n = kevent(kq, NULL, 0, &kev, 1, NULL); + if (n <= 0) { + if (errno == EINTR) continue; + warn("ERROR: kevent failed"); + status = EX_OSERR; + goto done; } - if (kev.flags & EV_ERROR) - errc(EX_OSERR, kev.data, "ERROR: kevent failed"); + if (kev.flags & EV_ERROR) { + warnc(kev.data, "ERROR: kevent failed"); + status = EX_OSERR; + goto done; + } switch (kev.filter) { case EVFILT_READ: /* log file data is present */ @@ -729,7 +737,10 @@ cmd_pmc_record(int argc, char **argv) status = EX_OK; goto done; } else { - err(EX_OSERR, "Unknown signal recieved"); + warnx("ERROR: Unknown signal %d received", + (int)kev.ident); + status = EX_OSERR; + goto done; } break; case EVFILT_TIMER: