[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200706163802.1836732-1-maz@kernel.org>
Date: Mon, 6 Jul 2020 17:37:58 +0100
From: Marc Zyngier <maz@...nel.org>
To: Will Deacon <will@...nel.org>,
Catalin Marinas <catalin.marinas@....com>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>,
Vincenzo Frascino <vincenzo.frascino@....com>,
Thomas Gleixner <tglx@...utronix.de>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
kernel-team@...roid.com
Subject: [PATCH v2 0/4] arm64: Allow the compat vdso to be disabled at runtime
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.
Lastly, I've tagged a rework of the 1414080 workaround (which had been
posted separately) at the end of the series so that it limits its
effect to 32bit tasks exclusively (so far, it forces the userspace
access bit on 64bit tasks, and we may need to leave it disabled in the
future...).
* From v1:
- Reworked following Mark's feedback (patches #2 and #3)
- Reworked patch #4 after Will's comments
- patches #1 to #3 are now cc stable
- Applied Mark's AB to patch #1
Marc Zyngier (4):
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
arm64: Rework ARM_ERRATUM_1414080 handling
arch/arm64/include/asm/arch_timer.h | 1 +
arch/arm64/include/asm/vdso/clocksource.h | 7 +++-
.../include/asm/vdso/compat_gettimeofday.h | 8 +++-
arch/arm64/kernel/entry.S | 40 +++++++++++--------
drivers/clocksource/arm_arch_timer.c | 11 +++++
5 files changed, 48 insertions(+), 19 deletions(-)
--
2.27.0
Powered by blists - more mailing lists