From nobody Mon May 25 20:35:25 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 4gPSLk1YPLz6fwf0 for ; Mon, 25 May 2026 20:35:26 +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 4gPSLj67Czz3KVV for ; Mon, 25 May 2026 20:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779741325; 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=eNTd1gda5+48SJDdgPlrFuC/CyaGsTk6N4K+9qL6t3GcZTh4RrShu9wLgQzK3NyzE0HvaB p6DFp6OVDKQwm8aIxCjEIc+kYE0GoUMgU8QBIlct1PG59cRPsxHKs9HPMhRu5suPw3yfsg 35oxI8bhhZibVJfofEXF37Wvfn28zpPPkCzaIKluCHjPU36R1zTwYlkXF/Gyw5h8vV1Gba RFpnf29vV7vyZFO3mpxYG7IPNjwRq2MB5lrD6hf+FwHNisvkioG1tUV9/AJIWhpoB7BJCp mVY12SIXpzES/j5zpEMT8YbFg3eHnhSCgwq6lwz6NPep4QEn9ElqY1ZyJBog8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779741325; a=rsa-sha256; cv=none; b=A/c744PamaH9Bl/16lpKoFcw7r7hpZfOIUvFa00Xj7RgsR/BdkuIJQt1aipLQ7fokY2U6C bTSdJe1qs2fgyL3E551UpkxesEfTOVSWhNYgWaoGaPHfhVIvbipkU2FwTt84mGwYlbqiNH QgeLobFHZmOa2Qs328/j2hj8Y2H1TMeCSp5CxvxjssIikIn+2VZd/3wIkUBS7Y5tyUF2NJ Wu/aPbSA/cy/iCCGvKYe2BwiErEr6qWPGS/musoSP0eQbvuuYTUyvNS0vRH1dyPZbHG0ny 8C11mP+J3J7p2zHnBC/tz3WSmCIwSKwwCzjqAEc1tEdI5KWLAym1njesrQtmuA== 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=1779741325; 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=kvGv4ASIrexsrwtv9BOkIi5Pk+S34gtKg1+QWBVOG9AQPPgxfwyXXGOaX45gujkMrTpRjB qvI+ojs7TCZ4l0779ncgNpa7dWT20imFutvGKDg4smku2gNatCWYxFyFLTnY7tCtwnXPRH 1Mzu990NuWpXjPN9TdXe7OF/eFZzJ6G5ocT5NLEjksuOdw9L7A+s/wI6L1wcN5XCbaAEDU hjc2WVniBBum4pUuYB2y4029ojzEj8iChZfP2vbz36P0ZV8xoP3X4tpvL/id/usYNccSbc 6Pz13B3NVqw29jaG12TLZwwysDeb/4QRTG+BHV+zwMKlXx1VsgYSFN4nsmbZAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPSLj5Wvnzxf6 for ; Mon, 25 May 2026 20:35:25 +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 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: 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));