From: Jiri Slaby <jslaby@suse.cz> To: mingo@redhat.com Cc: Juergen Gross <jgross@suse.com>, hpa@zytor.com, Herbert Xu <herbert@gondor.apana.org.au>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, x86@kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, jpoimboe@redhat.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, Jiri Slaby <jslaby@suse.cz>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 08/10] x86: assembly, annotate aliases Date: Fri, 17 Feb 2017 11:47:55 +0100 [thread overview] Message-ID: <20170217104757.28588-8-jslaby@suse.cz> (raw) In-Reply-To: <20170217104757.28588-1-jslaby@suse.cz> _key_expansion_128 is an alias to _key_expansion_256a, __memcpy to memcpy, xen_syscall32_target to xen_sysenter_target, and so on. Annotate them all using the new ENTRY_ALIAS and ENTRY_LOCAL_ALIAS. This will make the tools generating the debuginfo happy. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <x86@kernel.org> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: <linux-crypto@vger.kernel.org> Cc: <xen-devel@lists.xenproject.org> --- arch/x86/crypto/aesni-intel_asm.S | 5 ++--- arch/x86/lib/memcpy_64.S | 4 ++-- arch/x86/lib/memmove_64.S | 4 ++-- arch/x86/lib/memset_64.S | 4 ++-- arch/x86/xen/xen-asm_64.S | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 624e4303d0fb..6a0f25be1a56 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -1744,8 +1744,7 @@ ENDPROC(aesni_gcm_enc) #endif -.align 4 -_key_expansion_128: +ENTRY_LOCAL_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_256a) pshufd $0b11111111, %xmm1, %xmm1 shufps $0b00010000, %xmm0, %xmm4 @@ -1756,8 +1755,8 @@ ENTRY_LOCAL(_key_expansion_256a) movaps %xmm0, (TKEYP) add $0x10, TKEYP ret -ENDPROC(_key_expansion_128) ENDPROC(_key_expansion_256a) +END_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_192a) pshufd $0b01010101, %xmm1, %xmm1 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 779782f58324..c9ac54822e87 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -26,7 +26,7 @@ * Output: * rax original destination */ -ENTRY(__memcpy) +ENTRY_ALIAS(__memcpy) ENTRY(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS @@ -40,7 +40,7 @@ ENTRY(memcpy) rep movsb ret ENDPROC(memcpy) -ENDPROC(__memcpy) +END_ALIAS(__memcpy) EXPORT_SYMBOL(memcpy) EXPORT_SYMBOL(__memcpy) diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index 15de86cd15b0..76f54ba3dd26 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -25,7 +25,7 @@ */ .weak memmove -ENTRY(memmove) +ENTRY_ALIAS(memmove) ENTRY(__memmove) /* Handle more 32 bytes in loop */ @@ -207,6 +207,6 @@ ENTRY(__memmove) 13: retq ENDPROC(__memmove) -ENDPROC(memmove) +END_ALIAS(memmove) EXPORT_SYMBOL(__memmove) EXPORT_SYMBOL(memmove) diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 55b95db30a61..be6c4705ec51 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -18,7 +18,7 @@ * * rax original destination */ -ENTRY(memset) +ENTRY_ALIAS(memset) ENTRY(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended @@ -42,8 +42,8 @@ ENTRY(__memset) rep stosb movq %r9,%rax ret -ENDPROC(memset) ENDPROC(__memset) +END_ALIAS(memset) EXPORT_SYMBOL(memset) EXPORT_SYMBOL(__memset) diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index d617bea76039..4b0fe749f10c 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -117,13 +117,13 @@ ENDPROC(xen_sysenter_target) #else /* !CONFIG_IA32_EMULATION */ -ENTRY(xen_syscall32_target) +ENTRY_ALIAS(xen_syscall32_target) ENTRY(xen_sysenter_target) lea 16(%rsp), %rsp /* strip %rcx, %r11 */ mov $-ENOSYS, %rax pushq $0 jmp hypercall_iret -ENDPROC(xen_syscall32_target) ENDPROC(xen_sysenter_target) +END_ALIAS(xen_syscall32_target) #endif /* CONFIG_IA32_EMULATION */ -- 2.11.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jiri Slaby <jslaby@suse.cz> To: mingo@redhat.com Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>, linux-crypto@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH 08/10] x86: assembly, annotate aliases Date: Fri, 17 Feb 2017 11:47:55 +0100 [thread overview] Message-ID: <20170217104757.28588-8-jslaby@suse.cz> (raw) In-Reply-To: <20170217104757.28588-1-jslaby@suse.cz> _key_expansion_128 is an alias to _key_expansion_256a, __memcpy to memcpy, xen_syscall32_target to xen_sysenter_target, and so on. Annotate them all using the new ENTRY_ALIAS and ENTRY_LOCAL_ALIAS. This will make the tools generating the debuginfo happy. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <x86@kernel.org> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: <linux-crypto@vger.kernel.org> Cc: <xen-devel@lists.xenproject.org> --- arch/x86/crypto/aesni-intel_asm.S | 5 ++--- arch/x86/lib/memcpy_64.S | 4 ++-- arch/x86/lib/memmove_64.S | 4 ++-- arch/x86/lib/memset_64.S | 4 ++-- arch/x86/xen/xen-asm_64.S | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 624e4303d0fb..6a0f25be1a56 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -1744,8 +1744,7 @@ ENDPROC(aesni_gcm_enc) #endif -.align 4 -_key_expansion_128: +ENTRY_LOCAL_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_256a) pshufd $0b11111111, %xmm1, %xmm1 shufps $0b00010000, %xmm0, %xmm4 @@ -1756,8 +1755,8 @@ ENTRY_LOCAL(_key_expansion_256a) movaps %xmm0, (TKEYP) add $0x10, TKEYP ret -ENDPROC(_key_expansion_128) ENDPROC(_key_expansion_256a) +END_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_192a) pshufd $0b01010101, %xmm1, %xmm1 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 779782f58324..c9ac54822e87 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -26,7 +26,7 @@ * Output: * rax original destination */ -ENTRY(__memcpy) +ENTRY_ALIAS(__memcpy) ENTRY(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS @@ -40,7 +40,7 @@ ENTRY(memcpy) rep movsb ret ENDPROC(memcpy) -ENDPROC(__memcpy) +END_ALIAS(__memcpy) EXPORT_SYMBOL(memcpy) EXPORT_SYMBOL(__memcpy) diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index 15de86cd15b0..76f54ba3dd26 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -25,7 +25,7 @@ */ .weak memmove -ENTRY(memmove) +ENTRY_ALIAS(memmove) ENTRY(__memmove) /* Handle more 32 bytes in loop */ @@ -207,6 +207,6 @@ ENTRY(__memmove) 13: retq ENDPROC(__memmove) -ENDPROC(memmove) +END_ALIAS(memmove) EXPORT_SYMBOL(__memmove) EXPORT_SYMBOL(memmove) diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 55b95db30a61..be6c4705ec51 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -18,7 +18,7 @@ * * rax original destination */ -ENTRY(memset) +ENTRY_ALIAS(memset) ENTRY(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended @@ -42,8 +42,8 @@ ENTRY(__memset) rep stosb movq %r9,%rax ret -ENDPROC(memset) ENDPROC(__memset) +END_ALIAS(memset) EXPORT_SYMBOL(memset) EXPORT_SYMBOL(__memset) diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index d617bea76039..4b0fe749f10c 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -117,13 +117,13 @@ ENDPROC(xen_sysenter_target) #else /* !CONFIG_IA32_EMULATION */ -ENTRY(xen_syscall32_target) +ENTRY_ALIAS(xen_syscall32_target) ENTRY(xen_sysenter_target) lea 16(%rsp), %rsp /* strip %rcx, %r11 */ mov $-ENOSYS, %rax pushq $0 jmp hypercall_iret -ENDPROC(xen_syscall32_target) ENDPROC(xen_sysenter_target) +END_ALIAS(xen_syscall32_target) #endif /* CONFIG_IA32_EMULATION */ -- 2.11.1
next prev parent reply other threads:[~2017-02-17 10:47 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-17 10:47 [PATCH 01/10] x86: assembly, ENTRY for fn, GLOBAL for data Jiri Slaby 2017-02-17 10:47 ` [PATCH 02/10] x86: assembly, use ENDPROC for functions Jiri Slaby 2017-02-17 10:47 ` Jiri Slaby 2017-02-17 11:08 ` Juergen Gross 2017-02-17 11:08 ` Juergen Gross 2017-02-17 10:47 ` [PATCH 03/10] x86: boot, annotate functions properly Jiri Slaby 2017-02-17 10:47 ` [PATCH 04/10] linkage: introduce ENTRY_LOCAL Jiri Slaby 2017-02-17 10:47 ` [PATCH 05/10] x86: kernel, annotate local functions Jiri Slaby 2017-02-17 10:47 ` [PATCH 06/10] x86: crypto, " Jiri Slaby 2017-02-17 10:47 ` [PATCH 07/10] linkage: introduce ALIASes Jiri Slaby 2017-02-17 10:47 ` Jiri Slaby [this message] 2017-02-17 10:47 ` [PATCH 08/10] x86: assembly, annotate aliases Jiri Slaby 2017-02-17 11:52 ` Juergen Gross 2017-02-17 11:52 ` Juergen Gross 2017-02-17 10:47 ` [RFC 09/10] x86: boot, extract efi_pe_entry from startup_64 Jiri Slaby 2017-02-17 10:47 ` [PREVIEW 10/10] linkage: add .cfi_{start/end}proc to ENTRY/ENDPROC Jiri Slaby 2017-02-17 13:16 ` Josh Poimboeuf 2017-02-17 13:36 ` Jiri Slaby 2017-02-17 14:07 ` Josh Poimboeuf 2017-02-17 14:26 ` Jiri Slaby 2017-02-17 21:18 ` Josh Poimboeuf 2017-02-17 11:06 ` [PATCH 01/10] x86: assembly, ENTRY for fn, GLOBAL for data Juergen Gross 2017-02-17 11:06 ` Juergen Gross 2017-03-01 9:38 ` Ingo Molnar 2017-03-01 9:38 ` Ingo Molnar 2017-03-01 9:50 ` Jiri Slaby 2017-03-01 9:50 ` Jiri Slaby 2017-03-01 10:09 ` Thomas Gleixner 2017-03-01 10:09 ` Thomas Gleixner 2017-03-01 10:27 ` Ingo Molnar 2017-03-01 10:27 ` Ingo Molnar 2017-03-03 12:22 ` Jiri Slaby 2017-03-03 12:22 ` Jiri Slaby 2017-03-03 18:20 ` hpa 2017-03-03 18:20 ` hpa 2017-03-06 14:09 ` Jiri Slaby 2017-03-06 14:09 ` Jiri Slaby 2017-03-07 7:57 ` Ingo Molnar 2017-03-07 7:57 ` Ingo Molnar 2017-03-03 18:24 ` hpa 2017-03-03 18:24 ` hpa 2017-03-07 8:27 ` Ingo Molnar 2017-03-07 8:27 ` Ingo Molnar 2017-03-07 17:24 ` [RFC] linkage: new macros for functions and data Jiri Slaby 2017-03-07 17:24 ` Jiri Slaby 2017-03-16 8:02 ` Ingo Molnar 2017-03-16 8:02 ` Ingo Molnar 2017-03-16 8:13 ` Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 01/10] linkage: new macros for assembler symbols Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 02/10] x86: assembly, FUNC_START for fn, DATA_START for data Jiri Slaby 2017-03-20 12:32 ` Jiri Slaby 2017-03-20 13:32 ` Josh Poimboeuf 2017-03-20 13:32 ` Josh Poimboeuf 2017-03-20 15:32 ` Jiri Slaby 2017-03-20 15:32 ` Jiri Slaby 2017-03-20 16:07 ` Josh Poimboeuf 2017-03-20 16:07 ` Josh Poimboeuf 2017-03-21 14:08 ` Pavel Machek 2017-03-21 14:08 ` Pavel Machek 2017-03-22 7:25 ` Ingo Molnar 2017-03-22 7:25 ` Ingo Molnar 2017-03-22 7:39 ` Jiri Slaby 2017-03-22 7:39 ` Jiri Slaby 2017-03-22 7:46 ` Ingo Molnar 2017-03-22 7:46 ` Ingo Molnar 2017-03-22 14:11 ` Josh Poimboeuf 2017-03-22 15:01 ` Jiri Slaby 2017-03-22 15:33 ` Josh Poimboeuf 2017-03-22 15:33 ` Josh Poimboeuf 2017-03-22 15:01 ` Jiri Slaby 2017-03-23 7:38 ` Ingo Molnar 2017-03-23 7:38 ` Ingo Molnar 2017-03-23 13:24 ` Josh Poimboeuf 2017-03-23 13:24 ` Josh Poimboeuf 2017-03-22 14:11 ` Josh Poimboeuf 2017-03-22 7:25 ` Ingo Molnar 2017-03-22 12:06 ` Jiri Slaby 2017-03-22 12:06 ` Jiri Slaby 2017-03-22 15:52 ` Pavel Machek 2017-03-22 15:52 ` Pavel Machek 2017-03-20 12:32 ` [PATCH v2 03/10] x86: assembly, use SYM_FUNC_END for functions Jiri Slaby 2017-03-21 14:48 ` Josh Poimboeuf 2017-03-21 14:48 ` Josh Poimboeuf 2017-03-22 7:29 ` Ingo Molnar 2017-03-22 7:29 ` Ingo Molnar 2017-03-22 14:26 ` Josh Poimboeuf 2017-03-22 15:44 ` Jiri Slaby 2017-03-22 15:44 ` Jiri Slaby 2017-04-10 11:23 ` Jiri Slaby 2017-04-10 19:35 ` Josh Poimboeuf 2017-04-10 19:35 ` Josh Poimboeuf 2017-04-12 6:24 ` Jiri Slaby 2017-04-12 6:52 ` Ingo Molnar 2017-04-12 6:52 ` Ingo Molnar 2017-04-12 6:24 ` Jiri Slaby 2017-04-10 11:23 ` Jiri Slaby 2017-03-22 14:26 ` Josh Poimboeuf 2017-03-20 12:32 ` Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 04/10] x86: boot, annotate functions properly Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 05/10] x86: kernel+lib, annotate local functions Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 06/10] x86: crypto, " Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 07/10] x86: assembly, annotate aliases Jiri Slaby 2017-03-20 12:32 ` Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 08/10] x86: entry, annotate THUNKs Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 09/10] x86: entry, annotate interrupt symbols properly Jiri Slaby 2017-03-20 12:32 ` [RFC v2 10/10] x86: boot, extract efi_pe_entry from startup_64 Jiri Slaby 2017-03-20 12:32 ` [PATCH v2 01/10] linkage: new macros for assembler symbols Jiri Slaby 2017-03-16 8:13 ` [RFC] linkage: new macros for functions and data Jiri Slaby
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170217104757.28588-8-jslaby@suse.cz \ --to=jslaby@suse.cz \ --cc=boris.ostrovsky@oracle.com \ --cc=davem@davemloft.net \ --cc=herbert@gondor.apana.org.au \ --cc=hpa@zytor.com \ --cc=jgross@suse.com \ --cc=jpoimboe@redhat.com \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.