Skip to contentSkip to conversation

RFC: right way to conditional-ize some macros for LTO

PATCH Tim Bird 3 participants 5 messages Mar 29, 2013 – Apr 11, 2013 Arm (32-bit)

lore
Share & tools
lore

Tim Bird

author
#0 lore raw

Hi all,

A while ago I was working on supporting link-time optimization for ARM, and I'm just now getting around to submitting some of the patches from my work. I'll explain more below, but the executive summary is this: Andi Kleen's LTO patches for Linux almost work on ARM. I ran into one issue in arch/arm/include/asm/unified.h where various 'it'-related macros are expanding multiple times, in C context, and causing build errors.

As near as I can tell, these macros are not used except by arch/arm/kernel/kprobes-test-thumb.c (and most are not used at all).

When compiling with CONFIG_LTO=y, in Andi's 3.7.0 tree with LTO patches, I got the messages below:
-----------------------------------------------
...

  LD      drivers/tty/built-in.o
  LD      drivers/built-in.o
  LINK    vmlinux
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o

LDFINAL vmlinux.o
[Leaving LTRANS /tmp/ccsIMbQT.args]
[Leaving LTRANS vmlinux.o.ltrans.out]
In file included from /a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/include/uapi/linux/swab.h:269:0,

                 from :872:

/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c: In function 'wp512_process_buffer':
/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c:987:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] vmlinux.o.ltrans0.s: Assembler messages:
vmlinux.o.ltrans0.s:408: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:410: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:412: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:414: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:416: Error: Macro `itte' was already defined
vmlinux.o.ltrans0.s:418: Error: Macro `itet' was already defined
vmlinux.o.ltrans0.s:420: Error: Macro `itee' was already defined
vmlinux.o.ltrans0.s:422: Error: Macro `itttt' was already defined
vmlinux.o.ltrans0.s:424: Error: Macro `ittte' was already defined
vmlinux.o.ltrans0.s:426: Error: Macro `ittet' was already defined
vmlinux.o.ltrans0.s:428: Error: Macro `ittee' was already defined
vmlinux.o.ltrans0.s:430: Error: Macro `itett' was already defined
vmlinux.o.ltrans0.s:432: Error: Macro `itete' was already defined
vmlinux.o.ltrans0.s:434: Error: Macro `iteet' was already defined
vmlinux.o.ltrans0.s:436: Error: Macro `iteee' was already defined
vmlinux.o.ltrans0.s:968: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:970: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:972: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:974: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:976: Error: Macro `itte' was already defined
...
[Leaving LTRANS vmlinux.o.ltrans30.ltrans.o]
[Leaving LTRANS vmlinux.o.ltrans31.o]
[Leaving LTRANS vmlinux.o.ltrans31.ltrans.o] /a/home/tbird/work/auto-reduce/sony-yocto/lto-build2/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-sony-linux-gnueabi/gcc/arm-sony-linux-gnueabi/4.7.3/arm-sony-linux-gnueabi-ld: lto-wrapper failed
collect2: error: ld returned 1 exit status
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2

Error: Bad result 512, running "make -j 8 KALLSYMS_EXTRA_PASS=1 bzImage": (output follows) Error:
---------------------------------------------

The messages are repeated thousands of times (I'm guessing for every object file after the first that included arch/arm/include/asm/unified.h)

Recognizing that LTO is currently incompatible with kprobes, and (so far) finding that only kprobes appeared to use these macros, I did the following hack:

arch/arm/include/asm/unified.h +2 -0
index f5989f4..5179c13 100644
@@ -92,6 +92,7 @@
 	.macro	iteee, cond
 	.endm
 #else	/* !__ASSEMBLY__ */
+#ifndef CONFIG_LTO
 __asm__(
 "	.macro	it, cond\n"
 "	.endm\n"
@@ -123,6 +124,7 @@ __asm__(
 "	.endm\n"
 "	.macro	iteee, cond\n"
 "	.endm\n");
+#endif  /* ! CONFIG_LTO */
 #endif	/* __ASSEMBLY__ */
 
 #endif	/* CONFIG_ARM_ASM_UNIFIED */

This the macros thus removed, I had no problems building the kernel and running it on target.

While this works to remove the build error, it doesn't seem robust and I'd like to either 1) find a better way to make these macro definitions conditional, or 2) eliminate them completely.

