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 X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8908EC433F5 for ; Tue, 21 Sep 2021 07:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65AEA60F70 for ; Tue, 21 Sep 2021 07:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230452AbhIUHyY (ORCPT ); Tue, 21 Sep 2021 03:54:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbhIUHyX (ORCPT ); Tue, 21 Sep 2021 03:54:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6563CC061574; Tue, 21 Sep 2021 00:52:55 -0700 (PDT) Date: Tue, 21 Sep 2021 07:52:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1632210774; h=from:from:sender:sender:reply-to: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=v1QOzZheecOFkSCMtCpbq7MNEXfm7EmBx/vYQLDFQcg=; b=pRvb0YhVq/Gl8xKYaeyJxy/udcQkhx2wPzze121ER5qSSj7jHjJEaE+Z0xUuqGt9gN024V tY1tS0GcNlzwHr7zJ07uD/yx+mvv8AT0L85WvZjZPiqHSa4hnRQFK5zMotoep0jPXQqB88 7K1VW1Mp0l3txeIwOgHgTsj9qRRzmbP7V4AWkQURMXicJdishMISjtOKT8a3S2k8K9x0Xn tNcAnTWeFWKuP4IC0mmPDZZv/EylgHWpHcqfzky7hYHht3WF1944A6OeC3tDtukKt2Cj/z tGq+tVxmXWUfTzNxA2S0Q2SX7cdOPziYnk821hgPsz+PY+nOTLzRCL3y9sC7Hg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1632210774; h=from:from:sender:sender:reply-to: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=v1QOzZheecOFkSCMtCpbq7MNEXfm7EmBx/vYQLDFQcg=; b=ix81ZB+/qgLHkUvpgcbPZ5/+oheaavBRidqD3ViFYzrPiy5SG7bC5e0Lup/UKdQVhiWMld Vf980fafyjGC1eDw== From: "tip-bot2 for Tony Luck" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: ras/core] x86/mce: Drop copyin special case for #MC Cc: Tony Luck , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210818002942.1607544-4-tony.luck@intel.com> References: <20210818002942.1607544-4-tony.luck@intel.com> MIME-Version: 1.0 Message-ID: <163221077303.25758.8788992055844267780.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the ras/core branch of tip: Commit-ID: 690658471b5f28d306e6492c4585d748cb5304e8 Gitweb: https://git.kernel.org/tip/690658471b5f28d306e6492c4585d748cb5304e8 Author: Tony Luck AuthorDate: Tue, 17 Aug 2021 17:29:42 -07:00 Committer: Borislav Petkov CommitterDate: Mon, 20 Sep 2021 21:18:23 +02:00 x86/mce: Drop copyin special case for #MC Fixes to the iterator code to handle faults that are not on page boundaries mean that the special case for machine check during copy from user is no longer needed. For a full list of those fixes, see the output of: git log --oneline v5.14 ^v5.13 -- lib/iov_iter.c Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20210818002942.1607544-4-tony.luck@intel.com --- arch/x86/lib/copy_user_64.S | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 57b79c5..2797e63 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -234,24 +234,11 @@ EXPORT_SYMBOL(copy_user_enhanced_fast_string) */ SYM_CODE_START_LOCAL(.Lcopy_user_handle_tail) movl %edx,%ecx - cmp $X86_TRAP_MC,%eax /* check if X86_TRAP_MC */ - je 3f 1: rep movsb 2: mov %ecx,%eax ASM_CLAC ret - /* - * Return zero to pretend that this copy succeeded. This - * is counter-intuitive, but needed to prevent the code - * in lib/iov_iter.c from retrying and running back into - * the poison cache line again. The machine check handler - * will ensure that a SIGBUS is sent to the task. - */ -3: xorl %eax,%eax - ASM_CLAC - ret - _ASM_EXTABLE_CPY(1b, 2b) SYM_CODE_END(.Lcopy_user_handle_tail)