Commit 6dcc5627 authored by Jiri Slaby's avatar Jiri Slaby Committed by Borislav Petkov
Browse files

x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_* 



These are all functions which are invoked from elsewhere, so annotate
them as global using the new SYM_FUNC_START and their ENDPROC's by
SYM_FUNC_END.

Make sure ENTRY/ENDPROC is not defined on X86_64, given these were the
last users.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> [hibernate]
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> [xen bits]
Acked-by: Herbert Xu <herbert@gondor.apana.org.au> [crypto]
Cc: Allison Randal <allison@lohutok.net>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Armijn Hemel <armijn@tjaldur.nl>
Cc: Cao jin <caoj.fnst@cn.fujitsu.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Enrico Weigelt <info@metux.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: kvm ML <kvm@vger.kernel.org>
Cc: Len Brown <len.brown@intel.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-crypto@vger.kernel.org
Cc: linux-efi <linux-efi@vger.kernel.org>
Cc: linux-efi@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wanpeng Li <wanpengli@tencent.com>
Cc: Wei Huang <wei@redhat.com>
Cc: x86-ml <x86@kernel.org>
Cc: xen-devel@lists.xenproject.org
Cc: Xiaoyao Li <xiaoyao.li@linux.intel.com>
Link: https://lkml.kernel.org/r/20191011115108.12392-25-jslaby@suse.cz
parent bc7b11c0

arch/x86/boot/compressed/efi_thunk_64.S

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


	.code64

	.text

ENTRY(efi64_thunk)

SYM_FUNC_START(efi64_thunk)

	push	%rbp

	push	%rbx
@@ -97,7 +97,7 @@ ENTRY(efi64_thunk) 
	pop	%rbx

	pop	%rbp

	ret

ENDPROC(efi64_thunk)

SYM_FUNC_END(efi64_thunk)



SYM_FUNC_START_LOCAL(efi_exit32)

	movq	func_rt_ptr(%rip), %rax

arch/x86/boot/compressed/head_64.S

+8 −8
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


	__HEAD

	.code32

ENTRY(startup_32)

SYM_FUNC_START(startup_32)

	/*

	 * 32bit entry is 0 and it is ABI so immutable!

	 * If we come here directly from a bootloader,
@@ -222,11 +222,11 @@ ENTRY(startup_32) 


	/* Jump from 32bit compatibility mode into 64bit mode. */

	lret

ENDPROC(startup_32)

SYM_FUNC_END(startup_32)



#ifdef CONFIG_EFI_MIXED

	.org 0x190

ENTRY(efi32_stub_entry)

SYM_FUNC_START(efi32_stub_entry)

	add	$0x4, %esp		/* Discard return address */

	popl	%ecx

	popl	%edx
@@ -245,7 +245,7 @@ ENTRY(efi32_stub_entry) 
	movl	%eax, efi_config(%ebp)



	jmp	startup_32

ENDPROC(efi32_stub_entry)

SYM_FUNC_END(efi32_stub_entry)

#endif



	.code64
@@ -447,7 +447,7 @@ SYM_CODE_END(startup_64) 
#ifdef CONFIG_EFI_STUB



/* The entry point for the PE/COFF executable is efi_pe_entry. */

ENTRY(efi_pe_entry)

SYM_FUNC_START(efi_pe_entry)

	movq	%rcx, efi64_config(%rip)	/* Handle */

	movq	%rdx, efi64_config+8(%rip) /* EFI System table pointer */
@@ -496,10 +496,10 @@ fail: 
	movl	BP_code32_start(%esi), %eax

	leaq	startup_64(%rax), %rax

	jmp	*%rax

ENDPROC(efi_pe_entry)

SYM_FUNC_END(efi_pe_entry)



	.org 0x390

ENTRY(efi64_stub_entry)

SYM_FUNC_START(efi64_stub_entry)

	movq	%rdi, efi64_config(%rip)	/* Handle */

	movq	%rsi, efi64_config+8(%rip) /* EFI System table pointer */
@@ -508,7 +508,7 @@ ENTRY(efi64_stub_entry) 


	movq	%rdx, %rsi

	jmp	handover_entry

ENDPROC(efi64_stub_entry)

SYM_FUNC_END(efi64_stub_entry)

#endif



	.text

arch/x86/boot/compressed/mem_encrypt.S

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


	.text

	.code32

ENTRY(get_sev_encryption_bit)

SYM_FUNC_START(get_sev_encryption_bit)

	xor	%eax, %eax



#ifdef CONFIG_AMD_MEM_ENCRYPT
@@ -65,10 +65,10 @@ ENTRY(get_sev_encryption_bit) 
#endif	/* CONFIG_AMD_MEM_ENCRYPT */



	ret

ENDPROC(get_sev_encryption_bit)

SYM_FUNC_END(get_sev_encryption_bit)



	.code64

ENTRY(set_sev_encryption_mask)

SYM_FUNC_START(set_sev_encryption_mask)

#ifdef CONFIG_AMD_MEM_ENCRYPT

	push	%rbp

	push	%rdx
@@ -90,7 +90,7 @@ ENTRY(set_sev_encryption_mask) 


	xor	%rax, %rax

	ret

ENDPROC(set_sev_encryption_mask)

SYM_FUNC_END(set_sev_encryption_mask)



	.data

arch/x86/crypto/aegis128-aesni-asm.S

+14 −14
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ SYM_FUNC_END(__store_partial) 
/*

 * void crypto_aegis128_aesni_init(void *state, const void *key, const void *iv);

 */

ENTRY(crypto_aegis128_aesni_init)

SYM_FUNC_START(crypto_aegis128_aesni_init)

	FRAME_BEGIN



	/* load IV: */
@@ -226,13 +226,13 @@ ENTRY(crypto_aegis128_aesni_init) 


	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_init)

