From nobody Mon May 25 20:35:25 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 4gPSLq0pbCz6fwf1 for ; Mon, 25 May 2026 20:35:31 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gPSLq0KgJz3Kf4 for ; Mon, 25 May 2026 20:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779741331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVe2Yx3MQ7bOFlRIDN3T/NkNCIgipMPdBoM4m4ftGHs=; b=JiEl2VrgpsC3Hyn1mcSUQseXI9fT0jdkaqUSigv5tqewy+NJxsBFOe+KnKPeoscaf/a3dz 0H7jWcMy9sr/0xfOCSB8BmOSN313z0G3IksGuI4N/4iMKvizqcu6C5ggl/y6OHpOZE/MqA f59wghjrK8fbAzR3LlVHTRral/o3MRFYIwyzq4rrt3KSiFF2zWg8FQOBApGRYMW3uFe4by ySRIHBdPXoZDjtQ0W+IjMNK4uhl84zJLqQmdbFW2QG0i9+5qVrhG3ahEdY6kWzdfHdWzE2 b/ygmKx1eZu4RzW/If+5oRGOPaUqVSA21afxNeF50XSL8zgL56v0f10PFDVFAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779741331; a=rsa-sha256; cv=none; b=SSDsDh2i9ajPef67JjNVWXEd/+ELnZ3SKPL44KnX0mg/aAqLYzjRt367wGHuVZZuuqCyHa tMFZIueo0xwIwNcdCgIFdnkokG4KtiL6Yg/TQiZAED62376AjPQq1wR4Uygulxa4lrItze gyJYkApc9obSXH9VFxUQdLttg5u6h1MuUB2Sbp65FYR1joG5dwHDE0wU5aHf2fmlV38ndn ezxW7zzJ3LEq1JkK035CN6oVnnBGdQxN3QIk8Is9eEGJ/rI9AGNGuaqB1oTsJ/6GqGLHMn kK+DPl9QbvxU+sLdvhq7tE1MARrbR70qwVApobTP6n93DwIdQDfQrGGOms9KJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779741331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVe2Yx3MQ7bOFlRIDN3T/NkNCIgipMPdBoM4m4ftGHs=; b=oyCa0uQ9n6xNRIM6FAJQm7SXq5KarWRJyYPlaoJ3OKYudbnysPEBvL+T5FkZjc6mdsfkW9 Vn66QPIBJ7ThH9xPxmkz1IZg2EeBOxdhI8ip2FeGFKY2BVDiCIkp3aP79vwPBsWzhRveR1 deF1E0hkyPJ5XroF8F4K+9or6bO3SFlwJ9z7BTqv+b7VFdAQuep8t+uekITEyhM8NzF+iW Dua5PbIHSTdI5shDRL3zYjL8hMqWFaSTizewVnSQrjKVV37H8X/S2bpYciLo1vImtJcCYR qXoGrZr3kEn/CFO/cvfAjQdfzHOJv2AE9/gbMRbf2QIwyL2iS4ElXRA9ux3+Xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPSLp71YtzxS9 for ; Mon, 25 May 2026 20:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dbf1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 25 May 2026 20:35:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: b97ee5e9ce7b - main - hwpmc: Avoid panic on AMD cpus where IBS is not available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b97ee5e9ce7b5598be596ef51872c1136b20cf88 Auto-Submitted: auto-generated Date: Mon, 25 May 2026 20:35:25 +0000 Message-Id: <6a14b28d.1dbf1.3ad6d51a@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=b97ee5e9ce7b5598be596ef51872c1136b20cf88 commit b97ee5e9ce7b5598be596ef51872c1136b20cf88 Author: Andrew Gallatin AuthorDate: 2026-05-25 20:33:52 +0000 Commit: Andrew Gallatin CommitDate: 2026-05-25 20:33:52 +0000 hwpmc: Avoid panic on AMD cpus where IBS is not available The recent IBS work intruduced a bug on older CPUs where the IBS handler will be called on NMIs even when IBS is not initialized. Work around this in the IBS handler by checking to see if ibs_pcpu is NULL before accessing it. --- sys/dev/hwpmc/hwpmc_ibs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/hwpmc/hwpmc_ibs.c b/sys/dev/hwpmc/hwpmc_ibs.c index 8cfe7b2df145..ae14f2ccb14c 100644 --- a/sys/dev/hwpmc/hwpmc_ibs.c +++ b/sys/dev/hwpmc/hwpmc_ibs.c @@ -510,6 +510,9 @@ pmc_ibs_intr(struct trapframe *tf) int retval, cpu; uint64_t config; + if (ibs_pcpu == NULL) + return (0); + cpu = curcpu; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[ibs,%d] out of range CPU %d", __LINE__, cpu));