login
Header Space

 
 

Re: [patch] CFS scheduler, -v19

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Linus Torvalds <torvalds@...>
Cc: Markus <lists4me@...>, Linux Kernel Mailing List <linux-kernel@...>, Andrew Morton <akpm@...>, Mike Galbraith <efault@...>, Arjan van de Ven <arjan@...>, Thomas Gleixner <tglx@...>, Dmitry Adamushko <dmitry.adamushko@...>, Srivatsa Vaddagiri <vatsa@...>, Alan Cox <alan@...>
Date: Tuesday, July 17, 2007 - 4:43 pm

* Linus Torvalds <torvalds@linux-foundation.org> wrote:


hm, Markus indicated that he tried the v2.6.21.6-cfsv19 patch, and that 
does not include the time.c change. Markus - does your kernel include 
the code below? (if yes, please revert it via patch -p1 -R )

	Ingo

Index: linux/kernel/time.c
===================================================================
--- linux.orig/kernel/time.c
+++ linux/kernel/time.c
@@ -57,14 +57,17 @@ EXPORT_SYMBOL(sys_tz);
  */
 asmlinkage long sys_time(time_t __user * tloc)
 {
-	time_t i;
-	struct timeval tv;
+	/*
+	 * We read xtime.tv_sec atomically - it's updated
+	 * atomically by update_wall_time(), so no need to
+	 * even read-lock the xtime seqlock:
+	 */
+	time_t i = xtime.tv_sec;
 
-	do_gettimeofday(&tv);
-	i = tv.tv_sec;
+	smp_rmb(); /* sys_time() results are coherent */
 
 	if (tloc) {
-		if (put_user(i,tloc))
+		if (put_user(i, tloc))
 			i = -EFAULT;
 	}
 	return i;
@@ -373,6 +376,20 @@ void do_gettimeofday (struct timeval *tv
 
 	tv->tv_sec = sec;
 	tv->tv_usec = usec;
+
+	/*
+	 * Make sure xtime.tv_sec [returned by sys_time()] always
+	 * follows the gettimeofday() result precisely. This
+	 * condition is extremely unlikely, it can hit at most
+	 * once per second:
+	 */
+	if (unlikely(xtime.tv_sec != tv->tv_sec)) {
+		unsigned long flags;
+
+		write_seqlock_irqsave(&xtime_lock);
+		update_wall_time();
+		write_seqlock_irqrestore(&xtime_lock);
+	}
 }
 
 EXPORT_SYMBOL(do_gettimeofday);
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch] CFS scheduler, -v19, Ingo Molnar, (Fri Jul 6, 1:33 pm)
Re: [patch] CFS scheduler, -v19, Ed Tomlinson, (Sat Jul 14, 1:19 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Mon Jul 16, 5:17 am)
Re: [patch] CFS scheduler, -v19, Ed Tomlinson, (Mon Jul 16, 7:10 am)
Re: [patch] CFS scheduler, -v19, Mike Galbraith, (Sun Jul 15, 1:25 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Mon Jul 16, 4:00 am)
Re: [patch] CFS scheduler, -v19, Markus, (Sun Jul 15, 8:53 am)
Re: [patch] CFS scheduler, -v19, Mike Galbraith, (Sun Jul 15, 3:46 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Sun Jul 15, 5:11 pm)
Re: [patch] CFS scheduler, -v19, Mike Galbraith, (Mon Jul 16, 2:42 am)
Re: [patch] CFS scheduler, -v19, Markus, (Sat Jul 14, 7:34 am)
Re: [patch] CFS scheduler, -v19, Markus, (Sat Jul 14, 11:11 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Mon Jul 16, 5:41 am)
Re: [patch] CFS scheduler, -v19, Markus, (Mon Jul 16, 1:59 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 3:37 am)
Re: [patch] CFS scheduler, -v19, Markus, (Tue Jul 17, 9:06 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 1:06 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Tue Jul 17, 3:42 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 4:09 pm)
Re: [patch] CFS scheduler, -v19, Linus Torvalds, (Tue Jul 17, 4:37 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 4:43 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Tue Oct 16, 8:02 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Thu Aug 9, 1:34 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Fri Aug 10, 3:46 am)
Re: [patch] CFS scheduler, -v19, Markus, (Tue Aug 14, 1:15 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Fri Jul 20, 6:26 pm)
Re: [patch] CFS scheduler, -v19, Markus, (Tue Jul 17, 6:03 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 1:13 pm)
Re: [patch] CFS scheduler, -v19, Mike Galbraith, (Tue Jul 10, 4:08 am)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Wed Jul 11, 1:26 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Wed Jul 11, 4:55 pm)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Fri Jul 13, 5:19 pm)
Re: [patch] CFS scheduler, -v19, Chuck Ebbert, (Mon Jul 16, 5:34 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Mon Jul 16, 5:55 pm)
Re: [patch] CFS scheduler, -v19, Ian Kent, (Tue Jul 17, 1:01 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 3:45 am)
Re: [patch] CFS scheduler, -v19, Linus Torvalds, (Wed Jul 18, 12:03 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 4:16 am)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Wed Jul 18, 5:37 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 10:32 am)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Thu Jul 19, 10:32 pm)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Thu Jul 19, 1:06 pm)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Thu Jul 19, 1:26 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 1:42 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 1:17 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 1:10 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Thu Jul 19, 4:53 am)
Re: [patch] CFS scheduler, -v19, Ian Kent, (Wed Jul 18, 1:31 pm)
RE: [patch] CFS scheduler, -v19, David Schwartz, (Tue Jul 17, 5:16 pm)
RE: [patch] CFS scheduler, -v19, Ian Kent, (Wed Jul 18, 1:59 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Wed Jul 18, 3:54 am)
Re: [patch] CFS scheduler, -v19, Linus Torvalds, (Wed Jul 18, 1:23 pm)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Wed Jul 18, 9:50 am)
Re: [patch] CFS scheduler, -v19, Chuck Ebbert, (Tue Jul 17, 12:30 pm)
Re: [patch] CFS scheduler, -v19, Ian Kent, (Tue Jul 17, 7:17 am)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Tue Jul 17, 1:16 pm)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Tue Jul 17, 9:24 pm)
Re: [patch] CFS scheduler, -v19, Ian Kent, (Wed Jul 18, 2:19 am)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Tue Jul 17, 12:22 am)
Re: [patch] CFS scheduler, -v19, Bill Davidsen, (Thu Jul 12, 8:41 am)
Re: [patch] CFS scheduler, -v19, Willy Tarreau, (Sun Jul 8, 1:46 pm)
Re: [patch] CFS scheduler, -v19, Ingo Molnar, (Mon Jul 9, 6:39 pm)
Re: [patch] CFS scheduler, -v19, Willy Tarreau, (Tue Jul 17, 5:44 pm)
speck-geostationary