From nobody Wed Nov 04 17:40:06 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 4jKXlB4tdZz6yZh0 for ; Wed, 04 Nov 2026 17:40:06 +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 4jKXlB47TYz50t9 for ; Wed, 04 Nov 2026 17:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793814006; 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=ehpyolzHiJqYwF0Kb6J43bDj/2tTYYc7P/eBi2k3cww=; b=u2yfFoTkrbYL+Fvr/HFTT2atDPopWshE2Eo7UDRJUyxLgWzVGnu4DulhtHhCeY/0otcfgI 5+wP/xY5wIfzUo+yC5TLs6MOPB86DuNFwDmfHbQlvJW04sgcHWYEDnbOcU1Tknfl9Yl54e 4+MN9wsqfy4EFXeUlT9ekAIVHZozsS5UP2MX4/6n2J/HKDmydlbOXKFjCz0hJo1iJo1AdV s/4vw7sAr54VLWFLvFwq5gpzRAzFJsqCQHHTGN43wA7vNSfOb7a1gADX5/7CGJIuSxawK+ pig9Defcl4kCPWIGiOzS6C8Lr18T6fK00fgualmElRXU8ZWxmc0X/fbW/1jsNw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793814006; b=AnD4hYa8eBQ9GhtMP0hV2Y8xu9ZP1ZNbx1rhZBdAkbAE31rACZpRvLhfvrNEbq2oMg3u0G okGljSHaXUqdzKcLaLh3RVv4onFJLdI7JpAoZ+K0NMOOYXg9oabObJIGlBCAd21b4E4e+M k33xCJidvdjvHGjrdxheCTTfqL0yZ0E7lD2BekRgAgg9dw1f7WEQbT/tQVMoWBk98CA26x 8UcSbdUzQYvlubPRt3HHJfpy/TvgRr+D+68FcoVVKxebKtDo0QoGt7lAQR0kfFkqTF0/a4 RdVT3B6xeitwTYCGfiGogKrDPZa0hev79H/V4HAr3AGhr9SNje3fLzdGL6MPOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793814006; 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=ehpyolzHiJqYwF0Kb6J43bDj/2tTYYc7P/eBi2k3cww=; b=w3vFRjpZa6DytWWXIlOME9zGYveHYVombBj0MrOyKB96ZuiXX3CD5DxUaxSxBeJDqtPwDi J1x4sl46Uo4uWqBHc6+bxQkQaCyMGCYF0kal1Lf84ATlo4wApeN1fROVBLR8QdXlmEh0VZ mONm872QQIUDBJlCbRFEZ6+fXFSDFZGJFsH608vSK54i1ephxJ+W6f1qfd6hNTVI5zPpxq 1MGwWsruB/hslCGx5T4zw3AEJUvN5JRwIA2TAlX9mPpFUmHCEcuKIvQ3WfKFcndJ4PuDmH PZoJr1SPKJmXpFQiVAg0MrbVUPQGD0vqmveMsiDg8F6Kcem2dRqfaE91wNaFjw== 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 4jKXlB3X9Tz1CNc for ; Wed, 04 Nov 2026 17:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 273cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 17:40:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Silva From: Mitchell Horne Subject: git: 199a50dc63e6 - stable/14 - hwpmc: fix false callchain assertion on the PMC_UR ring List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 199a50dc63e6484ace01868ad73b097cf14d5ec2 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 17:40:06 +0000 Message-Id: <6aeb6df6.273cf.658122a@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=199a50dc63e6484ace01868ad73b097cf14d5ec2 commit 199a50dc63e6484ace01868ad73b097cf14d5ec2 Author: Andre Silva AuthorDate: 2026-08-11 16:17:57 +0000 Commit: Mitchell Horne CommitDate: 2026-11-04 17:36:03 +0000 hwpmc: fix false callchain assertion on the PMC_UR ring pmc_capture_user_callchain() asserts that TDP_CALLCHAIN is set on the current thread, but PMC_UR samples never set that flag -- only PMC_HR and PMC_SR do. That makes the assertion always fail for PMC_UR, panicking INVARIANTS kernels as soon as pmcstat -U is used. Skip the assertion for PMC_UR. No functional change on kernels built without INVARIANTS. Signed-off-by: Andre Silva Reviewed by: mhorne MFC after: 1 week Sponsored by: AMD Differential Revision: https://reviews.freebsd.org/D58572 (cherry picked from commit af3929c5152b47278c0b6ea66efbb782b9637495) --- sys/dev/hwpmc/hwpmc_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 5495c9f793dc..31f1805412db 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -4824,7 +4824,7 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) pass = 0; start_ticks = ticks; - KASSERT(td->td_pflags & TDP_CALLCHAIN, + KASSERT(ring == PMC_UR || (td->td_pflags & TDP_CALLCHAIN) != 0, ("[pmc,%d] Retrieving callchain for thread that doesn't want it", __LINE__)); restart: