Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934235AbcDMLpm (ORCPT ); Wed, 13 Apr 2016 07:45:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56916 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933928AbcDMLpi (ORCPT ); Wed, 13 Apr 2016 07:45:38 -0400 Date: Wed, 13 Apr 2016 04:44:31 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: bp@alien8.de, mingo@kernel.org, luto@kernel.org, boris.ostrovsky@oracle.com, hpa@zytor.com, kvm@vger.kernel.org, Xen-devel@lists.xen.org, pbonzini@redhat.com, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, arjan@linux.intel.com, torvalds@linux-foundation.org, akpm@linux-foundation.org Reply-To: torvalds@linux-foundation.org, arjan@linux.intel.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, peterz@infradead.org, Xen-devel@lists.xen.org, tglx@linutronix.de, pbonzini@redhat.com, boris.ostrovsky@oracle.com, luto@kernel.org, hpa@zytor.com, kvm@vger.kernel.org, mingo@kernel.org, bp@alien8.de In-Reply-To: <20fc047d926150cb08cb9b9f2923519b07ec1a15.1459605520.git.luto@kernel.org> References: <20fc047d926150cb08cb9b9f2923519b07ec1a15.1459605520.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/traps: Enable all exception handler callbacks early Git-Commit-ID: ae7ef45e12354a1e2f6013b46df0c9f5bbb6ffbe 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2285 Lines: 67 Commit-ID: ae7ef45e12354a1e2f6013b46df0c9f5bbb6ffbe Gitweb: http://git.kernel.org/tip/ae7ef45e12354a1e2f6013b46df0c9f5bbb6ffbe Author: Andy Lutomirski AuthorDate: Sat, 2 Apr 2016 07:01:35 -0700 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 11:37:45 +0200 x86/traps: Enable all exception handler callbacks early Now that early_fixup_exception() has pt_regs, we can just call fixup_exception() from it. This will make fancy exception handlers work early. Tested-by: Boris Ostrovsky Signed-off-by: Andy Lutomirski Acked-by: Linus Torvalds Cc: Andrew Morton Cc: Arjan van de Ven Cc: Borislav Petkov Cc: KVM list Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: xen-devel Link: http://lkml.kernel.org/r/20fc047d926150cb08cb9b9f2923519b07ec1a15.1459605520.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/mm/extable.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index da442f3..061a237 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -88,10 +88,6 @@ extern unsigned int early_recursion_flag; /* Restricted version used during very early boot */ void __init early_fixup_exception(struct pt_regs *regs, int trapnr) { - const struct exception_table_entry *e; - unsigned long new_ip; - ex_handler_t handler; - /* Ignore early NMIs. */ if (trapnr == X86_TRAP_NMI) return; @@ -102,19 +98,8 @@ void __init early_fixup_exception(struct pt_regs *regs, int trapnr) if (regs->cs != __KERNEL_CS) goto fail; - e = search_exception_tables(regs->ip); - if (!e) - goto fail; - - new_ip = ex_fixup_addr(e); - handler = ex_fixup_handler(e); - - /* special handling not supported during early boot */ - if (handler != ex_handler_default) - goto fail; - - regs->ip = new_ip; - return; + if (fixup_exception(regs, trapnr)) + return; fail: early_printk("PANIC: early exception 0x%02x IP %lx:%lx error %lx cr2 0x%lx\n",