[Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Rafael J. Wysocki]

This message has been generated automatically as a part of a report
of recent regressions.

The following bug entry is on the current list of known regressions
from 2.6.25.  Please verify if it still should be listed.


Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
Submitter	: Gabriel C <nix.or.die@googlemail.com>
Date		: 2008-05-08 00:26 (4 days old)
References	: http://lkml.org/lkml/2008/5/7/352
Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>

Re: [Bug 10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Peter Zijlstra]

Subject: sched: fix sched_clock_cpu()
From: Peter Zijlstra <a.p.zijlstra@chello.nl>

Make sched_clock_cpu() return 0 before it has been initialised and avoid
corrupting its state due to doing so.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 kernel/sched_clock.c |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

Index: linux-2.6/kernel/sched_clock.c
===================================================================
--- linux-2.6.orig/kernel/sched_clock.c	2008-05-13 18:40:35.000000000 +0200
+++ linux-2.6/kernel/sched_clock.c	2008-05-13 18:42:05.000000000 +0200
@@ -60,22 +60,26 @@
 	return &per_cpu(sched_clock_data, cpu);
 }
 
+static __read_mostly int sched_clock_running;
+
 void sched_clock_init(void)
 {
 	u64 ktime_now = ktime_to_ns(ktime_get());
-	u64 now = 0;
+	unsigned long now_jiffies = jiffies;
 	int cpu;
 
 	for_each_possible_cpu(cpu) {
 		struct sched_clock_data *scd = cpu_sdc(cpu);
 
 		scd->lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
-		scd->prev_jiffies = jiffies;
-		scd->prev_raw = now;
-		scd->tick_raw = now;
+		scd->prev_jiffies = now_jiffies;
+		scd->prev_raw = 0;
+		scd->tick_raw = 0;
 		scd->tick_gtod = ktime_now;
 		scd->clock = ktime_now;
 	}
+
+	sched_clock_running = 1;
 }
 
 /*
@@ -137,6 +141,9 @@
 	struct sched_clock_data *scd = cpu_sdc(cpu);
 	u64 now, clock;
 
+	if (unlikely(!sched_clock_running))
+		return 0ull;
+
 	/*
 	 * Normally this is not called in NMI context - but if it is,
 	 * trying to do any locking here is totally lethal.
@@ -182,6 +189,9 @@
 	struct sched_clock_data *scd = this_scd();
 	u64 now, now_gtod;
 
+	if (unlikely(!sched_clock_running))
+		return;
+
 	WARN_ON_ONCE(!irqs_disabled());
 
 	now = sched_clock();

[Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Rafael J. Wysocki]

This message has been generated automatically as a part of a report
of recent regressions.

The following bug entry is on the current list of known regressions
from 2.6.25.  Please verify if it still should be listed.


Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
Submitter	: Gabriel C <nix.or.die@googlemail.com>
Date		: 2008-05-08 00:26 (11 days old)
References	: http://lkml.org/lkml/2008/5/7/352
Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Peter Zijlstra]

On Sun, 2008-05-18 at 13:13 +0200, Rafael J. Wysocki wrote:
> This message has been generated automatically as a part of a report
> of recent regressions.
> 
> The following bug entry is on the current list of known regressions
> from 2.6.25.  Please verify if it still should be listed.
> 
> 
> Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
> Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
> Submitter	: Gabriel C <nix.or.die@googlemail.com>
> Date		: 2008-05-08 00:26 (11 days old)
> References	: http://lkml.org/lkml/2008/5/7/352
> Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
> 
> 

Could people test this:

git://git.kernel.org/home/peterz/git/linux-2.6-sched.git/ v2.6.26-rc2-group-load-balance

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Peter Zijlstra]

On Sun, 2008-05-18 at 19:21 +0200, Peter Zijlstra wrote:
> On Sun, 2008-05-18 at 13:13 +0200, Rafael J. Wysocki wrote:
> > This message has been generated automatically as a part of a report
> > of recent regressions.
> > 
> > The following bug entry is on the current list of known regressions
> > from 2.6.25.  Please verify if it still should be listed.
> > 
> > 
> > Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
> > Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
> > Submitter	: Gabriel C <nix.or.die@googlemail.com>
> > Date		: 2008-05-08 00:26 (11 days old)
> > References	: http://lkml.org/lkml/2008/5/7/352
> > Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > 
> > 
> 
> Could people test this:
> 
> git://git.kernel.org/home/peterz/git/linux-2.6-sched.git/ v2.6.26-rc2-group-load-balance


Seems I got my own url wrong - the right one is:

git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched.git v2.6.26-rc2-group-load-balance

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Gabriel C]

Peter Zijlstra wrote:

> On Sun, 2008-05-18 at 19:21 +0200, Peter Zijlstra wrote:
>> On Sun, 2008-05-18 at 13:13 +0200, Rafael J. Wysocki wrote:
>>> This message has been generated automatically as a part of a report
>>> of recent regressions.
>>>
>>> The following bug entry is on the current list of known regressions
>>> from 2.6.25.  Please verify if it still should be listed.
>>>
>>>
>>> Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
>>> Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
>>> Submitter	: Gabriel C <nix.or.die@googlemail.com>
>>> Date		: 2008-05-08 00:26 (11 days old)
>>> References	: http://lkml.org/lkml/2008/5/7/352
>>> Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
>>>
>>>
>> Could people test this:
>>
>> git://git.kernel.org/home/peterz/git/linux-2.6-sched.git/ v2.6.26-rc2-group-load-balance
> 
> 
> Seems I got my own url wrong - the right one is:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched.git v2.6.26-rc2-group-load-balance
> 
> 


Sorry for the lag , I'm gonna test this now and report back in a bit.

Gabriel

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Gabriel C]

Gabriel C wrote:

> Peter Zijlstra wrote:
> 
>> On Sun, 2008-05-18 at 19:21 +0200, Peter Zijlstra wrote:
>>> On Sun, 2008-05-18 at 13:13 +0200, Rafael J. Wysocki wrote:
>>>> This message has been generated automatically as a part of a report
>>>> of recent regressions.
>>>>
>>>> The following bug entry is on the current list of known regressions
>>>> from 2.6.25.  Please verify if it still should be listed.
>>>>
>>>>
>>>> Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
>>>> Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
>>>> Submitter	: Gabriel C <nix.or.die@googlemail.com>
>>>> Date		: 2008-05-08 00:26 (11 days old)
>>>> References	: http://lkml.org/lkml/2008/5/7/352
>>>> Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
>>>>
>>>>
>>> Could people test this:
>>>
>>> git://git.kernel.org/home/peterz/git/linux-2.6-sched.git/ v2.6.26-rc2-group-load-balance
>>
>> Seems I got my own url wrong - the right one is:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched.git v2.6.26-rc2-group-load-balance
>>
>>
> 
> 
> Sorry for the lag , I'm gonna test this now and report back in a bit.


Peter thx , it fixes the problem for me.

Gabriel

[Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Rafael J. Wysocki]

This message has been generated automatically as a part of a report
of recent regressions.

The following bug entry is on the current list of known regressions
from 2.6.25.  Please verify if it still should be listed.


Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
Submitter	: Gabriel C <nix.or.die@googlemail.com>
Date		: 2008-05-08 00:26 (17 days old)
References	: http://lkml.org/lkml/2008/5/7/352
Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
		  Peter Zijlstra <peterz@infradead.org>
Patch		: http://bugzilla.kernel.org/show_bug.cgi?id=10648#c3

[Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Rafael J. Wysocki]

This message has been generated automatically as a part of a report
of recent regressions.

The following bug entry is on the current list of known regressions
from 2.6.25.  Please verify if it still should be listed.


Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
Submitter	: Gabriel C <nix.or.die@googlemail.com>
Date		: 2008-05-08 00:26 (24 days old)
References	: http://lkml.org/lkml/2008/5/7/352
Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
		  Peter Zijlstra <peterz@infradead.org>
Patch		: http://bugzilla.kernel.org/show_bug.cgi?id=10648#c3

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Gabriel C]

Rafael J. Wysocki wrote:

> This message has been generated automatically as a part of a report
> of recent regressions.
> 
> The following bug entry is on the current list of known regressions
> from 2.6.25.  Please verify if it still should be listed.


No

> 
> 
> Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
> Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
> Submitter	: Gabriel C <nix.or.die@googlemail.com>
> Date		: 2008-05-08 00:26 (24 days old)
> References	: http://lkml.org/lkml/2008/5/7/352
> Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
> 		  Peter Zijlstra <peterz@infradead.org>
> Patch		: http://bugzilla.kernel.org/show_bug.cgi?id=10648#c3
> 
> 


This problem is fixed in linus tree by a381759d6ad5c5dea5a981918e0b4493e9b66ac7

Gabriel

Re: [Bug #10648] CONFIG_PRINTK_TIME broken on git HEAD ?

[Rafael J. Wysocki]

On Sunday, 1 of June 2008, Gabriel C wrote:
> Rafael J. Wysocki wrote:
> 
> > This message has been generated automatically as a part of a report
> > of recent regressions.
> > 
> > The following bug entry is on the current list of known regressions
> > from 2.6.25.  Please verify if it still should be listed.
> 
> 
> No
> 
> > 
> > 
> > Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=10648
> > Subject		: CONFIG_PRINTK_TIME broken on git HEAD ?
> > Submitter	: Gabriel C <nix.or.die@googlemail.com>
> > Date		: 2008-05-08 00:26 (24 days old)
> > References	: http://lkml.org/lkml/2008/5/7/352
> > Handled-By	: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > 		  Peter Zijlstra <peterz@infradead.org>
> > Patch		: http://bugzilla.kernel.org/show_bug.cgi?id=10648#c3
> > 
> > 
> 
> 
> This problem is fixed in linus tree by a381759d6ad5c5dea5a981918e0b4493e9b66ac7

Thanks, closed.

Rafael