Re: linux-next: build failure after merge of the tip tree

[Borislav Petkov]

On Mon, Nov 18, 2019 at 02:11:10PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/crypto/blake2s-core.S: Assembler messages:
> arch/x86/crypto/blake2s-core.S:50: Error: invalid character '(' in mnemonic
> arch/x86/crypto/blake2s-core.S:176: Error: invalid character '(' in mnemonic
> arch/x86/crypto/blake2s-core.S:180: Error: invalid character '(' in mnemonic
> arch/x86/crypto/blake2s-core.S:257: Error: invalid character '(' in mnemonic
> 
> Caused by commit
> 
>   ed0356eda153 ("crypto: blake2s - x86_64 SIMD implementation")
> 
> from the crypto tree interacting with commit
> 
>   6dcc5627f6ae ("x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*")
> 
> from the tip tree.
> 
> I have applied the following merge fix patch.

Thanks.

I need to remember to point Linus to it when I send the pull request
next week so that he's aware and can apply your patch when merging the
crypto tree.

Lemme CC him now too, as an FYI.

> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 18 Nov 2019 14:00:40 +1100
> Subject: [PATCH] fix up for "x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*"

<--- add a commit message blurb here pls.

> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  arch/x86/crypto/blake2s-core.S | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/crypto/blake2s-core.S b/arch/x86/crypto/blake2s-core.S
> index 8591938eee26..24910b766bdd 100644
> --- a/arch/x86/crypto/blake2s-core.S
> +++ b/arch/x86/crypto/blake2s-core.S
> @@ -47,7 +47,7 @@ SIGMA2:
>  
>  .text
>  #ifdef CONFIG_AS_SSSE3
> -ENTRY(blake2s_compress_ssse3)
> +SYM_FUNC_START(blake2s_compress_ssse3)
>  	testq		%rdx,%rdx
>  	je		.Lendofloop
>  	movdqu		(%rdi),%xmm0
> @@ -173,11 +173,11 @@ ENTRY(blake2s_compress_ssse3)
>  	movdqu		%xmm14,0x20(%rdi)
>  .Lendofloop:
>  	ret
> -ENDPROC(blake2s_compress_ssse3)
> +SYM_FUNC_END(blake2s_compress_ssse3)
>  #endif /* CONFIG_AS_SSSE3 */
>  
>  #ifdef CONFIG_AS_AVX512
> -ENTRY(blake2s_compress_avx512)
> +SYM_FUNC_START(blake2s_compress_avx512)
>  	vmovdqu		(%rdi),%xmm0
>  	vmovdqu		0x10(%rdi),%xmm1
>  	vmovdqu		0x20(%rdi),%xmm4
> @@ -254,5 +254,5 @@ ENTRY(blake2s_compress_avx512)
>  	vmovdqu		%xmm4,0x20(%rdi)
>  	vzeroupper
>  	retq
> -ENDPROC(blake2s_compress_avx512)
> +SYM_FUNC_END(blake2s_compress_avx512)
>  #endif /* CONFIG_AS_AVX512 */
> -- 
> 2.23.0
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix ImendÃrffer, HRB 36809, AG NÃrnberg