From nobody Tue Oct 28 19:20:33 2025 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 4cx0Zn2fKwz6DLj4; Tue, 28 Oct 2025 19:20:33 +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 4cx0Zn22VDz3Tdl; Tue, 28 Oct 2025 19:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761679233; 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=ABg4+A970tm/CvNdpRsrcXs+oVjmvETRYP0fQL16uoY=; b=kDAIUWfZTSyQydNQn9D3gA6n8YtSmG00JNhHgb6gxAoK72zE1STYEZJKS7ryZLvs0FuloD LEw5QuSj932EKlOu7mGenQpVyvIV0EvjUxBf5VG99FyXFiUg488vqQfhnTAnIr/rBio9wJ QX7Szo5fjApUH57OmBnYMqmb6OT6YMhFuynNYir8hQbbnsJ6Sv3E8eYjbunlZJSNs6poMA gIOzRz93bSxbgb+YWLp3LruEpsXSWS3Ab0FYOQNJrWVuSRoayDdBSWRHjEcBxafjCXkLl4 uW203rkI3msoQgR0v+PDykLauYpvD8pH0FLqoFZcb7mY+vnq/IHN0LsoQZ4FeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761679233; 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=ABg4+A970tm/CvNdpRsrcXs+oVjmvETRYP0fQL16uoY=; b=TiG5HAiKZ2IsefzJyLsg4IDAnXgvgi4A+1JHO1utXbnRnwoizsCyLphxXqQ+8SwWGaSZDI VeuOFrw+i+bCM6xlWaS87uTdP8+dhNwtTR+6nalnT1Lmm7TXcPhRExT0j2BsYmil7hvus5 ThIzEuzbBvt6CufqBhm4SJ1THSVX75d0ANKLsQ6VuERqYFQiTn594JdFdsQ9J1kKt8Tl/6 Kh+xdqy6bjyXMx4wn3ZFJMHhZKj4kkPD4Eh7U8P8f6GCqCZEUkXIXM8DXvCztAwdBZx91Q pR7bhiWYV5MV4itV++0GuYz1P/FeK5lUU+Bdpo1RLuTE51lyNzbcOayr4utf2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761679233; a=rsa-sha256; cv=none; b=MxUvumpNjlo9ebE3uI+j/eYkNn7/P6TeOqCt38P0qHc4M6XDBleu7dmIKiR10A0L5o9WKM UfCqjav33OpGg3YQpC6Yjf+ubw0XGcrPd6n57EGqnTp2i4Qmxs8ftuNiqrgBBy+4LMeK9u wn37sogrbGM2aHC12CBpQ4m8dI6ZwGU9xp2AIP63iEOKkF+EMbdvQKc50PoNA+uaAe0HmY w4zkCO3gJDq1YlT8EPNrCXAvIntvKcsYXA84PLyZzjbi7u9rZKyVoT4hXZ/a/z40zh2CKb jct29skQAIb39aExxB3zjrBoRigX2fQRe0dA7WncHa0IrUSV21CDUW3kn6gJxw== 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 4cx0Zn1f3xz13Q1; Tue, 28 Oct 2025 19:20:33 +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 59SJKXlA041642; Tue, 28 Oct 2025 19:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SJKXgY041639; Tue, 28 Oct 2025 19:20:33 GMT (envelope-from git) Date: Tue, 28 Oct 2025 19:20:33 GMT Message-Id: <202510281920.59SJKXgY041639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jonathan T. Looney" Subject: git: fc13cf3c5bd4 - stable/15 - x86: Add a way to inject artificial MCA events for testing 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fc13cf3c5bd4ef4727ab0a2fb7e2ead776b3d97f Auto-Submitted: auto-generated The branch stable/15 has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=fc13cf3c5bd4ef4727ab0a2fb7e2ead776b3d97f commit fc13cf3c5bd4ef4727ab0a2fb7e2ead776b3d97f Author: Loic Prylli AuthorDate: 2025-10-06 17:59:41 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-28 19:19:43 +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 (cherry picked from commit 1c2fc62e4a9689961169be7836038acd5f757be1) --- 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 efe1524eb0e7..a167854e8bbb 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -125,6 +125,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; @@ -783,8 +794,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);