From: Thomas Gleixner <tglx@linutronix.de>
To: john stultz <johnstul@us.ibm.com>
Cc: Frans Pop <elendil@planet.nl>,
linux-s390@vger.kernel.org, Roman Zippel <zippel@linux-m68k.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [BUG,2.6.28,s390] Fails to boot in Hercules S/390 emulator
Date: Thu, 12 Mar 2009 02:30:50 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.00.0903120201040.29264@localhost.localdomain> (raw)
In-Reply-To: <1236818863.7680.156.camel@localhost.localdomain>
On Wed, 11 Mar 2009, john stultz wrote:
> For a cleaner version, could you try the following, against 2.6.29-git
> with no other modification?
cleaner ?
> xtime_nsec is expected at times to be negative. Instead of trying to
> handle all the shifting properly via casts, define it as a s64 instead
> of a u64.
>
> NOT FOR INCLUSION
> Signed-off-by: John Stultz <johnstul@us.ibm.com>
>
> diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
> index f88d32f..e217000 100644
> --- a/include/linux/clocksource.h
> +++ b/include/linux/clocksource.h
> @@ -86,7 +86,7 @@ struct clocksource {
> * more than one cache line.
> */
> cycle_t cycle_last ____cacheline_aligned_in_smp;
> - u64 xtime_nsec;
> + s64 xtime_nsec;
> s64 error;
> struct timespec raw_time;
>
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index 900f1b6..387be3c 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -546,7 +546,7 @@ void update_wall_time(void)
> /* store full nanoseconds into xtime after rounding it up and
> * add the remainder to the error difference.
> */
> - xtime.tv_nsec = ((s64)clock->xtime_nsec >> clock->shift) + 1;
> + xtime.tv_nsec = (clock->xtime_nsec >> clock->shift) + 1;
> clock->xtime_nsec -= (s64)xtime.tv_nsec << clock->shift;
> clock->error += clock->xtime_nsec << (NTP_SCALE_SHIFT - clock->shift);
This code sequence does:
xtime.tv_nsec = (clock->xtime_nsec >> clock->shift) + 1;
clock->xtime_nsec -= xtime.tv_nsec << clock->shift;
Lets substitute a bit:
a = xtime.tv_nsec
b = clock->xtime_nsec
c = clock->shift
r = result (which ends up in b aka clock->xtime_nsec again for the next round)
=> a = (b >> c) + 1
r = b - (a << c)
b >> c = b / 2^c
a << c = a * 2^c
=> a = (b / 2^c) + 1
r = b - (a * 2^c)
=> r = b - ((b / 2^c) + 1) * 2^c
r = b - ((2^c * b / 2^c) + 2^c)
r = b - (2^c * b / 2^c) - 2^c
r = b - b - 2^c
r = -2^c
=> r = -(1 << c)
So the whole business boils down to:
clock->xtime_nsec = -(1 << clock->shift);
Famous last words (see also arch/x86/kernel/tsc.c and
arch/x86/include/asm/timer.h):
-johnstul@us.ibm.com "math is hard, lets go shopping!"
Thanks,
tglx
next prev parent reply other threads:[~2009-03-12 1:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-08 1:30 [BUG,2.6.28,s390] Fails to boot in Hercules S/390 emulator Frans Pop
2009-03-08 7:21 ` Frans Pop
2009-03-09 15:04 ` Frans Pop
2009-03-11 1:00 ` john stultz
2009-03-11 9:00 ` Frans Pop
2009-03-11 16:03 ` Frans Pop
2009-03-11 17:05 ` Frans Pop
2009-03-11 19:05 ` Frans Pop
2009-03-12 0:34 ` john stultz
2009-03-12 4:47 ` john stultz
2009-03-12 6:51 ` Frans Pop
2009-03-17 5:15 ` john stultz
2009-03-17 14:39 ` Frans Pop
2009-03-12 0:30 ` john stultz
2009-03-12 0:47 ` john stultz
2009-03-12 1:30 ` Thomas Gleixner [this message]
2009-03-12 1:57 ` john stultz
2009-03-12 7:50 ` Thomas Gleixner
2009-03-12 17:05 ` [BUG,2.6.28,s390] Fails to boot in Hercules S/390 emulator - hang traced Frans Pop
2009-03-13 11:48 ` Frans Pop
2009-03-13 17:34 ` Frans Pop
2009-03-17 5:09 ` john stultz
2009-03-18 2:26 ` john stultz
2009-03-18 2:54 ` john stultz
2009-03-18 9:28 ` Martin Schwidefsky
2009-03-18 12:07 ` Frans Pop
2009-03-18 15:48 ` John Stultz
2009-03-23 0:11 ` Frans Pop
2009-03-23 22:19 ` John Stultz
2009-03-24 8:23 ` Martin Schwidefsky
2009-03-18 15:39 ` John Stultz
2009-03-10 3:09 ` [BUG,2.6.28,s390] Fails to boot in Hercules S/390 emulator John Stultz
2009-03-10 3:37 ` Frans Pop
2009-03-10 3:38 ` John Stultz
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=alpine.LFD.2.00.0903120201040.29264@localhost.localdomain \
--to=tglx@linutronix.de \
--cc=elendil@planet.nl \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=zippel@linux-m68k.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox