From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: [PATCH v4 08/27] x86: assembly, annotate aliases Date: Mon, 2 Oct 2017 11:12:27 +0200 Message-ID: <20171002091246.28432-8-jslaby@suse.cz> References: <20171002091246.28432-1-jslaby@suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Juergen Gross , Herbert Xu , Boris Ostrovsky , x86@kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, hpa@zytor.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, Jiri Slaby , "David S. Miller" To: mingo@redhat.com Return-path: In-Reply-To: <20171002091246.28432-1-jslaby@suse.cz> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" List-Id: linux-crypto.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 eCAxZDM0ZDVhMTQ2ODIuLjQyNmEyMjE5MmQ2OSAxMDA2NDQKLS0tIGEvYXJjaC94ODYvY3J5cHRv L2Flc25pLWludGVsX2FzbS5TCisrKyBiL2FyY2gveDg2L2NyeXB0by9hZXNuaS1pbnRlbF9hc20u UwpAQCAtMTg3Myw4ICsxODczLDcgQEAgRU5EUFJPQyhhZXNuaV9nY21fZW5jKQogI2VuZGlmCiAK IAotLmFsaWduIDQKLV9rZXlfZXhwYW5zaW9uXzEyODoKK1NZTV9GVU5DX1NUQVJUX0xPQ0FMX0FM SUFTKF9rZXlfZXhwYW5zaW9uXzEyOCkKIFNZTV9GVU5DX1NUQVJUX0xPQ0FMKF9rZXlfZXhwYW5z aW9uXzI1NmEpCiAJcHNodWZkICQwYjExMTExMTExLCAleG1tMSwgJXhtbTEKIAlzaHVmcHMgJDBi MDAwMTAwMDAsICV4bW0wLCAleG1tNApAQCAtMTg4NSw4ICsxODg0LDggQEAgU1lNX0ZVTkNfU1RB UlRfTE9DQUwoX2tleV9leHBhbnNpb25fMjU2YSkKIAltb3ZhcHMgJXhtbTAsIChUS0VZUCkKIAlh ZGQgJDB4MTAsIFRLRVlQCiAJcmV0Ci1FTkRQUk9DKF9rZXlfZXhwYW5zaW9uXzEyOCkKIFNZTV9G VU5DX0VORChfa2V5X2V4cGFuc2lvbl8yNTZhKQorU1lNX0ZVTkNfRU5EX0FMSUFTKF9rZXlfZXhw YW5zaW9uXzEyOCkKIAogU1lNX0ZVTkNfU1RBUlRfTE9DQUwoX2tleV9leHBhbnNpb25fMTkyYSkK IAlwc2h1ZmQgJDBiMDEwMTAxMDEsICV4bW0xLCAleG1tMQpkaWZmIC0tZ2l0IGEvYXJjaC94ODYv bGliL21lbWNweV82NC5TIGIvYXJjaC94ODYvbGliL21lbWNweV82NC5TCmluZGV4IDlhNTNhMDZl NWEzZS4uNDkxMWIxYzYxYWE4IDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9saWIvbWVtY3B5XzY0LlMK KysrIGIvYXJjaC94ODYvbGliL21lbWNweV82NC5TCkBAIC0yNiw3ICsyNiw3IEBACiAgKiBPdXRw dXQ6CiAgKiByYXggb3JpZ2luYWwgZGVzdGluYXRpb24KICAqLwotRU5UUlkoX19tZW1jcHkpCitT WU1fRlVOQ19TVEFSVF9BTElBUyhfX21lbWNweSkKIEVOVFJZKG1lbWNweSkKIAlBTFRFUk5BVElW RV8yICJqbXAgbWVtY3B5X29yaWciLCAiIiwgWDg2X0ZFQVRVUkVfUkVQX0dPT0QsIFwKIAkJICAg ICAgImptcCBtZW1jcHlfZXJtcyIsIFg4Nl9GRUFUVVJFX0VSTVMKQEAgLTQwLDcgKzQwLDcgQEAg RU5UUlkobWVtY3B5KQogCXJlcCBtb3ZzYgogCXJldAogRU5EUFJPQyhtZW1jcHkpCi1FTkRQUk9D KF9fbWVtY3B5KQorU1lNX0ZVTkNfRU5EX0FMSUFTKF9fbWVtY3B5KQogRVhQT1JUX1NZTUJPTCht ZW1jcHkpCiBFWFBPUlRfU1lNQk9MKF9fbWVtY3B5KQogCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9s aWIvbWVtbW92ZV82NC5TIGIvYXJjaC94ODYvbGliL21lbW1vdmVfNjQuUwppbmRleCAxNWRlODZj ZDE1YjAuLmQyMmFmOTdlNWIyNyAxMDA2NDQKLS0tIGEvYXJjaC94ODYvbGliL21lbW1vdmVfNjQu UworKysgYi9hcmNoL3g4Ni9saWIvbWVtbW92ZV82NC5TCkBAIC0yNSw3ICsyNSw3IEBACiAgKi8K IC53ZWFrIG1lbW1vdmUKIAotRU5UUlkobWVtbW92ZSkKK1NZTV9GVU5DX1NUQVJUX0FMSUFTKG1l bW1vdmUpCiBFTlRSWShfX21lbW1vdmUpCiAKIAkvKiBIYW5kbGUgbW9yZSAzMiBieXRlcyBpbiBs b29wICovCkBAIC0yMDcsNiArMjA3LDYgQEAgRU5UUlkoX19tZW1tb3ZlKQogMTM6CiAJcmV0cQog RU5EUFJPQyhfX21lbW1vdmUpCi1FTkRQUk9DKG1lbW1vdmUpCitTWU1fRlVOQ19FTkRfQUxJQVMo bWVtbW92ZSkKIEVYUE9SVF9TWU1CT0woX19tZW1tb3ZlKQogRVhQT1JUX1NZTUJPTChtZW1tb3Zl KQpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvbGliL21lbXNldF82NC5TIGIvYXJjaC94ODYvbGliL21l bXNldF82NC5TCmluZGV4IDU1Yjk1ZGIzMGE2MS4uMGQzYTFkMzQxZTYwIDEwMDY0NAotLS0gYS9h cmNoL3g4Ni9saWIvbWVtc2V0XzY0LlMKKysrIGIvYXJjaC94ODYvbGliL21lbXNldF82NC5TCkBA IC0xOCw3ICsxOCw3IEBACiAgKgogICogcmF4ICAgb3JpZ2luYWwgZGVzdGluYXRpb24KICAqLwot RU5UUlkobWVtc2V0KQorU1lNX0ZVTkNfU1RBUlRfQUxJQVMobWVtc2V0KQogRU5UUlkoX19tZW1z ZXQpCiAJLyoKIAkgKiBTb21lIENQVXMgc3VwcG9ydCBlbmhhbmNlZCBSRVAgTU9WU0IvU1RPU0Ig ZmVhdHVyZS4gSXQgaXMgcmVjb21tZW5kZWQKQEAgLTQyLDggKzQyLDggQEAgRU5UUlkoX19tZW1z ZXQpCiAJcmVwIHN0b3NiCiAJbW92cSAlcjksJXJheAogCXJldAotRU5EUFJPQyhtZW1zZXQpCiBF TkRQUk9DKF9fbWVtc2V0KQorU1lNX0ZVTkNfRU5EX0FMSUFTKG1lbXNldCkKIEVYUE9SVF9TWU1C T0wobWVtc2V0KQogRVhQT1JUX1NZTUJPTChfX21lbXNldCkKIApkaWZmIC0tZ2l0IGEvYXJjaC94 ODYveGVuL3hlbi1hc21fNjQuUyBiL2FyY2gveDg2L3hlbi94ZW4tYXNtXzY0LlMKaW5kZXggZGFl MmNjMzNhZmI1Li5mN2U5YTgzNDQ5MTAgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi94ZW4tYXNt XzY0LlMKKysrIGIvYXJjaC94ODYveGVuL3hlbi1hc21fNjQuUwpAQCAtMTQ5LDEzICsxNDksMTMg QEAgRU5EUFJPQyh4ZW5fc3lzZW50ZXJfdGFyZ2V0KQogCiAjZWxzZSAvKiAhQ09ORklHX0lBMzJf RU1VTEFUSU9OICovCiAKLUVOVFJZKHhlbl9zeXNjYWxsMzJfdGFyZ2V0KQorU1lNX0ZVTkNfU1RB UlRfQUxJQVMoeGVuX3N5c2NhbGwzMl90YXJnZXQpCiBFTlRSWSh4ZW5fc3lzZW50ZXJfdGFyZ2V0 KQogCWxlYSAxNiglcnNwKSwgJXJzcAkvKiBzdHJpcCAlcmN4LCAlcjExICovCiAJbW92ICQtRU5P U1lTLCAlcmF4CiAJcHVzaHEgJDAKIAlqbXAgaHlwZXJjYWxsX2lyZXQKLUVORFBST0MoeGVuX3N5 c2NhbGwzMl90YXJnZXQpCiBFTkRQUk9DKHhlbl9zeXNlbnRlcl90YXJnZXQpCitTWU1fRlVOQ19F TkRfQUxJQVMoeGVuX3N5c2NhbGwzMl90YXJnZXQpCiAKICNlbmRpZgkvKiBDT05GSUdfSUEzMl9F TVVMQVRJT04gKi8KLS0gCjIuMTQuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751759AbdJBJQw (ORCPT ); Mon, 2 Oct 2017 05:16:52 -0400 Received: from mx2.suse.de ([195.135.220.15]:43380 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751062AbdJBJMx (ORCPT ); Mon, 2 Oct 2017 05:12:53 -0400 From: Jiri Slaby To: mingo@redhat.com Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Herbert Xu , "David S. Miller" , Boris Ostrovsky , Juergen Gross , linux-crypto@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH v4 08/27] x86: assembly, annotate aliases Date: Mon, 2 Oct 2017 11:12:27 +0200 Message-Id: <20171002091246.28432-8-jslaby@suse.cz> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171002091246.28432-1-jslaby@suse.cz> References: <20171002091246.28432-1-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org _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 1d34d5a14682..426a22192d69 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -1873,8 +1873,7 @@ ENDPROC(aesni_gcm_enc) #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 @@ -1885,8 +1884,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 15de86cd15b0..d22af97e5b27 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -25,7 +25,7 @@ */ .weak memmove -ENTRY(memmove) +SYM_FUNC_START_ALIAS(memmove) ENTRY(__memmove) /* Handle more 32 bytes in loop */ @@ -207,6 +207,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 55b95db30a61..0d3a1d341e60 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -18,7 +18,7 @@ * * rax original destination */ -ENTRY(memset) +SYM_FUNC_START_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) +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 dae2cc33afb5..f7e9a8344910 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -149,13 +149,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.14.2