Skip to content

vdso: Unbreak VDSO with PV and HyperV clocksources

Thomas Gleixner lkml stable 1 version Applied

Status from this message: The following commit has been merged into the x86/urgent branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 1 replyApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3clocksource: Remove obsolete ifdefkernel/time/clocksource.c+0 -20 replies
2/3lib/vdso: Provide sanity check for cycles (again)lib/vdso/gettimeofday.c+11 -00 replies
3/3x86/vdso: Unbreak paravirt VDSO clocksarch/x86/include/asm/vdso/gettimeofday.h+18 -00 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by.

PatchMiklos Szeredi
SeriesT-b
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [patch 0/3] vdso: Unbreak VDSO with PV and HyperV clocksources

Miklos reported [1] that the recent VDSO changes broke paravirt clocksource based VDSO in the case that the clocksource is invalidated by the hypervisor which happens after a suspend/resume cycle of the host.

The result is a stale clocksource which is about 2200 seconds ahead of the actual time and jumps forward by 2200 seconds once 2200 seconds have elapsed.

The reason for this is the core code change which optimized the VDSO clocksource validation by checking for the clocksource mode instead of using the rather subtle check for the clocksource read return value whether it has bit 63 set.

For some reason my brain blanked when doing that change, even if I should have known better.

The following series restores the previous behaviour but preserves the initially intended optimization for architectures which don't need that PV handling.

Thanks,

tglx

[1] https://lore.kernel.org/r/CAJfpegstNYeseo_C4KOF9Y74qRxr78x2tK-9rTgmYM4CK30nRQ@mail.gmail.com

8<-----------------

 arch/x86/include/asm/vdso/gettimeofday.h |   18 ++++++++++++++++++
 kernel/time/clocksource.c                |    2 --
 lib/vdso/gettimeofday.c                  |   19 +++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)