diff options
| author | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-20 16:44:18 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-20 23:49:55 -0400 |
| commit | 2ae2efda4b14ad93415c2b9884cbac1ac9d0d794 (patch) | |
| tree | 68dc36d7309cc9f91d9e4560765c4e32543bc617 | |
| parent | 509efc5dfd989cf959858c6199f61c269bc76059 (diff) | |
Revert "x86/retpoline/crypto: Convert crypto assembler indirect jumps"
This reverts commit 0153127f56d685b355e5adb5747f1d4463761756.
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
| -rw-r--r-- | arch/x86/crypto/aesni-intel_asm.S | 5 | ||||
| -rw-r--r-- | arch/x86/crypto/camellia-aesni-avx-asm_64.S | 3 | ||||
| -rw-r--r-- | arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 3 | ||||
| -rw-r--r-- | arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 3f93dedb5a4d..6bd2c6c95373 100644 --- 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 5881756f78a2..ce71f9212409 100644 --- 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 0d45b04b490a..0e0b8863a34b 100644 --- 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 5fc80c880a16..225be06edc80 100644 --- 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: |