Received: by 10.192.165.148 with SMTP id m20csp3577913imm; Mon, 23 Apr 2018 08:49:54 -0700 (PDT) X-Google-Smtp-Source: AIpwx48zAmtCxwygFfCPlOLbnch19lMvTiUAdHJwnNLgzj6qzsZfC1igmSMBBqTGc5bipkKubY5I X-Received: by 2002:a17:902:c24:: with SMTP id 33-v6mr20938795pls.88.1524498594043; Mon, 23 Apr 2018 08:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524498594; cv=none; d=google.com; s=arc-20160816; b=XIW3ESilnnuEtpYzD+YbZH485W5G9m0YbUGoa6RauAWWEL9/blPxL/+BisMgCbltTO ClYNeo0HsOICyn0ZKvN+uMNCZKIHJtckC7bAUrBSUn7boAlOEbfhNw8mBgWNn3m1BIov 3bDJ1F6oGp8m4Z8PU1Jzhm/TPnSsJuG0k5v9MbfDbQRbcaqCDzp4VG4TDgVY3wALEW+7 CAjKVZHleONNOBfYkh742++lQTRsWLpghVlYmNQsKPVAhXofCXEmKQSubMkv38E6vfAx WYJqJLWLEGCcfCQuzm9vEuvkndrLMlZ5NU2SO+naLnZMKiKeGYJW/K7oXApt77EW6ALu FDVA== 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=iPHhT9VtssZmLZNJRdhSe03HR3iIIdw+WkgWL9x7U+LiIrl3kSQjeTtctnCy3BloR9 Ibt1IX2JELxb7Ihgl9qmEza/vXXM1BkOGQS1KhXUatnNIKrkSGoounOYX+uX+5XlT8BN +Fh9fJSQEDjB6RoJxiIdxE94sPacBFGitukDXolnSlAK84jWU79+gNNVXW4gDiK1A6dL BTiUz7vb5+1Ub4LMh0XEKplWGwLjJvIVRIql3TaLIGVaO+tIZz1AbBTRWCmzYCEo1XIK udMGRHk09wMAFaebYFUemFUPviE6+Po+8To29racHtSvOG857LB5Zke5J8B+tJEaMAon YAXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Hg4Sqz/I; 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 v32-v6si11902453plb.575.2018.04.23.08.49.39; Mon, 23 Apr 2018 08:49:53 -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=Hg4Sqz/I; 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 S1755978AbeDWPsZ (ORCPT + 99 others); Mon, 23 Apr 2018 11:48:25 -0400 Received: from 8bytes.org ([81.169.241.247]:60416 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755448AbeDWPrw (ORCPT ); Mon, 23 Apr 2018 11:47:52 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 3CBFD75E; Mon, 23 Apr 2018 17:47:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1524498464; bh=LfLVFlchBNBi/xcwgUdp2CsNnqmiYfHt3itF8UQ+YcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hg4Sqz/IQicNOP8hscGaPjEMz4Wxadchzzaq7tbVzK4O9nvXhARIfs+nPCyE+1loz 5h2XxE3pQyT1z8l2FlL0FMZvc9vdHAXb1JX/T86S0qqpuVS8vc96iRf/rUoeJCoKPS X/igqb1jOCNgaakitYe/TfjO4EFn0t4NhPOH/gkj5Rq9IdJHmnYXu4jKpkh0eI1a5l oD66JqxaTp3H/ILlcBKvsEk8gGva4Qw0f39F3dclPUsFHQb9gecQ1M4Zq2Huye1lkc oKFDpCuzL4QpMhwE95iX1MSeXfhb8JYzbz5bDNQRRoVIrfAcIXT6aeHUHZ0MJfgT2h 0mmFMNd8x+IHA== 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/37] x86/entry/32: Unshare NMI return path Date: Mon, 23 Apr 2018 17:47:08 +0200 Message-Id: <1524498460-25530-6-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524498460-25530-1-git-send-email-joro@8bytes.org> References: <1524498460-25530-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