Skip to content

Commit 4327d16

Browse files
Peter Zijlstraherbertx
authored andcommitted
crypto: x86/chacha20 - Avoid spurious jumps to other functions
The chacha_Nblock_xor_avx512vl() functions all have their own, identical, .LdoneN label, however in one particular spot {2,4} jump to the 8 version instead of their own. Resulting in: arch/x86/crypto/chacha-x86_64.o: warning: objtool: chacha_2block_xor_avx512vl() falls through to next function chacha_8block_xor_avx512vl() arch/x86/crypto/chacha-x86_64.o: warning: objtool: chacha_4block_xor_avx512vl() falls through to next function chacha_8block_xor_avx512vl() Make each function consistently use its own done label. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Martin Willi <martin@strongswan.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent e9a36fe commit 4327d16

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/x86/crypto/chacha-avx512vl-x86_64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ SYM_FUNC_START(chacha_2block_xor_avx512vl)
172172
# xor remaining bytes from partial register into output
173173
mov %rcx,%rax
174174
and $0xf,%rcx
175-
jz .Ldone8
175+
jz .Ldone2
176176
mov %rax,%r9
177177
and $~0xf,%r9
178178

@@ -438,7 +438,7 @@ SYM_FUNC_START(chacha_4block_xor_avx512vl)
438438
# xor remaining bytes from partial register into output
439439
mov %rcx,%rax
440440
and $0xf,%rcx
441-
jz .Ldone8
441+
jz .Ldone4
442442
mov %rax,%r9
443443
and $~0xf,%r9
444444

0 commit comments

Comments
 (0)