On 2017-10-06 04:20:31 [+0200], Mike Galbraith wrote:
> On Thu, 2017-10-05 at 17:54 +0200, Sebastian Andrzej Siewior wrote:
> > On 2017-10-04 18:07:59 [+0200], Mike Galbraith wrote:
> > > Seems combo-patch induced some ltp posix conformance test grumbling.
> > >
> > > +clock_settime_8_1 ... ... FAILED
> > > +clock_settime_4_2 ... ... FAILED
> > > +clock_settime_speculative_4_3 ... ... FAILED
> > > +timer_settime_5_2 ... ... FAILED
> > > +timer_settime_5_1 ... ... FAILED
> > > +timer_settime_5_3 ... ... FAILED
> > >
> > > rtbox:/root #
> > > /usr/local/ltp/conformance/interfaces/clock_settime/clock_settime_8-1.run-test
> > > Ended too late. 1507131910 >> 1507131908
> > > Test FAILED
> > > rtbox:/root #
> > > /usr/local/ltp/conformance/interfaces/clock_settime/clock_settime_4-2.run-test
> > > timer should have expired _immediately_
> > > rtbox:/root #
> > > /usr/local/ltp/conformance/interfaces/clock_settime/speculative/clock_settime_speculative_4-3.run-test
> > > Overrun count =0, not # of repeating timer expirys
> > > FAIL: Caught 0 signals, not 1
> > > Test FAILED
> > > rtbox:/root #
> > > /opt/ltp/conformance/interfaces/timer_settime/timer_settime_5-2.run-test
> > > signal was not sent
> >
> > So the last triggers here, too and I have an idea.
>
> I ran a trace of clock_settime_4-2.run-test, which arms a timer for
> now+9 seconds, then clock_settime to advance 4 seconds past timer
> expiration, which should cause the timer to fire. Going through
> SyS_clock_settime..retrigger_next_event..lapic_next_deadline does not
> trigger interrupt, but does without the culprit patch applied.
This seems to fix this.
Subject: hrtimer: Update offset for soft bases
From: Anna-Maria Gleixner <anna-ma...@linutronix.de>
Date: Fri, 06 Oct 2017 11:28:38 +0200
The offset of the clock bases is done via timekeeping mechanisms. The
offsets of the soft bases has to be considered as well.
Signed-off-by: Anna-Maria Gleixner <anna-ma...@linutronix.de>
---
kernel/time/hrtimer.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -551,8 +551,14 @@ static inline ktime_t hrtimer_update_bas
ktime_t *offs_boot = &base->clock_base[HRTIMER_BASE_BOOTTIME].offset;
ktime_t *offs_tai = &base->clock_base[HRTIMER_BASE_TAI].offset;
- return ktime_get_update_offsets_now(&base->clock_was_set_seq,
+ ktime_t now = ktime_get_update_offsets_now(&base->clock_was_set_seq,
offs_real, offs_boot, offs_tai);
+
+ base->clock_base[HRTIMER_BASE_REALTIME_SOFT].offset = *offs_real;
+ base->clock_base[HRTIMER_BASE_BOOTTIME_SOFT].offset = *offs_boot;
+ base->clock_base[HRTIMER_BASE_TAI_SOFT].offset = *offs_tai;
+
+ return now;
}
/*
Sebastian
