2023-01-31 01:28:58

by Peter Lafreniere

[permalink] [raw]
Subject: [PATCH v2 3/3] crypto: x86/blowfish - Eliminate use of SYM_TYPED_FUNC_START in asm

Now that we use the ECB/CBC macros, none of the asm functions in
blowfish-x86_64 are called indirectly. So we can safely use
SYM_FUNC_START instead of SYM_TYPED_FUNC_START with no effect, allowing
us to remove an include.

Signed-off-by: Peter Lafreniere <[email protected]>
---
v1 -> v2:
- Fixed typo that caused an assembler failure
- Added note about performance to cover letter

arch/x86/crypto/blowfish-x86_64-asm_64.S | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
index 767a209ca989..fda2f9a3d83c 100644
--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
@@ -6,7 +6,6 @@
*/

#include <linux/linkage.h>
-#include <linux/cfi_types.h>

.file "blowfish-x86_64-asm.S"
.text
@@ -100,7 +99,7 @@
bswapq RX0; \
movq RX0, (RIO);

-SYM_TYPED_FUNC_START(blowfish_enc_blk)
+SYM_FUNC_START(blowfish_enc_blk)
/* input:
* %rdi: ctx
* %rsi: dst
@@ -131,7 +130,7 @@ SYM_TYPED_FUNC_START(blowfish_enc_blk)
RET;
SYM_FUNC_END(blowfish_enc_blk)

-SYM_TYPED_FUNC_START(blowfish_dec_blk)
+SYM_FUNC_START(blowfish_dec_blk)
/* input:
* %rdi: ctx
* %rsi: dst
@@ -273,7 +272,7 @@ SYM_FUNC_END(blowfish_dec_blk)
bswapq RT3; \
xorq RT3, RX3;

-SYM_TYPED_FUNC_START(blowfish_enc_blk_4way)
+SYM_FUNC_START(blowfish_enc_blk_4way)
/* input:
* %rdi: ctx
* %rsi: dst
@@ -308,7 +307,7 @@ SYM_TYPED_FUNC_START(blowfish_enc_blk_4way)
RET;
SYM_FUNC_END(blowfish_enc_blk_4way)

-SYM_TYPED_FUNC_START(__blowfish_dec_blk_4way)
+SYM_FUNC_START(__blowfish_dec_blk_4way)
/* input:
* %rdi: ctx
* %rsi: dst
--
2.39.1