From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, linux-kbuild@vger.kernel.org, mmarek@suse.cz,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 04/19] lto, workaround: Add workaround for initcall reordering
Date: Fri, 14 Feb 2014 22:21:28 +0100 [thread overview]
Message-ID: <1392412903-25733-5-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1392412903-25733-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Work around a LTO gcc problem: when there is no reference to a variable
in a module it will be moved to the end of the program. This causes
reordering of initcalls which the kernel does not like.
Add a dummy reference function to avoid this. The function is
deleted by the linker.
This replaces a previous much slower workaround.
Thanks to Honza Hubicka for suggesting this technique.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
include/linux/init.h | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/include/linux/init.h b/include/linux/init.h
index e168880..a3ba270 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -163,6 +163,23 @@ extern bool initcall_debug;
#ifndef __ASSEMBLY__
+#ifdef CONFIG_LTO
+/* Work around a LTO gcc problem: when there is no reference to a variable
+ * in a module it will be moved to the end of the program. This causes
+ * reordering of initcalls which the kernel does not like.
+ * Add a dummy reference function to avoid this. The function is
+ * deleted by the linker.
+ */
+#define LTO_REFERENCE_INITCALL(x) \
+ ; /* yes this is needed */ \
+ static __used __exit void *reference_##x(void) \
+ { \
+ return &x; \
+ }
+#else
+#define LTO_REFERENCE_INITCALL(x)
+#endif
+
/* initcalls are now grouped by functionality into separate
* subsections. Ordering inside the subsections is determined
* by link order.
@@ -175,7 +192,8 @@ extern bool initcall_debug;
#define __define_initcall(fn, id) \
static initcall_t __initcall_##fn##id __used \
- __attribute__((__section__(".initcall" #id ".init"))) = fn
+ __attribute__((__section__(".initcall" #id ".init"))) = fn; \
+ LTO_REFERENCE_INITCALL(__initcall_##fn##id)
/*
* Early initcalls run before initializing SMP.
--
1.8.5.2
next prev parent reply other threads:[~2014-02-14 21:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 21:21 Updated Link-Time-Optimization patchkit Andi Kleen
2014-02-14 21:21 ` [PATCH 01/19] x86, lto: Disable LTO for the x86 VDSO Andi Kleen
2014-02-15 21:26 ` Sam Ravnborg
2014-02-14 21:21 ` [PATCH 02/19] lto: Disable LTO for hweight functions Andi Kleen
2014-02-14 21:21 ` [PATCH 03/19] lto: Make asmlinkage __visible Andi Kleen
2014-02-15 21:28 ` Sam Ravnborg
2014-02-14 21:21 ` Andi Kleen [this message]
2014-02-14 21:21 ` [PATCH 05/19] lto: Handle LTO common symbols in module loader Andi Kleen
2014-02-14 21:21 ` [PATCH 06/19] lto: Disable LTO for sys_ni Andi Kleen
2014-02-14 21:21 ` [PATCH 07/19] lto: Don't let LATENCYTOP and LOCKDEP select KALLSYMS_ALL Andi Kleen
2014-02-14 21:21 ` [PATCH 08/19] Kbuild, lto, workaround: Don't warn for initcall_reference in modpost Andi Kleen
2014-02-15 21:36 ` Sam Ravnborg
2014-02-14 21:21 ` [PATCH 09/19] Kbuild, lto: Drop .number postfixes " Andi Kleen
2014-02-14 21:21 ` [PATCH 10/19] Kbuild, lto: add ld-version and ld-ifversion macros Andi Kleen
2014-02-15 21:32 ` Sam Ravnborg
2014-02-14 21:21 ` [PATCH 11/19] Kbuild, lto: Add a gcc-ld script to let run gcc as ld Andi Kleen
2014-02-14 21:21 ` [PATCH 12/19] Kbuild, lto: Disable LTO for asm-offsets.c Andi Kleen
2014-02-14 21:21 ` [PATCH 13/19] Kbuild, lto: Set TMPDIR for LTO v2 Andi Kleen
2014-02-14 21:21 ` [PATCH 14/19] Kbuild, lto: Handle basic LTO in modpost Andi Kleen
2014-02-15 21:35 ` Sam Ravnborg
2014-02-14 21:21 ` [PATCH 15/19] Kbuild, lto: Fix single pass kallsyms for LTO Andi Kleen
2014-02-14 21:21 ` [PATCH 16/19] Kbuild, lto: Add Link Time Optimization support v2 Andi Kleen
2014-02-14 21:21 ` [PATCH 17/19] lto: Mark spinlocks noinline when inline spinlocks are disabled Andi Kleen
2014-02-14 21:21 ` [PATCH 18/19] lto, module: Warn about modules that are not fully LTOed Andi Kleen
2014-02-14 21:21 ` [PATCH 19/19] lto: Don't inline __const_udelay Andi Kleen
2014-02-15 13:38 ` Updated Link-Time-Optimization patchkit Markus Trippelsdorf
2014-02-15 17:44 ` Andi Kleen
2014-02-15 18:41 ` H.J. Lu
2014-02-15 21:24 ` Sam Ravnborg
2014-02-16 3:35 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392412903-25733-5-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox