From nobody Tue Oct 7 16:41:24 2025 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 4ch22s1Gj6z6BbNh; Tue, 07 Oct 2025 16:41:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch22s0pF9z3gx2; Tue, 07 Oct 2025 16:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759855285; 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=ebECy2ToTPz5WOgXfEKay/P/O6PxvuUxL9eVTSHL/RQ=; b=vZ9cY9QYBw372BAaWspmzVkxffHPgFsOZ+Wu9ov2vh6vGhHRi+KVllcukDNCSetNT4Krvk qOUIWvElz7YBhcLk3nj2WoIzNrQciXQg6Kpit9DBAg6Yduq0snghegccaMbAmI2KGU7hKL /KooZ0uvJZXQlu1bOj/A3sLFdwZCXamYxIgopZ5K04kIgKNN5iO93XioruHwOIWL9zxRTN vmXm2oxM7qQLOVsNtlnoFqs9cLnUh4VJ3Qqy/oZg6vi0o6xhIih0OX3z1Qq1vxRZvI98m4 wT+nxm5IgiUWg0s+gKrbmzSrqSifqwQ+rEntZEXJ5awJhOShMUecbieFxdw5DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759855285; 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=ebECy2ToTPz5WOgXfEKay/P/O6PxvuUxL9eVTSHL/RQ=; b=Dsgwyqrb8rgmkDH6ltnDUSawYdHMTXHbOxTgKtFS9lt54BC4GsYmX6ZF3f+l81R7dTz3Ue ZEWx2QLCicClHl3B/ijCLYZuUrqGzQjbra7O2yU47eO6roAutWZp91Y0KRnBWlbRdiUppc TsOzneSXBoin0S9d2mlgZafSjuZAmnAfbjJ9+qraYgpqO9GUzmDMaZY2FEwmNXfR0oKDZ/ 0u3HMdg7Fc117bzjFxhFIGafiaq0z7ml8K8v7sEgGVHAUS7YqT2GjWCa2PETBIODBYfOGp 8zttSIS7VL1jCP3gvY9iLr33K2Y3UKYlbzrp8t/Qhpvu3UG/jafv8HZ6dM+eeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759855285; a=rsa-sha256; cv=none; b=FAbxpQ7BypXWe0AjTzRXwJBm/yn2/AoNBFNuyc73uoXl16SG4ttgCchrPDTwpT8wNEf6HD hzY1Ala92t6dY1JDL+FJcxEx5OzzegUTRbbY6cMk3OeavsB70412fKnx8TEHV8b/UDzZIS pg2P20ch5AHzkNgnRCuGibi3lyTKwsLbuGuJxZo3pltlBIcGvEASlRsJ3xPEL8i44/1ZgN aebLzC9XECcP9Fft9o9WU6DepKFEVT+HhH7gOWeIiMTwwWjPeT3vkxwog3IiKYBjdaTyHh ecsJRPLJswyCibU/7yuDPdski7zLB//kefXPr3JNxpWC10bpFDGa+7f7GXREjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ch22s0PYjztDY; Tue, 07 Oct 2025 16:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 597GfO3L010899; Tue, 7 Oct 2025 16:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GfO6t010896; Tue, 7 Oct 2025 16:41:24 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:41:24 GMT Message-Id: <202510071641.597GfO6t010896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 1c2fc62e4a96 - main - x86: Add a way to inject artificial MCA events for testing 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c2fc62e4a9689961169be7836038acd5f757be1 Auto-Submitted: auto-generated The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=1c2fc62e4a9689961169be7836038acd5f757be1 commit 1c2fc62e4a9689961169be7836038acd5f757be1 Author: Loic Prylli AuthorDate: 2025-10-06 17:59:41 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-07 16:36:47 +0000 x86: Add a way to inject artificial MCA events for testing Reviewed by: glebius Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D52942 --- sys/x86/x86/mca.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 7ee22895e0a7..4b40f343ac90 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -124,6 +124,17 @@ SYSCTL_INT(_hw_mca, OID_AUTO, erratum383, CTLFLAG_RDTUN, &workaround_erratum383, 0, "Is the workaround for Erratum 383 on AMD Family 10h processors enabled?"); +#ifdef DIAGNOSTIC +static uint64_t fake_status; +SYSCTL_U64(_hw_mca, OID_AUTO, fake_status, CTLFLAG_RW, + &fake_status, 0, + "Insert artificial MCA with given status (testing purpose only)"); +static int fake_bank; +SYSCTL_INT(_hw_mca, OID_AUTO, fake_bank, CTLFLAG_RW, + &fake_bank, 0, + "Bank to use for artificial MCAs (testing purpose only)"); +#endif + static STAILQ_HEAD(, mca_internal) mca_freelist; static int mca_freecount; static STAILQ_HEAD(, mca_internal) mca_records; @@ -701,8 +712,24 @@ mca_check_status(enum scan_mode mode, uint64_t mcg_cap, int bank, bool mce, recover; status = rdmsr(mca_msr_ops.status(bank)); - if (!(status & MC_STATUS_VAL)) + if (!(status & MC_STATUS_VAL)) { +#ifdef DIAGNOSTIC + /* + * Check if we have a pending artificial event to generate. + * Note that this is potentially racy with the sysctl. The + * tradeoff is deemed acceptable given the test nature + * of the code. + */ + if (fake_status && bank == fake_bank) { + status = fake_status; + fake_status = 0; + } + if (!(status & MC_STATUS_VAL)) + return (0); +#else return (0); +#endif + } recover = *recoverablep; mce = mca_is_mce(mcg_cap, status, &recover);