Skip to contentSkip to conversation

[2.6.21] BUG: clocksource_watchdog isn't reset after resume

DISCUSSION Indan Zupancic 2 participants 4 messages Apr 29, 2007 – Apr 30, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hello,

After s2ram, basically the following happens, which shouldn't happen:

[    0.880234] Clocksource tsc unstable (delta = 449782067799 ns)
[    0.881221] Time: pit clocksource has been installed.

Looking at the source, it seems that clocksource_watchdog isn't reset after resume, while the clock source used is, and hence it thinks that the clock is unstable.

So it appears that timekeeping_resume and/or timekeeping_suspend should do something to prevent this from happening.

Maybe by somehow updating 'watchdog_last' after resume, but it's unclear how that should happen, as the watchdog doesn't export any functions and the only thing that's reachable which calls anything watchdog related is clocksource_register().

This is a UP machine with no frequency changing CPU, so the tsc is good to use (before someone complaints that I should use the pm timer).

An alternative would be to not select CONFIG_CLOCKSOURCE_WATCHDOG, but it's unclear how or by what that's selected.

Greetings,

Indan

#1 lore raw
Quoted 10 lines · Indan Zupancic

Hello,

After s2ram, basically the following happens, which shouldn't happen:

[    0.880234] Clocksource tsc unstable (delta = 449782067799 ns)
[    0.881221] Time: pit clocksource has been installed.

Looking at the source, it seems that clocksource_watchdog isn't reset after resume, while the clock source used is, and hence it thinks that the clock is unstable.

Yup, missed that. I was looking into the resume path anyway for other reasons. Does the patch below fix your problem ?

tglx

arch/i386/kernel/apic.c +3 -0
Index: linux-2.6/arch/i386/kernel/apic.c
===================================================================
@@ -242,6 +242,9 @@ static void lapic_timer_setup(enum clock
 		v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
 		apic_write_around(APIC_LVTT, v);
 		break;
+	case CLOCK_EVT_MODE_RESUME:
+		/* Nothing to do here */
+		break;
 	}
 
 	local_irq_restore(flags);
arch/i386/kernel/hpet.c +5 -66

92 lines not on this page · raw message

arch/i386/kernel/i8253.c +4 -0
Index: linux-2.6/arch/i386/kernel/i8253.c
===================================================================
@@ -62,6 +62,10 @@ static void init_pit_timer(enum clock_ev
 		outb_p(0x38, PIT_MODE);
 		udelay(10);
 		break;
+
+	case CLOCK_EVT_MODE_RESUME:
+		/* Nothing to do here */
+		break;
 	}
 	spin_unlock_irqrestore(&i8253_lock, flags);
 }
include/linux/clockchips.h +1 -0
Index: linux-2.6/include/linux/clockchips.h
===================================================================
@@ -23,6 +23,7 @@ enum clock_event_mode {
 	CLOCK_EVT_MODE_SHUTDOWN,
 	CLOCK_EVT_MODE_PERIODIC,
 	CLOCK_EVT_MODE_ONESHOT,
+	CLOCK_EVT_MODE_RESUME,
 };
 
 /* Clock event notification values */
include/linux/clocksource.h +3 -0
Index: linux-2.6/include/linux/clocksource.h
===================================================================
@@ -48,6 +48,7 @@ struct clocksource;
  * @shift:		cycle to nanosecond divisor (power of two)
  * @flags:		flags describing special properties
  * @vread:		vsyscall based read
+ * @resume:		resume function for the clocksource, if necessary
  * @cycle_interval:	Used internally by timekeeping core, please ignore.
  * @xtime_interval:	Used internally by timekeeping core, please ignore.
  */
