Commit 3142ec4a authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

raid6: Move to more abstract 'ksimd' guard API 



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: default avatarEric Biggers <ebiggers@kernel.org>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 88a7999e

lib/raid6/neon.c

+7 −10
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ 
#include <linux/raid/pq.h>



#ifdef __KERNEL__

#include <asm/neon.h>

#include <asm/simd.h>

#else

#define kernel_neon_begin()

#define kernel_neon_end()

#define scoped_ksimd()

#define cpu_has_neon()		(1)

#endif
@@ -32,10 +31,9 @@ 
	{								\

		void raid6_neon ## _n  ## _gen_syndrome_real(int,	\

						unsigned long, void**);	\

		kernel_neon_begin();					\

		scoped_ksimd()						\

			raid6_neon ## _n ## _gen_syndrome_real(disks,	\

					(unsigned long)bytes, ptrs);	\

		kernel_neon_end();					\

	}								\

	static void raid6_neon ## _n ## _xor_syndrome(int disks,	\

					int start, int stop, 		\
@@ -43,10 +41,9 @@ 
	{								\

		void raid6_neon ## _n  ## _xor_syndrome_real(int,	\

				int, int, unsigned long, void**);	\

		kernel_neon_begin();					\

		scoped_ksimd()						\

			raid6_neon ## _n ## _xor_syndrome_real(disks,	\

				start, stop, (unsigned long)bytes, ptrs);\

		kernel_neon_end();					\

	}								\

	struct raid6_calls const raid6_neonx ## _n = {			\

		raid6_neon ## _n ## _gen_syndrome,			\

lib/raid6/recov_neon.c

+6 −9
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ 
#include <linux/raid/pq.h>



#ifdef __KERNEL__

#include <asm/neon.h>

#include <asm/simd.h>

#include "neon.h"

#else

#define kernel_neon_begin()

#define kernel_neon_end()

#define scoped_ksimd()

#define cpu_has_neon()		(1)

#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] ^

					 raid6_gfexp[failb]]];



	kernel_neon_begin();

	scoped_ksimd()

		__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,
@@ -86,9 +84,8 @@ static void raid6_datap_recov_neon(int disks, size_t bytes, int faila, 
	/* Now, pick the proper data tables */

	qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila]]];



	kernel_neon_begin();

	scoped_ksimd()

		__raid6_datap_recov_neon(bytes, p, q, dq, qmul);

	kernel_neon_end();

}



const struct raid6_recov_calls raid6_recov_neon = {