From patchwork Mon Feb 17 06:33:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13977129 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 DA7F3C021A0 for ; Mon, 17 Feb 2025 06:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 071AA280031; Mon, 17 Feb 2025 01:33:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F0640280030; Mon, 17 Feb 2025 01:33:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFFE2280032; Mon, 17 Feb 2025 01:33:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C3788280030 for ; Mon, 17 Feb 2025 01:33:46 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 50203141BA9 for ; Mon, 17 Feb 2025 06:33:46 +0000 (UTC) X-FDA: 83128470852.12.F6410B9 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf07.hostedemail.com (Postfix) with ESMTP id 3F49B40002 for ; Mon, 17 Feb 2025 06:33:42 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=FlvGBTqh; spf=pass (imf07.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.119 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=1739774024; 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=C//AWNBmkoQxyk9EmxC2ITDqwThmL3f05NW0jHto79U=; b=1NOjkSUF8L+EFeBhZNn7Vm3r2S13lV3g90qAU4U9ND0FwcgpOeoYvZ150Z+EHQ03fLpSLj K9OnZ/GJlYL8eza9KoarsUOnWDVETCZTFt5WSSzFSPRhU0GiyUO3KY4IrWnYaH0+vexswt /BqHvqsSq6n2a7Xpd+aAp80OpVed2dk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=FlvGBTqh; spf=pass (imf07.hostedemail.com: domain of xueshuai@linux.alibaba.com designates 115.124.30.119 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=1739774024; a=rsa-sha256; cv=none; b=HzAbXr2QY6jrnYEnZfIeAT8M8nCSP6b3Uqk+40a2SSmHnTHyNo2OyzpevuUDNG/Vuvx+bJ aub8w1ESjJYy1B3eybQqjYJwTD4IpJKkHYVhhb6vIrKr9/YZ0HlwhNmmyBcd47TxNMaj0z RgM4JU0EWqgQrURwTK3vycmvl/8p2XE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1739774020; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=C//AWNBmkoQxyk9EmxC2ITDqwThmL3f05NW0jHto79U=; b=FlvGBTqh6c9aFIDwnAtQaUDwxcIzWCEpU0Ryver0NEwZDfggbH0YPUZInCtpm2MUoc33F/x83R//Rzszv0S22curvnB+dRnFaXR1l9nVS1Fs30O3eD50gdm4VbWHswdrSzpbBf8qSXw+Wi6IMXuLOBI3bfss65oreJua855kFxE= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WPb1mOT_1739774017 cluster:ay36) by smtp.aliyun-inc.com; Mon, 17 Feb 2025 14:33:38 +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, peterz@infradead.org, jpoimboe@kernel.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 v2 1/5] x86/mce: Collect error message for severities below MCE_PANIC_SEVERITY Date: Mon, 17 Feb 2025 14:33:31 +0800 Message-ID: <20250217063335.22257-2-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250217063335.22257-1-xueshuai@linux.alibaba.com> References: <20250217063335.22257-1-xueshuai@linux.alibaba.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 3F49B40002 X-Stat-Signature: n74m5zr4658kmfq8rrynec7p19p6i3ek X-HE-Tag: 1739774022-968020 X-HE-Meta: U2FsdGVkX1+XjXbFfvjkuRF7rCUtI152e8yrLbMDIMqNCGzh+3d1Mu9mR7CgnWjrRvicIPc5HY4Zf6lik1iKTNKF4WULDfiWpMLZrzTfDgdqWQKryGne0kJDmwH3+q8tgc2R1PW1qLnYsZnXu7viY5Y+/nRZcxjexFoB9IVVjugHuHLo60cbLuqmQ77SOAEZ9/9Jrc6l2SAqueC0W3G/YNvFp/NstA8Xrfuzzhi+9TM66Mr9BS8QPEpteR4zBtuks2QQ61mNxDjGNz/rk09J9pnmpQ0JHLYGIAONxVszyIH51yylRq8D4mzD5TlYlq9KH4lhaVmD+c1xhvy9qByl3UAM8fxIgkvX6j5OswFTtHAYZzdrsAt1usVqaaHWklnnFcibo7zu4XnzgjaJRWnJgOsOWROnNdJ0EmoqzIu6OGUDuy2W8dvmXfs0Pdmxea5ViB41do9eGMFOxSh5NcMAWrlzuwLVuM+6Ci4rIBDx3YEtV/EgYY1L41/JYtqDd9hZUFTvPxAVxYJRjOApcKz6ExU3WZOTxddpvM6D9Ump7wSwvv1ERPKx7K7BnB6yudmgVYgAyDawX2VU1eiPAUc2WLfF+zB2yFroCrbUBgf/deBCgU0RiSxVUePlt70aZvwk4mCHYuG7rjGDctCIjMiBikCuZiHMgFMkDR3dupSbwo90q1b7pu85d6Peg46MnRljKNVvlpxcmoNTAV3LDa+112ttNr11EnVpOALADdt099JPkoB0jCNMVacRh1dCafv2duJoX9fmoTfvjhwCVg2oZEGQZjM5Bpx63+BTLky9tktT6seSIQckrZnrilPt2FRqIEO/v+32/Sp6DsiZ3v1wlhqomVz1uokkvdhjZaBB76G6E0MV/dQ95KLmUbT38RUCijvAnczjTaHfbjw/jEox484Sv9Mmg+eh4+uQkbD1Hs1krqjZZP3KhOvVffapqYeQc7TqHxEyRSmRQIwK6di 1lorGchM R2FaTdINLWTpMW0I1Ye9mxunRa+aBZZ8gzR2tL9p1wUd/4+J+U7CJKs0NpBj3iOZ2W35qCr6VnrLCP1n1RjTf1x1Wpw4RoRZEPxFY8yv+MS/vy2hwLgszGHVU91GPowGBxz8ixkbBUU3BXiXGv9ABGYLlt1oUjwbnKwg+wRRUeCw+dXnCIesrWpN8Ogjix7+GjUEDaWnaqRofB9ZUaaypR5e2aL8AmNaq6Gr74zZjSVPmLi4WV5cs0PYRJPHM3/KmejBmLttAe4lE75WVBZ/lUNKkO6t0mXOnq+KOPdxT4/6opvM4N9ae8aQYL1c5Ad7fHre6p2NRhbiv9FdGKbA+g9p2AcplbvxaY2ij X-Bogosity: Ham, tests=bogofilter, spamicity=0.004170, 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..f2e730d4acc5 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -925,12 +925,13 @@ 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; - int i; + int i, cur_sev = MCE_NO_SEVERITY, sev; for (i = 0; i < this_cpu_read(mce_num_banks); i++) { m->status = mce_rdmsrl(mca_msr_reg(i, MCA_STATUS)); @@ -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; } /*