Received: by 10.192.165.156 with SMTP id m28csp782184imm; Mon, 16 Apr 2018 08:37:52 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/uSDX/kkEXXqOzvIUX4j6iSfOH4HRuRlPyp5WkclqM6nBSHgHwXq+O3faDEFthIggyKEiP X-Received: by 10.101.75.66 with SMTP id k2mr13300300pgt.66.1523893072389; Mon, 16 Apr 2018 08:37:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523893072; cv=none; d=google.com; s=arc-20160816; b=a/jqAtUM5L5rXG2euC7WLoqint9tB4rO7d40RPRNI752ZiIe/IcNYHlALylsnCcJgL bft3v0280PXZzWmMJNmqqJI150G5GC/xWzYUiqJIAt5eO/JfVWU6Qb3vLtJTVrQAjf+f THsr0KzWJ5/lWslNEuar2IT8hIm9oDFe3m2Cl3vGiGSMk8zneVj0Ht+uCekD0zytPNHj lsRNwzVhsNVm7F0Gy0YGTopujXHLn6+6cy7twsMxJ/gmMnlUdSiNz5hDycBgDt4/3Bn5 Q8LQYZ2zTZUn1JOIiBInvqy2+QOR7A7guGU9NyNu/WeOTHKY/vghh7GY2gNX1RVmTpOR 2tPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=qKlv0dlfoJ0ph1CRFQGBUdfpl5F5TOgxEbVvMSZxBUI=; b=P3cDdvqPz7lEQ2ikFci4clv9qZf/ds8EMeN0HVpv5detmBM84zOE41dOkgsof/tiic ZM9Eq0SHC2P67gLEq6RJv+f/7Xyd6GoHz8wX8C6r4TFPk4Hs2fPJZhg4HOuXL5edzjJH pdC1mY1KCdLTbs3O2fWEcFNvjrp9EHcITuNarNyLamGucF1cl4Nat/or0hFfKNe1rJiV 6r67CGUChG062uX4N62QFe4Vn6eHoWWNlTQMxCQh47oefNKlqa/jupda1NBGutUGr5h4 SOspKm9XpdB6h8s7eMbrUWxGdAHdZnPiLY8FNpD4STKFLflX5OUEhhXdbV6FUS8hjxno Q7Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=XHEYDQAL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z18-v6si5175021plo.241.2018.04.16.08.37.38; Mon, 16 Apr 2018 08:37:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=XHEYDQAL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751980AbeDPPfm (ORCPT + 99 others); Mon, 16 Apr 2018 11:35:42 -0400 Received: from 8bytes.org ([81.169.241.247]:35888 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752725AbeDPPZm (ORCPT ); Mon, 16 Apr 2018 11:25:42 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 16A9D47A; Mon, 16 Apr 2018 17:25:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1523892337; bh=LfLVFlchBNBi/xcwgUdp2CsNnqmiYfHt3itF8UQ+YcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XHEYDQALvOpuLF8RA/Boz1OQxSdBRVVuFJVNMgM7GDz9pmf4o/ZzLv8CPUepljkla NgCnIySKsEtjxiSLLAy8Sn0lhrgHf6qND/uVaq6/4unMNwWHa9amc+ysAgpbsHKt6u 5PBWIOkFrg3ohxVo8KGOwlnZDdcdH9vIXj9S8JVVuFL1r3uvTww7PtRSWsFPtSjElg /kZd1+PdYgL73s3CrlrYovAPRrWsujGPlLAf37mnbLEuJa90PFDii7pSm5g4U7DHQf j0+JO8NC86AK1fwPayZqOTiGaW0UyydVnV+841OehIYCwfas27WzcknMEw/cfIsmiI pwe7myHrZ0u4A== From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Andy Lutomirski , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , aliguori@amazon.com, daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, Andrea Arcangeli , Waiman Long , Pavel Machek , "David H . Gutteridge" , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 05/35] x86/entry/32: Unshare NMI return path Date: Mon, 16 Apr 2018 17:24:53 +0200 Message-Id: <1523892323-14741-6-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523892323-14741-1-git-send-email-joro@8bytes.org> References: <1523892323-14741-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel NMI will no longer use most of the shared return path, because NMI needs special handling when the CR3 switches for PTI are added. This patch prepares for that. Signed-off-by: Joerg Roedel --- arch/x86/entry/entry_32.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 118420b..3a319fd 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -1017,7 +1017,7 @@ ENTRY(nmi) /* Not on SYSENTER stack. */ call do_nmi - jmp .Lrestore_all_notrace + jmp .Lnmi_return .Lnmi_from_sysenter_stack: /* @@ -1028,7 +1028,11 @@ ENTRY(nmi) movl PER_CPU_VAR(cpu_current_top_of_stack), %esp call do_nmi movl %ebx, %esp - jmp .Lrestore_all_notrace + +.Lnmi_return: + CHECK_AND_APPLY_ESPFIX + RESTORE_REGS 4 + jmp .Lirq_return #ifdef CONFIG_X86_ESPFIX32 .Lnmi_espfix_stack: -- 2.7.4