From nobody Thu Apr 2 20:41:54 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 239A934252B; Thu, 26 Mar 2026 14:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774536555; cv=none; b=i9jxwrDKvpDsJuvcD2PSYFAsNS0Pk0hHlz4sTSJsA7kwYs5NA1BKGNh5fn7QU7Ys4bNyGk+X+kMkmgpR8nZsrS+gLP2yu5ixz2ZlAxr3YcRTI+zIuMdDNN7GjjNyGDivxlblkbajlfnLMYCLD/bSsUq6NNqc5etclRrqtMvGMTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774536555; c=relaxed/simple; bh=uAIezbNFuG3m+b3CblOC/6dcYcD7+03q1lyxG7Ib51I=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=LIITPVvXEKJOXlLAb/MkOA91ohFiP5EZmlqGZvBS3vYwp4RHKUVYoq4LZkdodYMLqw+kssyy9Bod2kAaKpLZEX7JO5eTh5iQoi/QtA59Rveh6F4jDlst2Yqi0uUnisUW2QFCPNkoQ68XC3Qzvd8muuY90pEtWoeSYLpxZzKu4rc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=l1xUQiX+; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=qMcUso4r; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="l1xUQiX+"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="qMcUso4r" Date: Thu, 26 Mar 2026 14:49:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1774536550; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EhNp5yyQ7sVJSlAMetnq+CviAsOU/r8sK1Yer9JHMQ8=; b=l1xUQiX+iyoqoWId/QuE4P2wryKn6qeurrnhMSLgMv8F1oaX4WVZ7/fXnDC7AhAzlBBOyA 0dRf906WRLYulqvqleEVa7ci696TBXxAHRrs9GTXjTnS3/SnmWIcpvp7yEQGou+0dpquP7 p3lTOBKsf7qEB8JoQkDEWZqs0/Vu4GY4Bi1WHQG7sPoabLoE1mMiwfh6G0VP6pArc6wwOp gNj3KZ7KfEvqNztSeN1bL5g6iHC05TkxwKe7Buw6cBkHx+G5PFpU5jFJR1xjtQTXi7S4yc hy2aFhlYCMbtZ1inXpzW18T29FrlTHKqSdE6E7Rj4asVwMJwmT0lBxI7j3loxg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1774536550; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EhNp5yyQ7sVJSlAMetnq+CviAsOU/r8sK1Yer9JHMQ8=; b=qMcUso4reCc4v2DkjPvCVP8KbbrtjBmVesB9Cx0o9C9/h1ASsZ3UXF4/3AgXvhVsi8GNcA aibHk3uEzE68foBA== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/vdso] vdso/timens: Move functions to new file Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260326-vdso-timens-decoupling-v2-1-c82693a7775f@linutronix.de> References: <20260326-vdso-timens-decoupling-v2-1-c82693a7775f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177453654891.1647592.1170701141301953104.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 5dc9cf835aba73c882348aa4f99be83b6e45ad9b Gitweb: https://git.kernel.org/tip/5dc9cf835aba73c882348aa4f99be83b6= e45ad9b Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 26 Mar 2026 12:42:30 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 26 Mar 2026 15:44:22 +01:00 vdso/timens: Move functions to new file As a preparation of the untangling of time namespaces and the vDSO, move the glue functions between those subsystems into a new file. While at it, switch the mutex lock and mmap_read_lock() in the vDSO namespace code to guard(). Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260326-vdso-timens-decoupling-v2-1-c82693a= 7775f@linutronix.de --- MAINTAINERS | 2 +- include/linux/time_namespace.h | 8 +-- kernel/time/Makefile | 2 +- kernel/time/namespace.c | 124 +------------------------- kernel/time/namespace_internal.h | 13 +++- kernel/time/namespace_vdso.c | 146 ++++++++++++++++++++++++++++++- lib/vdso/datastore.c | 25 +----- 7 files changed, 166 insertions(+), 154 deletions(-) create mode 100644 kernel/time/namespace_internal.h create mode 100644 kernel/time/namespace_vdso.c diff --git a/MAINTAINERS b/MAINTAINERS index 77fdfcb..6ad74a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10768,6 +10768,7 @@ S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vd= so 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/ @@ -21000,6 +21001,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 =20 POWER MANAGEMENT CORE M: "Rafael J. Wysocki" diff --git a/include/linux/time_namespace.h b/include/linux/time_namespace.h index c514d0e..0421bf1 100644 --- a/include/linux/time_namespace.h +++ b/include/linux/time_namespace.h @@ -38,8 +38,6 @@ static inline struct time_namespace *to_time_ns(struct ns= _common *ns) return container_of(ns, struct time_namespace, ns); } void __init time_ns_init(void); -extern int vdso_join_timens(struct task_struct *task, - struct time_namespace *ns); extern void timens_commit(struct task_struct *tsk, struct time_namespace *= ns); =20 static inline struct time_namespace *get_time_ns(struct time_namespace *ns) @@ -117,12 +115,6 @@ static inline void __init time_ns_init(void) { } =20 -static inline int vdso_join_timens(struct task_struct *task, - struct time_namespace *ns) -{ - return 0; -} - static inline void timens_commit(struct task_struct *tsk, struct time_namespace *ns) { diff --git a/kernel/time/Makefile b/kernel/time/Makefile index f7d52d9..662bccb 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile @@ -29,6 +29,6 @@ endif obj-$(CONFIG_GENERIC_GETTIMEOFDAY) +=3D vsyscall.o obj-$(CONFIG_DEBUG_FS) +=3D timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) +=3D test_udelay.o -obj-$(CONFIG_TIME_NS) +=3D namespace.o +obj-$(CONFIG_TIME_NS) +=3D namespace.o namespace_vdso.o obj-$(CONFIG_TEST_CLOCKSOURCE_WATCHDOG) +=3D clocksource-wdtest.o obj-$(CONFIG_TIME_KUNIT_TEST) +=3D time_test.o diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c index 652744e..903f55a 100644 --- a/kernel/time/namespace.c +++ b/kernel/time/namespace.c @@ -19,7 +19,7 @@ #include #include =20 -#include +#include "namespace_internal.h" =20 ktime_t do_timens_ktime_to_host(clockid_t clockid, ktime_t tim, struct timens_offsets *ns_offsets) @@ -138,117 +138,7 @@ struct time_namespace *copy_time_ns(u64 flags, return clone_time_ns(user_ns, old_ns); } =20 -static struct timens_offset offset_from_ts(struct timespec64 off) -{ - struct timens_offset ret; - - ret.sec =3D off.tv_sec; - ret.nsec =3D off.tv_nsec; - - return ret; -} - -/* - * A time namespace VVAR page has the same layout as the VVAR page which - * contains the system wide VDSO data. - * - * For a normal task the VVAR pages are installed in the normal ordering: - * VVAR - * PVCLOCK - * HVCLOCK - * TIMENS <- Not really required - * - * Now for a timens task the pages are installed in the following order: - * TIMENS - * PVCLOCK - * HVCLOCK - * VVAR - * - * The check for vdso_clock->clock_mode is in the unlikely path of - * the seq begin magic. So for the non-timens case most of the time - * 'seq' is even, so the branch is not taken. - * - * If 'seq' is odd, i.e. a concurrent update is in progress, the extra che= ck - * for vdso_clock->clock_mode is a non-issue. The task is spin waiting for= the - * update to finish and for 'seq' to become even anyway. - * - * Timens page has vdso_clock->clock_mode set to VDSO_CLOCKMODE_TIMENS whi= ch - * enforces the time namespace handling path. - */ -static void timens_setup_vdso_clock_data(struct vdso_clock *vc, - struct time_namespace *ns) -{ - struct timens_offset *offset =3D vc->offset; - struct timens_offset monotonic =3D offset_from_ts(ns->offsets.monotonic); - struct timens_offset boottime =3D offset_from_ts(ns->offsets.boottime); - - vc->seq =3D 1; - vc->clock_mode =3D VDSO_CLOCKMODE_TIMENS; - offset[CLOCK_MONOTONIC] =3D monotonic; - offset[CLOCK_MONOTONIC_RAW] =3D monotonic; - offset[CLOCK_MONOTONIC_COARSE] =3D monotonic; - offset[CLOCK_BOOTTIME] =3D boottime; - offset[CLOCK_BOOTTIME_ALARM] =3D boottime; -} - -struct page *find_timens_vvar_page(struct vm_area_struct *vma) -{ - if (likely(vma->vm_mm =3D=3D current->mm)) - return current->nsproxy->time_ns->vvar_page; - - /* - * VM_PFNMAP | VM_IO protect .fault() handler from being called - * through interfaces like /proc/$pid/mem or - * process_vm_{readv,writev}() as long as there's no .access() - * in special_mapping_vmops(). - * For more details check_vma_flags() and __access_remote_vm() - */ - - WARN(1, "vvar_page accessed remotely"); - - return NULL; -} - -/* - * Protects possibly multiple offsets writers racing each other - * and tasks entering the namespace. - */ -static DEFINE_MUTEX(offset_lock); - -static void timens_set_vvar_page(struct task_struct *task, - struct time_namespace *ns) -{ - struct vdso_time_data *vdata; - struct vdso_clock *vc; - unsigned int i; - - if (ns =3D=3D &init_time_ns) - return; - - /* Fast-path, taken by every task in namespace except the first. */ - if (likely(ns->frozen_offsets)) - return; - - mutex_lock(&offset_lock); - /* Nothing to-do: vvar_page has been already initialized. */ - if (ns->frozen_offsets) - goto out; - - ns->frozen_offsets =3D true; - vdata =3D page_address(ns->vvar_page); - vc =3D vdata->clock_data; - - for (i =3D 0; i < CS_BASES; i++) - timens_setup_vdso_clock_data(&vc[i], ns); - - if (IS_ENABLED(CONFIG_POSIX_AUX_CLOCKS)) { - for (i =3D 0; i < ARRAY_SIZE(vdata->aux_clock_data); i++) - timens_setup_vdso_clock_data(&vdata->aux_clock_data[i], ns); - } - -out: - mutex_unlock(&offset_lock); -} +DEFINE_MUTEX(timens_offset_lock); =20 void free_time_ns(struct time_namespace *ns) { @@ -298,12 +188,6 @@ static void timens_put(struct ns_common *ns) put_time_ns(to_time_ns(ns)); } =20 -void timens_commit(struct task_struct *tsk, struct time_namespace *ns) -{ - timens_set_vvar_page(tsk, ns); - vdso_join_timens(tsk, ns); -} - static int timens_install(struct nsset *nsset, struct ns_common *new) { struct nsproxy *nsproxy =3D nsset->nsproxy; @@ -428,7 +312,7 @@ int proc_timens_set_offset(struct file *file, struct ta= sk_struct *p, goto out; } =20 - mutex_lock(&offset_lock); + mutex_lock(&timens_offset_lock); if (time_ns->frozen_offsets) { err =3D -EACCES; goto out_unlock; @@ -453,7 +337,7 @@ int proc_timens_set_offset(struct file *file, struct ta= sk_struct *p, } =20 out_unlock: - mutex_unlock(&offset_lock); + mutex_unlock(&timens_offset_lock); out: put_time_ns(time_ns); =20 diff --git a/kernel/time/namespace_internal.h b/kernel/time/namespace_inter= nal.h new file mode 100644 index 0000000..e85da11 --- /dev/null +++ b/kernel/time/namespace_internal.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _TIME_NAMESPACE_INTERNAL_H +#define _TIME_NAMESPACE_INTERNAL_H + +#include + +/* + * Protects possibly multiple offsets writers racing each other + * and tasks entering the namespace. + */ +extern struct mutex timens_offset_lock; + +#endif /* _TIME_NAMESPACE_INTERNAL_H */ diff --git a/kernel/time/namespace_vdso.c b/kernel/time/namespace_vdso.c new file mode 100644 index 0000000..0e154f9 --- /dev/null +++ b/kernel/time/namespace_vdso.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Author: Andrei Vagin + * Author: Dmitry Safonov + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include "namespace_internal.h" + +static struct timens_offset offset_from_ts(struct timespec64 off) +{ + struct timens_offset ret; + + ret.sec =3D off.tv_sec; + ret.nsec =3D off.tv_nsec; + + return ret; +} + +/* + * A time namespace VVAR page has the same layout as the VVAR page which + * contains the system wide VDSO data. + * + * For a normal task the VVAR pages are installed in the normal ordering: + * VVAR + * PVCLOCK + * HVCLOCK + * TIMENS <- Not really required + * + * Now for a timens task the pages are installed in the following order: + * TIMENS + * PVCLOCK + * HVCLOCK + * VVAR + * + * The check for vdso_clock->clock_mode is in the unlikely path of + * the seq begin magic. So for the non-timens case most of the time + * 'seq' is even, so the branch is not taken. + * + * If 'seq' is odd, i.e. a concurrent update is in progress, the extra che= ck + * for vdso_clock->clock_mode is a non-issue. The task is spin waiting for= the + * update to finish and for 'seq' to become even anyway. + * + * Timens page has vdso_clock->clock_mode set to VDSO_CLOCKMODE_TIMENS whi= ch + * enforces the time namespace handling path. + */ +static void timens_setup_vdso_clock_data(struct vdso_clock *vc, + struct time_namespace *ns) +{ + struct timens_offset *offset =3D vc->offset; + struct timens_offset monotonic =3D offset_from_ts(ns->offsets.monotonic); + struct timens_offset boottime =3D offset_from_ts(ns->offsets.boottime); + + vc->seq =3D 1; + vc->clock_mode =3D VDSO_CLOCKMODE_TIMENS; + offset[CLOCK_MONOTONIC] =3D monotonic; + offset[CLOCK_MONOTONIC_RAW] =3D monotonic; + offset[CLOCK_MONOTONIC_COARSE] =3D monotonic; + offset[CLOCK_BOOTTIME] =3D boottime; + offset[CLOCK_BOOTTIME_ALARM] =3D boottime; +} + +struct page *find_timens_vvar_page(struct vm_area_struct *vma) +{ + if (likely(vma->vm_mm =3D=3D current->mm)) + return current->nsproxy->time_ns->vvar_page; + + /* + * VM_PFNMAP | VM_IO protect .fault() handler from being called + * through interfaces like /proc/$pid/mem or + * process_vm_{readv,writev}() as long as there's no .access() + * in special_mapping_vmops(). + * For more details check_vma_flags() and __access_remote_vm() + */ + + WARN(1, "vvar_page accessed remotely"); + + return NULL; +} + +static void timens_set_vvar_page(struct task_struct *task, + struct time_namespace *ns) +{ + struct vdso_time_data *vdata; + struct vdso_clock *vc; + unsigned int i; + + if (ns =3D=3D &init_time_ns) + return; + + /* Fast-path, taken by every task in namespace except the first. */ + if (likely(ns->frozen_offsets)) + return; + + guard(mutex)(&timens_offset_lock); + /* Nothing to-do: vvar_page has been already initialized. */ + if (ns->frozen_offsets) + return; + + ns->frozen_offsets =3D true; + vdata =3D page_address(ns->vvar_page); + vc =3D vdata->clock_data; + + for (i =3D 0; i < CS_BASES; i++) + timens_setup_vdso_clock_data(&vc[i], ns); + + if (IS_ENABLED(CONFIG_POSIX_AUX_CLOCKS)) { + for (i =3D 0; i < ARRAY_SIZE(vdata->aux_clock_data); i++) + timens_setup_vdso_clock_data(&vdata->aux_clock_data[i], ns); + } +} + +/* + * The vvar page layout depends on whether a task belongs to the root or + * non-root time namespace. Whenever a task changes its namespace, the VVAR + * page tables are cleared and then they will be re-faulted with a + * corresponding layout. + * See also the comment near timens_setup_vdso_clock_data() for details. + */ +static int vdso_join_timens(struct task_struct *task, struct time_namespac= e *ns) +{ + struct mm_struct *mm =3D task->mm; + struct vm_area_struct *vma; + VMA_ITERATOR(vmi, mm, 0); + + guard(mmap_read_lock)(mm); + for_each_vma(vmi, vma) { + if (vma_is_special_mapping(vma, &vdso_vvar_mapping)) + zap_vma_pages(vma); + } + return 0; +} + +void timens_commit(struct task_struct *tsk, struct time_namespace *ns) +{ + timens_set_vvar_page(tsk, ns); + vdso_join_timens(tsk, ns); +} diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c index faebf5b..cf5d784 100644 --- a/lib/vdso/datastore.c +++ b/lib/vdso/datastore.c @@ -132,28 +132,3 @@ struct vm_area_struct *vdso_install_vvar_mapping(struc= t mm_struct *mm, unsigned=20 VM_MIXEDMAP | VM_SEALED_SYSMAP, &vdso_vvar_mapping); } - -#ifdef CONFIG_TIME_NS -/* - * The vvar page layout depends on whether a task belongs to the root or - * non-root time namespace. Whenever a task changes its namespace, the VVAR - * page tables are cleared and then they will be re-faulted with a - * corresponding layout. - * See also the comment near timens_setup_vdso_clock_data() for details. - */ -int vdso_join_timens(struct task_struct *task, struct time_namespace *ns) -{ - struct mm_struct *mm =3D task->mm; - struct vm_area_struct *vma; - VMA_ITERATOR(vmi, mm, 0); - - mmap_read_lock(mm); - for_each_vma(vmi, vma) { - if (vma_is_special_mapping(vma, &vdso_vvar_mapping)) - zap_vma_pages(vma); - } - mmap_read_unlock(mm); - - return 0; -} -#endif