uml: deal with host time going backwards
PATCH 6/14 uml: deal with host time going backwards
From 06e1e4ffbd1932e288839b3140cda6b8141eb684
Protection against the host's time going backwards (eg, ntp activity on the host) by keeping track of the time at the last tick and if it's greater than the current time, keep time stopped until the host catches up.
--- arch/um/os-Linux/time.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/um/os-Linux/time.c +7 -0
@@ -106,6 +106,10 @@ static void deliver_alarm(void)unsigned long long this_tick =os_nsecs ();int one_tick =UM_NSEC_PER_SEC /UM_HZ ; +/* Protection against the host's time going backwards */ +if ((last_tick !=0 ) && (this_tick < last_tick)) + this_tick = last_tick; +if (last_tick ==0 ) last_tick = this_tick - one_tick;
@@ -148,6 +152,9 @@ static int after_sleep_interval(struct timespec *ts) start_usecs = usec; start_usecs -= skew /UM_NSEC_PER_USEC ; +if (start_usecs <0 ) + start_usecs =0 ; + tv = ((struct timeval ) { .tv_sec = start_usecs /UM_USEC_PER_SEC , .tv_usec = start_usecs %UM_USEC_PER_SEC }); interval = ((struct itimerval ) { {0 , usec }, tv });
Signature · 12 lines
1.5.5.1 ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
patch uml-deal-with-host-time-going-backwards.patch added to 2.6.25-stable tree
This is a note to let you know that we have just queued up the patch titled
Subject: uml: deal with host time going backwards
to the 2.6.25-stable tree. Its filename is
uml-deal-with-host-time-going-backwards.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
From [email protected] Tue Aug 5 13:14:23 2008
From: Jeff Dike <[email protected]>
Date: Tue, 5 Aug 2008 16:14:06 -0400
Subject: uml: deal with host time going backwards
To: [email protected]
Cc: LKML <[email protected]>, uml-devel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
From: Jeff Dike <[email protected]>
commit 06e1e4ffbd1932e288839b3140cda6b8141eb684 upstream
Protection against the host's time going backwards (eg, ntp activity on the host) by keeping track of the time at the last tick and if it's greater than the current time, keep time stopped until the host catches up.
--- arch/um/os-Linux/time.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/um/os-Linux/time.c +7 -0
@@ -106,6 +106,10 @@ static void deliver_alarm(void)unsigned long long this_tick =os_nsecs ();int one_tick =UM_NSEC_PER_SEC /UM_HZ ; +/* Protection against the host's time going backwards */ +if ((last_tick !=0 ) && (this_tick < last_tick)) + this_tick = last_tick; +if (last_tick ==0 ) last_tick = this_tick - one_tick;
@@ -148,6 +152,9 @@ static int after_sleep_interval(struct t start_usecs = usec; start_usecs -= skew /UM_NSEC_PER_USEC ; +if (start_usecs <0 ) + start_usecs =0 ; + tv = ((struct timeval ) { .tv_sec = start_usecs /UM_USEC_PER_SEC , .tv_usec = start_usecs %UM_USEC_PER_SEC }); interval = ((struct itimerval ) { {0 , usec }, tv });
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.25/uml-fix-build-when-slob-is-enabled.patch queue-2.6.25/uml-fix-bad-ntp-interaction-with-clock.patch queue-2.6.25/uml-physical-memory-shouldn-t-include-initial-stack.patch queue-2.6.25/uml-track-and-make-up-lost-ticks.patch queue-2.6.25/uml-missed-kmalloc-in-pcap_user.c.patch queue-2.6.25/uml-deal-with-host-time-going-backwards.patch queue-2.6.25/uml-deal-with-inaccessible-address-space-start.patch queue-2.6.25/uml-missing-export-of-csum_partial-on-uml-amd64.patch queue-2.6.25/uml-memcpy-export-needs-to-follow-host-declaration.patch queue-2.6.25/uml-stub-needs-to-tolerate-sigwinch.patch queue-2.6.25/uml-work-around-broken-host-ptrace_sysemu.patch queue-2.6.25/uml-fix-gcc-ices-and-unresolved-externs.patch queue-2.6.25/uml-fix-boot-crash.patch
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel