From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: [PATCH v6 09/28] x86/asm: annotate aliases Date: Fri, 18 May 2018 11:17:02 +0200 Message-ID: <20180518091721.7604-10-jslaby@suse.cz> References: <20180518091721.7604-1-jslaby@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180518091721.7604-1-jslaby@suse.cz> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: mingo@redhat.com Cc: linux-arch@vger.kernel.org, Juergen Gross , Herbert Xu , Boris Ostrovsky , x86@kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, "H. Peter Anvin" , xen-devel@lists.xenproject.org, Thomas Gleixner , Jiri Slaby , "David S. Miller" List-Id: linux-arch.vger.kernel.org X2tleV9leHBhbnNpb25fMTI4IGlzIGFuIGFsaWFzIHRvIF9rZXlfZXhwYW5zaW9uXzI1NmEsIF9f bWVtY3B5IHRvCm1lbWNweSwgeGVuX3N5c2NhbGwzMl90YXJnZXQgdG8geGVuX3N5c2VudGVyX3Rh cmdldCwgYW5kIHNvIG9uLiBBbm5vdGF0ZQp0aGVtIGFsbCB1c2luZyB0aGUgbmV3IFNZTV9GVU5D X1NUQVJUX0FMSUFTLCBTWU1fRlVOQ19TVEFSVF9MT0NBTF9BTElBUywKYW5kIFNZTV9GVU5DX0VO RF9BTElBUy4gVGhpcyB3aWxsIG1ha2UgdGhlIHRvb2xzIGdlbmVyYXRpbmcgdGhlCmRlYnVnaW5m byBoYXBweS4KClNpZ25lZC1vZmYtYnk6IEppcmkgU2xhYnkgPGpzbGFieUBzdXNlLmN6PgpDYzog SGVyYmVydCBYdSA8aGVyYmVydEBnb25kb3IuYXBhbmEub3JnLmF1PgpDYzogIkRhdmlkIFMuIE1p bGxlciIgPGRhdmVtQGRhdmVtbG9mdC5uZXQ+CkNjOiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGlu dXRyb25peC5kZT4KQ2M6IEluZ28gTW9sbmFyIDxtaW5nb0ByZWRoYXQuY29tPgpDYzogIkguIFBl dGVyIEFudmluIiA8aHBhQHp5dG9yLmNvbT4KQ2M6IDx4ODZAa2VybmVsLm9yZz4KQ2M6IEJvcmlz IE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9yYWNsZS5jb20+CkNjOiBKdWVyZ2VuIEdyb3Nz IDxqZ3Jvc3NAc3VzZS5jb20+ClJldmlld2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3Vz ZS5jb20+IFt4ZW4gcGFydHNdCkNjOiA8bGludXgtY3J5cHRvQHZnZXIua2VybmVsLm9yZz4KQ2M6 IDx4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmc+Ci0tLQogYXJjaC94ODYvY3J5cHRvL2Fl c25pLWludGVsX2FzbS5TIHwgNSArKy0tLQogYXJjaC94ODYvbGliL21lbWNweV82NC5TICAgICAg ICAgIHwgNCArKy0tCiBhcmNoL3g4Ni9saWIvbWVtbW92ZV82NC5TICAgICAgICAgfCA0ICsrLS0K IGFyY2gveDg2L2xpYi9tZW1zZXRfNjQuUyAgICAgICAgICB8IDQgKystLQogYXJjaC94ODYveGVu L3hlbi1hc21fNjQuUyAgICAgICAgIHwgNCArKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2NyeXB0by9h ZXNuaS1pbnRlbF9hc20uUyBiL2FyY2gveDg2L2NyeXB0by9hZXNuaS1pbnRlbF9hc20uUwppbmRl eCBiNDgyYWMxYTFmYjMuLmM4NWVjYjE2M2M3OCAxMDA2NDQKLS0tIGEvYXJjaC94ODYvY3J5cHRv L2Flc25pLWludGVsX2FzbS5TCisrKyBiL2FyY2gveDg2L2NyeXB0by9hZXNuaS1pbnRlbF9hc20u UwpAQCAtMTc2MSw4ICsxNzYxLDcgQEAgRU5EUFJPQyhhZXNuaV9nY21fZmluYWxpemUpCiAjZW5k aWYKIAogCi0uYWxpZ24gNAotX2tleV9leHBhbnNpb25fMTI4OgorU1lNX0ZVTkNfU1RBUlRfTE9D QUxfQUxJQVMoX2tleV9leHBhbnNpb25fMTI4KQogU1lNX0ZVTkNfU1RBUlRfTE9DQUwoX2tleV9l eHBhbnNpb25fMjU2YSkKIAlwc2h1ZmQgJDBiMTExMTExMTEsICV4bW0xLCAleG1tMQogCXNodWZw cyAkMGIwMDAxMDAwMCwgJXhtbTAsICV4bW00CkBAIC0xNzczLDggKzE3NzIsOCBAQCBTWU1fRlVO Q19TVEFSVF9MT0NBTChfa2V5X2V4cGFuc2lvbl8yNTZhKQogCW1vdmFwcyAleG1tMCwgKFRLRVlQ KQogCWFkZCAkMHgxMCwgVEtFWVAKIAlyZXQKLUVORFBST0MoX2tleV9leHBhbnNpb25fMTI4KQog U1lNX0ZVTkNfRU5EKF9rZXlfZXhwYW5zaW9uXzI1NmEpCitTWU1fRlVOQ19FTkRfQUxJQVMoX2tl eV9leHBhbnNpb25fMTI4KQogCiBTWU1fRlVOQ19TVEFSVF9MT0NBTChfa2V5X2V4cGFuc2lvbl8x OTJhKQogCXBzaHVmZCAkMGIwMTAxMDEwMSwgJXhtbTEsICV4bW0xCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni9saWIvbWVtY3B5XzY0LlMgYi9hcmNoL3g4Ni9saWIvbWVtY3B5XzY0LlMKaW5kZXggOWE1 M2EwNmU1YTNlLi40OTExYjFjNjFhYTggMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2xpYi9tZW1jcHlf NjQuUworKysgYi9hcmNoL3g4Ni9saWIvbWVtY3B5XzY0LlMKQEAgLTI2LDcgKzI2LDcgQEAKICAq IE91dHB1dDoKICAqIHJheCBvcmlnaW5hbCBkZXN0aW5hdGlvbgogICovCi1FTlRSWShfX21lbWNw eSkKK1NZTV9GVU5DX1NUQVJUX0FMSUFTKF9fbWVtY3B5KQogRU5UUlkobWVtY3B5KQogCUFMVEVS TkFUSVZFXzIgImptcCBtZW1jcHlfb3JpZyIsICIiLCBYODZfRkVBVFVSRV9SRVBfR09PRCwgXAog CQkgICAgICAiam1wIG1lbWNweV9lcm1zIiwgWDg2X0ZFQVRVUkVfRVJNUwpAQCAtNDAsNyArNDAs NyBAQCBFTlRSWShtZW1jcHkpCiAJcmVwIG1vdnNiCiAJcmV0CiBFTkRQUk9DKG1lbWNweSkKLUVO RFBST0MoX19tZW1jcHkpCitTWU1fRlVOQ19FTkRfQUxJQVMoX19tZW1jcHkpCiBFWFBPUlRfU1lN Qk9MKG1lbWNweSkKIEVYUE9SVF9TWU1CT0woX19tZW1jcHkpCiAKZGlmZiAtLWdpdCBhL2FyY2gv eDg2L2xpYi9tZW1tb3ZlXzY0LlMgYi9hcmNoL3g4Ni9saWIvbWVtbW92ZV82NC5TCmluZGV4IGJi ZWM2OWQ4MjIzYi4uNTBjMTY0ODMxMWIzIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9saWIvbWVtbW92 ZV82NC5TCisrKyBiL2FyY2gveDg2L2xpYi9tZW1tb3ZlXzY0LlMKQEAgLTI2LDcgKzI2LDcgQEAK ICAqLwogLndlYWsgbWVtbW92ZQogCi1FTlRSWShtZW1tb3ZlKQorU1lNX0ZVTkNfU1RBUlRfQUxJ QVMobWVtbW92ZSkKIEVOVFJZKF9fbWVtbW92ZSkKIAogCS8qIEhhbmRsZSBtb3JlIDMyIGJ5dGVz IGluIGxvb3AgKi8KQEAgLTIwOCw2ICsyMDgsNiBAQCBFTlRSWShfX21lbW1vdmUpCiAxMzoKIAly ZXRxCiBFTkRQUk9DKF9fbWVtbW92ZSkKLUVORFBST0MobWVtbW92ZSkKK1NZTV9GVU5DX0VORF9B TElBUyhtZW1tb3ZlKQogRVhQT1JUX1NZTUJPTChfX21lbW1vdmUpCiBFWFBPUlRfU1lNQk9MKG1l bW1vdmUpCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9saWIvbWVtc2V0XzY0LlMgYi9hcmNoL3g4Ni9s aWIvbWVtc2V0XzY0LlMKaW5kZXggOWJjODYxYzcxZTc1Li45MjdhYzQ0ZDM0YWEgMTAwNjQ0Ci0t LSBhL2FyY2gveDg2L2xpYi9tZW1zZXRfNjQuUworKysgYi9hcmNoL3g4Ni9saWIvbWVtc2V0XzY0 LlMKQEAgLTE5LDcgKzE5LDcgQEAKICAqCiAgKiByYXggICBvcmlnaW5hbCBkZXN0aW5hdGlvbgog ICovCi1FTlRSWShtZW1zZXQpCitTWU1fRlVOQ19TVEFSVF9BTElBUyhtZW1zZXQpCiBFTlRSWShf X21lbXNldCkKIAkvKgogCSAqIFNvbWUgQ1BVcyBzdXBwb3J0IGVuaGFuY2VkIFJFUCBNT1ZTQi9T VE9TQiBmZWF0dXJlLiBJdCBpcyByZWNvbW1lbmRlZApAQCAtNDMsOCArNDMsOCBAQCBFTlRSWShf X21lbXNldCkKIAlyZXAgc3Rvc2IKIAltb3ZxICVyOSwlcmF4CiAJcmV0Ci1FTkRQUk9DKG1lbXNl dCkKIEVORFBST0MoX19tZW1zZXQpCitTWU1fRlVOQ19FTkRfQUxJQVMobWVtc2V0KQogRVhQT1JU X1NZTUJPTChtZW1zZXQpCiBFWFBPUlRfU1lNQk9MKF9fbWVtc2V0KQogCmRpZmYgLS1naXQgYS9h cmNoL3g4Ni94ZW4veGVuLWFzbV82NC5TIGIvYXJjaC94ODYveGVuL3hlbi1hc21fNjQuUwppbmRl eCA0MTdiMzM5ZTVjOGUuLmU4ZjZmNDgyYmIyMCAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL3hl bi1hc21fNjQuUworKysgYi9hcmNoL3g4Ni94ZW4veGVuLWFzbV82NC5TCkBAIC0xNjQsMTMgKzE2 NCwxMyBAQCBFTkRQUk9DKHhlbl9zeXNlbnRlcl90YXJnZXQpCiAKICNlbHNlIC8qICFDT05GSUdf SUEzMl9FTVVMQVRJT04gKi8KIAotRU5UUlkoeGVuX3N5c2NhbGwzMl90YXJnZXQpCitTWU1fRlVO Q19TVEFSVF9BTElBUyh4ZW5fc3lzY2FsbDMyX3RhcmdldCkKIEVOVFJZKHhlbl9zeXNlbnRlcl90 YXJnZXQpCiAJbGVhIDE2KCVyc3ApLCAlcnNwCS8qIHN0cmlwICVyY3gsICVyMTEgKi8KIAltb3Yg JC1FTk9TWVMsICVyYXgKIAlwdXNocSAkMAogCWptcCBoeXBlcmNhbGxfaXJldAotRU5EUFJPQyh4 ZW5fc3lzY2FsbDMyX3RhcmdldCkKIEVORFBST0MoeGVuX3N5c2VudGVyX3RhcmdldCkKK1NZTV9G VU5DX0VORF9BTElBUyh4ZW5fc3lzY2FsbDMyX3RhcmdldCkKIAogI2VuZGlmCS8qIENPTkZJR19J QTMyX0VNVUxBVElPTiAqLwotLSAKMi4xNi4zCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xp c3RpbmZvL3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:45430 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753016AbeERJRi (ORCPT ); Fri, 18 May 2018 05:17:38 -0400 From: Jiri Slaby Subject: [PATCH v6 09/28] x86/asm: annotate aliases Date: Fri, 18 May 2018 11:17:02 +0200 Message-ID: <20180518091721.7604-10-jslaby@suse.cz> In-Reply-To: <20180518091721.7604-1-jslaby@suse.cz> References: <20180518091721.7604-1-jslaby@suse.cz> Sender: linux-arch-owner@vger.kernel.org List-ID: To: mingo@redhat.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Herbert Xu , "David S. Miller" , Thomas Gleixner , "H. Peter Anvin" , x86@kernel.org, Boris Ostrovsky , Juergen Gross , linux-crypto@vger.kernel.org, xen-devel@lists.xenproject.org Message-ID: <20180518091702.0rly3KF577TRrL0QkEOYSARl8qcKIboS8biTBRqvvKA@z> _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 SYM_FUNC_START_ALIAS, SYM_FUNC_START_LOCAL_ALIAS, and SYM_FUNC_END_ALIAS. This will make the tools generating the debuginfo happy. Signed-off-by: Jiri Slaby Cc: Herbert Xu Cc: "David S. Miller" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Cc: Boris Ostrovsky Cc: Juergen Gross Reviewed-by: Juergen Gross [xen parts] Cc: Cc: --- 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 b482ac1a1fb3..c85ecb163c78 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -1761,8 +1761,7 @@ ENDPROC(aesni_gcm_finalize) #endif -.align 4 -_key_expansion_128: +SYM_FUNC_START_LOCAL_ALIAS(_key_expansion_128) SYM_FUNC_START_LOCAL(_key_expansion_256a) pshufd $0b11111111, %xmm1, %xmm1 shufps $0b00010000, %xmm0, %xmm4 @@ -1773,8 +1772,8 @@ SYM_FUNC_START_LOCAL(_key_expansion_256a) movaps %xmm0, (TKEYP) add $0x10, TKEYP ret -ENDPROC(_key_expansion_128) SYM_FUNC_END(_key_expansion_256a) +SYM_FUNC_END_ALIAS(_key_expansion_128) SYM_FUNC_START_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 9a53a06e5a3e..4911b1c61aa8 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) +SYM_FUNC_START_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) +SYM_FUNC_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 bbec69d8223b..50c1648311b3 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -26,7 +26,7 @@ */ .weak memmove -ENTRY(memmove) +SYM_FUNC_START_ALIAS(memmove) ENTRY(__memmove) /* Handle more 32 bytes in loop */ @@ -208,6 +208,6 @@ ENTRY(__memmove) 13: retq ENDPROC(__memmove) -ENDPROC(memmove) +SYM_FUNC_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 9bc861c71e75..927ac44d34aa 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -19,7 +19,7 @@ * * rax original destination */ -ENTRY(memset) +SYM_FUNC_START_ALIAS(memset) ENTRY(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended @@ -43,8 +43,8 @@ ENTRY(__memset) rep stosb movq %r9,%rax ret -ENDPROC(memset) ENDPROC(__memset) +SYM_FUNC_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 417b339e5c8e..e8f6f482bb20 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -164,13 +164,13 @@ ENDPROC(xen_sysenter_target) #else /* !CONFIG_IA32_EMULATION */ -ENTRY(xen_syscall32_target) +SYM_FUNC_START_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) +SYM_FUNC_END_ALIAS(xen_syscall32_target) #endif /* CONFIG_IA32_EMULATION */ -- 2.16.3