ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

crypto: x86/nhpoly1305 - eliminate unnecessary CFI wrappers

Browse Source 
Since the CFI implementation now supports indirect calls to assembly
functions, take advantage of that rather than use wrapper functions.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers
2022-11-18 11:44:12 -08:00
committed by Herbert Xu
parent c67b553a4f
commit 0f8bc4bd48
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/crypto/nh-avx2-x86_64.S
View File

@@ -8,6 +8,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#define PASS0_SUMS %ymm0 #define PASS0_SUMS %ymm0
#define PASS1_SUMS %ymm1 #define PASS1_SUMS %ymm1
@@ -65,11 +66,11 @@
/* /*
* void nh_avx2(const u32 *key, const u8 *message, size_t message_len, * void nh_avx2(const u32 *key, const u8 *message, size_t message_len,
* u8 hash[NH_HASH_BYTES]) * __le64 hash[NH_NUM_PASSES])
* *
* It's guaranteed that message_len % 16 == 0. * It's guaranteed that message_len % 16 == 0.
*/ */
SYM_FUNC_START(nh_avx2) SYM_TYPED_FUNC_START(nh_avx2)
vmovdqu 0x00(KEY), K0 vmovdqu 0x00(KEY), K0
vmovdqu 0x10(KEY), K1 vmovdqu 0x10(KEY), K1

5
arch/x86/crypto/nh-sse2-x86_64.S
View File

@@ -8,6 +8,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h>
#define PASS0_SUMS %xmm0 #define PASS0_SUMS %xmm0
#define PASS1_SUMS %xmm1 #define PASS1_SUMS %xmm1
@@ -67,11 +68,11 @@
/* /*
* void nh_sse2(const u32 *key, const u8 *message, size_t message_len, * void nh_sse2(const u32 *key, const u8 *message, size_t message_len,
* u8 hash[NH_HASH_BYTES]) * __le64 hash[NH_NUM_PASSES])
* *
* It's guaranteed that message_len % 16 == 0. * It's guaranteed that message_len % 16 == 0.
*/ */
SYM_FUNC_START(nh_sse2) SYM_TYPED_FUNC_START(nh_sse2)
movdqu 0x00(KEY), K0 movdqu 0x00(KEY), K0
movdqu 0x10(KEY), K1 movdqu 0x10(KEY), K1

11
arch/x86/crypto/nhpoly1305-avx2-glue.c
View File

@@ -14,14 +14,7 @@
#include <asm/simd.h> #include <asm/simd.h>
asmlinkage void nh_avx2(const u32 *key, const u8 *message, size_t message_len, asmlinkage void nh_avx2(const u32 *key, const u8 *message, size_t message_len,
u8 hash[NH_HASH_BYTES]); __le64 hash[NH_NUM_PASSES]);
/* wrapper to avoid indirect call to assembly, which doesn't work with CFI */
static void _nh_avx2(const u32 *key, const u8 *message, size_t message_len,
__le64 hash[NH_NUM_PASSES])
{
nh_avx2(key, message, message_len, (u8 *)hash);
}
static int nhpoly1305_avx2_update(struct shash_desc *desc, static int nhpoly1305_avx2_update(struct shash_desc *desc,
const u8 *src, unsigned int srclen) const u8 *src, unsigned int srclen)
@@ -33,7 +26,7 @@ static int nhpoly1305_avx2_update(struct shash_desc *desc,
unsigned int n = min_t(unsigned int, srclen, SZ_4K); unsigned int n = min_t(unsigned int, srclen, SZ_4K);
kernel_fpu_begin(); kernel_fpu_begin();
crypto_nhpoly1305_update_helper(desc, src, n, _nh_avx2); crypto_nhpoly1305_update_helper(desc, src, n, nh_avx2);
kernel_fpu_end(); kernel_fpu_end();
src += n; src += n;
srclen -= n; srclen -= n;

11
arch/x86/crypto/nhpoly1305-sse2-glue.c
View File

@@ -14,14 +14,7 @@
#include <asm/simd.h> #include <asm/simd.h>
asmlinkage void nh_sse2(const u32 *key, const u8 *message, size_t message_len, asmlinkage void nh_sse2(const u32 *key, const u8 *message, size_t message_len,
u8 hash[NH_HASH_BYTES]); __le64 hash[NH_NUM_PASSES]);
/* wrapper to avoid indirect call to assembly, which doesn't work with CFI */
static void _nh_sse2(const u32 *key, const u8 *message, size_t message_len,
__le64 hash[NH_NUM_PASSES])
{
nh_sse2(key, message, message_len, (u8 *)hash);
}
static int nhpoly1305_sse2_update(struct shash_desc *desc, static int nhpoly1305_sse2_update(struct shash_desc *desc,
const u8 *src, unsigned int srclen) const u8 *src, unsigned int srclen)
@@ -33,7 +26,7 @@ static int nhpoly1305_sse2_update(struct shash_desc *desc,
unsigned int n = min_t(unsigned int, srclen, SZ_4K); unsigned int n = min_t(unsigned int, srclen, SZ_4K);
kernel_fpu_begin(); kernel_fpu_begin();
crypto_nhpoly1305_update_helper(desc, src, n, _nh_sse2); crypto_nhpoly1305_update_helper(desc, src, n, nh_sse2);
kernel_fpu_end(); kernel_fpu_end();
src += n; src += n;
srclen -= n; srclen -= n;