From patchwork Tue Feb 11 06:01:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13969433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C51D9C021A1 for ; Tue, 11 Feb 2025 06:02:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B364E28000C; Tue, 11 Feb 2025 01:02:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A98D7280004; Tue, 11 Feb 2025 01:02:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D5C628000C; Tue, 11 Feb 2025 01:02:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 60B62280005 for ; Tue, 11 Feb 2025 01:02:10 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C6BBEC104C for ; Tue, 11 Feb 2025 06:02:09 +0000 (UTC) X-FDA: 83106618378.27.5136624 Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) by imf22.hostedemail.com (Postfix) with ESMTP id C4250C0002 for ; Tue, 11 Feb 2025 06:02:07 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=ttDnyvxC; spf=pass (imf22.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739253728; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=v4nYqPoOVXQKgJH/YSunWnnMJy+4Q4FHZPFcfZOd/Xs=; b=FS0+UslYepCZHHFORqAtD/fcIPAr4xC5hQols6c5UX01OwIVsr6KGjx+kmtRHSCG7R79ml AoaJBZb28kmy+KS9ZsUNbvM+Bq9H8G7Y5VnVuBjbiNDTOWfzp1KVZQeKWPkyr+ePcBBzSA uj0K9QLqExUAd3aDTFGOkVI9lltWDuU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=ttDnyvxC; spf=pass (imf22.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.118 as permitted sender) smtp.mailfrom=xueshuai@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739253728; a=rsa-sha256; cv=none; b=hL0NS2uLire9d1IBhTmqtQnn/x3hGAxW20EjBh3TKBwUgQh2yaFU1Ihri73l+PfVsPu/2w i+XYRGx2MJHhZwNiYJXVrQP1oVKLK4vszMCJiCV2rWti3+5tw2AMtAADhUuUVN2egB/QnC l6juAvjzS/XRCwkP86UO8ql+jaF4TP4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1739253724; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=v4nYqPoOVXQKgJH/YSunWnnMJy+4Q4FHZPFcfZOd/Xs=; b=ttDnyvxCF7PsEWP5YB5QdE4Ksk0AkLATMRFClZ0Pirfp7Y8glgPVIDuq0wNNyPzu3UCiekhrF3PmfsDVgh60bg0kyeI0xRnnM4DxrcqF1QC2smg2CEy/cdHhqMsTi1ZLclgiYwLZYLv6p04B2oMX436qYYm00Lc3h+hnQifdylQ= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WPFiSHq_1739253722 cluster:ay36) by smtp.aliyun-inc.com; Tue, 11 Feb 2025 14:02:03 +0800 From: Shuai Xue To: tony.luck@intel.com, bp@alien8.de, nao.horiguchi@gmail.com Cc: tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linmiaohe@huawei.com, akpm@linux-foundation.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, baolin.wang@linux.alibaba.com, tianruidong@linux.alibaba.com Subject: [PATCH v1 1/4] x86/mce: Collect error message for severities below MCE_PANIC_SEVERITY Date: Tue, 11 Feb 2025 14:01:57 +0800 Message-ID: <20250211060200.33845-2-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250211060200.33845-1-xueshuai@linux.alibaba.com> References: <20250211060200.33845-1-xueshuai@linux.alibaba.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: C4250C0002 X-Stat-Signature: irbtj5qi7dm6qpxic7bz1srfpcinot3p X-HE-Tag: 1739253727-802863 X-HE-Meta: U2FsdGVkX185+tOp9DeVyw5Gb1oxti5uMQjDSPpuDjzPW1mqwoDxr70LqZ4JaCYukqkTHFYaPUTrO1kzIZSPmvBmlux/6yyP1hmd9fLBpOrbsprxBuJ0JyBUspG/yRB5B9q/GRQktsgapr8DqLd7pcntKslNavd3qZWvaKpp91DH9+2xe4YSPFZDQS8ZntCkEuI/n0bQYiFV7kM38i0e4F0gkNxPbP/wTKvPw0d0UDUAqAQX7zesD09CEBqUdJ9k6oFI+tdW22pDy2/g4i0puGPP7mgh0qIgMxknwceIfJogZWogOCmQ9QyOJAW9s/rHlkUStk1nuWZhlZN29TwVPJw1TS/2HjOfrOF4eLQCqIZxX0cyJnNPCY2WI+0JGjaNrPJluxfDTaS29+5uPRUDySAgiOkqMa2RzQiwufvKpuAV6Lrh2zIkZ5ufmoObXkY2o1Qlatsw3ZBzl4dbH6ufxQ/Udm8pLCZrOnx7uYzcoKK+dvGbcRoGG92rkT+uOAz9tiGEU4g2P7PI0GPqEFHNk/BbgE4oi5TiYFa8gHpfCy32vI6qplDEO1mw31pV3l3nxtziyA6bCQznlTJaAs+DdnF6gF9BRbuIe75ulLa1VwfC5JBcZg1NQX1B69ih+KisDkLP2uhP05GbjJaNiCtXRnAjbzjhPWD3OB4R0PtsL3x0NkLg3cRuyOmQVEewcK9Mus12xbnQLfkEMlzW521ylqL5hgP9vmHkmmxGHZgYTSKCvehuCFwpXAyKhBI/J6qlFiZCzA/lRkaXjZq9ed6Tu4+snbWspidzh0Axr4GU+rR3DSlOxW884DhDwzZtwNpHEd1cp+lcio+c/DY0D5LlmEppf2+Tk6dZ48kkc6Ftp+XPk+l1MmHie7FhRFNRqbJQzP4V/YhxHPEHwzZPbcd6K78aBl6VbQH1M2Ga31MCGSWMsHV83Vb+5dZiSsVm51FgGpsMYaNTpwICmBSYBu+ NOJUnM7t pDisLtc4slE/Z4EXsgB0Uq6yNqvwy4kuF/iTcZ5o0VQyEaW+nkOqKbOH71at3V2WWVVdXeQHLQosZ8RmnJPIDXNnnXQm/T2F3bgHOJJGtEAjkRMjuIA4M98/Mi6RGrhl13XyMIuy49gUYQLNjhkR+eK4hRD3kp7/Qyj3YXqE+rjtAApGycBY3YZVkDMb5EHmpX3yi1JWaBBj/TPxBRABFk63Tw3CDEUF8U3W1+AuYVseDMSlVA2caEIaHMavicj6u0HTutTlYfZN7X/cO2ZyRn82dGczp9Eg3CUSG+XeHW3VTFawxlGjHgpIJKJJQEocEMpgPi7RwMbLgJOZt1AaJmTOayUCwfaa5PyQ/tz1OJ3l++zXxU7rl7SXu4dI4YT+CZulr X-Bogosity: Ham, tests=bogofilter, spamicity=0.033149, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently, mce_no_way_out() only collects error messages when the error severity is equal to `MCE_PANIC_SEVERITY`. To improve diagnostics, modify the behavior to also collect error messages when the severity is less than `MCE_PANIC_SEVERITY`. Signed-off-by: Shuai Xue --- arch/x86/kernel/cpu/mce/core.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 0dc00c9894c7..2919a077cd66 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -925,11 +925,12 @@ static __always_inline void quirk_zen_ifu(int bank, struct mce *m, struct pt_reg * Do a quick check if any of the events requires a panic. * This decides if we keep the events around or clear them. */ -static __always_inline int mce_no_way_out(struct mce_hw_err *err, char **msg, unsigned long *validp, - struct pt_regs *regs) +static __always_inline bool mce_no_way_out(struct mce_hw_err *err, char **msg, + unsigned long *validp, + struct pt_regs *regs) { struct mce *m = &err->m; - char *tmp = *msg; + char *tmp = *msg, cur_sev = MCE_NO_SEVERITY, sev; int i; for (i = 0; i < this_cpu_read(mce_num_banks); i++) { @@ -945,13 +946,17 @@ static __always_inline int mce_no_way_out(struct mce_hw_err *err, char **msg, un quirk_zen_ifu(i, m, regs); m->bank = i; - if (mce_severity(m, regs, &tmp, true) >= MCE_PANIC_SEVERITY) { + sev = mce_severity(m, regs, &tmp, true); + if (sev >= cur_sev) { mce_read_aux(err, i); *msg = tmp; - return 1; + cur_sev = sev; } + + if (cur_sev == MCE_PANIC_SEVERITY) + return true; } - return 0; + return false; } /*