korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

selftests: vDSO: check cpu caps before running chacha test

Browse Source 
Some archs -- arm64 and s390x -- implemented chacha using instructions
that are available most places, but aren't always available. The kernel
handles this just fine, but the selftest does not. Check the hwcaps
before running, and skip the test if the cpu doesn't support it. As
well, on s390x, always emit the fallback instructions of an alternative
block, to ensure maximum compatibility.

Co-developed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2024-09-15 01:07:27 +02:00
parent b920aa77be
commit 210860e7f7
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/include/asm/alternative.h
View File

@ -2,8 +2,18 @@
#ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H #ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H
#define _TOOLS_ASM_ALTERNATIVE_ASM_H #define _TOOLS_ASM_ALTERNATIVE_ASM_H
#if defined(__s390x__)
#ifdef __ASSEMBLY__
.macro ALTERNATIVE oldinstr, newinstr, feature
\oldinstr
.endm
#endif
#else
/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ /* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */
#define ALTERNATIVE # #define ALTERNATIVE #
#endif #endif
#endif

20
tools/testing/selftests/vDSO/vdso_test_chacha.c
View File

@ -5,11 +5,29 @@
#include <tools/le_byteshift.h> #include <tools/le_byteshift.h>
#include <sys/random.h> #include <sys/random.h>
#include <sys/auxv.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "../kselftest.h" #include "../kselftest.h"
#if defined(__aarch64__)
static bool cpu_has_capabilities(void)
{
return getauxval(AT_HWCAP) & HWCAP_ASIMD;
}
#elif defined(__s390x__)
static bool cpu_has_capabilities(void)
{
return getauxval(AT_HWCAP) & HWCAP_S390_VXRS;
}
#else
static bool cpu_has_capabilities(void)
{
return true;
}
#endif
static uint32_t rol32(uint32_t word, unsigned int shift) static uint32_t rol32(uint32_t word, unsigned int shift)
{ {
return (word << (shift & 31)) | (word >> ((-shift) & 31)); return (word << (shift & 31)) | (word >> ((-shift) & 31));
@ -67,6 +85,8 @@ int main(int argc, char *argv[])
uint8_t output1[BLOCK_SIZE * BLOCKS], output2[BLOCK_SIZE * BLOCKS]; uint8_t output1[BLOCK_SIZE * BLOCKS], output2[BLOCK_SIZE * BLOCKS];
ksft_print_header(); ksft_print_header();
if (!cpu_has_capabilities())
ksft_exit_skip("Required CPU capabilities missing\n");
ksft_set_plan(1); ksft_set_plan(1);
for (unsigned int trial = 0; trial < TRIALS; ++trial) { for (unsigned int trial = 0; trial < TRIALS; ++trial) {