From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756601AbaHHRqK (ORCPT ); Fri, 8 Aug 2014 13:46:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45494 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753842AbaHHRqE (ORCPT ); Fri, 8 Aug 2014 13:46:04 -0400 From: Denys Vlasenko To: linux-kernel@vger.kernel.org Cc: Denys Vlasenko , Linus Torvalds , Oleg Nesterov , "H. Peter Anvin" , Andy Lutomirski , Frederic Weisbecker , X86 ML , Alexei Starovoitov , Will Drewry , Kees Cook Subject: [PATCH 15/17] x86: code shrink in paranoid_exit Date: Fri, 8 Aug 2014 19:44:38 +0200 Message-Id: <1407519880-6719-16-git-send-email-dvlasenk@redhat.com> In-Reply-To: <1407519880-6719-1-git-send-email-dvlasenk@redhat.com> References: <1407519880-6719-1-git-send-email-dvlasenk@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org RESTORE_EXTRA_REGS + RESTORE_C_REGS looks small, but it's a lot of instructions (fourteen). Let's reuse them. Signed-off-by: Denys Vlasenko CC: Linus Torvalds CC: Oleg Nesterov CC: "H. Peter Anvin" CC: Andy Lutomirski CC: Frederic Weisbecker CC: X86 ML CC: Alexei Starovoitov CC: Will Drewry CC: Kees Cook CC: linux-kernel@vger.kernel.org --- arch/x86/kernel/entry_64.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index f652ac6..7bc8c24 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1288,12 +1288,10 @@ ENTRY(paranoid_exit) paranoid_swapgs: TRACE_IRQS_IRETQ 0 SWAPGS_UNSAFE_STACK - RESTORE_EXTRA_REGS - RESTORE_C_REGS - REMOVE_PTREGS_FROM_STACK 8 - jmp irq_return + jmp paranoid_restore1 paranoid_restore: TRACE_IRQS_IRETQ_DEBUG 0 +paranoid_restore1: RESTORE_EXTRA_REGS RESTORE_C_REGS REMOVE_PTREGS_FROM_STACK 8 -- 1.8.1.4