RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-17 20:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: crypto: call sha256 implementations by pointer

Browse Source 
Change how sha256 implementation is selected. Instead of an if-else
check in the block processing function select the best version and assign
the function pointer. This is slightly faster.

At this point the selection is not implemented properly in
hash-speedtest so all results are from the fastest version. This will
be fixed once all algorithms are converted.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-02-16 03:22:58 +01:00
parent d1c366ee42
commit bbf703bfd3
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/hash.c
View File

@ -24,6 +24,7 @@ void hash_init_accel(void)
{
crc32c_optimization_init();
blake2_init_accel();
sha256_init_accel();
}
void hash_init_blake2(void)
@ -31,6 +32,11 @@ void hash_init_blake2(void)
blake2_init_accel();
}
void hash_init_sha256(void)
{
sha256_init_accel();
}
/*
* Default builtin implementations
*/

1
crypto/hash.h
View File

@ -28,5 +28,6 @@ int hash_blake2b(const u8 *buf, size_t length, u8 *out);
void hash_init_accel(void);
void hash_init_blake2(void);
void hash_init_sha256(void);
#endif

2
crypto/sha.h
View File

@ -209,4 +209,6 @@ extern int hmacFinalBits(HMACContext *context, uint8_t bits,
extern int hmacResult(HMACContext *context,
uint8_t digest[USHAMaxHashSize]);
void sha256_init_accel(void);
#endif /* _SHA_H_ */

37
crypto/sha224-256.c
View File

@ -95,6 +95,29 @@ static uint32_t SHA256_H0[SHA256HashSize/4] = {
0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
};
static void (*sha256_process_message_block)(SHA256Context *context) = SHA224_256ProcessMessageBlock;
#ifdef __SHA__
void sha256_process_x86(uint32_t state[8], const uint8_t data[], uint32_t length);
static void sha256_process_x86_dispatch(SHA256Context *context)
{
/* Compiler and CPU support SHA extension. */
sha256_process_x86(context->Intermediate_Hash, context->Message_Block, SHA256_Message_Block_Size);
context->Message_Block_Index = 0;
}
#endif
void sha256_init_accel(void)
{
#ifdef __SHA__
if (cpu_has_feature(CPU_FLAG_SHA))
sha256_process_message_block = sha256_process_x86_dispatch;
else
#endif
sha256_process_message_block = SHA224_256ProcessMessageBlock;
}
/*
* SHA224Reset
*
@ -209,8 +232,6 @@ int SHA256Reset(SHA256Context *context)
return SHA224_256Reset(context, SHA256_H0);
}
void sha256_process_x86(uint32_t state[8], const uint8_t data[], uint32_t length);
/*
* SHA256Input
*
@ -245,17 +266,7 @@ int SHA256Input(SHA256Context *context, const uint8_t *message_array,
if ((SHA224_256AddLength(context, 8) == shaSuccess) &&
(context->Message_Block_Index == SHA256_Message_Block_Size)) {
#if HAVE_CFLAG_msha
/* Do the runtime check only if compiler supports the instructions */
if (cpu_has_feature(CPU_FLAG_SHA)) {
sha256_process_x86(context->Intermediate_Hash, context->Message_Block, SHA256_Message_Block_Size);
context->Message_Block_Index = 0;
} else {
SHA224_256ProcessMessageBlock(context);
}
#else
SHA224_256ProcessMessageBlock(context);
#endif
sha256_process_message_block(context);
}
message_array++;