The macros themselves seem empty. Can someone tell me what they do? What is the status of these macros? Are they even needed? Could they be made conditional on something like NEED_IT_MACROS, and then have that set only in the arch/arm/kernel/kprobes-test-thumb.c, before the unified.h is included?

I would like get this minor issue resolved in mainline, to make it easier for Andi to get his LTO work upstream and have it work with ARM.

Any suggestions are welcome.

Thanks,
-- Tim

P.S. For anyone interested, here are some stats about LTO from my testing on a kernel build for a pandaboard. Note that I was primarily interested in using LTO to reduce image size, for this project.

vmlinux.non-lto => vmlinux.lto

       baseline   other   change  percent
       --------   -----   ------  -------
 text:  5242000  4869340  -372660  -7%
 data:   490184   476200   -13984  -2%
  bss:   121824   122112      288   0%

total: 5854008 5467652 -386356 -6%

Kernel: non-lto lto
--------------------------- ------- --------

time for full build:            1m5.87s         3m22s
time for incremental build:     0m5.24s         2m12s
kernel image size:              5854008         5467652
compressed uImage size:         2849920         2694224
system meminfo MemTotal:        17804 kB        18188 kB
system meminfo MemFree:         11020 kB        11260 kB
boot time:                      2.466369        2.414428

=============================
Tim Bird
Architecture Group Chair, CE Workgroup of the Linux Foundation Senior Staff Engineer, Sony Network Entertainment
=============================

#1 lore raw
Quoted 98 lines · Tim Bird

Hi all,

A while ago I was working on supporting link-time optimization for ARM, and I'm just now getting around to submitting some of the patches from my work. I'll explain more below, but the executive summary is this: Andi Kleen's LTO patches for Linux almost work on ARM. I ran into one issue in arch/arm/include/asm/unified.h where various 'it'-related macros are expanding multiple times, in C context, and causing build errors.

As near as I can tell, these macros are not used except by arch/arm/kernel/kprobes-test-thumb.c (and most are not used at all).

When compiling with CONFIG_LTO=y, in Andi's 3.7.0 tree with LTO patches, I got the messages below:
-----------------------------------------------
...

  LD      drivers/tty/built-in.o
  LD      drivers/built-in.o
  LINK    vmlinux
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o

LDFINAL vmlinux.o
[Leaving LTRANS /tmp/ccsIMbQT.args]
[Leaving LTRANS vmlinux.o.ltrans.out]
In file included from /a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/include/uapi/linux/swab.h:269:0,

                 from :872:

/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c: In function 'wp512_process_buffer':
/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c:987:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] vmlinux.o.ltrans0.s: Assembler messages:
vmlinux.o.ltrans0.s:408: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:410: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:412: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:414: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:416: Error: Macro `itte' was already defined
vmlinux.o.ltrans0.s:418: Error: Macro `itet' was already defined
vmlinux.o.ltrans0.s:420: Error: Macro `itee' was already defined
vmlinux.o.ltrans0.s:422: Error: Macro `itttt' was already defined
vmlinux.o.ltrans0.s:424: Error: Macro `ittte' was already defined
vmlinux.o.ltrans0.s:426: Error: Macro `ittet' was already defined
vmlinux.o.ltrans0.s:428: Error: Macro `ittee' was already defined
vmlinux.o.ltrans0.s:430: Error: Macro `itett' was already defined
vmlinux.o.ltrans0.s:432: Error: Macro `itete' was already defined
vmlinux.o.ltrans0.s:434: Error: Macro `iteet' was already defined
vmlinux.o.ltrans0.s:436: Error: Macro `iteee' was already defined
vmlinux.o.ltrans0.s:968: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:970: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:972: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:974: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:976: Error: Macro `itte' was already defined
...
[Leaving LTRANS vmlinux.o.ltrans30.ltrans.o]
[Leaving LTRANS vmlinux.o.ltrans31.o]
[Leaving LTRANS vmlinux.o.ltrans31.ltrans.o] /a/home/tbird/work/auto-reduce/sony-yocto/lto-build2/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-sony-linux-gnueabi/gcc/arm-sony-linux-gnueabi/4.7.3/arm-sony-linux-gnueabi-ld: lto-wrapper failed
collect2: error: ld returned 1 exit status
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2

Error: Bad result 512, running "make -j 8 KALLSYMS_EXTRA_PASS=1 bzImage": (output follows) Error:
---------------------------------------------

The messages are repeated thousands of times (I'm guessing for every object file after the first that included arch/arm/include/asm/unified.h)

Recognizing that LTO is currently incompatible with kprobes, and (so far) finding that only kprobes appeared to use these macros, I did the following hack:

arch/arm/include/asm/unified.h +2 -0
index f5989f4..5179c13 100644
@@ -92,6 +92,7 @@
 	.macro	iteee, cond
 	.endm
 #else	/* !__ASSEMBLY__ */
+#ifndef CONFIG_LTO
 __asm__(
 "	.macro	it, cond\n"
 "	.endm\n"
@@ -123,6 +124,7 @@ __asm__(
 "	.endm\n"
 "	.macro	iteee, cond\n"
 "	.endm\n");
+#endif  /* ! CONFIG_LTO */
 #endif	/* __ASSEMBLY__ */
 
 #endif	/* CONFIG_ARM_ASM_UNIFIED */

This the macros thus removed, I had no problems building the kernel and running it on target.

Quoted 6 lines

While this works to remove the build error, it doesn't seem robust and I'd like to either 1) find a better way to make these macro definitions conditional, or 2) eliminate them completely.

The macros themselves seem empty. Can someone tell me what they do? What is the status of these macros? Are they even needed?

The names of the macros are for Thumb2 instructions which are redundant when building for the ARM instruction set. Newer toolchains which support the unified assembler syntax will effectively ignore them and I guess these empty macros are there so people can write assembler which will compile with older toolchains.

Quoted 3 lines

Could they be
made conditional on something like NEED_IT_MACROS, and then have that set only in the arch/arm/kernel/kprobes-test-thumb.c, before the unified.h is included?

That file needs the real Thumb2 instructions, not empty macros, and indeed it doesn't use them, because it is only compiled when CONFIG_THUMB2_KERNEL=y and that selects CONFIG_ARM_ASM_UNIFIED and those 'it' macro's are guarded by #ifndef CONFIG_ARM_ASM_UNIFIED.

Note, there are other files which use the 'it' instructions, e.g. arch/arm/include/asm/futex.h.

Quoted 4 lines

I would like get this minor issue resolved in mainline, to make it easier for Andi to get his LTO work upstream and have it work with ARM.

Any suggestions are welcome.

If your toolchain supports the unified assembler syntax, you could try enabling CONFIG_ARM_ASM_UNIFIED in ARM builds.

Signature · 1 line
Tixy
author
#2 lore raw
Quoted 22 lines · Jon Medhurst (Tixy)
Quoted 2 lines · Tim Bird

The macros themselves seem empty. Can someone tell me what they do? What is the status of these macros? Are they even needed?

The names of the macros are for Thumb2 instructions which are redundant when building for the ARM instruction set. Newer toolchains which support the unified assembler syntax will effectively ignore them and I guess these empty macros are there so people can write assembler which will compile with older toolchains.

Quoted 3 lines

Could they be
made conditional on something like NEED_IT_MACROS, and then have that set only in the arch/arm/kernel/kprobes-test-thumb.c, before the unified.h is included?

That file needs the real Thumb2 instructions, not empty macros, and indeed it doesn't use them, because it is only compiled when CONFIG_THUMB2_KERNEL=y and that selects CONFIG_ARM_ASM_UNIFIED and those 'it' macro's are guarded by #ifndef CONFIG_ARM_ASM_UNIFIED.

Note, there are other files which use the 'it' instructions, e.g. arch/arm/include/asm/futex.h.

Quoted 7 lines
Quoted 4 lines

I would like get this minor issue resolved in mainline, to make it easier for Andi to get his LTO work upstream and have it work with ARM.

Any suggestions are welcome.

If your toolchain supports the unified assembler syntax, you could try enabling CONFIG_ARM_ASM_UNIFIED in ARM builds.

Thanks very much! It may well be that any toolchain capable of supporting LTO will support the unified assembler syntax, in which case it would make sense for LTO to enable this, on ARM. I'll check it out.
-- Tim

=============================
Tim Bird
Architecture Group Chair, CE Workgroup of the Linux Foundation Senior Staff Engineer, Sony Network Entertainment
=============================

#3 lore raw
In reply to Jon Medhurst (Tixy)
Quoted 94 lines · Jon Medhurst (Tixy)
Quoted 93 lines · Tim Bird

Hi all,

A while ago I was working on supporting link-time optimization for ARM, and I'm just now getting around to submitting some of the patches from my work. I'll explain more below, but the executive summary is this: Andi Kleen's LTO patches for Linux almost work on ARM. I ran into one issue in arch/arm/include/asm/unified.h where various 'it'-related macros are expanding multiple times, in C context, and causing build errors.

As near as I can tell, these macros are not used except by arch/arm/kernel/kprobes-test-thumb.c (and most are not used at all).

When compiling with CONFIG_LTO=y, in Andi's 3.7.0 tree with LTO patches, I got the messages below:
-----------------------------------------------
...

  LD      drivers/tty/built-in.o
  LD      drivers/built-in.o
  LINK    vmlinux
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o

LDFINAL vmlinux.o
[Leaving LTRANS /tmp/ccsIMbQT.args]
[Leaving LTRANS vmlinux.o.ltrans.out]
In file included from /a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/include/uapi/linux/swab.h:269:0,

                 from :872:

/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c: In function 'wp512_process_buffer':
/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c:987:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] vmlinux.o.ltrans0.s: Assembler messages:
vmlinux.o.ltrans0.s:408: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:410: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:412: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:414: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:416: Error: Macro `itte' was already defined
vmlinux.o.ltrans0.s:418: Error: Macro `itet' was already defined
vmlinux.o.ltrans0.s:420: Error: Macro `itee' was already defined
vmlinux.o.ltrans0.s:422: Error: Macro `itttt' was already defined
vmlinux.o.ltrans0.s:424: Error: Macro `ittte' was already defined
vmlinux.o.ltrans0.s:426: Error: Macro `ittet' was already defined
vmlinux.o.ltrans0.s:428: Error: Macro `ittee' was already defined
vmlinux.o.ltrans0.s:430: Error: Macro `itett' was already defined
vmlinux.o.ltrans0.s:432: Error: Macro `itete' was already defined
vmlinux.o.ltrans0.s:434: Error: Macro `iteet' was already defined
vmlinux.o.ltrans0.s:436: Error: Macro `iteee' was already defined
vmlinux.o.ltrans0.s:968: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:970: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:972: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:974: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:976: Error: Macro `itte' was already defined
...
[Leaving LTRANS vmlinux.o.ltrans30.ltrans.o]
[Leaving LTRANS vmlinux.o.ltrans31.o]
[Leaving LTRANS vmlinux.o.ltrans31.ltrans.o] /a/home/tbird/work/auto-reduce/sony-yocto/lto-build2/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-sony-linux-gnueabi/gcc/arm-sony-linux-gnueabi/4.7.3/arm-sony-linux-gnueabi-ld: lto-wrapper failed
collect2: error: ld returned 1 exit status
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2

Error: Bad result 512, running "make -j 8 KALLSYMS_EXTRA_PASS=1 bzImage": (output follows) Error:
---------------------------------------------

The messages are repeated thousands of times (I'm guessing for every object file after the first that included arch/arm/include/asm/unified.h)

Recognizing that LTO is currently incompatible with kprobes, and (so far) finding that only kprobes appeared to use these macros, I did the following hack:

arch/arm/include/asm/unified.h +2 -0
index f5989f4..5179c13 100644
@@ -92,6 +92,7 @@
 	.macro	iteee, cond
 	.endm
 #else	/* !__ASSEMBLY__ */
+#ifndef CONFIG_LTO
 __asm__(
 "	.macro	it, cond\n"
 "	.endm\n"
@@ -123,6 +124,7 @@ __asm__(
 "	.endm\n"
 "	.macro	iteee, cond\n"
 "	.endm\n");
+#endif  /* ! CONFIG_LTO */
 #endif	/* __ASSEMBLY__ */
 
Quoted 8 lines
Quoted 8 lines
arch/arm/include/asm/unified.h +0 -0
 #endif	/* CONFIG_ARM_ASM_UNIFIED */

This the macros thus removed, I had no problems building the kernel and running it on target.

While this works to remove the build error, it doesn't seem robust and I'd like to either 1) find a better way to make these macro definitions conditional, or 2) eliminate them completely.

This is one instance of a more general problem: anything in an asm() which alters the state of the assembler is potentially unsafe when we start attempting to merge compilation units together before passing them through the assembler, because GCC does not take these side effects into account at all.

This feels like a potential problem for every arch if my understanding is correct. But how much it hurts will depend to some extent on how asm() is used in arch-specific headers.

LTO may completely reorder / remove stuff at external scope, so every toplevel asm needs careful scrutiny, as does any code anywhere using directives which permanently change the assembler state (like .arch etc.) ... otherwise we could end up with half the kernel assembled using the wrong CPU or arch settings, because a random C file somewhere happened to override them using asm directives.

An nasty hack which might work would be to add primitive multi-definition prevention like

	.ifndef .L__UNIFIED_H_INCLUDED
	.equ .L__UNIFIED_H_INCLUDED
	
	.macro it cond
	.endm

	@ ...

	.endif

This only works because we know the macro definitions are supposed to be the same everywhere.

(.L__UNIFIED_H_INCLUDED is anything sufficiently verbose to avoid clashes with any custom or compiler-generated local symbol. This symbol will leak between compilation units too, but providing it doesn't clash with anything emitted by the compiler, that shouldn't matter. Because of the .L prefix, gas will not emit the symbol in its output by default)

If LTO inlines some affected code before the first top-level asm arising from unified.h then you still lose :( AFAIK there's no guarantee it won't, unless you pass -fno-toplevel-reorder, but I believe that has undesirable side-effects, and somewhat defeats the idea of LTO.)

Two slightly more correct fixes I can think of:

1) Get of the "it" .macros for C files, as you suggested. We can provide C macros which provide equivalent functionality at the expense of ugliness and non-standard syntax. Since the use of these is so rare, that could be acceptable.

For example:

#ifdef CONFIG_ARM_ASM_UNIFIED
#define U(x...) x
#else
#define U(x...)
#endif

	asm (
	 U(	"itee	eq\n\t"		)
		"moveq	%0, %2\n\t"
		"movne	%0, %3\n\t"
		"movne	%1, #1"
	);

(Silly example, but you get the idea)

.S files won't be LTO'd, so we can keep the macros there, conditional on #ifdef __ASSEMBLY__, at least allowing the illusion of compliant assembler syntax to be preserved.

2) Eliminate the toplevel asms for any compilation unit which will be subjected to LTO, and re-inject them when assembling the LTO output, or to inject them only when running the assembler. Since the assembler has no mechanism like the gcc -include option, that might require wrapping the assembler in a script, which might slow down compilation noticeably, depending on how many times the assembler is invoked. I guess LTO reduces the number of actual assembler invocations rather significantly, though -- perhaps we would only do this when LTO is enabled.

This all feels complex and impractical, though.

Quoted 12 lines
Quoted 3 lines

The macros themselves seem empty. Can someone tell me what they do? What is the status of these macros? Are they even needed?

The names of the macros are for Thumb2 instructions which are redundant when building for the ARM instruction set. Newer toolchains which support the unified assembler syntax will effectively ignore them and I guess these empty macros are there so people can write assembler which will compile with older toolchains.

Quoted 2 lines

Could they be
made conditional on something like NEED_IT_MACROS, and then have that set only

This wouldn't solve the problem unless there is only ever one C file in the entire kernel built with that define. Even it it were true today, it might not be true tomorrow.

Quoted 9 lines
Quoted 1 line

in the arch/arm/kernel/kprobes-test-thumb.c, before the unified.h is included?

That file needs the real Thumb2 instructions, not empty macros, and indeed it doesn't use them, because it is only compiled when CONFIG_THUMB2_KERNEL=y and that selects CONFIG_ARM_ASM_UNIFIED and those 'it' macro's are guarded by #ifndef CONFIG_ARM_ASM_UNIFIED.

Note, there are other files which use the 'it' instructions, e.g. arch/arm/include/asm/futex.h.

For code which might be built using either the ARM or Thumb instruction set (which is most of the kernel) the "it" directives are required in certain situations as part of the assembler syntax. Just because a particular one is not needed right now does not mean some assembler that gets written tomorrow won't need it. gas can guess correctly which IT instructions to insert most of the time, but there are some situations where it's necessary to override the default guess, such as when a location in the middle of a conditional sequence is a branch target.

Unfortunately, gas chokes on those directives in non-unified syntax, so we have to make them disappear using macros... hence the problem.

Quoted 8 lines
Quoted 5 lines

I would like get this minor issue resolved in mainline, to make it easier for Andi to get his LTO work upstream and have it work with ARM.

Any suggestions are welcome.

If your toolchain supports the unified assembler syntax, you could try enabling CONFIG_ARM_ASM_UNIFIED in ARM builds.

This is the easiest fix for the immediate issue would be OK if older toolchains are not LTO-capable anyway, providing there are no old boards which this would break etc.

It doesn't solve any of the other problems with LTO and toplevel asm(), so we'd still need to be vigilant about those.

Cheers
---Dave

author
#4 lore raw
In reply to Jon Medhurst (Tixy)
Quoted 124 lines · Jon Medhurst (Tixy)
Quoted 98 lines · Tim Bird

Hi all,

A while ago I was working on supporting link-time optimization for ARM, and I'm just now getting around to submitting some of the patches from my work. I'll explain more below, but the executive summary is this: Andi Kleen's LTO patches for Linux almost work on ARM. I ran into one issue in arch/arm/include/asm/unified.h where various 'it'-related macros are expanding multiple times, in C context, and causing build errors.

As near as I can tell, these macros are not used except by arch/arm/kernel/kprobes-test-thumb.c (and most are not used at all).

When compiling with CONFIG_LTO=y, in Andi's 3.7.0 tree with LTO patches, I got the messages below:
-----------------------------------------------
...

  LD      drivers/tty/built-in.o
  LD      drivers/built-in.o
  LINK    vmlinux
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o

LDFINAL vmlinux.o
[Leaving LTRANS /tmp/ccsIMbQT.args]
[Leaving LTRANS vmlinux.o.ltrans.out]
In file included from /a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/include/uapi/linux/swab.h:269:0,

                 from :872:

/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c: In function 'wp512_process_buffer':
/a/home/tbird/work/auto-reduce/lto-work/linux-misc-andi-kleen/crypto/wp512.c:987:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] vmlinux.o.ltrans0.s: Assembler messages:
vmlinux.o.ltrans0.s:408: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:410: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:412: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:414: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:416: Error: Macro `itte' was already defined
vmlinux.o.ltrans0.s:418: Error: Macro `itet' was already defined
vmlinux.o.ltrans0.s:420: Error: Macro `itee' was already defined
vmlinux.o.ltrans0.s:422: Error: Macro `itttt' was already defined
vmlinux.o.ltrans0.s:424: Error: Macro `ittte' was already defined
vmlinux.o.ltrans0.s:426: Error: Macro `ittet' was already defined
vmlinux.o.ltrans0.s:428: Error: Macro `ittee' was already defined
vmlinux.o.ltrans0.s:430: Error: Macro `itett' was already defined
vmlinux.o.ltrans0.s:432: Error: Macro `itete' was already defined
vmlinux.o.ltrans0.s:434: Error: Macro `iteet' was already defined
vmlinux.o.ltrans0.s:436: Error: Macro `iteee' was already defined
vmlinux.o.ltrans0.s:968: Error: Macro `it' was already defined
vmlinux.o.ltrans0.s:970: Error: Macro `itt' was already defined
vmlinux.o.ltrans0.s:972: Error: Macro `ite' was already defined
vmlinux.o.ltrans0.s:974: Error: Macro `ittt' was already defined
vmlinux.o.ltrans0.s:976: Error: Macro `itte' was already defined
...
[Leaving LTRANS vmlinux.o.ltrans30.ltrans.o]
[Leaving LTRANS vmlinux.o.ltrans31.o]
[Leaving LTRANS vmlinux.o.ltrans31.ltrans.o] /a/home/tbird/work/auto-reduce/sony-yocto/lto-build2/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-sony-linux-gnueabi/gcc/arm-sony-linux-gnueabi/4.7.3/arm-sony-linux-gnueabi-ld: lto-wrapper failed
collect2: error: ld returned 1 exit status
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2

Error: Bad result 512, running "make -j 8 KALLSYMS_EXTRA_PASS=1 bzImage": (output follows) Error:
---------------------------------------------

The messages are repeated thousands of times (I'm guessing for every object file after the first that included arch/arm/include/asm/unified.h)

Recognizing that LTO is currently incompatible with kprobes, and (so far) finding that only kprobes appeared to use these macros, I did the following hack:

arch/arm/include/asm/unified.h +2 -0
index f5989f4..5179c13 100644
@@ -92,6 +92,7 @@
 	.macro	iteee, cond
 	.endm
 #else	/* !__ASSEMBLY__ */
+#ifndef CONFIG_LTO
 __asm__(
 "	.macro	it, cond\n"
 "	.endm\n"
@@ -123,6 +124,7 @@ __asm__(
 "	.endm\n"
 "	.macro	iteee, cond\n"
 "	.endm\n");
+#endif  /* ! CONFIG_LTO */
 #endif	/* __ASSEMBLY__ */
 
 #endif	/* CONFIG_ARM_ASM_UNIFIED */

This the macros thus removed, I had no problems building the kernel and running it on target.

Quoted 6 lines

While this works to remove the build error, it doesn't seem robust and I'd like to either 1) find a better way to make these macro definitions conditional, or 2) eliminate them completely.

The macros themselves seem empty. Can someone tell me what they do? What is the status of these macros? Are they even needed?

The names of the macros are for Thumb2 instructions which are redundant when building for the ARM instruction set. Newer toolchains which support the unified assembler syntax will effectively ignore them and I guess these empty macros are there so people can write assembler which will compile with older toolchains.

Quoted 3 lines

Could they be
made conditional on something like NEED_IT_MACROS, and then have that set only in the arch/arm/kernel/kprobes-test-thumb.c, before the unified.h is included?

That file needs the real Thumb2 instructions, not empty macros, and indeed it doesn't use them, because it is only compiled when CONFIG_THUMB2_KERNEL=y and that selects CONFIG_ARM_ASM_UNIFIED and those 'it' macro's are guarded by #ifndef CONFIG_ARM_ASM_UNIFIED.

Note, there are other files which use the 'it' instructions, e.g. arch/arm/include/asm/futex.h.

Quoted 8 lines
Quoted 4 lines

I would like get this minor issue resolved in mainline, to make it easier for Andi to get his LTO work upstream and have it work with ARM.

Any suggestions are welcome.

If your toolchain supports the unified assembler syntax, you could try enabling CONFIG_ARM_ASM_UNIFIED in ARM builds.

Well, I came up with the patch below, but it doesn't feel right. There must be a better way to select an arch-specific config variable. It seems goofy to add this to the general init/Kconfig LTO option. Any better suggestions for how to do this?

When LTO is turned on for the ARM architecture, the macros in arch/arm/include/asm/unified.h get included multiple times in the global build, causing build errors. Avoid this by turning on CONFIG_ARM_ASM_UNIFIED. Unfortunately, this causes another set of errors from .S files about 'conditional infixes are deprecated'. This commit also avoids that warning, by turning off the warning in the flags to the toolchain (when CONFIG_ARM_ASM_UNIFIED=y).

---
 arch/arm/Makefile |    5 ++++-
 init/Kconfig      |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/Makefile +4 -1
index 5f914fc..ac3f9a8 100644
@@ -110,7 +110,10 @@ ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
 CFLAGS_MODULE	+=-fno-optimize-sibling-calls
 endif
 else
-CFLAGS_ISA	:=$(call cc-option,-marm,)
+ifeq ($(CONFIG_ARM_ASM_UNIFIED),y)
+AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
+endif
+CFLAGS_ISA	:=$(call cc-option,-marm,) $(AFLAGS_NOWARN)
 AFLAGS_ISA	:=$(CFLAGS_ISA)
 endif
 
init/Kconfig +1 -0
index 33090d8..b586be9 100644
@@ -1164,6 +1164,7 @@ config LTO_DISABLE
 config LTO
 	bool
 	default y
+	select ARM_ASM_UNIFIED
 	depends on LTO_MENU && !LTO_DISABLE
 
 config LTO_DEBUG
Signature · 7 lines
1.7.9.5

=============================
Tim Bird
Architecture Group Chair, CE Workgroup of the Linux Foundation
Senior Staff Engineer, Sony Network Entertainment
=============================