@@ -61,6 +62,7 @@ struct clocksource {
 	u32 shift;
 	unsigned long flags;
 	cycle_t (*vread)(void);
+	void (*resume)(void);
 
 	/* timekeeping specific data, ignore */
 	cycle_t cycle_last, cycle_interval;
@@ -198,6 +200,7 @@ static inline void clocksource_calculate
 extern int clocksource_register(struct clocksource*);
 extern struct clocksource* clocksource_get_next(void);
 extern void clocksource_change_rating(struct clocksource *cs, int rating);
+extern void clocksource_resume(void);
 
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
 extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
kernel/time/clocksource.c +45 -0

81 lines not on this page · raw message

kernel/time/tick-broadcast.c +2 -0
Index: linux-2.6/kernel/time/tick-broadcast.c
===================================================================
@@ -309,6 +309,8 @@ int tick_resume_broadcast(void)
 	bc = tick_broadcast_device.evtdev;
 
 	if (bc) {
+		clockevents_set_mode(bc, CLOCK_EVT_MODE_RESUME);
+
 		switch (tick_broadcast_device.mode) {
 		case TICKDEV_MODE_PERIODIC:
 			if(!cpus_empty(tick_broadcast_mask))
kernel/time/tick-common.c +13 -7
Index: linux-2.6/kernel/time/tick-common.c
===================================================================
@@ -308,16 +308,20 @@ static void tick_suspend(void)
 	spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
-static void tick_resume(void)
+static void tick_resume(int broadcast)
 {
 	struct tick_device *td = &__get_cpu_var(tick_cpu_device);
 	unsigned long flags;
 
 	spin_lock_irqsave(&tick_device_lock, flags);
-	if (td->mode == TICKDEV_MODE_PERIODIC)
-		tick_setup_periodic(td->evtdev, 0);
-	else
-		tick_resume_oneshot();
+	clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME);
+
+	if (!broadcast) {
+		if (td->mode == TICKDEV_MODE_PERIODIC)
+			tick_setup_periodic(td->evtdev, 0);
+		else
+			tick_resume_oneshot();
+	}
 	spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
@@ -327,6 +331,8 @@ static void tick_resume(void)
 static int tick_notify(struct notifier_block *nb, unsigned long reason,
 			       void *dev)
 {
+	int res;
+
 	switch (reason) {
 
 	case CLOCK_EVT_NOTIFY_ADD:
@@ -354,8 +360,8 @@ static int tick_notify(struct notifier_b
 		break;
 
 	case CLOCK_EVT_NOTIFY_RESUME:
-		if (!tick_resume_broadcast())
-			tick_resume();
+		res = tick_resume_broadcast();
+		tick_resume(res);
 		break;
 
 	default:
kernel/timer.c +2 -0
Index: linux-2.6/kernel/timer.c
===================================================================
@@ -999,6 +999,8 @@ static int timekeeping_resume(struct sys
 	unsigned long flags;
 	unsigned long now = read_persistent_clock();
 
+	clocksource_resume();
+
 	write_seqlock_irqsave(&xtime_lock, flags);
 
 	if (now && (now > timekeeping_suspend_time)) {
#2 lore raw
Quoted 8 lines · Thomas Gleixner
Quoted 7 lines · Indan Zupancic

Hello,

After s2ram, basically the following happens, which shouldn't happen:

[    0.880234] Clocksource tsc unstable (delta = 449782067799 ns)
[    0.881221] Time: pit clocksource has been installed.
Quoted 6 lines
Quoted 3 lines

Looking at the source, it seems that clocksource_watchdog isn't reset after resume, while the clock source used is, and hence it thinks that the clock is unstable.

Yup, missed that. I was looking into the resume path anyway for other reasons. Does the patch below fix your problem ?

Yes it does, thanks!

Just wondering, but is it expected that tsc doesn't show up in /proc/timer_list? Output below:

$ cat /proc/timer_list
Timer List Version: v0.3
HRTIMER_MAX_CLOCK_BASES: 2
now at 557820361144 nsecs

cpu: 0
clock 0:
.index: 0
.resolution: 999848 nsecs
.get_time: ktime_get_real
active timers:
clock 1:
.index: 1
.resolution: 999848 nsecs
.get_time: ktime_get
active timers:
#0: <b6e12f10>, it_real_fn, S:01

 # expires at 557838167583 nsecs [in 17806439 nsecs]
 #1: <b6e12f10>, it_real_fn, S:01
 # expires at 577078756293 nsecs [in 19258395149 nsecs]
 #2: <b6e12f10>, hrtimer_wakeup, S:01
 # expires at 607716759262 nsecs [in 49896398118 nsecs]
 #3: <b6e12f10>, it_real_fn, S:01
 # expires at 3656633914145 nsecs [in 3098813553001 nsecs]

Tick Device: mode: 0
Clock Event Device: pit

 max_delta_ns:   27461866
 min_delta_ns:   12571
 mult:           5124677
 shift:          32
 mode:           4
 next_event:     0 nsecs

set_next_event: pit_next_event
set_mode: init_pit_timer
event_handler: clockevents_handle_noop
tick_broadcast_mask: 00000000

Tick Device: mode: 0
Clock Event Device: lapic

 max_delta_ns:   674685450
 min_delta_ns:   1206
 mult:           53400874
 shift:          32
 mode:           2
 next_event:     0 nsecs

set_next_event: lapic_next_event
set_mode: lapic_timer_setup
event_handler: tick_handle_periodic

Greetings,

Indan

#3 lore raw
In reply to Thomas Gleixner
Quoted 38 lines · Thomas Gleixner
kernel/time/tick-common.c +11 -5
@@ -308,16 +308,20 @@ static void tick_suspend(void)
 	spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
-static void tick_resume(void)
+static void tick_resume(int broadcast)
 {
 	struct tick_device *td = &__get_cpu_var(tick_cpu_device);
 	unsigned long flags;
 
 	spin_lock_irqsave(&tick_device_lock, flags);
-	if (td->mode == TICKDEV_MODE_PERIODIC)
-		tick_setup_periodic(td->evtdev, 0);
-	else
-		tick_resume_oneshot();
+	clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME);
+
+	if (!broadcast) {
+		if (td->mode == TICKDEV_MODE_PERIODIC)
+			tick_setup_periodic(td->evtdev, 0);
+		else
+			tick_resume_oneshot();
+	}
 	spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
@@ -327,6 +331,8 @@ static void tick_resume(void)
 static int tick_notify(struct notifier_block *nb, unsigned long reason,
 			       void *dev)
 {
+	int res;
+
 	switch (reason) {
 
 	case CLOCK_EVT_NOTIFY_ADD:

kernel/time/tick-common.c static int tick_notify(struct notifier_b · line 365

Quoted 8 lines
kernel/time/tick-common.c +2 -2
@@ -354,8 +360,8 @@ static int tick_notify(struct notifier_b
 		break;
 
 	case CLOCK_EVT_NOTIFY_RESUME:
-		if (!tick_resume_broadcast())
-			tick_resume();
+		res = tick_resume_broadcast();
+		tick_resume(res);
 		break;

What about moving the tick_resume_broadcast() check into tick_resume() and removing the parameter again? Something like the below:

tick-common.c.iz renamed from tick-common.c +3 -4
@@ -308,7 +308,7 @@ static void tick_suspend(void)
 	spin_unlock_irqrestore(&tick_device_lock, flags);
 }
 
-static void tick_resume(int broadcast)
+static void tick_resume(void)
 {
 	struct tick_device *td = &__get_cpu_var(tick_cpu_device);
 	unsigned long flags;
@@ -316,7 +316,7 @@ static void tick_resume(int broadcast)
 	spin_lock_irqsave(&tick_device_lock, flags);
 	clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME);
 
-	if (!broadcast) {
+	if (!tick_resume_broadcast()) {
 		if (td->mode == TICKDEV_MODE_PERIODIC)
 			tick_setup_periodic(td->evtdev, 0);
 		else
@@ -360,8 +360,7 @@ static int tick_notify(struct notifier_b
 		break;
 
 	case CLOCK_EVT_NOTIFY_RESUME:
-		res = tick_resume_broadcast();
-		tick_resume(res);
+		tick_resume();
 		break;
 
 	default: