Commit f21f7b51 authored Apr 14, 2026 by Linus Torvalds

Merge tag 'timers-vdso-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull vdso updates from Thomas Gleixner:

 - Make the handling of compat functions consistent and more robust

 - Rework the underlying data store so that it is dynamically allocated,
   which allows the conversion of the last holdout SPARC64 to the
   generic VDSO implementation

 - Rework the SPARC64 VDSO to utilize the generic implementation

 - Mop up the left overs of the non-generic VDSO support in the core
   code

 - Expand the VDSO selftest and make them more robust

 - Allow time namespaces to be enabled independently of the generic VDSO
   support, which was not possible before due to SPARC64 not using it

 - Various cleanups and improvements in the related code

* tag 'timers-vdso-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (51 commits)
  timens: Use task_lock guard in timens_get*()
  timens: Use mutex guard in proc_timens_set_offset()
  timens: Simplify some calls to put_time_ns()
  timens: Add a __free() wrapper for put_time_ns()
  timens: Remove dependency on the vDSO
  vdso/timens: Move functions to new file
  selftests: vDSO: vdso_test_correctness: Add a test for time()
  selftests: vDSO: vdso_test_correctness: Use facilities from parse_vdso.c
  selftests: vDSO: vdso_test_correctness: Handle different tv_usec types
  selftests: vDSO: vdso_test_correctness: Drop SYS_getcpu fallbacks
  selftests: vDSO: vdso_test_gettimeofday: Remove nolibc checks
  Revert "selftests: vDSO: parse_vdso: Use UAPI headers instead of libc headers"
  random: vDSO: Remove ifdeffery
  random: vDSO: Trim vDSO includes
  vdso/datapage: Trim down unnecessary includes
  vdso/datapage: Remove inclusion of gettimeofday.h
  vdso/helpers: Explicitly include vdso/processor.h
  vdso/gettimeofday: Add explicit includes
  random: vDSO: Add explicit includes
  MIPS: vdso: Explicitly include asm/vdso/vdso.h
  ...

parents c1fe867b 7138a869

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -10796,6 +10796,7 @@ 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/vdso/
		F: kernel/time/namespace_vdso.c
		F: kernel/time/vsyscall.c
		F: lib/vdso/
		F: tools/testing/selftests/vDSO/
		@@ -21042,6 +21043,7 @@ F: include/trace/events/timer*
		F: kernel/time/itimer.c
		F: kernel/time/posix-*
		F: kernel/time/namespace.c
		F: kernel/time/namespace_vdso.c

		POWER MANAGEMENT CORE
		M: "Rafael J. Wysocki" <rafael@kernel.org>

arch/arm/include/asm/vdso/gettimeofday.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		#include <asm/errno.h>
		#include <asm/unistd.h>
		#include <asm/vdso/cp15.h>
		#include <vdso/clocksource.h>
		#include <vdso/time32.h>
		#include <uapi/linux/time.h>

		#define VDSO_HAS_CLOCK_GETRES 1

arch/arm64/include/asm/vdso/compat_gettimeofday.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,9 @@

		#ifndef __ASSEMBLER__

		#include <vdso/clocksource.h>
		#include <vdso/time32.h>

		#include <asm/barrier.h>
		#include <asm/unistd_compat_32.h>
		#include <asm/errno.h>

arch/arm64/include/asm/vdso/gettimeofday.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@

		#ifndef __ASSEMBLER__

		#include <vdso/clocksource.h>

		#include <asm/alternative.h>
		#include <asm/arch_timer.h>
		#include <asm/barrier.h>

arch/loongarch/kernel/process.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@
		#include <asm/switch_to.h>
		#include <asm/unwind.h>
		#include <asm/vdso.h>
		#include <asm/vdso/vdso.h>

		#ifdef CONFIG_STACKPROTECTOR
		#include <linux/stackprotector.h>