All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: Andrew Morton <akpm@osdl.org>,
	Maciej Rutecki <maciej.rutecki@gmail.com>,
	linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: [PATCH -mm] gtod persistent clock resume fix
Date: Thu, 01 Feb 2007 14:03:47 +0100	[thread overview]
Message-ID: <1170335027.29240.272.camel@localhost.localdomain> (raw)
In-Reply-To: <200701310155.05474.fzu@wemgehoertderstaat.de>

The reworked highres/dyntick code made a thinko in the resume code
visible, which was magically working in the old queue.

On resume we add the slept time to xtime. This delta must be adjusted in
wall_to_monotonic as well. The update of jiffies64 is bogus and a
leftover of the code which was taken from arch/i386/kernel/time.c.

On suspend the current state of xtime, wall_to_monotonic and jiffies is
frozen. After resume we need to add the slept time to xtime, but we need
to subtract it from wall_to_monotonic, so the monotonic time is resuming
from exactly the point where it was suspended. jiffies are restarting
from the same point as well.

This solves the resume waittime observed by Karsten Wiese.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Index: linux-2.6.20-rc6-mm/kernel/timer.c
===================================================================
--- linux-2.6.20-rc6-mm.orig/kernel/timer.c
+++ linux-2.6.20-rc6-mm/kernel/timer.c
@@ -985,8 +985,9 @@ static int timekeeping_resume(struct sys
 
 	if (now && (now > timekeeping_suspend_time)) {
 		unsigned long sleep_length = now - timekeeping_suspend_time;
+
 		xtime.tv_sec += sleep_length;
-		jiffies_64 += (u64)sleep_length * HZ;
+		wall_to_monotonic.tv_sec -= sleep_length;
 	}
 	/* re-base the last cycle value */
 	clock->cycle_last = clocksource_read(clock);
@@ -994,7 +995,7 @@ static int timekeeping_resume(struct sys
 	timekeeping_suspended = 0;
 	write_sequnlock_irqrestore(&xtime_lock, flags);
 
-	clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
+	touch_softlockup_watchdog();
 	/* Resume hrtimers */
 	clock_was_set();
 



  parent reply	other threads:[~2007-02-01 13:02 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-30  4:45 2.6.20-rc6-mm3 Andrew Morton
2007-01-30  4:50 ` 2.6.20-rc6-mm3 Jeff Garzik
2007-01-30  5:11   ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-30  9:56     ` 2.6.20-rc6-mm3 Evgeniy Polyakov
2007-01-30  8:16 ` 2.6.20-rc6-mm3 Sunil Naidu
2007-01-30  8:32   ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-30  9:06 ` 2.6.20-rc6-mm3 Olivier Galibert
2007-01-30  9:26   ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-30 18:47     ` 2.6.20-rc6-mm3 Olivier Galibert
2007-01-31  7:57     ` 2.6.20-rc6-mm3 Len Brown
2007-02-01  4:25     ` 2.6.20-rc6-mm3 Len Brown
2007-01-30 22:18 ` 2.6.20-rc6-mm3 Maciej Rutecki
2007-01-30 22:27   ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-31  0:55     ` 2.6.20-rc6-mm3 Karsten Wiese
2007-01-31 13:22       ` 2.6.20-rc6-mm3 Ingo Molnar
2007-01-31 14:25         ` 2.6.20-rc6-mm3 Karsten Wiese
2007-02-01  8:01           ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-01 10:44             ` 2.6.20-rc6-mm3 Karsten Wiese
2007-02-01 11:12               ` 2.6.20-rc6-mm3 Karsten Wiese
2007-03-01 11:11                 ` 2.6.20-rc6-mm3 Karsten Wiese
2007-02-01 11:12               ` 2.6.20-rc6-mm3 Karsten Wiese
2007-02-03  0:37             ` 2.6.20-rc6-mm3 Pavel Machek
2007-02-01 13:03       ` Thomas Gleixner [this message]
2007-01-31 11:54     ` 2.6.20-rc6-mm3 Maciej Rutecki
2007-02-01  4:10       ` 2.6.20-rc6-mm3 Len Brown
2007-02-01  4:10         ` 2.6.20-rc6-mm3 Len Brown
2007-02-01  4:17         ` 2.6.20-rc6-mm3 Andrew Morton
2007-02-01  4:17           ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-31  1:16   ` 2.6.20-rc6-mm3 Tilman Schmidt
2007-01-31  1:25     ` 2.6.20-rc6-mm3 Andrew Morton
2007-01-31 11:38       ` 2.6.20-rc6-mm3 Tilman Schmidt
2007-01-31 12:29         ` 2.6.20-rc6-mm3 Alexey Starikovskiy
2007-01-31 16:02           ` 2.6.20-rc6-mm3 Maciej Rutecki
2007-01-31 18:28           ` 2.6.20-rc6-mm3 Tilman Schmidt
2007-01-31 21:52 ` 2.6.20-rc6-mm3 Mattia Dongili
2007-01-31 23:21   ` 2.6.20-rc6-mm3 Mattia Dongili
2007-02-01 19:04     ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-01 19:36     ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-01 20:01       ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-01 21:11         ` 2.6.20-rc6-mm3 Mattia Dongili
2007-02-01 22:33           ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-02 19:18             ` dynticks + iptables almost stops the boot process [was: Re: 2.6.20-rc6-mm3] Mattia Dongili
2007-02-02 20:27               ` Thomas Gleixner
2007-02-02 20:43                 ` Mattia Dongili
2007-02-06 16:48                   ` Ingo Molnar
2007-02-06 19:28                     ` Mattia Dongili
2007-02-06 23:12                       ` Tilman Schmidt
2007-02-06 23:17                         ` Thomas Gleixner
2007-02-07  1:01                           ` Andrew Morton
2007-02-07 19:33                             ` Ingo Molnar
2007-02-01 21:37         ` 2.6.20-rc6-mm3 Mattia Dongili
2007-02-01 20:24       ` 2.6.20-rc6-mm3 Mattia Dongili
2007-02-01  0:14 ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-01  0:24   ` 2.6.20-rc6-mm3 Andrew Morton
2007-02-01  0:27     ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-01  0:36       ` 2.6.20-rc6-mm3 Andrew Morton
2007-02-01  0:38         ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-01  6:20         ` 2.6.20-rc6-mm3 David Chinner
2007-02-01  7:12           ` 2.6.20-rc6-mm3 Andrew Morton
2007-02-01 19:01             ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-01 19:18               ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-01 20:18                 ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-01 20:26                   ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-01 23:02                     ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-05 12:02                       ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-05 12:17                         ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-05 12:56                           ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-05 18:20                             ` 2.6.20-rc6-mm3 Christoph Lameter
2007-02-05 18:34                               ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-02  4:08                 ` 2.6.20-rc6-mm3 David Chinner
2007-02-02  7:31                   ` 2.6.20-rc6-mm3 Jens Axboe
2007-02-01 18:24 ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-01 19:37   ` 2.6.20-rc6-mm3 Starikovskiy, Alexey Y
2007-02-01 20:29     ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-01 20:38       ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-02 14:22         ` 2.6.20-rc6-mm3 Starikovskiy, Alexey Y
2007-02-02 14:47           ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-02 14:50             ` 2.6.20-rc6-mm3 Starikovskiy, Alexey Y
2007-02-02 16:04               ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-03  7:30                 ` 2.6.20-rc6-mm3 Cedric Le Goater
2007-02-03  7:57                   ` 2.6.20-rc6-mm3 Starikovskiy, Alexey Y
2007-02-02 17:39 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 16:03 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 18:36   ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 18:45     ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 19:07       ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 19:55         ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 20:20           ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 20:40             ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 20:52               ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 20:56                 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 21:09                   ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 21:20                     ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 21:23                     ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 21:41                       ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 21:54                         ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 22:08                           ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 22:42                             ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 22:56                               ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 23:04                                 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:14                                   ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 23:22                                     ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:28                                       ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 23:35                                         ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:44                                           ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 23:51                                           ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-07  2:46                                             ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:36                                       ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-07  1:12                                         ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-07 14:53                                           ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 23:37                                       ` 2.6.20-rc6-mm3 Ingo Molnar
2007-02-06 22:13                           ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 21:43                       ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 21:59                         ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 21:17               ` 2.6.20-rc6-mm3 Thomas Gleixner
2007-02-06 21:25                 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:15               ` 2.6.20-rc6-mm3 Rob Landley
2007-02-06 23:28                 ` 2.6.20-rc6-mm3 Daniel Walker
2007-02-06 23:55                   ` 2.6.20-rc6-mm3 Rob Landley
2007-02-06 22:11 ` [-mm patch] #ifdef ACPI_FUTURE_USAGE acpi_os_readable() Adrian Bunk
2007-02-06 22:12 ` [RFC: -mm patch] drivers/net/atl1/: possible cleanups Adrian Bunk
2007-02-07  0:19   ` Jay Cliburn
2007-02-07  0:22     ` Jeff Garzik
2007-02-07  0:24       ` J. K. Cliburn
2007-02-07  0:24     ` Adrian Bunk
2007-02-06 22:12 ` [-mm patch] drivers/scsi/aacraid/: cleanups Adrian Bunk
2007-02-06 22:12 ` [-mm patch] make gfs2_writepages() static Adrian Bunk
2007-02-06 22:12   ` [Cluster-devel] " Adrian Bunk
2007-02-07 10:50   ` Steven Whitehouse
2007-02-07 10:50     ` [Cluster-devel] " Steven Whitehouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1170335027.29240.272.camel@localhost.localdomain \
    --to=tglx@linutronix.de \
    --cc=akpm@osdl.org \
    --cc=fzu@wemgehoertderstaat.de \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maciej.rutecki@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.