Skip to content

lib/vdso: Bugfix and consolidation

Thomas Gleixner lkml 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 7 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/15lib/vdso: Make __arch_update_vdso_data() logic understandablearch/arm/include/asm/vdso/vsyscall.h include/asm-generic/vdso/vsyscall.h kernel/time/vsyscall.c+5 -50 replies
2/15lib/vdso: Update coarse timekeeper unconditionallykernel/time/vsyscall.c+17 -200 replies
3/15ARM: vdso: Remove unused functionarch/arm/include/asm/vdso/vsyscall.h+0 -70 replies
4/15lib/vdso: Allow the high resolution parts to be compiled outlib/vdso/gettimeofday.c+11 -00 replies
5/15ARM: vdso: Compile high resolution parts conditionallyarch/arm/include/asm/vdso/gettimeofday.h+6 -00 replies
6/15MIPS: vdso: Compile high resolution parts conditionallyarch/mips/include/asm/vdso/gettimeofday.h+7 -00 replies
7/15clocksource: Cleanup struct clocksource and documentationinclude/linux/clocksource.h+47 -400 replies
8/15x86/vdso: Move VDSO clocksource state tracking to callbackarch/x86/entry/vdso/vma.c arch/x86/include/asm/clocksource.h arch/x86/include/asm/mshyperv.h +6 more+65 -322 replies
9/15clocksource: Add common vdso clock mode storageinclude/linux/clocksource.h kernel/time/clocksource.c kernel/time/vsyscall.c +2 more+41 -32 replies
10/15x86/vdso: Use generic VDSO clock mode storagearch/x86/Kconfig arch/x86/entry/vdso/vma.c arch/x86/include/asm/clocksource.h +10 more+46 -631 reply
11/15mips: vdso: Use generic VDSO clock mode storagearch/mips/Kconfig arch/mips/include/asm/clocksource.h arch/mips/include/asm/vdso/gettimeofday.h +3 more+15 -480 replies
12/15ARM/arm64: vdso: Use common vdso clock mode storagearch/arm/Kconfig arch/arm/include/asm/clocksource.h arch/arm/include/asm/vdso/vsyscall.h +5 more+10 -420 replies
13/15lib/vdso: Cleanup clock mode storage leftoversarch/arm/mm/Kconfig arch/arm64/Kconfig arch/mips/Kconfig +6 more+7 -330 replies
14/15lib/vdso: Avoid highres update if clocksource is not VDSO capablearch/arm/include/asm/vdso/vsyscall.h include/asm-generic/vdso/vsyscall.h kernel/time/vsyscall.c+7 -211 reply
15/15lib/vdso: Move VCLOCK_TIMENS to vdso_clock_modesinclude/linux/clocksource.h include/vdso/datapage.h kernel/time/namespace.c +1 more+17 -131 reply

Reviews trailers per patch

2 of 15 patches have a Reviewed-by or Acked-by.

PatchJuergen GrossMichael Kelley
1/15
2/15
3/15
4/15
5/15
6/15
7/15
8/15A-b R-b
9/15
10/15A-b
11/15
12/15
13/15
14/15
15/15

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 00/15] lib/vdso: Bugfix and consolidation

The recent discussions about changes in the VDSO to support PPC triggered this consolidation series which in turn unearthed a subtle bug affecting ARM.

The bug affects only ARM 32bit systems which lack a VDSO capable timer. The absence of the ARM architected timer causes the VDSO update code to terminate early. As a result the parts of the VDSO data which is usable without a VDSO capable clocksource are not updated either, but the VDSO code uses them, i.e. it uses stale data and will serve that forever. The fix is to make only the parts of the update conditional which are related to te high resolution interfaces.

The rest of the series is addressing the following points:

- Allow architectures to compile out the high resolution parts of the VDSO library when they know at compile time that no VDSO capable clocksource will be available.

- Move the storage of the VDSO clockmode into generic code and remove all the redundant copies of the storage and the handling of it from the architectures.

This allows to remove the check for a valid clocksource at runtime from the clock readout function and make it generic by checking for a clock mode != NONE in the generic code. This generates better code on PPC and does not affect x86/arm performance.

Thanks,

tglx

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

 arch/arm/Kconfig                            |    1 
 arch/arm/include/asm/clocksource.h          |    5 -
 arch/arm/include/asm/vdso/gettimeofday.h    |    6 +
 arch/arm/include/asm/vdso/vsyscall.h        |   35 ---------
 arch/arm64/Kconfig                          |    1 
 arch/arm64/include/asm/clocksource.h        |    5 -
 arch/arm64/include/asm/vdso/vsyscall.h      |    9 --
 arch/mips/Kconfig                           |    1 
 arch/mips/include/asm/clocksource.h         |   18 ----
 arch/mips/include/asm/vdso/vsyscall.h       |    9 --
 arch/mips/kernel/csrc-r4k.c                 |    2 
 arch/x86/Kconfig                            |    1 
 arch/x86/entry/vdso/vma.c                   |    8 +-
 arch/x86/include/asm/clocksource.h          |   23 ++++--
 arch/x86/include/asm/mshyperv.h             |    4 -
 arch/x86/include/asm/vdso/gettimeofday.h    |    6 -
 arch/x86/include/asm/vdso/vsyscall.h        |   15 ----
 arch/x86/include/asm/vgtod.h                |    6 -
 arch/x86/kernel/kvmclock.c                  |    9 ++
 arch/x86/kernel/pvclock.c                   |    2 
 arch/x86/kernel/time.c                      |   12 ---
 arch/x86/kernel/tsc.c                       |   32 +++++---
 arch/x86/kvm/trace.h                        |    4 -
 arch/x86/kvm/x86.c                          |   22 +++---
 arch/x86/xen/time.c                         |   36 ++++++---
 b/arch/mips/include/asm/vdso/gettimeofday.h |   29 +++----
 b/include/asm-generic/vdso/vsyscall.h       |   14 ---
 drivers/clocksource/arm_arch_timer.c        |    8 +-
 drivers/clocksource/hyperv_timer.c          |    7 +
 drivers/clocksource/mips-gic-timer.c        |    8 +-
 include/linux/clocksource.h                 |  102 ++++++++++++++++------------
 include/vdso/datapage.h                     |    2 
 kernel/time/clocksource.c                   |    9 ++
 kernel/time/namespace.c                     |    7 +
 kernel/time/vsyscall.c                      |   43 +++++------
 lib/vdso/gettimeofday.c                     |   43 +++++++----
 36 files changed, 259 insertions(+), 285 deletions(-)