admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

raid6: Move to more abstract 'ksimd' guard API

Browse Source 
Move away from calling kernel_neon_begin() and kernel_neon_end()
directly, and instead, use the newly introduced scoped_ksimd() API. This
permits arm64 to modify the kernel mode NEON API without affecting code
that is shared between ARM and arm64.

Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel
2025-10-01 12:23:40 +02:00
parent 88a7999e80
commit 3142ec4af2
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/raid6/neon.c
View File

@@ -8,10 +8,9 @@
#include <linux/raid/pq.h> #include <linux/raid/pq.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/neon.h> #include <asm/simd.h>
#else #else
#define kernel_neon_begin() #define scoped_ksimd()
#define kernel_neon_end()
#define cpu_has_neon() (1) #define cpu_has_neon() (1)
#endif #endif
@@ -32,10 +31,9 @@
{ \ { \
void raid6_neon ## _n ## _gen_syndrome_real(int, \ void raid6_neon ## _n ## _gen_syndrome_real(int, \
unsigned long, void**); \ unsigned long, void**); \
kernel_neon_begin(); \ scoped_ksimd() \
raid6_neon ## _n ## _gen_syndrome_real(disks, \ raid6_neon ## _n ## _gen_syndrome_real(disks, \
(unsigned long)bytes, ptrs); \ (unsigned long)bytes, ptrs); \
kernel_neon_end(); \
} \ } \
static void raid6_neon ## _n ## _xor_syndrome(int disks, \ static void raid6_neon ## _n ## _xor_syndrome(int disks, \
int start, int stop, \ int start, int stop, \
@@ -43,10 +41,9 @@
{ \ { \
void raid6_neon ## _n ## _xor_syndrome_real(int, \ void raid6_neon ## _n ## _xor_syndrome_real(int, \
int, int, unsigned long, void**); \ int, int, unsigned long, void**); \
kernel_neon_begin(); \ scoped_ksimd() \
raid6_neon ## _n ## _xor_syndrome_real(disks, \ raid6_neon ## _n ## _xor_syndrome_real(disks, \
start, stop, (unsigned long)bytes, ptrs); \ start, stop, (unsigned long)bytes, ptrs);\
kernel_neon_end(); \
} \ } \
struct raid6_calls const raid6_neonx ## _n = { \ struct raid6_calls const raid6_neonx ## _n = { \
raid6_neon ## _n ## _gen_syndrome, \ raid6_neon ## _n ## _gen_syndrome, \

15
lib/raid6/recov_neon.c
View File

@@ -7,11 +7,10 @@
#include <linux/raid/pq.h> #include <linux/raid/pq.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/neon.h> #include <asm/simd.h>
#include "neon.h" #include "neon.h"
#else #else
#define kernel_neon_begin() #define scoped_ksimd()
#define kernel_neon_end()
#define cpu_has_neon() (1) #define cpu_has_neon() (1)
#endif #endif
@@ -55,9 +54,8 @@ static void raid6_2data_recov_neon(int disks, size_t bytes, int faila,
qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila] ^ qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila] ^
raid6_gfexp[failb]]]; raid6_gfexp[failb]]];
kernel_neon_begin(); scoped_ksimd()
__raid6_2data_recov_neon(bytes, p, q, dp, dq, pbmul, qmul); __raid6_2data_recov_neon(bytes, p, q, dp, dq, pbmul, qmul);
kernel_neon_end();
} }
static void raid6_datap_recov_neon(int disks, size_t bytes, int faila, static void raid6_datap_recov_neon(int disks, size_t bytes, int faila,
@@ -86,9 +84,8 @@ static void raid6_datap_recov_neon(int disks, size_t bytes, int faila,
/* Now, pick the proper data tables */ /* Now, pick the proper data tables */
qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila]]]; qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila]]];
kernel_neon_begin(); scoped_ksimd()
__raid6_datap_recov_neon(bytes, p, q, dq, qmul); __raid6_datap_recov_neon(bytes, p, q, dq, qmul);
kernel_neon_end();
} }
const struct raid6_recov_calls raid6_recov_neon = { const struct raid6_recov_calls raid6_recov_neon = {