Revert "x86/retpoline/crypto: Convert crypto assembler indirect jumps"

This reverts commit 0153127f56d685b355e5adb5747f1d4463761756.

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
index 3f93dedb5a4dc33ab73e45abc69e0c9e33e4614e..6bd2c6c95373f58dc8f915f5e50967105bf404d0 100644 (file)
--- a/arch/x86/crypto/aesni-intel_asm.S
+++ b/arch/x86/crypto/aesni-intel_asm.S
@@ -31,7 +31,6 @@
 
 #include <linux/linkage.h>
 #include <asm/inst.h>
-#include <asm/nospec-branch.h>
 
 /*
  * The following macros are used to move an (un)aligned 16 byte value to/from
@@ -2715,7 +2714,7 @@ ENTRY(aesni_xts_crypt8)
        pxor INC, STATE4
        movdqu IV, 0x30(OUTP)
 
-       CALL_NOSPEC %r11
+       call *%r11
 
        movdqu 0x00(OUTP), INC
        pxor INC, STATE1
@@ -2760,7 +2759,7 @@ ENTRY(aesni_xts_crypt8)
        _aesni_gf128mul_x_ble()
        movups IV, (IVP)
 
-       CALL_NOSPEC %r11
+       call *%r11
 
        movdqu 0x40(OUTP), INC
        pxor INC, STATE1

diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
index 5881756f78a21c1c2db89625dd6f56120eecd7a3..ce71f9212409f16326ffc92efec812c2be7d731c 100644 (file)
--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
@@ -16,7 +16,6 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/nospec-branch.h>
 
 #define CAMELLIA_TABLE_BYTE_LEN 272
 
@@ -1211,7 +1210,7 @@ camellia_xts_crypt_16way:
        vpxor 14 * 16(%rax), %xmm15, %xmm14;
        vpxor 15 * 16(%rax), %xmm15, %xmm15;
 
-       CALL_NOSPEC %r9;
+       call *%r9;
 
        addq $(16 * 16), %rsp;
 

diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
index 0d45b04b490a86ee0aab0fdd83efe9d1a53d0efc..0e0b8863a34bd168c618941407b2890c385a442d 100644 (file)
--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
@@ -11,7 +11,6 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/nospec-branch.h>
 
 #define CAMELLIA_TABLE_BYTE_LEN 272
 
@@ -1324,7 +1323,7 @@ camellia_xts_crypt_32way:
        vpxor 14 * 32(%rax), %ymm15, %ymm14;
        vpxor 15 * 32(%rax), %ymm15, %ymm15;
 
-       CALL_NOSPEC %r9;
+       call *%r9;
 
        addq $(16 * 32), %rsp;
 

diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
index 5fc80c880a164cfb779d8536cfde312f937c65e0..225be06edc80982f9509e25af09e1ac0a0232237 100644 (file)
--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
@@ -45,7 +45,6 @@
 
 #include <asm/inst.h>
 #include <linux/linkage.h>
-#include <asm/nospec-branch.h>
 
 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
 
@@ -173,7 +172,7 @@ continue_block:
        movzxw  (bufp, %rax, 2), len
        offset=crc_array-jump_table
        lea     offset(bufp, len, 1), bufp
-       JMP_NOSPEC bufp
+       jmp     *bufp
 
        ################################################################
        ## 2a) PROCESS FULL BLOCKS: