xor: split xor.h

Keep xor.h for the public API, and split the struct xor_block_template
definition that is only needed by the xor.ko core and
architecture-specific optimizations into a separate xor_impl.h header.

Link: https://lkml.kernel.org/r/20260327061704.3707577-9-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Tested-by: Eric Biggers <ebiggers@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: David Sterba <dsterba@suse.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason A. Donenfeld <jason@zx2c4.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Li Nan <linan122@huawei.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Song Liu <song@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm/lib/xor-neon.c b/arch/arm/lib/xor-neon.c
index cf57fca979089a2d4a051fb3e071bceed94669b8..282980b9bf2a2298432341c3ca6fe23922994273 100644 (file)
--- a/arch/arm/lib/xor-neon.c
+++ b/arch/arm/lib/xor-neon.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
 #include <linux/module.h>
 
 MODULE_DESCRIPTION("NEON accelerated XOR implementation");

diff --git a/arch/arm64/lib/xor-neon.c b/arch/arm64/lib/xor-neon.c
index 8fffebfa17b204a2a0a86228dce78d949f8b141a..351aba92d9324ce9d1b27595a93ef480b69cf4f8 100644 (file)
--- a/arch/arm64/lib/xor-neon.c
+++ b/arch/arm64/lib/xor-neon.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
 #include <linux/module.h>
 #include <asm/neon-intrinsics.h>
 

diff --git a/arch/s390/lib/xor.c b/arch/s390/lib/xor.c
index 5363e4c2462d1c2a925bc5369f69ca66472f5f8d..3bbe21b40e660359b5b5d9889ee9c69586b8c918 100644 (file)
--- a/arch/s390/lib/xor.c
+++ b/arch/s390/lib/xor.c
@@ -8,7 +8,7 @@
 
 #include <linux/types.h>
 #include <linux/export.h>
-#include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
 #include <asm/xor.h>
 
 static void xor_xc_2(unsigned long bytes, unsigned long * __restrict p1,

diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h
index 51b811b623224fd3c9d19288a04b9ed6921c0f49..02bda8d995347bef1b6716d635097a8556f863c6 100644 (file)
--- a/include/linux/raid/xor.h
+++ b/include/linux/raid/xor.h
@@ -7,24 +7,4 @@
 extern void xor_blocks(unsigned int count, unsigned int bytes,
        void *dest, void **srcs);
 
-struct xor_block_template {
-        struct xor_block_template *next;
-        const char *name;
-        int speed;
-       void (*do_2)(unsigned long, unsigned long * __restrict,
-                    const unsigned long * __restrict);
-       void (*do_3)(unsigned long, unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict);
-       void (*do_4)(unsigned long, unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict);
-       void (*do_5)(unsigned long, unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict,
-                    const unsigned long * __restrict);
-};
-
-#endif
+#endif /* _XOR_H */

diff --git a/include/linux/raid/xor_impl.h b/include/linux/raid/xor_impl.h
new file mode 100644 (file)
index 0000000..a1890cd
--- /dev/null
+++ b/include/linux/raid/xor_impl.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _XOR_IMPL_H
+#define _XOR_IMPL_H
+
+struct xor_block_template {
+       struct xor_block_template *next;
+       const char *name;
+       int speed;
+       void (*do_2)(unsigned long, unsigned long * __restrict,
+                    const unsigned long * __restrict);
+       void (*do_3)(unsigned long, unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict);
+       void (*do_4)(unsigned long, unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict);
+       void (*do_5)(unsigned long, unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict,
+                    const unsigned long * __restrict);
+};
+
+#endif /* _XOR_IMPL_H */

diff --git a/lib/raid/xor/xor-core.c b/lib/raid/xor/xor-core.c
index e6e593e404fba1f5a0854864af384b1dfe835e5a..db1824011a12a83cdfad4aa44e890e2f4428a482 100644 (file)
--- a/lib/raid/xor/xor-core.c
+++ b/lib/raid/xor/xor-core.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/gfp.h>
 #include <linux/raid/xor.h>
+#include <linux/raid/xor_impl.h>
 #include <linux/jiffies.h>
 #include <linux/preempt.h>
 #include <asm/xor.h>