Skip to content

arm64: Allow the compat vdso to be disabled at runtime

Marc Zyngier linux-arm-kernel lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3arm64: Introduce a way to disable the 32bit vdsoarch/arm/include/asm/clocksource.h arch/arm/kernel/vdso.c arch/arm64/include/asm/clocksource.h +5 more+41 -140 replies
2/3arm64: arch_timer: Allow an workaround descriptor to disable compat vdsoarch/arm64/include/asm/arch_timer.h drivers/clocksource/arm_arch_timer.c+4 -00 replies
3/3arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040drivers/clocksource/arm_arch_timer.c+8 -00 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchMark Rutland
1/3A-b
2/3A-b
3/3A-b

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

Read the v1 thread

Cover letter [Stable-5.4][PATCH 0/3] arm64: Allow the compat vdso to be disabled at runtime

This is a backport of the series that recently went into 5.8. Note that the first patch is more a complete rewriting than a backport, as the vdso implementation in 5.4 doesn't have much in common with mainline. This affects the 32bit arch code in a benign way.

It has seen very little testing, as I don't have the HW that triggers this issue. I have run it in VMs by faking the CPU MIDR, and nothing caught fire. Famous last words.

The original cover letter follows.

	M.

The relatively recent introduction of the compat vdso on arm64 has overlooked its interactions with some of the interesting errata workarounds, such as ARM64_ERRATUM_1418040 (and its older 1188873 incarnation).

This erratum requires the 64bit kernel to trap 32bit accesses to the virtual counter and emulate it. When the workaround was introduced, the compat vdso simply wasn't a thing. Now that the patches have landed in mainline, we trap the CVTVCT accesses from the vdso.

This can end-up in a nasty loop in the vdso, where the sequence number changes on each trap, never stabilising, and leaving userspace in a bit of a funny state (which is why we disable the vdso in most similar cases). This erratum mentionned above is a bit special in the sense that in only requires to trap AArch32 accesses, and 64bit tasks can be left alone. Consequently, the vdso is never disabled and AArch32 tasks are affected.

Obviously, we really want to retain the 64bit vdso in this case. To that effect, this series offers a way to disable the 32bit view of the vdso without impacting its 64bit counterpart, by providing a "no-compat" vdso clock_mode, and plugging this feature into the 1418040 detection code.

Marc Zyngier (3):
arm64: Introduce a way to disable the 32bit vdso
arm64: arch_timer: Allow an workaround descriptor to disable compat
vdso
arm64: arch_timer: Disable the compat vdso for cores affected by

    ARM64_WORKAROUND_1418040
 arch/arm/include/asm/clocksource.h            | 11 ++++++++++-
 arch/arm/kernel/vdso.c                        |  2 +-
 arch/arm64/include/asm/arch_timer.h           |  1 +
 arch/arm64/include/asm/clocksource.h          |  5 ++++-
 arch/arm64/include/asm/vdso/clocksource.h     | 14 ++++++++++++++
 .../include/asm/vdso/compat_gettimeofday.h    |  5 +++--
 arch/arm64/include/asm/vdso/gettimeofday.h    |  6 ++++--
 arch/arm64/include/asm/vdso/vsyscall.h        |  4 +---
 drivers/clocksource/arm_arch_timer.c          | 19 +++++++++++++++----
 9 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 arch/arm64/include/asm/vdso/clocksource.h
Signature · 1 line
2.27.0