From nobody Fri Oct 02 13:58:52 2026 X-Original-To: dev-commits-src-main@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 4hx9PG0FTCz6vS1j for ; Fri, 02 Oct 2026 13:58:58 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hx9PF2qFdz4NVc for ; Fri, 02 Oct 2026 13:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790949537; 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=lzopTJ66nMoko7CHVy4NXEgLi/Ss53ktB+1R9cZaedg=; b=qbofJs2ggCGwXLc7MFsDv0h5S1KajubCuwh71MUdI5/wwfE3gYvKJeJLAWR2a7iJA+FutF 3pAVFl3CKnNteKs/03FLiXMvxFoj4YvVja38z7v2vrDWQZkjPpKfVvBqzjicXKAfdYF2BM FA7Yf44f1A7qmXUGoMvMKtTXnDnqXLSBTcID4Xl7Q4qzhWNFMjhLoTO7s4beYC/8tDj9W8 5G3ZLZIxofecX05m6btALIaZ0Oo719n7oWKWaMRrGL2fT1xeOAI6i6+ZuI4mjdmBHx8INF lwf7scp2EEFbVc7dRE6x1U92IFB0be7ewumtwGWMRIOLO+cnzBhvNj65wo3CRg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790949537; b=JrRuxW0SpoGd0nL9jD9uly+HoO8J9aUxS4wA8dFfnG0LId0Du3uMs/YbvRzkGeMHfpUzIT E8c6jjxEW02dhr2cDMWl8J6HZLyzF4EE/W8XjYS62+G8xVojiD+nzjpU4/BR66yfc9oVv2 Sh2BgtfOWSzLQUOjlfVd6WsX7016NPyg/QURpJ7EXWGPRBPkzFoBM6HLQLqS/72jM8iUZt PJnAvS78QADtwyXS1tTloxvGvmNItOhoqNF+c8l6qVGCPBoG4QEwRZ/HTJFN93oNSaBLI9 8JUGEMuO+G2PvGD9QQ09tuYcJIBqoHeYDFwh3eBHCN0sr+fgp78NcQ81j0iCoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790949537; 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=lzopTJ66nMoko7CHVy4NXEgLi/Ss53ktB+1R9cZaedg=; b=ruTRX+cl/j1/VoahVs98iNNEHf2B6iizyC6/IraA+sqUDuhuE/Arwax1Zm7diPi/FcaT+b VViHHN8S1s310doVKgflgCcrJ/7ru231oakSLhprXXBBLXtNNNOyoBNIV1U5nI/WgHRQl5 7RULBDOF0uux0ygY0/Ls6OXsMXZlbhxc1xzrMtUv29IAwGUdnM5fY7E4nXZg7IcoOE6YhC l7NnUv9e2ct4bT0nd/zKsgzQPBwWRZ+YqLNnxEbr/nkvVkU5N+tcK8+kB7E9FyhPFa8Bjh Iihwf0PB1PbNVQ2w9V6Lt16h7PWPEsASYwXNAMUgirVRRGkLWCU9vs2G+Pyf6g== 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 4hx9PF1tp9zKxQ for ; Fri, 02 Oct 2026 13:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34130 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Oct 2026 13:58:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Andre Silva From: Mitchell Horne Subject: git: c97cea955f90 - main - hwpmc: count each AMD PMC interrupt once List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: c97cea955f90ceea1024716d335a39215688f324 Auto-Submitted: auto-generated Date: Fri, 02 Oct 2026 13:58:52 +0000 Message-Id: <6abfb89c.34130.1fc5301b@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c97cea955f90ceea1024716d335a39215688f324 commit c97cea955f90ceea1024716d335a39215688f324 Author: Andre Silva AuthorDate: 2026-10-02 13:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-10-02 13:54:41 +0000 hwpmc: count each AMD PMC interrupt once amd_intr() and amd_intr_v2() call pmc_ibs_intr() and then update kern.hwpmc.stats.intr_processed or intr_ignored. pmc_ibs_intr() also updated them. So each core PMC NMI was also counted as ignored, and each IBS NMI was counted as processed two times. Update the statistics only in the caller. Similarly, drop duplicate PMCDBG messages. Reviewed by: mhorne, Ali Mashtizadeh Fixes: e51ef8ae490f ("hwpmc: Initial support for AMD IBS") Sponsored by: AMD Differential Revision: https://reviews.freebsd.org/D60185 --- sys/dev/hwpmc/hwpmc_ibs.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_ibs.c b/sys/dev/hwpmc/hwpmc_ibs.c index 9e4af386f8d8..be981b0c7a07 100644 --- a/sys/dev/hwpmc/hwpmc_ibs.c +++ b/sys/dev/hwpmc/hwpmc_ibs.c @@ -697,8 +697,6 @@ pmc_ibs_intr(struct trapframe *tf) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[ibs,%d] out of range CPU %d", __LINE__, cpu)); - PMCDBG3(MDP, INT, 1, "cpu=%d tf=%p um=%d", cpu, tf, TRAPF_USERMODE(tf)); - retval = 0; pac = ibs_pcpu[cpu]; @@ -744,13 +742,7 @@ pmc_ibs_intr(struct trapframe *tf) } } - - if (retval) - counter_u64_add(pmc_stats.pm_intr_processed, 1); - else - counter_u64_add(pmc_stats.pm_intr_ignored, 1); - - PMCDBG1(MDP, INT, 2, "retval=%d", retval); + /* The caller updates the interrupt statistics. */ return (retval); }