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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 F16E2ECDE5F for ; Thu, 19 Jul 2018 23:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF02C20673 for ; Thu, 19 Jul 2018 23:24:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF02C20673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zytor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731054AbeGTAJY (ORCPT ); Thu, 19 Jul 2018 20:09:24 -0400 Received: from terminus.zytor.com ([198.137.202.136]:59623 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727556AbeGTAJY (ORCPT ); Thu, 19 Jul 2018 20:09:24 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6JNN37s2451350 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 19 Jul 2018 16:23:03 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6JNN36O2451347; Thu, 19 Jul 2018 16:23:03 -0700 Date: Thu, 19 Jul 2018 16:23:03 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Joerg Roedel Message-ID: Cc: David.Laight@aculab.com, peterz@infradead.org, hpa@zytor.com, llong@redhat.com, dhgutteridge@sympatico.ca, luto@kernel.org, dvlasenk@redhat.com, jroedel@suse.de, mingo@kernel.org, eduval@amazon.com, will.deacon@arm.com, dave.hansen@intel.com, jpoimboe@redhat.com, pavel@ucw.cz, aarcange@redhat.com, bp@alien8.de, jgross@suse.com, boris.ostrovsky@oracle.com, jkosina@suse.cz, gregkh@linuxfoundation.org, tglx@linutronix.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, gregkh@linuxfoundation.org, jkosina@suse.cz, boris.ostrovsky@oracle.com, jgross@suse.com, bp@alien8.de, torvalds@linux-foundation.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, pavel@ucw.cz, dave.hansen@intel.com, jpoimboe@redhat.com, aarcange@redhat.com, jroedel@suse.de, will.deacon@arm.com, eduval@amazon.com, mingo@kernel.org, peterz@infradead.org, David.Laight@aculab.com, dvlasenk@redhat.com, luto@kernel.org, dhgutteridge@sympatico.ca, llong@redhat.com, hpa@zytor.com In-Reply-To: <1531906876-13451-10-git-send-email-joro@8bytes.org> References: <1531906876-13451-10-git-send-email-joro@8bytes.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/entry/32: Introduce SAVE_ALL_NMI and RESTORE_ALL_NMI Git-Commit-ID: 8b376fae0514dc7ee04786e2327169e39d12e51b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8b376fae0514dc7ee04786e2327169e39d12e51b Gitweb: https://git.kernel.org/tip/8b376fae0514dc7ee04786e2327169e39d12e51b Author: Joerg Roedel AuthorDate: Wed, 18 Jul 2018 11:40:46 +0200 Committer: Thomas Gleixner CommitDate: Fri, 20 Jul 2018 01:11:38 +0200 x86/entry/32: Introduce SAVE_ALL_NMI and RESTORE_ALL_NMI These macros will be used in the NMI handler code and replace plain SAVE_ALL and RESTORE_REGS there. The NMI-specific CR3-switch will be added to these macros later. Signed-off-by: Joerg Roedel Signed-off-by: Thomas Gleixner Tested-by: Pavel Machek Cc: "H . Peter Anvin" Cc: linux-mm@kvack.org Cc: Linus Torvalds Cc: Andy Lutomirski Cc: Dave Hansen Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Jiri Kosina Cc: Boris Ostrovsky Cc: Brian Gerst Cc: David Laight Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: Greg KH Cc: Will Deacon Cc: aliguori@amazon.com Cc: daniel.gruss@iaik.tugraz.at Cc: hughd@google.com Cc: keescook@google.com Cc: Andrea Arcangeli Cc: Waiman Long Cc: "David H . Gutteridge" Cc: joro@8bytes.org Link: https://lkml.kernel.org/r/1531906876-13451-10-git-send-email-joro@8bytes.org --- arch/x86/entry/entry_32.S | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index a905e6215ea9..763592596727 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -181,6 +181,9 @@ .endm +.macro SAVE_ALL_NMI + SAVE_ALL +.endm /* * This is a sneaky trick to help the unwinder find pt_regs on the stack. The * frame pointer is replaced with an encoded pointer to pt_regs. The encoding @@ -227,6 +230,10 @@ POP_GS_EX .endm +.macro RESTORE_ALL_NMI pop=0 + RESTORE_REGS pop=\pop +.endm + .macro CHECK_AND_APPLY_ESPFIX #ifdef CONFIG_X86_ESPFIX32 #define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8) @@ -1161,7 +1168,7 @@ ENTRY(nmi) #endif pushl %eax # pt_regs->orig_ax - SAVE_ALL + SAVE_ALL_NMI ENCODE_FRAME_POINTER xorl %edx, %edx # zero error code movl %esp, %eax # pt_regs pointer @@ -1189,7 +1196,7 @@ ENTRY(nmi) .Lnmi_return: CHECK_AND_APPLY_ESPFIX - RESTORE_REGS 4 + RESTORE_ALL_NMI pop=4 jmp .Lirq_return #ifdef CONFIG_X86_ESPFIX32 @@ -1205,12 +1212,12 @@ ENTRY(nmi) pushl 16(%esp) .endr pushl %eax - SAVE_ALL + SAVE_ALL_NMI ENCODE_FRAME_POINTER FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx, %edx # zero error code call do_nmi - RESTORE_REGS + RESTORE_ALL_NMI lss 12+4(%esp), %esp # back to espfix stack jmp .Lirq_return #endif