mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [x86/mm] vsyscall_fn fault in early startup
@ 2008-01-11  7:21 Roland McGrath
  2008-01-11  7:40 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: Roland McGrath @ 2008-01-11  7:21 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: H. Peter Anvin, Thomas Gleixner, linux-kernel

I bisected my startup problem down to:

	197e4989b0404996dfe3ab091c1398e4c2813d44 is first bad commit
	commit 197e4989b0404996dfe3ab091c1398e4c2813d44
	Author: Ingo Molnar <mingo@elte.hu>
	Date:   Wed Jan 9 13:31:06 2008 +0100

	    x86: mark native_read_tsc() as __vsyscall_fn

	    Andi Kleen reported the following breakage: the 64-bit vdso faulted
	    because native_read_tsc() is not a vsyscall-fn. Mark it as such.

	    Signed-off-by: Ingo Molnar <mingo@elte.hu>

Without that commit, it gets past early startup and boots fine,
but of course then init crashes in the vDSO just as Andi reported.

Apparently this one:

	commit 715cf488c640ef4bed6c971660251d8d6cba4fbb
	Author: Ingo Molnar <mingo@elte.hu>
	Date:   Wed Jan 9 13:31:06 2008 +0100

	    x86: map vsyscalls early enough

	    map vsyscalls early enough. This is important if a __vsyscall_fn
	    function is used by other kernel code too.

	    Signed-off-by: Ingo Molnar <mingo@elte.hu>

is not really doing its job.  It's not early enough for the use I'm hitting.

Thanks to qemu-gdbserver, I have this handy backtrace for the early startup
case even though it dies too hard to print one.  
0xffffffffff60010d is really &native_read_tsc+0 though gdb reports the name
of the preceding symbol (vread_tsc).

   #0  early_idt_handler ()
       at /home/roland/redhat/linux/2.6/arch/x86/kernel/head_64.S:289
   #1  0x0000000000000010 in ?? ()
   #2  0xffffffffff60010d in vread_tsc ()
       at /home/roland/redhat/linux/2.6/arch/x86/kernel/tsc_64.c:308
   #3  0xffffffff80258cec in __lock_acquire (lock=0xffffffff806f4bf8, 
       subclass=0, trylock=0, read=0, check=2, hardirqs_off=1, 
       ip=18446744071564512884)
       at /home/roland/redhat/linux/2.6/kernel/lockdep.c:2416
   #4  0xffffffff802598f2 in lock_acquire (lock=0xffffffff806ea460, subclass=1, 
       trylock=3340, read=131072, check=-1, ip=18446744071564405679)
       at /home/roland/redhat/linux/2.6/kernel/lockdep.c:2703
   #5  0xffffffff8054de4f in _spin_lock (lock=0xffffffff806f4be0)
       at /home/roland/redhat/linux/2.6/kernel/spinlock.c:180
   #6  0xffffffff80254e74 in clockevents_register_notifier (
       nb=0xffffffff806f4c80)
       at /home/roland/redhat/linux/2.6/kernel/time/clockevents.c:114
   #7  0xffffffff807dc1f4 in tick_init ()
       at /home/roland/redhat/linux/2.6/kernel/time/tick-common.c:390
   #8  0xffffffff807c9811 in start_kernel ()
       at /home/roland/redhat/linux/2.6/init/main.c:531
   #9  0xffffffff807c9110 in x86_64_start_kernel (
       real_mode_data=0x92dc0 <Address 0x92dc0 out of bounds>)
       at /home/roland/redhat/linux/2.6/arch/x86/kernel/head64.c:73

So with lockdep et al turned on, tick_init leads to native_read_tsc.
setup_arch is after tick_init, so not early enough.  

I don't know if map_vsyscall needs too much stuff to come much earlier than
it is.  

It might be best just to let native_read_tsc be inlined ;-)


Thanks,
Roland

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [x86/mm] vsyscall_fn fault in early startup
  2008-01-11  7:21 [x86/mm] vsyscall_fn fault in early startup Roland McGrath
@ 2008-01-11  7:40 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-01-11  7:40 UTC (permalink / raw)
  To: Roland McGrath; +Cc: H. Peter Anvin, Thomas Gleixner, linux-kernel


* Roland McGrath <roland@redhat.com> wrote:

> I bisected my startup problem down to:

i fixed this in my tree yesterday but was held up by another problem 
from uploading it. The patch below should apply to the tree you have.

	Ingo

-------------->
Subject: x86: fix sched_clock()
From: Ingo Molnar <mingo@elte.hu>

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/rtc.c |   12 ------------
 include/asm-x86/msr.h |   11 ++++++++++-
 2 files changed, 10 insertions(+), 13 deletions(-)

Index: linux-x86.q/arch/x86/kernel/rtc.c
===================================================================
--- linux-x86.q.orig/arch/x86/kernel/rtc.c
+++ linux-x86.q/arch/x86/kernel/rtc.c
@@ -195,15 +195,3 @@ int update_persistent_clock(struct times
 {
 	return set_rtc_mmss(now.tv_sec);
 }
-
-unsigned long long __vsyscall_fn native_read_tsc(void)
-{
-	DECLARE_ARGS(val, low, high);
-
-	rdtsc_barrier();
-	asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
-	rdtsc_barrier();
-
-	return EAX_EDX_VAL(val, low, high);
-}
-EXPORT_SYMBOL_GPL(native_read_tsc);
Index: linux-x86.q/include/asm-x86/msr.h
===================================================================
--- linux-x86.q.orig/include/asm-x86/msr.h
+++ linux-x86.q/include/asm-x86/msr.h
@@ -91,7 +91,16 @@ static inline int native_write_msr_safe(
 	return err;
 }
 
-extern unsigned long long native_read_tsc(void);
+static __always_inline unsigned long long native_read_tsc(void)
+{
+	DECLARE_ARGS(val, low, high);
+
+	rdtsc_barrier();
+	asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
+	rdtsc_barrier();
+
+	return EAX_EDX_VAL(val, low, high);
+}
 
 static inline unsigned long long native_read_pmc(int counter)
 {

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-01-11  7:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-11  7:21 [x86/mm] vsyscall_fn fault in early startup Roland McGrath
2008-01-11  7:40 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®