提交 97fac488 编写于 作者: A Ard Biesheuvel 提交者: Zheng Zengkai

crypto: arm64/aes-neonbs - remove NEON yield calls

mainline inclusion
from mainline-v5.12-rc1
commit f5943ef4
category: bugfix
bugzilla: 172149 https://gitee.com/openeuler/kernel/issues/I4CZ7H
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f5943ef456f8

-----------------------------------------------

There is no need for elaborate yield handling in the bit-sliced NEON
implementation of AES, given that skciphers are naturally bounded by the
size of the chunks returned by the skcipher_walk API. So remove the
yield calls from the asm code.
Signed-off-by: NArd Biesheuvel <ardb@kernel.org>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NWei Li <liwei391@huawei.com>
Reviewed-by: NJason Yan <yanaijie@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 4a8d67c4
...@@ -613,7 +613,6 @@ SYM_FUNC_END(aesbs_decrypt8) ...@@ -613,7 +613,6 @@ SYM_FUNC_END(aesbs_decrypt8)
st1 {\o7\().16b}, [x19], #16 st1 {\o7\().16b}, [x19], #16
cbz x23, 1f cbz x23, 1f
cond_yield_neon
b 99b b 99b
1: frame_pop 1: frame_pop
...@@ -715,7 +714,6 @@ SYM_FUNC_START(aesbs_cbc_decrypt) ...@@ -715,7 +714,6 @@ SYM_FUNC_START(aesbs_cbc_decrypt)
1: st1 {v24.16b}, [x24] // store IV 1: st1 {v24.16b}, [x24] // store IV
cbz x23, 2f cbz x23, 2f
cond_yield_neon
b 99b b 99b
2: frame_pop 2: frame_pop
...@@ -801,7 +799,7 @@ SYM_FUNC_END(__xts_crypt8) ...@@ -801,7 +799,7 @@ SYM_FUNC_END(__xts_crypt8)
mov x23, x4 mov x23, x4
mov x24, x5 mov x24, x5
0: movi v30.2s, #0x1 movi v30.2s, #0x1
movi v25.2s, #0x87 movi v25.2s, #0x87
uzp1 v30.4s, v30.4s, v25.4s uzp1 v30.4s, v30.4s, v25.4s
ld1 {v25.16b}, [x24] ld1 {v25.16b}, [x24]
...@@ -846,7 +844,6 @@ SYM_FUNC_END(__xts_crypt8) ...@@ -846,7 +844,6 @@ SYM_FUNC_END(__xts_crypt8)
cbz x23, 1f cbz x23, 1f
st1 {v25.16b}, [x24] st1 {v25.16b}, [x24]
cond_yield_neon 0b
b 99b b 99b
1: st1 {v25.16b}, [x24] 1: st1 {v25.16b}, [x24]
...@@ -889,7 +886,7 @@ SYM_FUNC_START(aesbs_ctr_encrypt) ...@@ -889,7 +886,7 @@ SYM_FUNC_START(aesbs_ctr_encrypt)
cset x26, ne cset x26, ne
add x23, x23, x26 // do one extra block if final add x23, x23, x26 // do one extra block if final
98: ldp x7, x8, [x24] ldp x7, x8, [x24]
ld1 {v0.16b}, [x24] ld1 {v0.16b}, [x24]
CPU_LE( rev x7, x7 ) CPU_LE( rev x7, x7 )
CPU_LE( rev x8, x8 ) CPU_LE( rev x8, x8 )
...@@ -967,7 +964,6 @@ CPU_LE( rev x8, x8 ) ...@@ -967,7 +964,6 @@ CPU_LE( rev x8, x8 )
st1 {v0.16b}, [x24] st1 {v0.16b}, [x24]
cbz x23, .Lctr_done cbz x23, .Lctr_done
cond_yield_neon 98b
b 99b b 99b
.Lctr_done: .Lctr_done:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册