Skip to contentSkip to conversation

x86: check CONFIG options instead of __arch_um__

PATCH New Masahiro Yamada 1 participant 2 messages Apr 21, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86: check CONFIG options instead of __arch_um__

If the intention is to check i386/x86_64 excluding UML, we can use CONFIG options instead.

There are only some users of __arch_um__. This commit replaces them, then removes the __arch_um__ definition.

The original reason for checking __i386__ / __x86_64__ was perhaps because lib/raid6/algos.c is built not only for the kernel but also for the user-space test program.

However, lib/raid6/test/Makefile passes -DCONFIG_X86, -DCONFIG_X86_32, and -DCONFIG_X86_64 for this case. So, I do not see a good reason to not use CONFIG options here.

What is confusing is, CONFIG_X86_{32,64} is defined not only in arch/x86/Kconfig, but also in arch/x86/um/Kconfig. To exlucde UML, we need to check CONFIG_X86 too.

---

 arch/um/Makefile  | 2 +-
 kernel/signal.c   | 2 +-
 lib/raid6/algos.c | 6 ++++--
 lib/raid6/x86.h   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
arch/um/Makefile +1 -1
index d2daa206872d..064fbed7a4e9 100644
@@ -62,7 +62,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um
 #
 # These apply to USER_CFLAGS to.
 
-KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \
+KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) \
 	$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap	\
 	-Dlongjmp=kernel_longjmp -Dsetjmp=kernel_setjmp \
 	-Din6addr_loopback=kernel_in6addr_loopback \
kernel/signal.c +1 -1
index 713104884414..1af3ad707b02 100644
@@ -1246,7 +1246,7 @@ static void print_fatal_signal(int signr)
 	struct pt_regs *regs = signal_pt_regs();
 	pr_info("potentially unexpected fatal signal %d.\n", signr);
 
-#if defined(__i386__) && !defined(__arch_um__)
+#if defined(CONFIG_X86) && defined(CONFIG_X86_32)
 	pr_info("code at %08lx: ", regs->ip);
 	{
 		int i;
lib/raid6/algos.c +4 -2
index 6d5e5000fdd7..978fa19efbbf 100644
@@ -29,7 +29,8 @@ struct raid6_calls raid6_call;
 EXPORT_SYMBOL_GPL(raid6_call);
 
 const struct raid6_calls * const raid6_algos[] = {
-#if defined(__i386__) && !defined(__arch_um__)
+#ifdef CONFIG_X86
+#if defined(CONFIG_X86_32)
 #ifdef CONFIG_AS_AVX512
 	&raid6_avx512x2,
 	&raid6_avx512x1,
@@ -43,7 +44,7 @@ const struct raid6_calls * const raid6_algos[] = {
 	&raid6_mmxx2,
 	&raid6_mmxx1,
 #endif
-#if defined(__x86_64__) && !defined(__arch_um__)
+#if defined(CONFIG_X86_64)
 #ifdef CONFIG_AS_AVX512
 	&raid6_avx512x4,
 	&raid6_avx512x2,
@@ -56,6 +57,7 @@ const struct raid6_calls * const raid6_algos[] = {
 	&raid6_sse2x2,
 	&raid6_sse2x1,
 #endif
+#endif /* CONFIG_X86 */
 #ifdef CONFIG_ALTIVEC
 	&raid6_vpermxor8,
 	&raid6_vpermxor4,
lib/raid6/x86.h +1 -1
index 9a6ff37115e7..0436b32f7709 100644
@@ -14,7 +14,7 @@
 #ifndef LINUX_RAID_RAID6X86_H
 #define LINUX_RAID_RAID6X86_H
 
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
+#ifdef CONFIG_X86
 
 #ifdef __KERNEL__ /* Real code */
 
Signature · 7 lines
2.25.1


_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
#1 lore raw

PATCH 2/2 raid6/algos.c: refactor raid6_algos array for x86

Factor out the common pointer references.

Common for i386 and x86_64:
raid6_avx512x2
raid6_avx512x1
raid6_avx2x2
raid6_avx2x1
raid6_sse2x2
raid6_sse2x1
raid6_sse1x2

Only for i386:
raid6_sse1x1
raid6_mmxx2
raid6_mmxx1

Only for x86_64:
raid6_avx512x4
raid6_avx2x4
raid6_sse2x4

---

 lib/raid6/algos.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
lib/raid6/algos.c +10 -14
index 978fa19efbbf..c0f2fd6e0621 100644
@@ -30,32 +30,28 @@ EXPORT_SYMBOL_GPL(raid6_call);
 
 const struct raid6_calls * const raid6_algos[] = {
 #ifdef CONFIG_X86
-#if defined(CONFIG_X86_32)
 #ifdef CONFIG_AS_AVX512
-	&raid6_avx512x2,
-	&raid6_avx512x1,
-#endif
-	&raid6_avx2x2,
-	&raid6_avx2x1,
-	&raid6_sse2x2,
-	&raid6_sse2x1,
-	&raid6_sse1x2,
-	&raid6_sse1x1,
-	&raid6_mmxx2,
-	&raid6_mmxx1,
-#endif
 #if defined(CONFIG_X86_64)
-#ifdef CONFIG_AS_AVX512
 	&raid6_avx512x4,
+#endif
 	&raid6_avx512x2,
 	&raid6_avx512x1,
 #endif
+#ifdef CONFIG_X86_64
 	&raid6_avx2x4,
+#endif
 	&raid6_avx2x2,
 	&raid6_avx2x1,
+#ifdef CONFIG_X86_64
 	&raid6_sse2x4,
+#endif
 	&raid6_sse2x2,
 	&raid6_sse2x1,
+	&raid6_sse1x2,
+#ifdef CONFIG_X86_32
+	&raid6_sse1x1,
+	&raid6_mmxx2,
+	&raid6_mmxx1,
 #endif
 #endif /* CONFIG_X86 */
 #ifdef CONFIG_ALTIVEC
Signature · 1 line
2.25.1