Skip to contentSkip to conversation

kbuild, LLVMLinux: Fix asm-offset generation to work with clang

PATCH In review [email protected] 2 participants 3 messages Sep 23, 2014 – Sep 24, 2014 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild, LLVMLinux: Fix asm-offset generation to work with clang

From: Behan Webster <[email protected]>

When using clang with -no-integerated-as clang will use the gnu assembler instead of the integrated assembler. However clang will still perform asm error checking before sending the inline assembly language to gas.

The generation of asm-offsets from within C code is dependent on gcc's blind passing of whatever is in asm() through to gas. Arbirary text is passed through which is then modified by a sed script into the appropriate .h and .S code. Since the arbitrary text is not valid assembly language, clang fails.

This can be fixed by making the arbitrary text into an ASM comment and then updating the sed scripts accordingly to work as expected.

This solution works for both gcc and clang.

Cc Jan Moskyto Matejka <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Ard Biesheuvel <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Tom Gundersen <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Arnd Bergmann <[email protected]>
---
 Kbuild                 | 8 ++++----
 include/linux/kbuild.h | 6 +++---
 scripts/mod/Makefile   | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)
Kbuild +4 -4
index b8b708a..2f509c9 100644
@@ -52,10 +52,10 @@ targets += arch/$(SRCARCH)/kernel/asm-offsets.s
 
 # Default sed regexp - multiline due to syntax constraints
 define sed-y
-	"/^->/{s:->#\(.*\):/* \1 */:; \
-	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
-	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
-	s:->::; p;}"
+	"/^@->/{s:->#\(.*\):/* \1 */:; \
+	s:^@->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:^@->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:@->::; p;}"
 endef
 
 quiet_cmd_offsets = GEN     $@
include/linux/kbuild.h +3 -3
index 22a7219..75fa2c3 100644
@@ -2,14 +2,14 @@
 #define __LINUX_KBUILD_H
 
 #define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+	asm volatile("\n@->" #sym " %0 " #val : : "i" (val))
 
-#define BLANK() asm volatile("\n->" : : )
+#define BLANK() asm volatile("\n@->" : : )
 
 #define OFFSET(sym, str, mem) \
 	DEFINE(sym, offsetof(struct str, mem))
 
 #define COMMENT(x) \
-	asm volatile("\n->#" x)
+	asm volatile("\n@->#" x)
 
 #endif
scripts/mod/Makefile +4 -4
index c11212f..86f6b85 100644
@@ -6,10 +6,10 @@ modpost-objs	:= modpost.o file2alias.o sumversion.o
 devicetable-offsets-file := devicetable-offsets.h
 
 define sed-y
-	"/^->/{s:->#\(.*\):/* \1 */:; \
-	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
-	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
-	s:->::; p;}"
+	"/^@->/{s:@->#\(.*\):/* \1 */:; \
+	s:^@->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:^@->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
+	s:@->::; p;}"
 endef
 
 quiet_cmd_offsets = GEN     $@
Signature · 1 line
1.9.1
#1 lore raw

include/linux/kbuild.h line 5

Quoted 4 lines · On Tuesday 23 September 2014 12:25:31 [email protected] wrote:

#define DEFINE(sym, val) \

include/linux/kbuild.h +1 -1
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+       asm volatile("\n@->" #sym " %0 " #val : : "i" (val))

Isn't the '@' character to start a comment architecture specific?

If this makes it work on ARM, what about other architectures?

Arnd

#2 lore raw
Quoted 5 lines · Arnd Bergmann

include/linux/kbuild.h line 5

Quoted 3 lines · On Tuesday 23 September 2014 12:25:31 [email protected] wrote:
  #define DEFINE(sym, val) \
include/linux/kbuild.h +1 -1
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+       asm volatile("\n@->" #sym " %0 " #val : : "i" (val))

Isn't the '@' character to start a comment architecture specific?

I had worried about that as well (as we discussed at LCU), but with the limited testing I tried this with it seemed to indicate that gas was smart enough to handle it in most cases. However the kbuild test robot indicates that this patch breaks MIPS. So indeed your concern is justified.

Gotta love the kbuild test robot. Thank you Fengguang Wu!

Quoted 1 line

If this makes it work on ARM, what about other architectures?

For now, I think I need to try something else.

Thanks,

Behan

Signature · 2 lines
Behan Webster
[email protected]