* linux-next: build failure after merge of the tip tree
@ 2019-11-18 3:11 Stephen Rothwell
2019-11-18 9:49 ` Jiri Slaby
2019-11-18 12:49 ` Borislav Petkov
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-18 3:11 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Herbert Xu, Linux Crypto List
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Jason A. Donenfeld, Samuel Neves, Ard Biesheuvel, Borislav Petkov,
Jiri Slaby
[-- Attachment #1: Type: text/plain, Size: 2122 bytes --]
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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Nov 2019 14:00:40 +1100
Subject: [PATCH] fix up for "x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the tip tree
2019-11-18 3:11 linux-next: build failure after merge of the tip tree Stephen Rothwell
@ 2019-11-18 9:49 ` Jiri Slaby
2019-11-18 12:49 ` Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2019-11-18 9:49 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Herbert Xu, Linux Crypto List
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Jason A. Donenfeld, Samuel Neves, Ard Biesheuvel, Borislav Petkov
[-- Attachment #1.1: Type: text/plain, Size: 1508 bytes --]
On 18. 11. 19, 4:11, Stephen Rothwell wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 18 Nov 2019 14:00:40 +1100
> Subject: [PATCH] fix up for "x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> 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 */
Hi, FWIW LGTM.
thanks,
--
js
suse labs
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the tip tree
2019-11-18 3:11 linux-next: build failure after merge of the tip tree Stephen Rothwell
2019-11-18 9:49 ` Jiri Slaby
@ 2019-11-18 12:49 ` Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2019-11-18 12:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Herbert Xu, Linux Crypto List, Linux Next Mailing List,
Linux Kernel Mailing List, Jason A. Donenfeld, Samuel Neves,
Ard Biesheuvel, Jiri Slaby, Linus Torvalds
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@canb.auug.org.au>
> 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@canb.auug.org.au>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-18 12:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-18 3:11 linux-next: build failure after merge of the tip tree Stephen Rothwell
2019-11-18 9:49 ` Jiri Slaby
2019-11-18 12:49 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).