From mboxrd@z Thu Jan 1 00:00:00 1970 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 184DCC4828F for ; Sun, 4 Feb 2024 08:26:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F7626B007D; Sun, 4 Feb 2024 03:26:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A74E6B007E; Sun, 4 Feb 2024 03:26:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 396546B0080; Sun, 4 Feb 2024 03:26:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 283A36B007D for ; Sun, 4 Feb 2024 03:26:43 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EE86BA19D7 for ; Sun, 4 Feb 2024 08:26:42 +0000 (UTC) X-FDA: 81753440244.04.3130E69 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf04.hostedemail.com (Postfix) with ESMTP id 520AA4000A for ; Sun, 4 Feb 2024 08:26:39 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707035201; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JIhTmCKp1JPvrDf4Nft0zYZgK3+6jgIK0+TowYYY4xU=; b=r/vAVIh5a0OEkhP/Cffg90S7OLe0/fYniKJDeFMrc204Gh1RjUJU2QdxQR7Diz6EdXFqFm wHPlPh7kgTYqM7JfORPOBpSP2aONwDpP1u7h88uSaypaptsNtLdVNoJC8w+945VH+hMDEx 3TduK6DJiwUfPF7C9Dm8E6f43HqdfE8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707035201; a=rsa-sha256; cv=none; b=D/+CrYfvXpvEuGlILbKv06r+czndYh+NnL2RNAdTwveOCCUubWV4DgZ9QlnrGF5ctUx798 iao3guig0HkjdnUqJdjquXPfO63Ie82kmFIB4AcH6EA0UbuvdLbsR3LboiDGxvvkwUMMh9 iXDTEAp1XwTlSRS0tpWWQYPcbPW4P7o= Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4TSMyh23QKz1xnCm; Sun, 4 Feb 2024 16:25:32 +0800 (CST) Received: from kwepemm600017.china.huawei.com (unknown [7.193.23.234]) by mail.maildlp.com (Postfix) with ESMTPS id 71B6814013B; Sun, 4 Feb 2024 16:26:36 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 4 Feb 2024 16:26:35 +0800 From: Tong Tiangen To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , , Dave Hansen , , "H. Peter Anvin" , Tony Luck , Andy Lutomirski , Peter Zijlstra , Andrew Morton , Naoya Horiguchi CC: , , , Tong Tiangen , Guohanjun Subject: [PATCH -next v5 3/3] x86/mce: rename MCE_IN_KERNEL_COPYIN to MCE_IN_KERNEL_COPY_MC Date: Sun, 4 Feb 2024 16:26:27 +0800 Message-ID: <20240204082627.3892816-4-tongtiangen@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240204082627.3892816-1-tongtiangen@huawei.com> References: <20240204082627.3892816-1-tongtiangen@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600017.china.huawei.com (7.193.23.234) X-Rspamd-Queue-Id: 520AA4000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: uydmzk7s4nxf3nnckt4p4uiuinz6a1k9 X-HE-Tag: 1707035199-292835 X-HE-Meta: U2FsdGVkX19+aCdeeaIFH1obRK2jQ9WicdQXMVLRrqUEW4eOmtVtBsZrTlwB9zVh2AaA3y5HHqCSmRizswg7GJoRBpsbfqoOHPK7DqtMms/mQ1Q5nfgq6ePaIKvCygAqRCbvFfcUonPnKj4GzsYDuUxJRUNakEGS48wjYYS301BdI7pdwY92R3BlYlAltXF302dRG4nXwJXt+o8eG5roCzGJQNRu4cP6C0bkZEJpBMtLMZIBM9VNnA/3wNnnBb6JRCYIZVkdk0i18sVUQapQGGCcBEpu4HBrZuQ928Vfw11aF60GA62a3kptmPnGfCjNC+HIc3igwLEZxC3mn/fO/IP8K8gMJPfyaeTttmLMpFRiNLPucBOaWg51pfJQngyMyBMGy/i1hsOLKbl+33DKm2Q9RDXUlNlMlL2jbWKJNPETViEGoNh0mWRwvHwLiF8za2Kc7u/awSlBdQyIwrlSLfxCWfZJgpsxNLsRvCBz51xlI2EPbSf1gGgMNMlQmHdHcGeVIbDzOYkV+//O3BXQgzNd2QAxDGTvBfM4Smzo35juCZsMTe+erNlhKYPpl+K5netPYY2XfbGuLu09kIxWlO30G0950ebmT7Ptsq3aYPRiXW2AKyXJyVWBeH5LJ1dM/pEDae+OcmeBzkxhPYosECQ4AH7RvRPK3vtV5B94vPziKkHU8ATm73wmwraXjGp/GY3jFS6puKyOcycLWUjGyTUpx44MUVMIBRkagkhmClf0POS2oBrxwPAUziZv8UbbU9k8HY4ArMcxyeTEF+auE8l6P3zigfks1ORNwYq+FRSns4hlPyAiFfBWf7AEM2r9K7PJpkVSTrcNcRkSw6ltQZn1Tpd0+PsV34GXphK/KDsbbIDqe5pWz9e8dKEZIXUSIB6ItCy0AbT/xOzRY35x/03fXgZf4imG4hnw4MfU5IuCQ+ACVqLAsHGIewg45nkwaaBkuKpNhDgWuAyuMLf O2qXtjRL 46Fy4Q05aUELdSFcHPFVP6kErWycUhgmv/m29jZSEKa5BgWa1TiCKNnP45MDau+URYMt3Nj+EXrgiCw4mwCFqenDg7eKf3hQHdl9cX4nfDTnwaR+EHPUUFMECWRQexJ5oUpKPpGeHRtMH8iJFgtaCMrpNFKUoOZ1dOcFlj1j0w8344j8Pi2yNF3KalohOdItt7wdF X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In the x86 mce processing, error_context() use MCE_IN_KERNEL_COPYIN for user-to-kernel copy(EX_TYPE_UACCESS) and kernel-to-kernel copy (EX_TYPE_DEFAULT_MCE_SAFE). "COPYIN" only stands for user-to-kernel copy and can't stands for kernel-to-kernel copy, this can cause some misunderstandings. So rename MCE_IN_KERNEL_COPYIN to MCE_IN_KERNEL_COPY_MC. Signed-off-by: Tong Tiangen --- arch/x86/include/asm/mce.h | 8 ++++---- arch/x86/kernel/cpu/mce/core.c | 2 +- arch/x86/kernel/cpu/mce/severity.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index de3118305838..cb628ab2f32f 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -151,11 +151,11 @@ /* * Indicates an MCE that happened in kernel space while copying data - * from user. In this case fixup_exception() gets the kernel to the - * error exit for the copy function. Machine check handler can then - * treat it like a fault taken in user mode. + * from user or kernel. In this case fixup_exception() gets the kernel + * to the error exit for the copy function. Machine check handler can + * then treat it like a fault taken in user or kernel mode. */ -#define MCE_IN_KERNEL_COPYIN BIT_ULL(7) +#define MCE_IN_KERNEL_COPY_MC BIT_ULL(7) /* * This structure contains all data related to the MCE log. Also diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 04acdc3534c8..644748a5d98e 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1608,7 +1608,7 @@ noinstr void do_machine_check(struct pt_regs *regs) mce_panic("Failed kernel mode recovery", &m, msg); } - if (m.kflags & MCE_IN_KERNEL_COPYIN) + if (m.kflags & MCE_IN_KERNEL_COPY_MC) queue_task_work(&m, msg, kill_me_never); } diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c index b2cce1b6c96d..b4b1d028cbb3 100644 --- a/arch/x86/kernel/cpu/mce/severity.c +++ b/arch/x86/kernel/cpu/mce/severity.c @@ -294,7 +294,7 @@ static noinstr int error_context(struct mce *m, struct pt_regs *regs) return IN_KERNEL; fallthrough; case EX_TYPE_DEFAULT_MCE_SAFE: - m->kflags |= MCE_IN_KERNEL_COPYIN; + m->kflags |= MCE_IN_KERNEL_COPY_MC; fallthrough; case EX_TYPE_FAULT_MCE_SAFE: m->kflags |= MCE_IN_KERNEL_RECOV; -- 2.25.1