* [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig
@ 2026-05-21 6:53 Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
` (8 more replies)
0 siblings, 9 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
MIPS contains multiple different, incomplete methods to disable the
time-related vDSO bits. Unify them and make them work correctly.
This can go through either the vDSO or MIPS tree.
There will be a conflict with one of my other serieses [0].
It is trivial to resolve, remove all instances of GENERIC_TIME_VSYSCALL.
[0] https://lore.kernel.org/lkml/20260519-vdso-generic_time_vsyscal-v1-0-5c2a5905d5f5@linutronix.de/
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
Thomas Weißschuh (9):
MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block
vdso/datastore: Always provide symbol declarations
MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY
MIPS: VDSO: Only map the data pages when the vDSO is used
MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
MIPS: VDSO: Gate microMIPS restriction on GCC version
MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
MAINTAINERS | 1 +
arch/mips/Kconfig | 19 +++++++++++--------
arch/mips/kernel/csrc-r4k.c | 5 ++++-
arch/mips/kernel/vdso.c | 12 +++++++-----
arch/mips/vdso/Kconfig | 6 ------
arch/mips/vdso/Makefile | 7 ++-----
arch/mips/vdso/vdso.lds.S | 4 +---
arch/mips/vdso/vgettimeofday.c | 20 --------------------
drivers/clocksource/mips-gic-timer.c | 2 ++
include/linux/vdso_datastore.h | 2 +-
10 files changed, 29 insertions(+), 49 deletions(-)
---
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
change-id: 20260518-vdso-mips-kconfig-ddd4583b5f3e
Best regards,
--
Thomas Weißschuh <thomas.weissschuh@linutronix.de>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
` (7 subsequent siblings)
8 siblings, 1 reply; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
This file is part of the generic vDSO subsystem.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2fb1c75afd16..e1ba3826ef53 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10857,6 +10857,7 @@ L: linux-kernel@vger.kernel.org
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso
F: include/asm-generic/vdso/vsyscall.h
+F: include/linux/vdso_datastore.h
F: include/vdso/
F: kernel/time/namespace_vdso.c
F: kernel/time/vsyscall.c
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 2/9] vdso/datastore: Always provide symbol declarations
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
` (6 subsequent siblings)
8 siblings, 1 reply; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
Allow callers to easily reference these symbols in code that is built
even when the generic datastore is disabled.
As there are no good default no-op variants of these symbols, do not
provide stubs but require users to have their own fallback handling
using IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO).
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
include/linux/vdso_datastore.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/vdso_datastore.h b/include/linux/vdso_datastore.h
index 0b530428db71..3dfba9502d78 100644
--- a/include/linux/vdso_datastore.h
+++ b/include/linux/vdso_datastore.h
@@ -2,12 +2,12 @@
#ifndef _LINUX_VDSO_DATASTORE_H
#define _LINUX_VDSO_DATASTORE_H
-#ifdef CONFIG_HAVE_GENERIC_VDSO
#include <linux/mm_types.h>
extern const struct vm_special_mapping vdso_vvar_mapping;
struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, unsigned long addr);
+#ifdef CONFIG_HAVE_GENERIC_VDSO
void __init vdso_setup_data_pages(void);
#else /* !CONFIG_HAVE_GENERIC_VDSO */
static inline void vdso_setup_data_pages(void) { }
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
` (5 subsequent siblings)
8 siblings, 1 reply; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
The logic to enable the generic vDSO Kconfig symbols is about to become
more complex.
Introduce a new helper symbol to keep the configuration readable.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/Kconfig | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4364f3dba688..af610af7ed08 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -38,7 +38,6 @@ config MIPS
select GENERIC_BUILTIN_DTB if BUILTIN_DTB
select GENERIC_CMOS_UPDATE
select GENERIC_CPU_AUTOPROBE
- select GENERIC_GETTIMEOFDAY
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_ISA_DMA if EISA
@@ -51,7 +50,6 @@ config MIPS
select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
select GENERIC_SMP_IDLE_THREAD
select GENERIC_IDLE_POLL_SETUP
- select GENERIC_TIME_VSYSCALL
select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT
select HAS_IOPORT if !NO_IOPORT_MAP || ISA
select HAVE_ARCH_COMPILER_H
@@ -3170,6 +3168,11 @@ endmenu
config MIPS_EXTERNAL_TIMER
bool
+config MIPS_GENERIC_GETTIMEOFDAY
+ def_bool y
+ select GENERIC_GETTIMEOFDAY
+ select GENERIC_TIME_VSYSCALL
+
menu "CPU Power Management"
if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (2 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
` (4 subsequent siblings)
8 siblings, 1 reply; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
A future change will make it possible to disable the time-related vDSO.
In that case there is no point in calling into the datastore.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/Kconfig | 2 +-
arch/mips/kernel/vdso.c | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index af610af7ed08..3a01cc85bd6a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -74,7 +74,6 @@ config MIPS
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_GCC_PLUGINS
- select HAVE_GENERIC_VDSO
select HAVE_IOREMAP_PROT
select HAVE_IRQ_EXIT_ON_IRQ_STACK
select HAVE_IRQ_TIME_ACCOUNTING
@@ -3172,6 +3171,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
select GENERIC_TIME_VSYSCALL
+ select HAVE_GENERIC_VDSO
menu "CPU Power Management"
diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c
index 2fa4df3e46e4..bd1fc17d3975 100644
--- a/arch/mips/kernel/vdso.c
+++ b/arch/mips/kernel/vdso.c
@@ -129,7 +129,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
* This ensures that when the kernel updates the VDSO data userland
* will observe it without requiring cache invalidations.
*/
- if (cpu_has_dc_aliases) {
+ if (cpu_has_dc_aliases && IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) {
base = __ALIGN_MASK(base, shm_align_mask);
base += ((unsigned long)vdso_k_time_data - gic_size) & shm_align_mask;
}
@@ -137,10 +137,12 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
data_addr = base + gic_size;
vdso_addr = data_addr + VDSO_NR_PAGES * PAGE_SIZE;
- vma = vdso_install_vvar_mapping(mm, data_addr);
- if (IS_ERR(vma)) {
- ret = PTR_ERR(vma);
- goto out;
+ if (IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) {
+ vma = vdso_install_vvar_mapping(mm, data_addr);
+ if (IS_ERR(vma)) {
+ ret = PTR_ERR(vma);
+ goto out;
+ }
}
/* Map GIC user page. */
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (3 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
` (3 subsequent siblings)
8 siblings, 2 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
VDSO_CLOCKMODE_R4K is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_R4K.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/kernel/csrc-r4k.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index 59eca397f297..7c431119bb14 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -130,8 +130,11 @@ int __init init_r4k_clocksource(void)
* R2 onwards makes the count accessible to user mode so it can be used
* by the VDSO (HWREna is configured by configure_hwrena()).
*/
- if (cpu_has_mips_r2_r6 && rdhwr_count_usable())
+ if (cpu_has_mips_r2_r6 && rdhwr_count_usable()) {
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;
+#endif
+ }
clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (4 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
` (2 subsequent siblings)
8 siblings, 2 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
drivers/clocksource/mips-gic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 1501c7db9a8e..a1669266c94d 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -198,7 +198,9 @@ static struct clocksource gic_clocksource = {
.name = "GIC",
.read = gic_hpt_read,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
.vdso_clock_mode = VDSO_CLOCKMODE_GIC,
+#endif
};
static void gic_clocksource_unstable(char *reason)
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (5 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
8 siblings, 2 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
The currently used MIPS_DISABLE_VDSO will disable only the userspace
bits of the time-related vDSO. The kernel part is still pointlessly
built and running.
Remove MIPS_DISABLE_VDSO and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/Kconfig | 6 ++++--
arch/mips/vdso/Kconfig | 6 ------
arch/mips/vdso/Makefile | 7 ++-----
arch/mips/vdso/vdso.lds.S | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3a01cc85bd6a..8a3bd431b16a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3172,6 +3172,10 @@ config MIPS_GENERIC_GETTIMEOFDAY
select GENERIC_GETTIMEOFDAY
select GENERIC_TIME_VSYSCALL
select HAVE_GENERIC_VDSO
+ # GCC (at least up to version 9.2) appears to emit function calls that make use
+ # of the GOT when targeting microMIPS, which we can't use in the VDSO due to
+ # the lack of relocations. As such, we disable the VDSO for microMIPS builds.
+ depends on !CPU_MICROMIPS
menu "CPU Power Management"
@@ -3184,5 +3188,3 @@ source "drivers/cpuidle/Kconfig"
endmenu
source "arch/mips/kvm/Kconfig"
-
-source "arch/mips/vdso/Kconfig"
diff --git a/arch/mips/vdso/Kconfig b/arch/mips/vdso/Kconfig
deleted file mode 100644
index 70140248da72..000000000000
--- a/arch/mips/vdso/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# GCC (at least up to version 9.2) appears to emit function calls that make use
-# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
-# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
-
-config MIPS_DISABLE_VDSO
- def_bool CPU_MICROMIPS
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 69d4593f64fe..00d3ba2c482a 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -4,7 +4,7 @@
# Include the generic Makefile to check the built vdso.
include $(srctree)/lib/vdso/Makefile.include
-obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
+obj-vdso-y := elf.o sigreturn.o
# Common compiler flags between ABIs.
ccflags-vdso := \
@@ -36,6 +36,7 @@ aflags-vdso := $(ccflags-vdso) \
-D__ASSEMBLY__ -Wa,-gdwarf-2
ifneq ($(c-gettimeofday-y),)
+obj-vdso-y += vgettimeofday.o
CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
# config-n32-o32-env.c prepares the environment to build a 32bit vDSO
@@ -47,10 +48,6 @@ endif
CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE)
-ifdef CONFIG_MIPS_DISABLE_VDSO
- obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
-endif
-
# VDSO linker flags.
ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
$(filter -E%,$(KBUILD_CFLAGS)) -shared \
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index 5d08be3a6b85..fd263b05d3e7 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -94,7 +94,7 @@ PHDRS
VERSION
{
LINUX_2.6 {
-#ifndef CONFIG_MIPS_DISABLE_VDSO
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (6 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
8 siblings, 2 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
As explained in the comment, the problematic GOT references are only
emitted by old versions of GCC.
Limit the restriction to those compilers.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 8a3bd431b16a..d545a50c4bd5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3175,7 +3175,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
- depends on !CPU_MICROMIPS
+ depends on !(CPU_MICROMIPS && CC_IS_GCC && GCC_VERSION < 90300)
menu "CPU Power Management"
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
` (7 preceding siblings ...)
2026-05-21 6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
@ 2026-05-21 6:53 ` Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:03 ` tip-bot2 for Thomas Weißschuh
8 siblings, 2 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-05-21 6:53 UTC (permalink / raw)
To: Thomas Bogendoerfer, Daniel Lezcano, Thomas Gleixner,
Andy Lutomirski, Vincenzo Frascino
Cc: Arnd Bergmann, linux-mips, linux-kernel, Thomas Weißschuh
This configuration option exists so "that we don't provide the symbol
when there's no possibility of there being a usable clocksource".
However it only covers __vdso_gettimeofday() and none of the other vDSO
functions which should be affected by the same circumstances.slightly slightly.
Remove MIPS_CLOCK_VSYSCALL and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
A different variant of this was originally part of another series [0].
[0] https://lore.kernel.org/lkml/20260227-vdso-compat_32bit_time-v1-0-3f0286a7bac3@linutronix.de/
---
arch/mips/Kconfig | 4 +---
arch/mips/vdso/vdso.lds.S | 2 --
arch/mips/vdso/vgettimeofday.c | 20 --------------------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d545a50c4bd5..fcfa16b483a8 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1133,9 +1133,6 @@ config CSRC_R4K
config CSRC_SB1250
bool
-config MIPS_CLOCK_VSYSCALL
- def_bool CSRC_R4K || CLKSRC_MIPS_GIC
-
config GPIO_TXX9
select GPIOLIB
bool
@@ -3172,6 +3169,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
select GENERIC_GETTIMEOFDAY
select GENERIC_TIME_VSYSCALL
select HAVE_GENERIC_VDSO
+ depends on CSRC_R4K || CLKSRC_MIPS_GIC
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index fd263b05d3e7..05badf3ae0ff 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -97,9 +97,7 @@ VERSION
#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
__vdso_gettimeofday;
-#endif
__vdso_clock_getres;
#if _MIPS_SIM != _MIPS_SIM_ABI64
__vdso_clock_gettime64;
diff --git a/arch/mips/vdso/vgettimeofday.c b/arch/mips/vdso/vgettimeofday.c
index 1d236215e8f6..00f9fcfc327e 100644
--- a/arch/mips/vdso/vgettimeofday.c
+++ b/arch/mips/vdso/vgettimeofday.c
@@ -18,22 +18,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime32(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct old_timespec32 *res)
{
@@ -59,22 +49,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct __kernel_timespec *res)
{
--
2.54.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
2026-06-09 15:03 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer,
Daniel Lezcano, Andy Lutomirski, Vincenzo Frascino,
Arnd Bergmann, linux-mips, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 13f6218e6fe79dc64aed76d738b765b45f62492b
Gitweb: https://git.kernel.org/tip/13f6218e6fe79dc64aed76d738b765b45f62492b
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:23 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
This configuration option exists so "that we don't provide the symbol
when there's no possibility of there being a usable clocksource".
However it only covers __vdso_gettimeofday() and none of the other vDSO
functions which should be affected by the same circumstances.slightly slightly.
Remove MIPS_CLOCK_VSYSCALL and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@vger.kernel.org
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-9-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 4 +---
arch/mips/vdso/vdso.lds.S | 2 --
arch/mips/vdso/vgettimeofday.c | 20 --------------------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ccc66e3..323ca08 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1133,9 +1133,6 @@ config CSRC_R4K
config CSRC_SB1250
bool
-config MIPS_CLOCK_VSYSCALL
- def_bool CSRC_R4K || CLKSRC_MIPS_GIC
-
config GPIO_TXX9
select GPIOLIB
bool
@@ -3171,6 +3168,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
select HAVE_GENERIC_VDSO
+ depends on CSRC_R4K || CLKSRC_MIPS_GIC
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index fd263b0..05badf3 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -97,9 +97,7 @@ VERSION
#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
__vdso_gettimeofday;
-#endif
__vdso_clock_getres;
#if _MIPS_SIM != _MIPS_SIM_ABI64
__vdso_clock_gettime64;
diff --git a/arch/mips/vdso/vgettimeofday.c b/arch/mips/vdso/vgettimeofday.c
index 1d23621..00f9fcf 100644
--- a/arch/mips/vdso/vgettimeofday.c
+++ b/arch/mips/vdso/vgettimeofday.c
@@ -18,22 +18,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime32(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct old_timespec32 *res)
{
@@ -59,22 +49,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct __kernel_timespec *res)
{
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Gate microMIPS restriction on GCC version
2026-05-21 6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 0f63c3fbdc06eeac48eb6beb437270722a5aa50e
Gitweb: https://git.kernel.org/tip/0f63c3fbdc06eeac48eb6beb437270722a5aa50e
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:22 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
MIPS: VDSO: Gate microMIPS restriction on GCC version
As explained in the comment, the problematic GOT references are only
emitted by old versions of GCC.
Limit the restriction to those compilers.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-8-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6463b0b..ccc66e3 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3174,7 +3174,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
- depends on !CPU_MICROMIPS
+ depends on !(CPU_MICROMIPS && CC_IS_GCC && GCC_VERSION < 90300)
menu "CPU Power Management"
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer,
Daniel Lezcano, Andy Lutomirski, Vincenzo Frascino,
Arnd Bergmann, linux-mips, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 2db1ec80dfd5f9f1200acc90ec04a9c8ea47701a
Gitweb: https://git.kernel.org/tip/2db1ec80dfd5f9f1200acc90ec04a9c8ea47701a
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:21 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
The currently used MIPS_DISABLE_VDSO will disable only the userspace
bits of the time-related vDSO. The kernel part is still pointlessly
built and running.
Remove MIPS_DISABLE_VDSO and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@vger.kernel.org
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-7-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 6 ++++--
arch/mips/vdso/Kconfig | 6 ------
arch/mips/vdso/Makefile | 7 ++-----
arch/mips/vdso/vdso.lds.S | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
delete mode 100644 arch/mips/vdso/Kconfig
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f56e1a5..6463b0b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3171,6 +3171,10 @@ config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
select HAVE_GENERIC_VDSO
+ # GCC (at least up to version 9.2) appears to emit function calls that make use
+ # of the GOT when targeting microMIPS, which we can't use in the VDSO due to
+ # the lack of relocations. As such, we disable the VDSO for microMIPS builds.
+ depends on !CPU_MICROMIPS
menu "CPU Power Management"
@@ -3183,5 +3187,3 @@ source "drivers/cpuidle/Kconfig"
endmenu
source "arch/mips/kvm/Kconfig"
-
-source "arch/mips/vdso/Kconfig"
diff --git a/arch/mips/vdso/Kconfig b/arch/mips/vdso/Kconfig
deleted file mode 100644
index 7014024..0000000
--- a/arch/mips/vdso/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# GCC (at least up to version 9.2) appears to emit function calls that make use
-# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
-# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
-
-config MIPS_DISABLE_VDSO
- def_bool CPU_MICROMIPS
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 69d4593..00d3ba2 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -4,7 +4,7 @@
# Include the generic Makefile to check the built vdso.
include $(srctree)/lib/vdso/Makefile.include
-obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
+obj-vdso-y := elf.o sigreturn.o
# Common compiler flags between ABIs.
ccflags-vdso := \
@@ -36,6 +36,7 @@ aflags-vdso := $(ccflags-vdso) \
-D__ASSEMBLY__ -Wa,-gdwarf-2
ifneq ($(c-gettimeofday-y),)
+obj-vdso-y += vgettimeofday.o
CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
# config-n32-o32-env.c prepares the environment to build a 32bit vDSO
@@ -47,10 +48,6 @@ endif
CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE)
-ifdef CONFIG_MIPS_DISABLE_VDSO
- obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
-endif
-
# VDSO linker flags.
ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
$(filter -E%,$(KBUILD_CFLAGS)) -shared \
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index 5d08be3..fd263b0 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -94,7 +94,7 @@ PHDRS
VERSION
{
LINUX_2.6 {
-#ifndef CONFIG_MIPS_DISABLE_VDSO
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
2026-05-21 6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: a7d9141d5ddf08fa3cd50a079be4bd93a8aa42fe
Gitweb: https://git.kernel.org/tip/a7d9141d5ddf08fa3cd50a079be4bd93a8aa42fe
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:20 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de
---
drivers/clocksource/mips-gic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 1501c7d..a166926 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -198,7 +198,9 @@ static struct clocksource gic_clocksource = {
.name = "GIC",
.read = gic_hpt_read,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
.vdso_clock_mode = VDSO_CLOCKMODE_GIC,
+#endif
};
static void gic_clocksource_unstable(char *reason)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
2026-05-21 6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
2026-06-05 7:59 ` Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 1 reply; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 0ebac10c9f1020963dd803f871a9b413979c76b8
Gitweb: https://git.kernel.org/tip/0ebac10c9f1020963dd803f871a9b413979c76b8
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:19 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
VDSO_CLOCKMODE_R4K is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_R4K.
[ tglx: Replace #ifdeffery ]
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de
---
arch/mips/kernel/csrc-r4k.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index 59eca39..5ce95e1 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -130,7 +130,8 @@ int __init init_r4k_clocksource(void)
* R2 onwards makes the count accessible to user mode so it can be used
* by the VDSO (HWREna is configured by configure_hwrena()).
*/
- if (cpu_has_mips_r2_r6 && rdhwr_count_usable())
+ if (IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) &&
+ cpu_has_mips_r2_r6 && rdhwr_count_usable())
clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;
clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Only map the data pages when the vDSO is used
2026-05-21 6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
0 siblings, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 8ea920c48d82a0ef031bedfb649d4d8c77ef3d1c
Gitweb: https://git.kernel.org/tip/8ea920c48d82a0ef031bedfb649d4d8c77ef3d1c
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:18 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00
MIPS: VDSO: Only map the data pages when the vDSO is used
A future change will make it possible to disable the time-related vDSO.
In that case there is no point in calling into the datastore.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-4-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 2 +-
arch/mips/kernel/vdso.c | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b041d3d..f56e1a5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -74,7 +74,6 @@ config MIPS
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_GCC_PLUGINS
- select HAVE_GENERIC_VDSO
select HAVE_IOREMAP_PROT
select HAVE_IRQ_EXIT_ON_IRQ_STACK
select HAVE_IRQ_TIME_ACCOUNTING
@@ -3171,6 +3170,7 @@ config MIPS_EXTERNAL_TIMER
config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
+ select HAVE_GENERIC_VDSO
menu "CPU Power Management"
diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c
index 2fa4df3..bd1fc17 100644
--- a/arch/mips/kernel/vdso.c
+++ b/arch/mips/kernel/vdso.c
@@ -129,7 +129,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
* This ensures that when the kernel updates the VDSO data userland
* will observe it without requiring cache invalidations.
*/
- if (cpu_has_dc_aliases) {
+ if (cpu_has_dc_aliases && IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) {
base = __ALIGN_MASK(base, shm_align_mask);
base += ((unsigned long)vdso_k_time_data - gic_size) & shm_align_mask;
}
@@ -137,10 +137,12 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
data_addr = base + gic_size;
vdso_addr = data_addr + VDSO_NR_PAGES * PAGE_SIZE;
- vma = vdso_install_vvar_mapping(mm, data_addr);
- if (IS_ERR(vma)) {
- ret = PTR_ERR(vma);
- goto out;
+ if (IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) {
+ vma = vdso_install_vvar_mapping(mm, data_addr);
+ if (IS_ERR(vma)) {
+ ret = PTR_ERR(vma);
+ goto out;
+ }
}
/* Map GIC user page. */
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
0 siblings, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 60ad2f1158577b4923987f0a410456cfccd0fd23
Gitweb: https://git.kernel.org/tip/60ad2f1158577b4923987f0a410456cfccd0fd23
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:17 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00
MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY
The logic to enable the generic vDSO Kconfig symbols is about to become
more complex.
Introduce a new helper symbol to keep the configuration readable.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-3-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3249880..b041d3d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -38,7 +38,6 @@ config MIPS
select GENERIC_BUILTIN_DTB if BUILTIN_DTB
select GENERIC_CMOS_UPDATE
select GENERIC_CPU_AUTOPROBE
- select GENERIC_GETTIMEOFDAY
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_ISA_DMA if EISA
@@ -3169,6 +3168,10 @@ endmenu
config MIPS_EXTERNAL_TIMER
bool
+config MIPS_GENERIC_GETTIMEOFDAY
+ def_bool y
+ select GENERIC_GETTIMEOFDAY
+
menu "CPU Power Management"
if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] vdso/datastore: Always provide symbol declarations
2026-05-21 6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
0 siblings, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits; +Cc: thomas.weissschuh, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 551f209164c4d2cb8d5542351f145e8257c44702
Gitweb: https://git.kernel.org/tip/551f209164c4d2cb8d5542351f145e8257c44702
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:16 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00
vdso/datastore: Always provide symbol declarations
Allow callers to easily reference these symbols in code that is built
even when the generic datastore is disabled.
As there are no good default no-op variants of these symbols, do not
provide stubs but require users to have their own fallback handling
using IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO).
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-2-2f79dcd6c78f@linutronix.de
---
include/linux/vdso_datastore.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/vdso_datastore.h b/include/linux/vdso_datastore.h
index 0b53042..3dfba95 100644
--- a/include/linux/vdso_datastore.h
+++ b/include/linux/vdso_datastore.h
@@ -2,12 +2,12 @@
#ifndef _LINUX_VDSO_DATASTORE_H
#define _LINUX_VDSO_DATASTORE_H
-#ifdef CONFIG_HAVE_GENERIC_VDSO
#include <linux/mm_types.h>
extern const struct vm_special_mapping vdso_vvar_mapping;
struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, unsigned long addr);
+#ifdef CONFIG_HAVE_GENERIC_VDSO
void __init vdso_setup_data_pages(void);
#else /* !CONFIG_HAVE_GENERIC_VDSO */
static inline void vdso_setup_data_pages(void) { }
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block
2026-05-21 6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
@ 2026-06-04 16:24 ` tip-bot2 for Thomas Weißschuh
0 siblings, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-04 16:24 UTC (permalink / raw)
To: linux-tip-commits; +Cc: thomas.weissschuh, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: facdd1b82a41092f7f7c69f2881b946d74ede997
Gitweb: https://git.kernel.org/tip/facdd1b82a41092f7f7c69f2881b946d74ede997
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:15 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00
MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block
This file is part of the generic vDSO subsystem.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-1-2f79dcd6c78f@linutronix.de
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9ec290e..65b2336 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10870,6 +10870,7 @@ L: linux-kernel@vger.kernel.org
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso
F: include/asm-generic/vdso/vsyscall.h
+F: include/linux/vdso_datastore.h
F: include/vdso/
F: kernel/time/namespace_vdso.c
F: kernel/time/vsyscall.c
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [tip: timers/vdso] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-05 7:59 ` Thomas Weißschuh
0 siblings, 0 replies; 25+ messages in thread
From: Thomas Weißschuh @ 2026-06-05 7:59 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: linux-kernel, linux-tip-commits, Thomas Bogendoerfer, x86
On Thu, Jun 04, 2026 at 04:24:53PM +0000, tip-bot2 for Thomas Weißschuh wrote:
> The following commit has been merged into the timers/vdso branch of tip:
>
> Commit-ID: 0ebac10c9f1020963dd803f871a9b413979c76b8
> Gitweb: https://git.kernel.org/tip/0ebac10c9f1020963dd803f871a9b413979c76b8
> Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> AuthorDate: Thu, 21 May 2026 08:53:19 +02:00
> Committer: Thomas Gleixner <tglx@kernel.org>
> CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00
>
> MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
>
> VDSO_CLOCKMODE_R4K is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
> enabled. Right now this is always the case, but it will change soon.
>
> Prepare for the potential unavailability of VDSO_CLOCKMODE_R4K.
>
> [ tglx: Replace #ifdeffery ]
Right now the #ifdeffery is necessary:
arch/mips/kernel/csrc-r4k.c:135:38: error: use of undeclared identifier 'VDSO_CLOCKMODE_R4K'; did you mean 'VDSO_CLOCKMODE_MAX'?
135 | clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;
| ^~~~~~~~~~~~~~~~~~
| VDSO_CLOCKMODE_MAX
include/vdso/clocksource.h:16:2: note: 'VDSO_CLOCKMODE_MAX' declared here
16 | VDSO_CLOCKMODE_MAX,
| ^
We could do something like this to avoid it:
+++ b/include/asm-generic/Kbuild
@@ -61,6 +61,7 @@ mandatory-y += topology.h
mandatory-y += trace_clock.h
mandatory-y += uaccess.h
mandatory-y += unwind_user.h
+mandatory-y += vdso/clocksource.h
mandatory-y += vermagic.h
mandatory-y += vga.h
mandatory-y += video.h
diff --git a/include/asm-generic/vdso/clocksource.h b/include/asm-generic/vdso/clocksource.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/include/vdso/clocksource.h b/include/vdso/clocksource.h
index c682e7c60273..830ca619261e 100644
--- a/include/vdso/clocksource.h
+++ b/include/vdso/clocksource.h
@@ -4,9 +4,11 @@
#include <vdso/limits.h>
-#ifdef CONFIG_GENERIC_GETTIMEOFDAY
#include <asm/vdso/clocksource.h>
-#endif /* CONFIG_GENERIC_GETTIMEOFDAY */
+
+#ifdef VDSO_ARCH_CLOCKMODES
+extern int VDSO_ARCH_CLOCKMODES;
+#endif
enum vdso_clock_mode {
VDSO_CLOCKMODE_NONE,
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> Signed-off-by: Thomas Gleixner <tglx@kernel.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de
> ---
> arch/mips/kernel/csrc-r4k.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
> index 59eca39..5ce95e1 100644
> --- a/arch/mips/kernel/csrc-r4k.c
> +++ b/arch/mips/kernel/csrc-r4k.c
> @@ -130,7 +130,8 @@ int __init init_r4k_clocksource(void)
> * R2 onwards makes the count accessible to user mode so it can be used
> * by the VDSO (HWREna is configured by configure_hwrena()).
> */
> - if (cpu_has_mips_r2_r6 && rdhwr_count_usable())
> + if (IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) &&
> + cpu_has_mips_r2_r6 && rdhwr_count_usable())
> clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;
>
> clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-09 15:03 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-09 15:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer,
Daniel Lezcano, Andy Lutomirski, Vincenzo Frascino,
Arnd Bergmann, linux-mips, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 8d563bd7904734c05a4f2abf4ecca0e4fe764b50
Gitweb: https://git.kernel.org/tip/8d563bd7904734c05a4f2abf4ecca0e4fe764b50
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:23 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00
MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY
This configuration option exists so "that we don't provide the symbol
when there's no possibility of there being a usable clocksource".
However it only covers __vdso_gettimeofday() and none of the other vDSO
functions which should be affected by the same circumstances.slightly slightly.
Remove MIPS_CLOCK_VSYSCALL and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@vger.kernel.org
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-9-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 4 +---
arch/mips/vdso/vdso.lds.S | 2 --
arch/mips/vdso/vgettimeofday.c | 20 --------------------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ccc66e3..323ca08 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1133,9 +1133,6 @@ config CSRC_R4K
config CSRC_SB1250
bool
-config MIPS_CLOCK_VSYSCALL
- def_bool CSRC_R4K || CLKSRC_MIPS_GIC
-
config GPIO_TXX9
select GPIOLIB
bool
@@ -3171,6 +3168,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
select HAVE_GENERIC_VDSO
+ depends on CSRC_R4K || CLKSRC_MIPS_GIC
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index fd263b0..05badf3 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -97,9 +97,7 @@ VERSION
#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
__vdso_gettimeofday;
-#endif
__vdso_clock_getres;
#if _MIPS_SIM != _MIPS_SIM_ABI64
__vdso_clock_gettime64;
diff --git a/arch/mips/vdso/vgettimeofday.c b/arch/mips/vdso/vgettimeofday.c
index 1d23621..00f9fcf 100644
--- a/arch/mips/vdso/vgettimeofday.c
+++ b/arch/mips/vdso/vgettimeofday.c
@@ -18,22 +18,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime32(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct old_timespec32 *res)
{
@@ -59,22 +49,12 @@ int __vdso_clock_gettime(clockid_t clock,
return __cvdso_clock_gettime(clock, ts);
}
-#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
-
-/*
- * This is behind the ifdef so that we don't provide the symbol when there's no
- * possibility of there being a usable clocksource, because there's nothing we
- * can do without it. When libc fails the symbol lookup it should fall back on
- * the standard syscall path.
- */
int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
struct timezone *tz)
{
return __cvdso_gettimeofday(tv, tz);
}
-#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
-
int __vdso_clock_getres(clockid_t clock_id,
struct __kernel_timespec *res)
{
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Gate microMIPS restriction on GCC version
2026-05-21 6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-09 15:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: d051ede1adeeb8ccc9314bac00f33e013deedbf5
Gitweb: https://git.kernel.org/tip/d051ede1adeeb8ccc9314bac00f33e013deedbf5
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:22 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00
MIPS: VDSO: Gate microMIPS restriction on GCC version
As explained in the comment, the problematic GOT references are only
emitted by old versions of GCC.
Limit the restriction to those compilers.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-8-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6463b0b..ccc66e3 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3174,7 +3174,7 @@ config MIPS_GENERIC_GETTIMEOFDAY
# GCC (at least up to version 9.2) appears to emit function calls that make use
# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
- depends on !CPU_MICROMIPS
+ depends on !(CPU_MICROMIPS && CC_IS_GCC && GCC_VERSION < 90300)
menu "CPU Power Management"
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
2026-05-21 6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-09 15:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer,
Daniel Lezcano, Andy Lutomirski, Vincenzo Frascino,
Arnd Bergmann, linux-mips, x86, linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 51512c216e1d2ab4822282c9ecdd40f43fa1484c
Gitweb: https://git.kernel.org/tip/51512c216e1d2ab4822282c9ecdd40f43fa1484c
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:21 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00
MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
The currently used MIPS_DISABLE_VDSO will disable only the userspace
bits of the time-related vDSO. The kernel part is still pointlessly
built and running.
Remove MIPS_DISABLE_VDSO and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@vger.kernel.org
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-7-2f79dcd6c78f@linutronix.de
---
arch/mips/Kconfig | 6 ++++--
arch/mips/vdso/Kconfig | 6 ------
arch/mips/vdso/Makefile | 7 ++-----
arch/mips/vdso/vdso.lds.S | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
delete mode 100644 arch/mips/vdso/Kconfig
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f56e1a5..6463b0b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3171,6 +3171,10 @@ config MIPS_GENERIC_GETTIMEOFDAY
def_bool y
select GENERIC_GETTIMEOFDAY
select HAVE_GENERIC_VDSO
+ # GCC (at least up to version 9.2) appears to emit function calls that make use
+ # of the GOT when targeting microMIPS, which we can't use in the VDSO due to
+ # the lack of relocations. As such, we disable the VDSO for microMIPS builds.
+ depends on !CPU_MICROMIPS
menu "CPU Power Management"
@@ -3183,5 +3187,3 @@ source "drivers/cpuidle/Kconfig"
endmenu
source "arch/mips/kvm/Kconfig"
-
-source "arch/mips/vdso/Kconfig"
diff --git a/arch/mips/vdso/Kconfig b/arch/mips/vdso/Kconfig
deleted file mode 100644
index 7014024..0000000
--- a/arch/mips/vdso/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# GCC (at least up to version 9.2) appears to emit function calls that make use
-# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
-# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
-
-config MIPS_DISABLE_VDSO
- def_bool CPU_MICROMIPS
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 69d4593..00d3ba2 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -4,7 +4,7 @@
# Include the generic Makefile to check the built vdso.
include $(srctree)/lib/vdso/Makefile.include
-obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
+obj-vdso-y := elf.o sigreturn.o
# Common compiler flags between ABIs.
ccflags-vdso := \
@@ -36,6 +36,7 @@ aflags-vdso := $(ccflags-vdso) \
-D__ASSEMBLY__ -Wa,-gdwarf-2
ifneq ($(c-gettimeofday-y),)
+obj-vdso-y += vgettimeofday.o
CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
# config-n32-o32-env.c prepares the environment to build a 32bit vDSO
@@ -47,10 +48,6 @@ endif
CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE)
-ifdef CONFIG_MIPS_DISABLE_VDSO
- obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
-endif
-
# VDSO linker flags.
ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
$(filter -E%,$(KBUILD_CFLAGS)) -shared \
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index 5d08be3..fd263b0 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -94,7 +94,7 @@ PHDRS
VERSION
{
LINUX_2.6 {
-#ifndef CONFIG_MIPS_DISABLE_VDSO
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
global:
__vdso_clock_gettime;
#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
2026-05-21 6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-09 15:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 66e0b2e3e3817efe0e0f283c04a9dd773ec4ac5e
Gitweb: https://git.kernel.org/tip/66e0b2e3e3817efe0e0f283c04a9dd773ec4ac5e
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:20 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00
clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de
---
drivers/clocksource/mips-gic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 1501c7d..a166926 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -198,7 +198,9 @@ static struct clocksource gic_clocksource = {
.name = "GIC",
.read = gic_hpt_read,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
.vdso_clock_mode = VDSO_CLOCKMODE_GIC,
+#endif
};
static void gic_clocksource_unstable(char *reason)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [tip: timers/vdso] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
2026-05-21 6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
@ 2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
1 sibling, 0 replies; 25+ messages in thread
From: tip-bot2 for Thomas Weißschuh @ 2026-06-09 15:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: thomas.weissschuh, Thomas Gleixner, Thomas Bogendoerfer, x86,
linux-kernel
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: f3dc8fb24f90fa2901a87fb5273edabcc4e8f2ed
Gitweb: https://git.kernel.org/tip/f3dc8fb24f90fa2901a87fb5273edabcc4e8f2ed
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Thu, 21 May 2026 08:53:19 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00
MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available
VDSO_CLOCKMODE_R4K is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.
Prepare for the potential unavailability of VDSO_CLOCKMODE_R4K.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de
---
arch/mips/kernel/csrc-r4k.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index 59eca39..241a934 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -126,12 +126,14 @@ int __init init_r4k_clocksource(void)
clocksource_mips.rating = 200;
clocksource_mips.rating += clamp(mips_hpt_frequency / 10000000, 0, 99);
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
/*
* R2 onwards makes the count accessible to user mode so it can be used
* by the VDSO (HWREna is configured by configure_hwrena()).
*/
if (cpu_has_mips_r2_r6 && rdhwr_count_usable())
clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;
+#endif
clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2026-06-09 15:04 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-21 6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-05 7:59 ` Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04 ` tip-bot2 for Thomas Weißschuh
2026-05-21 6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:03 ` tip-bot2 for Thomas Weißschuh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®