From nobody Mon Aug 15 17:57:23 2022 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 4M626r0XR4z4ZcwZ; Mon, 15 Aug 2022 17:57:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M626r015mz426Z; Mon, 15 Aug 2022 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660586244; 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=JG0sqmxRSZi0jC6U0wzzknE9fB9SU/sPyCzem5s2O6w=; b=twSUKPC0yxGuPdYzArju1KzKwqucyxvAuJGsEQ7NK2PlI+w3kOS+LD2qDLvLgcy1N9u+yt JIPGAnlKgVooBewiSJonmzm9CbWne2Lc+irQ7ZzPKFbUO/3rf6nXYqD/WY0Gc51/hGpUZJ l+n2HgGVyH8dhEKu8Ph1BN98Fx6PErq0uCB+L4WP8yvLHXCv9lTxanC3LyAwOuc87kNyFZ 6wraxvdH6wKZ7GGQWWjHAJtW5x7Evtdpu0GIX2RPeOCd/F4p4Pyj4kKapXJaRHF6CJC7kt ZGQdTJM3ZY2D+J+qJxhwN7Iu+48jIPheYl+jxbQnCBHboUF3skNb3qkoyF86QA== 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 4M626q69DFzdsb; Mon, 15 Aug 2022 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27FHvN4i055843; Mon, 15 Aug 2022 17:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FHvNX8055842; Mon, 15 Aug 2022 17:57:23 GMT (envelope-from git) Date: Mon, 15 Aug 2022 17:57:23 GMT Message-Id: <202208151757.27FHvNX8055842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: c13e9968db3b - stable/13 - mca: Add sysctl to mute corrected errors. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c13e9968db3bece3d6dd8d17c0a0bce5ef204967 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660586244; 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=JG0sqmxRSZi0jC6U0wzzknE9fB9SU/sPyCzem5s2O6w=; b=I5qP+snjnElcuFcBCWNOPg9bTaI2KnhEGPyYvlvcNZIjdtarKWo9bRedsiahT5/0Lr1Uct zuWmd0LkKXMk+pHYtY7m5CA0Ea0UWlTtUsB9yeQaPsX8ibLUuFWnemQRkL/FUMCTkp1Pwq Pnu0Jbmno7X1nZyIfLrtbk6Reqfsd/L+7F3LArktFLAkuBGcK6kqYFJr3yXlsRcjlG+qAW tKGNxvHelIHfmGXI5cordR/F6gC+S5KSSYDIRxqXiSWruFAcO+az93FpuDzTTRH2XWjWZM MkATyW2DL9mylhXgKpHaCx8nB4bZukdXN+Y0DO3JUDGhvwrjaBtEAqDlTjqCLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660586244; a=rsa-sha256; cv=none; b=dIutSY0sIysrCY0x1bCVUAYww+0ZrakE7zG15y3AzjnD89MZ4zJgy6Gxt86HsJjeVYpJZh Hjjp+sh0N9IkevYHB23zgzs3t0SBTHNODGVpwHSq+yLO8gK2XC8PUEXs/GTGKE2I4uAXA6 exSo7/WRnMoNRoDJ/KYM3Fpj6jT3Dhzr0r2Hk5CdIixxjshZjbEj0QFu7upJUrGVLpvX9Y NdWsgOQNu7Gs9rxyt2G3OrlJhHucZu/txOIVL0g31JkB0hYUBCv+CB+Ccob/o91h9rLOa3 vlj0ZGsB59zsoVJey5ntfEWFJkI18C546ZRBOvzxNiZt2KC24v3mpmJOv688XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c13e9968db3bece3d6dd8d17c0a0bce5ef204967 commit c13e9968db3bece3d6dd8d17c0a0bce5ef204967 Author: Alexander Motin AuthorDate: 2022-08-05 17:40:57 +0000 Commit: Alexander Motin CommitDate: 2022-08-15 17:29:13 +0000 mca: Add sysctl to mute corrected errors. Setting hw.mca.log_corrected to 0 will mute corrected errors logging except ones marked as reaching Yellow threshold by hardware. MFC after: 1 week (cherry picked from commit ac64943ca8514382289e6054e8127726a7c40ea3) --- sys/x86/x86/mca.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index e3386b5b7459..58630fae0781 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -109,6 +109,10 @@ static int mca_enabled = 1; SYSCTL_INT(_hw_mca, OID_AUTO, enabled, CTLFLAG_RDTUN, &mca_enabled, 0, "Administrative toggle for machine check support"); +static int log_corrected = 1; +SYSCTL_INT(_hw_mca, OID_AUTO, log_corrected, CTLFLAG_RWTUN, &log_corrected, 0, + "Log corrected errors to the console"); + static int amd10h_L1TP = 1; SYSCTL_INT(_hw_mca, OID_AUTO, amd10h_L1TP, CTLFLAG_RDTUN, &amd10h_L1TP, 0, "Administrative toggle for logging of level one TLB parity (L1TP) errors"); @@ -426,7 +430,12 @@ mca_log(const struct mca_record *rec) uint16_t mca_error; if (mca_mute(rec)) - return; + return; + + if (!log_corrected && (rec->mr_status & MC_STATUS_UC) == 0 && + (!tes_supported(rec->mr_mcg_cap) || + ((rec->mr_status & MC_STATUS_TES_STATUS) >> 53) != 0x2)) + return; printf("MCA: Bank %d, Status 0x%016llx\n", rec->mr_bank, (long long)rec->mr_status);