From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1040498AbdDUON0 (ORCPT ); Fri, 21 Apr 2017 10:13:26 -0400 Received: from mx2.suse.de ([195.135.220.15]:56054 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1040463AbdDUONQ (ORCPT ); Fri, 21 Apr 2017 10:13:16 -0400 From: Jiri Slaby To: mingo@redhat.com Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH v3 16/29] x86: entry, annotate interrupt symbols properly Date: Fri, 21 Apr 2017 16:12:52 +0200 Message-Id: <20170421141305.25180-16-jslaby@suse.cz> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170421141305.25180-1-jslaby@suse.cz> References: <20170421141305.25180-1-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * annotate local functions properly by SYM_FUNC_START_LOCAL and SYM_FUNC_END * use SYM_FUNC_INNER_LABEL for functions being in the middle of others * mark the end of common_interrupt by SYM_FUNC_END Signed-off-by: Jiri Slaby Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: --- arch/x86/entry/entry_32.S | 15 ++++++++------- arch/x86/entry/entry_64.S | 9 ++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 73c34507893b..acc8d5ad5264 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -316,7 +316,7 @@ ret_from_intr: cmpl $USER_RPL, %eax jb resume_kernel # not returning to v8086 or userspace -ENTRY(resume_userspace) +SYM_FUNC_INNER_LABEL(resume_userspace, SYM_V_LOCAL) DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF movl %esp, %eax @@ -547,10 +547,11 @@ restore_all: INTERRUPT_RETURN .section .fixup, "ax" -ENTRY(iret_exc ) +SYM_FUNC_START(iret_exc) pushl $0 # no error code pushl $do_iret_error jmp common_exception +SYM_FUNC_END(iret_exc) .previous _ASM_EXTABLE(.Lirq_return, iret_exc) @@ -642,7 +643,7 @@ ENDPROC(irq_entries_start) * so IRQ-flags tracing has to follow that: */ .p2align CONFIG_X86_L1_CACHE_SHIFT -common_interrupt: +SYM_FUNC_START_LOCAL(common_interrupt) ASM_CLAC addl $-0x80, (%esp) /* Adjust vector into the [-256, -1] range */ SAVE_ALL @@ -651,7 +652,7 @@ common_interrupt: movl %esp, %eax call do_IRQ jmp ret_from_intr -ENDPROC(common_interrupt) +SYM_FUNC_END(common_interrupt) #define BUILD_INTERRUPT3(name, nr, fn) \ ENTRY(name) \ @@ -811,7 +812,7 @@ ENTRY(xen_hypervisor_callback) jmp xen_iret_crit_fixup -ENTRY(xen_do_upcall) +SYM_FUNC_INNER_LABEL(xen_do_upcall, SYM_V_GLOBAL) 1: mov %esp, %eax call xen_evtchn_do_upcall #ifndef CONFIG_PREEMPT @@ -898,7 +899,7 @@ ENTRY(page_fault) jmp common_exception ENDPROC(page_fault) -common_exception: +SYM_FUNC_START_LOCAL(common_exception) /* the function address is in %gs's slot on the stack */ pushl %fs pushl %es @@ -928,7 +929,7 @@ common_exception: movl %esp, %eax # pt_regs pointer call *%edi jmp ret_from_exception -ENDPROC(common_exception) +SYM_FUNC_END(common_exception) ENTRY(debug) /* diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index aff5f8051ce2..086f0cb600ff 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -509,7 +509,7 @@ ENDPROC(irq_entries_start) * then jump to common_interrupt. */ .p2align CONFIG_X86_L1_CACHE_SHIFT -common_interrupt: +SYM_FUNC_START_LOCAL(common_interrupt) ASM_CLAC addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */ interrupt do_IRQ @@ -562,7 +562,7 @@ restore_c_regs_and_iret: REMOVE_PT_GPREGS_FROM_STACK 8 INTERRUPT_RETURN -ENTRY(native_iret) +SYM_FUNC_INNER_LABEL(native_iret, SYM_V_GLOBAL) /* * Are we returning to a stack segment from the LDT? Note: in * 64-bit mode SS:RSP on the exception stack is always valid. @@ -572,8 +572,7 @@ ENTRY(native_iret) jnz native_irq_return_ldt #endif -.global native_irq_return_iret -native_irq_return_iret: +SYM_FUNC_INNER_LABEL(native_irq_return_iret, SYM_V_GLOBAL) /* * This may fault. Non-paranoid faults on return to userspace are * handled by fixup_bad_iret. These include #SS, #GP, and #NP. @@ -649,7 +648,7 @@ native_irq_return_ldt: */ jmp native_irq_return_iret #endif -ENDPROC(common_interrupt) +SYM_FUNC_END(common_interrupt) /* * APIC interrupts. -- 2.12.2