From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48KIKJmuoQQPg2bzrvPrPr4kECmvimEHqlH8Wdr3EM1ZuXrpPHbp50n6WPAgfO6ftaK3bZy ARC-Seal: i=1; a=rsa-sha256; t=1523892341; cv=none; d=google.com; s=arc-20160816; b=qMxngKCSfiRGIIKEwmDjG3jD9OacpXzFLpnnDQffCA9YiseCzTlFzE08QrUQAYiaAi 8fGNd9LUMm0hqdVZBLs1054rApP32zy7VBCbb3JumdPILTl5BTKfGeT+cAiptw2q60No qPiu5oxVCUrm/px+1s6mj1oGjuz3cu1XdUntCmsy3Az5/GLS/EwhDAA0tys9o8HImB6b Jck4armsz8jXv+yNNlElgOPCQqi8HBDP4Cg8dzdTiDdCt+DoNIUA3x+FH7eg8xHMk6ty cM8mSmixAX0F8ZMHU2akA6kgs3MRRmfD0EUYxykvKJqFxHgw2tNWCWEaWkhpcX7LmhJ4 57ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=qKlv0dlfoJ0ph1CRFQGBUdfpl5F5TOgxEbVvMSZxBUI=; b=JDEA/YWfQ58xcBHpQKM829WW+6ns8cUILFvL5NCSV8Iz2oupDFyq3yGzT/ujBBE3zs 32gDX3JWHWr5a3JVKwfy+brdtijfALX7LCFpgoMFob4rZsAlYpGKmQWwkC2jfisAamHp Kj7L1+Z+ph+NptoLEsOz0eLr8PA12L/Sy85Y5h/LSFkO3CBQ5najNBjjwkkbxywsINPC v8BOo8qAzuFQB6MImyKu5Q5ZQoNXFRTijDaYtPP/uRxH3umR6b8iTcCzlSidUSzjt9Fs /OpYhroaXxTf4QxxvgPL61t55gkyz9KQxGW+MynjFV0cWYWVi2VBZ6E3QpQf6sZDF5Vm h6RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=XHEYDQAL; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=XHEYDQAL; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org 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> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1597916936024671765?= X-GMAIL-MSGID: =?utf-8?q?1597916936024671765?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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