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=-19.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 09CE8C433DB for ; Wed, 10 Feb 2021 02:40:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5B5964E32 for ; Wed, 10 Feb 2021 02:40:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235376AbhBJCkh (ORCPT ); Tue, 9 Feb 2021 21:40:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:34642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235043AbhBJCgb (ORCPT ); Tue, 9 Feb 2021 21:36:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6574964E5B; Wed, 10 Feb 2021 02:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612924435; bh=jz7kDiFJcINdjgVT2eVSSkNbzkyQcpTZqngJqJck5pg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OkM/D1RDYFACY3KcIRSOgVRQIK2IDbr8OCP/Ycwsj6YPWiS2vAwVh8jz6mNxqh46/ 3giXFUBa76qPRwpayqX4AMRFn7uKgkMNf7PA+RgD/Dtwgcp0jOMRs427PYIiDYcvFw EccSeehbC+yjkj2O3o+1okT0z73HWMEwSmg6Pi0Zt8REi0VYuMx3YnDD/2hQH39lCn BSMIdm1qCMjkTgAI74RLtfOd0J5ClOmucR9EH4kpntsLuZh5XvIq/ByliB93mEAMVZ vELly7aCuQIg+YtbziAiWnghv0wtl6+UXWbotJYQz3+2v3DJsDgaSqQnAwfb68Qfg8 GvlXpnQzIVUSA== From: Andy Lutomirski To: x86@kernel.org Cc: LKML , Dave Hansen , Alexei Starovoitov , Daniel Borkmann , Yonghong Song , Masami Hiramatsu , Andy Lutomirski Subject: [PATCH v2 08/14] x86/fault: Skip erratum #93 workaround on new CPUs Date: Tue, 9 Feb 2021 18:33:40 -0800 Message-Id: <8969c688ee663e99901cf4b0383bc6662ce79707.1612924255.git.luto@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Erratum #93 applies to the first generation of AMD K8 CPUs. Skip the workaround on newer CPUs. Signed-off-by: Andy Lutomirski --- arch/x86/mm/fault.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index cbb1a9754473..3fe2f4800b69 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -442,9 +442,8 @@ static void dump_pagetable(unsigned long address) */ static int is_errata93(struct pt_regs *regs, unsigned long address) { -#if defined(CONFIG_X86_64) && defined(CONFIG_CPU_SUP_AMD) - if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD - || boot_cpu_data.x86 != 0xf) +#if defined(CONFIG_X86_64) + if (!is_amd_k8_pre_npt()) return 0; if (user_mode(regs)) -- 2.29.2