From nobody Thu Oct 9 17:17:12 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 4cjGlF01SQz6Bnw6; Thu, 09 Oct 2025 17:17:13 +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 4cjGlD6Z4Rz3Brl; Thu, 09 Oct 2025 17:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760030232; 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=OKsqhQGNKBI37HLJaq3NQTldTer84DsIVizQB1fVMZI=; b=Wr8czNBKn1K6LbgFMXItsccoV9bHjjdPudu0BidZmzBhENega9q8ESxUQRjvCw7tTgfa2O hbDK41zfqqojuhvJMhVirf7WM0pMgvA+ffWW6I+1xAPjj2S0b/uBJ596EEJZlaD1EE8Jb9 F2FXjXIzKhxHXiJbZkxwgLDAwcUdtidCsE9OYW0MUjtc6DwZC0yfAjiAzXQ2VYL3NFvz6K r/27LX1LtwBwWH/EmPNHLCR79N9DNaFjGwMlmaQblJ/hr+6SdElEMa0glica/T24x5MlCt l4bO0NZ0S8CtwqVtxyUoCEXAgwcI8QSm4VO3ctFpXC2GQeLwT8ecCk58TXqDvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760030232; 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=OKsqhQGNKBI37HLJaq3NQTldTer84DsIVizQB1fVMZI=; b=tm+1BRQtZn2IQ8kKbNNqss2Q2P8X1R8vGReqC12eU2Hd7hotOzsFmfW+FYrgts8ecGs8MA 6RwWGPgkXEW8zFFstwT7zWrJsdXhlwE+71fmIMyTHLYEry+7wzO2CJc2+g4DWj/zk3C7ZQ Iofuu5EFiObU2JB4yg9nMULlj27U4+Ge/4fB1fXKExXSQkWq3ABzH6R5GwqUb2zjvCnjx1 ErOkjgCHHxvm23ME0lzkaBBeWaocVSoVNWKvbOHGw1UsY7TqIr4ua2X6JPoM/J2YSe0Dq5 i/PJMtTf2XuVJUl1LrZTfxMyj6i23jOZ4UMEG4e2kuzQSF4vmjeFPP/xbLzudw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760030232; a=rsa-sha256; cv=none; b=YQMNFp63Vlwb2ytiwAxd6lDM6mRBcimCUkWPTZut3JXdR9lvYahDKyGk2rb92bhAfhtTPL CfJ1QskbwvmfGxFJFUyTEA0v6EUZMjzn+4/QoyTMCZFilAwG1RXr1JITBccQzBomUkYAnX Cg3dQsIZOWd32cuTJGl6+swxcr7pMWMIxYixDlP+Xqr+lwmVI62E1INFGHToC2fU4j9ulg 0EvLAuwle5LKF0FsbWmwa23inAf/UML5tuHLQiJrLzqpdvVVlb15jK/eyxcDVGmw9XoMHM tSStDAOAyGOHh2ri40Ty/kqlXuMGAyy6rYUZtoSzm+oV0gMcYB/5TBxP+30ccA== 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 4cjGlD6970zBGq; Thu, 09 Oct 2025 17:17:12 +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 599HHC9W001774; Thu, 9 Oct 2025 17:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599HHCjV001771; Thu, 9 Oct 2025 17:17:12 GMT (envelope-from git) Date: Thu, 9 Oct 2025 17:17:12 GMT Message-Id: <202510091717.599HHCjV001771@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: 3f0df559cbe4 - stable/15 - x86: Defer non-fatal MCA message output from the HW interrupt context 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: 3f0df559cbe4a084047007d104585b01bb137a28 Auto-Submitted: auto-generated The branch stable/15 has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=3f0df559cbe4a084047007d104585b01bb137a28 commit 3f0df559cbe4a084047007d104585b01bb137a28 Author: Jonathan T. Looney AuthorDate: 2025-10-03 18:26:37 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-09 17:16:41 +0000 x86: Defer non-fatal MCA message output from the HW interrupt context When processing recoverable MCA events in a hardware interrupt context, defer logging the messages to a task queue. Reviewed by: markj MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D12275 (cherry picked from commit 5e1611a37a02076180ccea1506713b8c9628779e) --- sys/x86/x86/mca.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 933d10e52187..e43c88b3a27b 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -131,6 +131,7 @@ static STAILQ_HEAD(, mca_internal) mca_pending; static int mca_ticks = 300; static struct taskqueue *mca_tq; static struct task mca_resize_task; +static struct task mca_postscan_task; static struct timeout_task mca_scan_task; static struct mtx mca_lock; static bool mca_startup_done = false; @@ -1017,6 +1018,16 @@ mca_process_records(enum scan_mode mode) { struct mca_internal *mca; + /* + * If in an interrupt context, defer the post-scan activities to a + * task queue. + */ + if (mode != POLLED) { + if (mca_startup_done) + taskqueue_enqueue(mca_tq, &mca_postscan_task); + return; + } + mtx_lock_spin(&mca_lock); while ((mca = STAILQ_FIRST(&mca_pending)) != NULL) { STAILQ_REMOVE_HEAD(&mca_pending, link); @@ -1024,10 +1035,19 @@ mca_process_records(enum scan_mode mode) mca_store_record(mca); } mtx_unlock_spin(&mca_lock); - if (mode == POLLED) - mca_resize_freelist(); - else if (mca_startup_done) - taskqueue_enqueue(mca_tq, &mca_resize_task); + mca_resize_freelist(); +} + +/* + * Emit log entries and resize the free list. This is intended to be called + * from a task queue to handle work which does not need to be done (or cannot + * be done) in an interrupt context. + */ +static void +mca_postscan(void *context __unused, int pending __unused) +{ + + mca_process_records(POLLED); } /* @@ -1110,13 +1130,16 @@ mca_startup(void *dummy) if (mca_banks <= 0) return; - /* CMCIs during boot may have claimed items from the freelist. */ - mca_resize_freelist(); - taskqueue_start_threads(&mca_tq, 1, PI_SWI(SWI_TQ), "mca taskq"); taskqueue_enqueue_timeout_sbt(mca_tq, &mca_scan_task, mca_ticks * SBT_1S, 0, C_PREL(1)); mca_startup_done = true; + + /* + * CMCIs during boot may have recorded entries. Conduct the post-scan + * activities now. + */ + mca_postscan(NULL, 0); } SYSINIT(mca_startup, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, mca_startup, NULL); @@ -1176,6 +1199,7 @@ mca_setup(uint64_t mcg_cap) TIMEOUT_TASK_INIT(mca_tq, &mca_scan_task, 0, mca_scan_cpus, NULL); STAILQ_INIT(&mca_freelist); TASK_INIT(&mca_resize_task, 0, mca_resize, NULL); + TASK_INIT(&mca_postscan_task, 0, mca_postscan, NULL); mca_resize_freelist(); SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO, "count", CTLFLAG_RD, (int *)(uintptr_t)&mca_count, 0, @@ -1579,6 +1603,9 @@ mca_intr(void) panic("Unrecoverable machine check exception"); } + if (count) + mca_process_records(MCE); + /* Clear MCIP. */ wrmsr(MSR_MCG_STATUS, mcg_status & ~MCG_STATUS_MCIP); }