* [PATCH]x86: make relocatable kernel work with new binutils -resend
@ 2011-01-17 2:46 Shaohua Li
2011-01-17 10:17 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Shaohua Li @ 2011-01-17 2:46 UTC (permalink / raw)
To: lkml; +Cc: Andrew Morton, hpa@zytor.com, Lu, Hongjiu, Huang, Ying,
Ingo Molnar
last post is lost, resend it.
The CONFIG_RELOCATABLE is broken with new binutils, which will make boot
panic. According to Lu Hongjiu, the affected binutils are from
2.20.51.0.12 to 2.21.51.0.3, which are release since Oct 22 this year.
At least ubuntu 10.10 is using such binutils. see:
http://sourceware.org/bugzilla/show_bug.cgi?id=12327
The reason of boot panic is we have 'jiffies = jiffies_64;' in
vmlinux.lds.S. The jiffies isn't in any section. In kernel build, there
is warning saying jiffies is an absolute address and can't be
relocatable. At runtime, jiffies will have virtual address 0.
Signed-off-by: Shaohua Li<shaohua.li@intel.com>
---
arch/x86/kernel/vmlinux.lds.S | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: linux/arch/x86/kernel/vmlinux.lds.S
===================================================================
--- linux.orig/arch/x86/kernel/vmlinux.lds.S 2011-01-17 09:13:58.000000000 +0800
+++ linux/arch/x86/kernel/vmlinux.lds.S 2011-01-17 09:58:28.000000000 +0800
@@ -34,11 +34,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
-jiffies = jiffies_64;
#else
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)
-jiffies_64 = jiffies;
#endif
#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
@@ -142,6 +140,11 @@ SECTIONS
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
DATA_DATA
+#ifdef CONFIG_X86_32
+ jiffies = jiffies_64;
+#else
+ jiffies_64 = jiffies;
+#endif
CONSTRUCTORS
/* rarely changed data like cpu maps */
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH]x86: make relocatable kernel work with new binutils -resend
2011-01-17 2:46 [PATCH]x86: make relocatable kernel work with new binutils -resend Shaohua Li
@ 2011-01-17 10:17 ` Ingo Molnar
2011-01-18 0:57 ` Shaohua Li
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2011-01-17 10:17 UTC (permalink / raw)
To: Shaohua Li; +Cc: lkml, Andrew Morton, hpa@zytor.com, Lu, Hongjiu, Huang, Ying
* Shaohua Li <shaohua.li@intel.com> wrote:
> @@ -142,6 +140,11 @@ SECTIONS
> CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
>
> DATA_DATA
> +#ifdef CONFIG_X86_32
> + jiffies = jiffies_64;
> +#else
> + jiffies_64 = jiffies;
> +#endif
I suspect this needs a comment, as to the unsuspecting reader it looks like black
magic :-)
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH]x86: make relocatable kernel work with new binutils -resend
2011-01-17 10:17 ` Ingo Molnar
@ 2011-01-18 0:57 ` Shaohua Li
2011-01-18 8:05 ` Ingo Molnar
2011-01-18 8:49 ` [tip:x86/urgent] x86: Make relocatable kernel work with new binutils tip-bot for Shaohua Li
0 siblings, 2 replies; 5+ messages in thread
From: Shaohua Li @ 2011-01-18 0:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: lkml, Andrew Morton, hpa@zytor.com, Lu, Hongjiu, Huang, Ying
On Mon, 2011-01-17 at 18:17 +0800, Ingo Molnar wrote:
> * Shaohua Li <shaohua.li@intel.com> wrote:
>
> > @@ -142,6 +140,11 @@ SECTIONS
> > CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
> >
> > DATA_DATA
> > +#ifdef CONFIG_X86_32
> > + jiffies = jiffies_64;
> > +#else
> > + jiffies_64 = jiffies;
> > +#endif
>
> I suspect this needs a comment, as to the unsuspecting reader it looks like black
> magic :-)
does this one look better?
The CONFIG_RELOCATABLE is broken with new binutils, which will make boot
panic. According to Lu Hongjiu, the affected binutils are from
2.20.51.0.12 to 2.21.51.0.3, which are release since Oct 22 this year.
At least ubuntu 10.10 is using such binutils. see:
http://sourceware.org/bugzilla/show_bug.cgi?id=12327
The reason of boot panic is we have 'jiffies = jiffies_64;' in
vmlinux.lds.S. The jiffies isn't in any section. In kernel build, there
is warning saying jiffies is an absolute address and can't be
relocatable. At runtime, jiffies will have virtual address 0.
Signed-off-by: Shaohua Li<shaohua.li@intel.com>
---
arch/x86/kernel/vmlinux.lds.S | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
Index: linux/arch/x86/kernel/vmlinux.lds.S
===================================================================
--- linux.orig/arch/x86/kernel/vmlinux.lds.S 2011-01-18 08:32:22.000000000 +0800
+++ linux/arch/x86/kernel/vmlinux.lds.S 2011-01-18 08:57:09.000000000 +0800
@@ -34,11 +34,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
-jiffies = jiffies_64;
#else
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)
-jiffies_64 = jiffies;
#endif
#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
@@ -142,6 +140,15 @@ SECTIONS
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
DATA_DATA
+ /*
+ * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug.
+ * This makes jiffies relocatable in such binutils
+ */
+#ifdef CONFIG_X86_32
+ jiffies = jiffies_64;
+#else
+ jiffies_64 = jiffies;
+#endif
CONSTRUCTORS
/* rarely changed data like cpu maps */
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH]x86: make relocatable kernel work with new binutils -resend
2011-01-18 0:57 ` Shaohua Li
@ 2011-01-18 8:05 ` Ingo Molnar
2011-01-18 8:49 ` [tip:x86/urgent] x86: Make relocatable kernel work with new binutils tip-bot for Shaohua Li
1 sibling, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2011-01-18 8:05 UTC (permalink / raw)
To: Shaohua Li; +Cc: lkml, Andrew Morton, hpa@zytor.com, Lu, Hongjiu, Huang, Ying
* Shaohua Li <shaohua.li@intel.com> wrote:
> On Mon, 2011-01-17 at 18:17 +0800, Ingo Molnar wrote:
> > * Shaohua Li <shaohua.li@intel.com> wrote:
> >
> > > @@ -142,6 +140,11 @@ SECTIONS
> > > CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
> > >
> > > DATA_DATA
> > > +#ifdef CONFIG_X86_32
> > > + jiffies = jiffies_64;
> > > +#else
> > > + jiffies_64 = jiffies;
> > > +#endif
> >
> > I suspect this needs a comment, as to the unsuspecting reader it looks like black
> > magic :-)
>
> does this one look better?
Yeah, thanks!
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:x86/urgent] x86: Make relocatable kernel work with new binutils
2011-01-18 0:57 ` Shaohua Li
2011-01-18 8:05 ` Ingo Molnar
@ 2011-01-18 8:49 ` tip-bot for Shaohua Li
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Shaohua Li @ 2011-01-18 8:49 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, sam, hongjiu.lu, shaohua.li, ying.huang,
tglx, mingo
Commit-ID: 86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf
Gitweb: http://git.kernel.org/tip/86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf
Author: Shaohua Li <shaohua.li@intel.com>
AuthorDate: Tue, 18 Jan 2011 08:57:49 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 18 Jan 2011 09:05:33 +0100
x86: Make relocatable kernel work with new binutils
The CONFIG_RELOCATABLE=y option is broken with new binutils, which will make
boot panic.
According to Lu Hongjiu, the affected binutils are from 2.20.51.0.12 to
2.21.51.0.3, which are release since Oct 22 this year. At least ubuntu 10.10 is
using such binutils. See:
http://sourceware.org/bugzilla/show_bug.cgi?id=12327
The reason of the boot panic is that we have 'jiffies = jiffies_64;' in
vmlinux.lds.S. The jiffies isn't in any section. In kernel build, there is
warning saying jiffies is an absolute address and can't be relocatable. At
runtime, jiffies will have virtual address 0.
Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Cc: Lu Hongjiu<hongjiu.lu@intel.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
LKML-Reference: <1295312269.1949.725.camel@sli10-conroe>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/vmlinux.lds.S | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bf47007..b34ab80 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -34,11 +34,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
-jiffies = jiffies_64;
#else
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)
-jiffies_64 = jiffies;
#endif
#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
@@ -142,6 +140,15 @@ SECTIONS
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
DATA_DATA
+ /*
+ * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug.
+ * This makes jiffies relocatable in such binutils
+ */
+#ifdef CONFIG_X86_32
+ jiffies = jiffies_64;
+#else
+ jiffies_64 = jiffies;
+#endif
CONSTRUCTORS
/* rarely changed data like cpu maps */
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-18 8:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-17 2:46 [PATCH]x86: make relocatable kernel work with new binutils -resend Shaohua Li
2011-01-17 10:17 ` Ingo Molnar
2011-01-18 0:57 ` Shaohua Li
2011-01-18 8:05 ` Ingo Molnar
2011-01-18 8:49 ` [tip:x86/urgent] x86: Make relocatable kernel work with new binutils tip-bot for Shaohua Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.