[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <174621297192.22196.5751074600127323972.tip-bot2@tip-bot2>
Date: Fri, 02 May 2025 19:09:31 -0000
From:
tip-bot2 for Thomas Weißschuh <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Jan Stancek <jstancek@...hat.com>, thomas.weissschuh@...utronix.de,
Thomas Gleixner <tglx@...utronix.de>,
Catalin Marinas <catalin.marinas@....com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: timers/urgent] arm64: vdso: Work around invalid absolute
relocations from GCC
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: 0c314cda93258cd1f0055a278a6576b5d4aeabf5
Gitweb: https://git.kernel.org/tip/0c314cda93258cd1f0055a278a6576b5d4aeabf5
Author: Thomas Weißschuh <thomas.weissschuh@...utronix.de>
AuthorDate: Wed, 30 Apr 2025 11:20:13 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Fri, 02 May 2025 20:57:11 +02:00
arm64: vdso: Work around invalid absolute relocations from GCC
All vDSO code needs to be completely position independent. Symbol
references are marked as hidden so the compiler emits PC-relative
relocations.
However GCC emits absolute relocations for symbol-relative references with
an offset >= 64KiB. After recent refactorings in the vDSO code this is the
case in __arch_get_vdso_u_timens_data() with a page size of 64KiB.
Work around the issue by preventing the optimizer from seeing the offsets.
Fixes: 83a2a6b8cfc5 ("vdso/gettimeofday: Prepare do_hres_timens() for introduction of struct vdso_clock")
Reported-by: Jan Stancek <jstancek@...hat.com>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@...utronix.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Catalin Marinas <catalin.marinas@....com>
Link: https://lore.kernel.org/all/20250430-vdso-absolute-reloc-v2-1-5efcc3bc4b26@linutronix.de
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120002
Closes: https://lore.kernel.org/lkml/aApGPAoctq_eoE2g@t14ultra/
---
arch/arm64/include/asm/vdso/gettimeofday.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h b/arch/arm64/include/asm/vdso/gettimeofday.h
index 92a2b59..3322c70 100644
--- a/arch/arm64/include/asm/vdso/gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/gettimeofday.h
@@ -99,6 +99,19 @@ static __always_inline u64 __arch_get_hw_counter(s32 clock_mode,
return res;
}
+#if IS_ENABLED(CONFIG_CC_IS_GCC) && IS_ENABLED(CONFIG_PAGE_SIZE_64KB)
+static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)
+{
+ const struct vdso_time_data *ret = &vdso_u_time_data;
+
+ /* Work around invalid absolute relocations */
+ OPTIMIZER_HIDE_VAR(ret);
+
+ return ret;
+}
+#define __arch_get_vdso_u_time_data __arch_get_vdso_u_time_data
+#endif /* IS_ENABLED(CONFIG_CC_IS_GCC) && IS_ENABLED(CONFIG_PAGE_SIZE_64KB) */
+
#endif /* !__ASSEMBLY__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
Powered by blists - more mailing lists