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 D2BECC47077 for ; Thu, 11 Jan 2024 13:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70B696B00A0; Thu, 11 Jan 2024 08:56:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 694B06B00A1; Thu, 11 Jan 2024 08:56:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50DB86B00A2; Thu, 11 Jan 2024 08:56:06 -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 3B0216B00A0 for ; Thu, 11 Jan 2024 08:56:06 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 12177A073F for ; Thu, 11 Jan 2024 13:56:06 +0000 (UTC) X-FDA: 81667179132.09.7E16978 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf09.hostedemail.com (Postfix) with ESMTP id 730FE14002C for ; Thu, 11 Jan 2024 13:56:02 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704981364; 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=T6WG9KUfVaGV9joS3Ux1kZYyTmtSO+B2hljD4HKF7dU=; b=PJj1K0C1TsR9p8Qky5zQtAfNPPBVGMJj6gTUTYbhpL5Fvh3StSFiRl4qZmMPj3dE56F0aR KDqlqHt/jGKyha1YDgKglZSoUkMXJ16m5bmz1AX/XsfNNv8g7QImvmMP2pDoOBhTbqG+H1 9YdfoyKhOICzx8Rq231vgS5pEJWD6HI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704981364; a=rsa-sha256; cv=none; b=wXRsqXy/Y7RVd+NgQbFF1oHTMQ1ERz7WY/nPfRt+uTYoSanAjfU8jL8HS34D/AX4ldLe3L ViMwOyYbE5k0QAlK5PILBNLwnRXkHqbKJcs77HHA2rioPT59AWXPWTH4CS1QGxLDMtXx1h n1KDFSy8suyh0DfLsw/l++Fa5KpQrF4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4T9mQH0QMSzNkcv; Thu, 11 Jan 2024 21:55:19 +0800 (CST) Received: from kwepemm600017.china.huawei.com (unknown [7.193.23.234]) by mail.maildlp.com (Postfix) with ESMTPS id 02BA514011B; Thu, 11 Jan 2024 21:55:58 +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; Thu, 11 Jan 2024 21:55:56 +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 v4 1/3] x86/mce: remove redundant fixup type EX_TYPE_COPY Date: Thu, 11 Jan 2024 21:55:46 +0800 Message-ID: <20240111135548.3207437-2-tongtiangen@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240111135548.3207437-1-tongtiangen@huawei.com> References: <20240111135548.3207437-1-tongtiangen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600017.china.huawei.com (7.193.23.234) X-Rspamd-Queue-Id: 730FE14002C X-Rspam-User: X-Stat-Signature: ouigpj857x1sf5ksp74zid6c6x8846iy X-Rspamd-Server: rspam03 X-HE-Tag: 1704981362-850318 X-HE-Meta: U2FsdGVkX1+fIApbO3Xoq8Ia02QSMDl6QHUPrDQ547J8PLnhLhD9WbfgQtqVYUMJZGDD7xLpyITJshoiik2QXLgjWKCqAr1SOgeRTI5GOR4dI5mQwQGbGqB2Vf3zsEG1EtvkzzWDw3M5CvWnt0WZKkV1R8Jq1g8C8PWyOR5on4KPEnx0vtCpyauRnJQ+DMD8P0O7o2Me0SWzACiozxYQIYf0ILvraXBvg7Vdm1WvaamJ2G2rM63plMwZxv8yEqNFMZXmwfh3wS6oIX5Jp2hAW8RjGZxyyOGmBMh+DJqbO9mtv5u7y2ReDIWEXzaloJfbBzy46AcTHdS4RmItzs/x2MzkAhIqdWbFK9FH6e4XlZv9I3urA1hVl+yHyRWruuKCdcibJ9d/13mgSgXEKko7c7KxzeZvDxWBRqbKmpJIRBNc5aUoTCRRygQ0/gv4z+oCkHpHa+w3t5N8zXgf5+K/PLEg5rx0XPkQRbgHDwTr2sgYcGzcEQDXCBAth/ZbHwt6Q83DWC7ppS72OZybLSgQCPg+cCVR8YbvALp8cKEyFsugC0yCzPGzjTH0+ugDuf/xGDjYpUka0eNMMSLq5js6PqUIyyggbH3aFpHIpUuLEBIxSgMphVdOtqAdkrY0NVhTWebMMz3re1z4GK3u/z8BGkgtkzJVfIxqmsXWKg6PkREQmlbUSsTBTUOzm0EZacUAli1xY4pOy/wutW0FcnwmBlQlBu42l3f5g9h9B8ZuKdD8NoYJCbwt4arACIDatHRv+TtoojV5fuMCgcxbQm/Xc9e96pAmrQzcaNVo0FylsoLjTDHV6NGmb0eW0VI7rA7LCRH1skCc+U2poU6ENLdlxoL8L9IkbpIns7CX/VtH5JhG2vhYWWerPIsofCDvd8+PIB5BQPR7ni0iEpHka0naDqe5X9LDK51lf8dXh+43r+6r0dzOiGLkMZSC1GGMOaU2NJRhOKh/i35n0DmY5XI Tkhe/xIq 5ysxog0N2Nsa0jwybuOdjAiXOdj9GVyOfrzZ7A/75cC59z8a2H8yI0iQ9VWn+a6QvRRR7DZByRXmFTf+//h4UzuvC7RJZbf6F55rq9clPjQZsAt4HpyGU7Vkwu8uV7DMYLbP3KaoKqN3dIjPsbbCoF2Aj92VzwY2de+4GfR0QP0fB6WfodRvFYKtBaYgCDXygXvinVywL4ZjFeGA= 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 commit 034ff37d3407 ("x86: rewrite '__copy_user_nocache' function"), rewrited __copy_user_nocache() uses EX_TYPE_UACCESS instead of EX_TYPE_COPY，this change does not broken the MC safe copy for __copy_user_nocache(), but as a result, there's no place for EX_TYPE_COPY to use. Therefore, we remove the definition of EX_TYPE_COPY. Signed-off-by: Tong Tiangen --- arch/x86/include/asm/asm.h | 3 --- arch/x86/include/asm/extable_fixup_types.h | 23 +++++++++++----------- arch/x86/kernel/cpu/mce/severity.c | 1 - arch/x86/mm/extable.c | 9 --------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index fbcfec4dc4cc..692409ea0c37 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -215,9 +215,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP); #define _ASM_EXTABLE_UA(from, to) \ _ASM_EXTABLE_TYPE(from, to, EX_TYPE_UACCESS) -#define _ASM_EXTABLE_CPY(from, to) \ - _ASM_EXTABLE_TYPE(from, to, EX_TYPE_COPY) - #define _ASM_EXTABLE_FAULT(from, to) \ _ASM_EXTABLE_TYPE(from, to, EX_TYPE_FAULT) diff --git a/arch/x86/include/asm/extable_fixup_types.h b/arch/x86/include/asm/extable_fixup_types.h index fe6312045042..787916ec1e12 100644 --- a/arch/x86/include/asm/extable_fixup_types.h +++ b/arch/x86/include/asm/extable_fixup_types.h @@ -36,18 +36,17 @@ #define EX_TYPE_DEFAULT 1 #define EX_TYPE_FAULT 2 #define EX_TYPE_UACCESS 3 -#define EX_TYPE_COPY 4 -#define EX_TYPE_CLEAR_FS 5 -#define EX_TYPE_FPU_RESTORE 6 -#define EX_TYPE_BPF 7 -#define EX_TYPE_WRMSR 8 -#define EX_TYPE_RDMSR 9 -#define EX_TYPE_WRMSR_SAFE 10 /* reg := -EIO */ -#define EX_TYPE_RDMSR_SAFE 11 /* reg := -EIO */ -#define EX_TYPE_WRMSR_IN_MCE 12 -#define EX_TYPE_RDMSR_IN_MCE 13 -#define EX_TYPE_DEFAULT_MCE_SAFE 14 -#define EX_TYPE_FAULT_MCE_SAFE 15 +#define EX_TYPE_CLEAR_FS 4 +#define EX_TYPE_FPU_RESTORE 5 +#define EX_TYPE_BPF 6 +#define EX_TYPE_WRMSR 7 +#define EX_TYPE_RDMSR 8 +#define EX_TYPE_WRMSR_SAFE 9 /* reg := -EIO */ +#define EX_TYPE_RDMSR_SAFE 10 /* reg := -EIO */ +#define EX_TYPE_WRMSR_IN_MCE 11 +#define EX_TYPE_RDMSR_IN_MCE 12 +#define EX_TYPE_DEFAULT_MCE_SAFE 13 +#define EX_TYPE_FAULT_MCE_SAFE 14 #define EX_TYPE_POP_REG 16 /* sp += sizeof(long) */ #define EX_TYPE_POP_ZERO (EX_TYPE_POP_REG | EX_DATA_IMM(0)) diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c index c4477162c07d..bca780fa5e57 100644 --- a/arch/x86/kernel/cpu/mce/severity.c +++ b/arch/x86/kernel/cpu/mce/severity.c @@ -290,7 +290,6 @@ static noinstr int error_context(struct mce *m, struct pt_regs *regs) switch (fixup_type) { case EX_TYPE_UACCESS: - case EX_TYPE_COPY: if (!copy_user) return IN_KERNEL; m->kflags |= MCE_IN_KERNEL_COPYIN; diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 271dcb2deabc..2354c0156e51 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -163,13 +163,6 @@ static bool ex_handler_uaccess(const struct exception_table_entry *fixup, return ex_handler_default(fixup, regs); } -static bool ex_handler_copy(const struct exception_table_entry *fixup, - struct pt_regs *regs, int trapnr) -{ - WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?"); - return ex_handler_fault(fixup, regs, trapnr); -} - static bool ex_handler_msr(const struct exception_table_entry *fixup, struct pt_regs *regs, bool wrmsr, bool safe, int reg) { @@ -267,8 +260,6 @@ int fixup_exception(struct pt_regs *regs, int trapnr, unsigned long error_code, return ex_handler_fault(e, regs, trapnr); case EX_TYPE_UACCESS: return ex_handler_uaccess(e, regs, trapnr, fault_addr); - case EX_TYPE_COPY: - return ex_handler_copy(e, regs, trapnr); case EX_TYPE_CLEAR_FS: return ex_handler_clear_fs(e, regs); case EX_TYPE_FPU_RESTORE: -- 2.25.1