Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp322673imm; Wed, 18 Jul 2018 02:47:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc8zND0Wwn76e3H4FPvy+NUuE5/Qt2g5PLi/0CogI2Vp3g4kBzeDweO19vSKv3TYR81MbhC X-Received: by 2002:a17:902:7b87:: with SMTP id w7-v6mr5273446pll.142.1531907234718; Wed, 18 Jul 2018 02:47:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531907234; cv=none; d=google.com; s=arc-20160816; b=qrAOt6A0zipR/dKW3YPckU+26rFF32xAldori2Y3gdgnvw8NDjklqFKceot0LOkfop n/soYuqfYGlVItfrWkSagSz6d5uzvgm3werIBShY5JIiobuj7JHjdHkXS7VfxnAUN47b U28B0IzBTYFwgfuCc9D2/znlCe465042+0YZI5j++r4r9y9TkqdgWrer2niJG1FTuvgF XRuO82H7dJ/Z+/lbDB27v9bFXkAacv97csyi8PltO1iSLtI7cgq8c4lhLVzj8tGinjMC O25ohjqEG1AdNNg3kbj6uuvJKXzRd5oqSIS6V7QxhRyT8V8ftRex7H+vQJqUZDkXoOHf AxQQ== 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=59kgpSZCp9XjsleM3vfbMGOeIR/pli/7ooP/sZn4aWc=; b=hJ7FmZANXQyiu1pHSsTVM7q+QHCj/CbiTMYsvdeT3f/DAJbirkFq/W5+Ies2Mxbw0W dJnI+3emrfnbgYNUTiirLbTwsIshVMk7jQ+s8+UrWQWTI2doqeVIwIZ9YG4Fa+jU3pQL Y4+3lxpO8b2KOkGaP0hJRZjEMDWT5K4PPI09uq2uYxv9zmcCcn44Yjn1ARnpKgUtXV3d e8rV83QQga6Szed1qQveeXLQ40WZU23ccRVXQzW8bXPJsRPVDa4rNfgFZQy1CuWXG91/ VmoYZcs5UR7pPiQB2wwCNDFAtcg/ZhPETtnVQKW6zfTFkLVLPXbmeJdroGTbD9HDV5v7 Hefw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=OWPCGoxk; 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 q65-v6si3165212pfb.9.2018.07.18.02.46.59; Wed, 18 Jul 2018 02:47:14 -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=OWPCGoxk; 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 S1731340AbeGRKS2 (ORCPT + 99 others); Wed, 18 Jul 2018 06:18:28 -0400 Received: from 8bytes.org ([81.169.241.247]:53544 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731270AbeGRKS1 (ORCPT ); Wed, 18 Jul 2018 06:18:27 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 3417B1D3; Wed, 18 Jul 2018 11:41:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531906879; bh=A4ZQi0DSL1gF1Xdjf/O6RlUKBa98rFH/5ngDgFaQgf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OWPCGoxkyV63Cz1JYkqeO9epA90FYq0ck8LqSJqk6xwZqLN2GwgBFiziNRoOtlOny Zvkx8q/hc4nXJuVQyp+CYLQurH1IfgTfLbqBUbRHSG+PVyQDvQNS+JcvN8UQtir1Nf cflNSbuZ1SWgusK/nApkWDe8V/mWlWcNFCDblt6ciqXKPltEtx5bCnJMzpLsPFJvrn 6qlcKW5AyY7Tnyc8x/zIXlUXdYcFdoivfu6H9HvatKMES1knZ0S36aIPVioZvvDw8d QyLOKVbATUtbtcDeEJtjf80V2xgb0yHFKp59wdjk/sQlrHpNmL8b5HYKnIRQm02Al+ IZl6qTSMhmgpg== 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/39] x86/entry/32: Unshare NMI return path Date: Wed, 18 Jul 2018 11:40:42 +0200 Message-Id: <1531906876-13451-6-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531906876-13451-1-git-send-email-joro@8bytes.org> References: <1531906876-13451-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 ef7d653..4364131 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