• John Stultz's avatar
    timekeeping: Copy the shadow-timekeeper over the real timekeeper last · 906c5557
    John Stultz authored
    The fix in d1518326 (time: Move clock_was_set_seq update
    before updating shadow-timekeeper) was unfortunately incomplete.
    
    The main gist of that change was to do the shadow-copy update
    last, so that any state changes were properly duplicated, and
    we wouldn't accidentally have stale data in the shadow.
    
    Unfortunately in the main update_wall_time() logic, we update
    use the shadow-timekeeper to calculate the next update values,
    then while holding the lock, copy the shadow-timekeeper over,
    then call timekeeping_update() to do some additional
    bookkeeping, (skipping the shadow mirror). The bug with this is
    the additional bookkeeping isn't all read-only, and some
    changes timkeeper state. Thus we might then overwrite this state
    change on the next update.
    
    To avoid this problem, do the timekeeping_update() on the
    shadow-timekeeper prior to copying the full state over to
    the real-timekeeper.
    
    This avoids problems with both the clock_was_set_seq and
    next_leap_ktime being overwritten and possibly the
    fast-timekeepers as well.
    
    Many thanks to Prarit for his rigorous testing, which discovered
    this problem, along with Prarit and Daniel's work validating this
    fix.
    Reported-by: default avatarPrarit Bhargava <prarit@redhat.com>
    Tested-by: default avatarPrarit Bhargava <prarit@redhat.com>
    Tested-by: default avatarDaniel Bristot de Oliveira <bristot@redhat.com>
    Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
    Cc: Richard Cochran <richardcochran@gmail.com>
    Cc: Jan Kara <jack@suse.cz>
    Cc: Jiri Bohac <jbohac@suse.cz>
    Cc: Ingo Molnar <mingo@kernel.org>
    Link: http://lkml.kernel.org/r/1434560753-7441-1-git-send-email-john.stultz@linaro.orgSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
    906c5557
timekeeping.c 55.9 KB