SYM_FUNC_END(crypto_aegis128_aesni_init)



/*

 * void crypto_aegis128_aesni_ad(void *state, unsigned int length,

 *                               const void *data);

 */

ENTRY(crypto_aegis128_aesni_ad)

SYM_FUNC_START(crypto_aegis128_aesni_ad)

	FRAME_BEGIN



	cmp $0x10, LEN
@@ -378,7 +378,7 @@ ENTRY(crypto_aegis128_aesni_ad) 
.Lad_out:

	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_ad)

SYM_FUNC_END(crypto_aegis128_aesni_ad)



.macro encrypt_block a s0 s1 s2 s3 s4 i

	movdq\a (\i * 0x10)(SRC), MSG
@@ -402,7 +402,7 @@ ENDPROC(crypto_aegis128_aesni_ad) 
 * void crypto_aegis128_aesni_enc(void *state, unsigned int length,

 *                                const void *src, void *dst);

 */

ENTRY(crypto_aegis128_aesni_enc)

SYM_FUNC_START(crypto_aegis128_aesni_enc)

	FRAME_BEGIN



	cmp $0x10, LEN
@@ -493,13 +493,13 @@ ENTRY(crypto_aegis128_aesni_enc) 
.Lenc_out:

	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_enc)

SYM_FUNC_END(crypto_aegis128_aesni_enc)



/*

 * void crypto_aegis128_aesni_enc_tail(void *state, unsigned int length,

 *                                     const void *src, void *dst);

 */

ENTRY(crypto_aegis128_aesni_enc_tail)

SYM_FUNC_START(crypto_aegis128_aesni_enc_tail)

	FRAME_BEGIN



	/* load the state: */
@@ -533,7 +533,7 @@ ENTRY(crypto_aegis128_aesni_enc_tail) 


	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_enc_tail)

SYM_FUNC_END(crypto_aegis128_aesni_enc_tail)



.macro decrypt_block a s0 s1 s2 s3 s4 i

	movdq\a (\i * 0x10)(SRC), MSG
@@ -556,7 +556,7 @@ ENDPROC(crypto_aegis128_aesni_enc_tail) 
 * void crypto_aegis128_aesni_dec(void *state, unsigned int length,

 *                                const void *src, void *dst);

 */

ENTRY(crypto_aegis128_aesni_dec)

SYM_FUNC_START(crypto_aegis128_aesni_dec)

	FRAME_BEGIN



	cmp $0x10, LEN
@@ -647,13 +647,13 @@ ENTRY(crypto_aegis128_aesni_dec) 
.Ldec_out:

	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_dec)

SYM_FUNC_END(crypto_aegis128_aesni_dec)



/*

 * void crypto_aegis128_aesni_dec_tail(void *state, unsigned int length,

 *                                     const void *src, void *dst);

 */

ENTRY(crypto_aegis128_aesni_dec_tail)

SYM_FUNC_START(crypto_aegis128_aesni_dec_tail)

	FRAME_BEGIN



	/* load the state: */
@@ -697,13 +697,13 @@ ENTRY(crypto_aegis128_aesni_dec_tail) 


	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_dec_tail)

SYM_FUNC_END(crypto_aegis128_aesni_dec_tail)



/*

 * void crypto_aegis128_aesni_final(void *state, void *tag_xor,

 *                                  u64 assoclen, u64 cryptlen);

 */

ENTRY(crypto_aegis128_aesni_final)

SYM_FUNC_START(crypto_aegis128_aesni_final)

	FRAME_BEGIN



	/* load the state: */
@@ -744,4 +744,4 @@ ENTRY(crypto_aegis128_aesni_final) 


	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_final)
 
SYM_FUNC_END(crypto_aegis128_aesni_final)

arch/x86/crypto/aes_ctrby8_avx-x86_64.S

+6 −6
Original line number Diff line number Diff line
@@ -544,11 +544,11 @@ ddq_add_8: 
 * aes_ctr_enc_128_avx_by8(void *in, void *iv, void *keys, void *out,

 *			unsigned int num_bytes)

 */

ENTRY(aes_ctr_enc_128_avx_by8)

SYM_FUNC_START(aes_ctr_enc_128_avx_by8)

	/* call the aes main loop */

	do_aes_ctrmain KEY_128



ENDPROC(aes_ctr_enc_128_avx_by8)

SYM_FUNC_END(aes_ctr_enc_128_avx_by8)



/*

 * routine to do AES192 CTR enc/decrypt "by8"
@@ -557,11 +557,11 @@ ENDPROC(aes_ctr_enc_128_avx_by8) 
 * aes_ctr_enc_192_avx_by8(void *in, void *iv, void *keys, void *out,

 *			unsigned int num_bytes)

 */

ENTRY(aes_ctr_enc_192_avx_by8)

SYM_FUNC_START(aes_ctr_enc_192_avx_by8)

	/* call the aes main loop */

	do_aes_ctrmain KEY_192



ENDPROC(aes_ctr_enc_192_avx_by8)

SYM_FUNC_END(aes_ctr_enc_192_avx_by8)



/*

 * routine to do AES256 CTR enc/decrypt "by8"
@@ -570,8 +570,8 @@ ENDPROC(aes_ctr_enc_192_avx_by8) 
 * aes_ctr_enc_256_avx_by8(void *in, void *iv, void *keys, void *out,

 *			unsigned int num_bytes)

 */

ENTRY(aes_ctr_enc_256_avx_by8)

SYM_FUNC_START(aes_ctr_enc_256_avx_by8)

	/* call the aes main loop */

	do_aes_ctrmain KEY_256



ENDPROC(aes_ctr_enc_256_avx_by8)
 
SYM_FUNC_END(aes_ctr_enc_256_avx_by8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE