Commit 6760b109603c794e4bd281c0014fef069c019b6a

Authored by Russell King
1 parent 4dfa33868d

ARM: fix vmlinux.lds.S discarding sections

We are seeing linker errors caused by sections being discarded, despite
the linker script trying to keep them.  The result is (eg):

`.exit.text' referenced in section `.alt.smp.init' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
`.exit.text' referenced in section `.alt.smp.init' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o

This is the relevent part of the linker script (reformatted to make it
clearer):
| SECTIONS
| {
| /*
| * unwind exit sections must be discarded before the rest of the
| * unwind sections get included.
| */
| /DISCARD/ : {
| *(.ARM.exidx.exit.text)
| *(.ARM.extab.exit.text)
| }
| ...
| .exit.text : {
| *(.exit.text)
| *(.memexit.text)
| }
| ...
| /DISCARD/ : {
| *(.exit.text)
| *(.memexit.text)
| *(.exit.data)
| *(.memexit.data)
| *(.memexit.rodata)
| *(.exitcall.exit)
| *(.discard)
| *(.discard.*)
| }
| }

Now, this is what the linker manual says about discarded output sections:

|    The special output section name `/DISCARD/' may be used to discard
| input sections.  Any input sections which are assigned to an output
| section named `/DISCARD/' are not included in the output file.

No questions, no exceptions. It doesn't say "unless they are listed
before the /DISCARD/ section." Now, this is what asn-generic/vmlinux.lds.S
says:
| /*
|  * Default discarded sections.
|  *
|  * Some archs want to discard exit text/data at runtime rather than
|  * link time due to cross-section references such as alt instructions,
|  * bug table, eh_frame, etc. DISCARDS must be the last of output
|  * section definitions so that such archs put those in earlier section
|  * definitions.
|  */

And guess what - the list _always_ includes .exit.text etc.

Now, what's actually happening is that the linker is reading the script,
and it finds the first /DISCARD/ output section at the beginning of the
script. It continues reading the script, and finds the 'DISCARD' macro
at the end, which having been postprocessed results in another
/DISCARD/ output section. As the linker already contains the earlier
/DISCARD/ output section, it adds it to that existing section, so it
effectively is placed at the start. This can be seen by using the -M
option to ld:

| Linker script and memory map
|
|                 0xc037c080                jiffies = jiffies_64
|
| /DISCARD/
|  *(.ARM.exidx.exit.text)
|  *(.ARM.extab.exit.text)
|  *(.exit.text)
|  *(.memexit.text)
|  *(.exit.data)
|  *(.memexit.data)
|  *(.memexit.rodata)
|  *(.exitcall.exit)
|  *(.discard)
|  *(.discard.*)
|
|                 0xc0008000                . = 0xc0008000
|
| .head.text      0xc0008000      0x1d0
|                 0xc0008000                _text = .
|  *(.head.text)
|  .head.text     0xc0008000      0x1d0 arch/arm/kernel/head.o
|                 0xc0008000                stext
|
| .text           0xc0008200   0x2d78d0
|                 0xc0008200                _stext = .
|                 0xc0008200                __exception_text_start = .
|  *(.exception.text)
|  .exception.text
| ...

As you can see, all the discarded sections are grouped together - and
as a result of it being the first output section, they all appear before
any other section.

The result is that not only is the unwind information discarded (as
intended), but also the .exit.text, despite us wanting to have the
.exit.text preserved.

We can't move the unwind information elsewhere, because it'll then be
included even when we do actually discard the .exit.text (and similar)
sections.

So, work around this by avoiding the generic DISCARDS macro, and instead
conditionalize the sections to be discarded ourselves.  This avoids the
ambiguity in how the linker assigns input sections to output sections,
making our script less dependent on undocumented linker behaviour.

Reported-by: Rob Herring <robherring2@gmail.com>
Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 12 additions and 3 deletions Side-by-side Diff

arch/arm/kernel/vmlinux.lds.S
... ... @@ -23,8 +23,10 @@
23 23  
24 24 #if defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)
25 25 #define ARM_EXIT_KEEP(x) x
  26 +#define ARM_EXIT_DISCARD(x)
26 27 #else
27 28 #define ARM_EXIT_KEEP(x)
  29 +#define ARM_EXIT_DISCARD(x) x
28 30 #endif
29 31  
30 32 OUTPUT_ARCH(arm)
... ... @@ -39,6 +41,11 @@
39 41 SECTIONS
40 42 {
41 43 /*
  44 + * XXX: The linker does not define how output sections are
  45 + * assigned to input sections when there are multiple statements
  46 + * matching the same input section name. There is no documented
  47 + * order of matching.
  48 + *
42 49 * unwind exit sections must be discarded before the rest of the
43 50 * unwind sections get included.
44 51 */
... ... @@ -47,6 +54,9 @@
47 54 *(.ARM.extab.exit.text)
48 55 ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))
49 56 ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))
  57 + ARM_EXIT_DISCARD(EXIT_TEXT)
  58 + ARM_EXIT_DISCARD(EXIT_DATA)
  59 + EXIT_CALL
50 60 #ifndef CONFIG_HOTPLUG
51 61 *(.ARM.exidx.devexit.text)
52 62 *(.ARM.extab.devexit.text)
... ... @@ -58,6 +68,8 @@
58 68 #ifndef CONFIG_SMP_ON_UP
59 69 *(.alt.smp.init)
60 70 #endif
  71 + *(.discard)
  72 + *(.discard.*)
61 73 }
62 74  
63 75 #ifdef CONFIG_XIP_KERNEL
... ... @@ -279,9 +291,6 @@
279 291  
280 292 STABS_DEBUG
281 293 .comment 0 : { *(.comment) }
282   -
283   - /* Default discards */
284   - DISCARDS
285 294 }
286 295  
287 296 /*