kernel: Introduce Time Namespace
v4 cover kernel: Introduce Time Namespace
Discussions around time namespace are there for a long time. The first attempt to implement it was in 2006 by Jeff Dike. From that time, the topic appears on and off in various discussions.
There are two main use cases for time namespaces:
1. change date and time inside a container;
2. adjust clocks for a container restored from a checkpoint.
“It seems like this might be one of the last major obstacles keeping migration from being used in production systems, given that not all containers and connections can be migrated as long as a time dependency is capable of messing it up.” (by github.com/dav-ell)
The kernel provides access to several clocks: CLOCK_REALTIME, CLOCK_MONOTONIC, CLOCK_BOOTTIME. Last two clocks are monotonous, but the start points for them are not defined and are different for each system. When a container is migrated from one node to another, all clocks have to be restored into consistent states; in other words, they have to continue running from the same points where they have been dumped.
The main idea of this patch set is adding per-namespace offsets for system clocks. When a process in a non-root time namespace requests time of a clock, a namespace offset is added to the current value of this clock and the sum is returned.
All offsets are placed on a separate page, this allows us to map it as part of VVAR into user processes and use offsets from VDSO calls.
Now offsets are implemented for CLOCK_MONOTONIC and CLOCK_BOOTTIME clocks.
v4 Changes:
* CLOCKE_NEWTIME is unshare()-only flag now (CLON_PIDFD took previous value)
* Addressing Jann Horn's feedback - we don't allow CLONE_THREAD or CLONE_VM together with CLONE_NEWTIME (thanks for spotting!)
* Addressing issues found by Thomas - removed unmaintainable CLOCK_TIMENS and introduced another call back into k_clock to get ktime instead of getting timespec and converting it (Patch 03)
* Renaming timens_offsets members to omit _offset postfix (thanks Cyrill for the suggestion)
* Suggestions, renaming and making code more maintainable from Thomas's feedback (thanks much!)
* Fixing out-of-bounds and other issues in procfs file (kudos Jann Horn)
* vdso_fault() can be called on a remote task by /proc/$pid/mem or process_vm_readv() - addressed by adding a slow-path with searching for owner's namespace (thanks for spotting this unobvious issue, Jann)
* Other nits by Jann Horn
v3: Major changes:
* Simplify two VDSO images by using static_branch() in vclock_gettime() Removes unwanted conflicts with generic VDSO movement patches and simplifies things by dropping too invasive linker magic.
As an alternative to static_branch() we tested an attempt to introduce home-made dynamic patching called retcalls:
https://github.com/0x7f454c46/linux/commit/4cc0180f6d65
Considering some theoretical problems with toolchains, we decided to go with long well-tested nop-patching in static_branch(). Though, it was needed to provide backend for relative code.
* address Thomas' comments.
* add sanity checks for offsets:
- the current clock time in a namespace has to be in [0, KTIME_MAX / 2). KTIME_MAX is divided by two here to be sure that the KTIME_MAX limit is still unreachable.
v2: There are two major changes:
* Two versions of the VDSO library to avoid a performance penalty for host tasks outside time namespace (as suggested by Andy and Thomas).
As it has been discussed on timens RFC, adding a new conditional branch if (inside_time_ns) on VDSO for all processes is undesirable. It will add a penalty for everybody as branch predictor may mispredict the jump. Also there are instruction cache lines wasted on cmp/jmp.
Those effects of introducing time namespace are very much unwanted having in mind how much work have been spent on micro-optimisation VDSO code.
Addressing those problems, there are two versions of VDSO's .so:
for host tasks (without any penalty) and for processes inside of time namespace with clk_to_ns() that subtracts offsets from host's time.
* Allow to set clock offsets for a namespace only before any processes appear in it.
Now a time namespace looks similar to a pid namespace in a way how it is
created: unshare(CLONE_NEWTIME) system call creates a new time namespace, but doesn't set it to the current process. Then all children of the process will be born in the new time namespace, or a process can use the setns() system call to join a namespace.
This scheme allows to create a new time namespaces, set clock offsets and then populate the namespace with processes.
Our performance measurements show that the price of VDSO's clock_gettime() in a child time namespace is about 8% with a hot CPU cache and about 90% with a cold CPU cache. There is no performance regression for host processes outside time namespace on those tests.
We wrote two small benchmarks. The first one gettime_perf.c calls clock_gettime() in a loop for 3 seconds. It shows us performance with a hot CPU cache (more clock_gettime() cycles - the better):
| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- cycles | 139887013 | 139453003 | 139899785 | 128792458 diff (%)| 100 | 99.7 | 100 | 92
The second one gettime_perf_cold.c calls rdtsc, clock_gettime(), rdtsc and shows a difference of second and first rdtsc. We call this binary in a loop 1000 times, get 1000 values and calculate MODE for them. It should show us performance with a cold CPU cache
(lesser tsc per cycle - the better):
| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- tsc | 6748 | 6718 | 6862 | 12682 diff (%)| 100 | 99.6 | 101.7 | 188
The numbers gathered on Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz.
v3: https://lkml.kernel.org/r/[email protected]
v2: https://lore.kernel.org/lkml/[email protected]/
RFC: https://lkml.kernel.org/r/[email protected]/
Andrei Vagin (17):
ns: Introduce Time Namespace
timens: Add timens_offsets
posix-clocks: add another call back to return clock time in ktime_t
timens: Introduce CLOCK_MONOTONIC offsets
timens: Introduce CLOCK_BOOTTIME offset
timerfd/timens: Take into account ns clock offsets posix-timers/timens: Take into account clock offsets timens/kernel: Take into account timens clock offsets in
clock_nanosleep
x86/vdso: Add offsets page in vvar
vdso: introduce timens_static_branch
timens/fs/proc: Introduce /proc/pid/timens_offsets selftest/timens: Add a test for timerfd
selftest/timens: Add a test for clock_nanosleep() selftest/timens: Add timer offsets test
x86/vdso: Align VDSO functions by CPU L1 cache line
selftests: Add a simple perf test for clock_gettime() selftest/timens: Check that a right vdso is mapped after fork and exec
Dmitry Safonov (11):
timens: Shift /proc/uptime
x86/vdso2c: Correct err messages on file opening x86/vdso2c: Convert iterator to unsigned x86/vdso/Makefile: Add vobjs32
x86/vdso: Restrict splitting VVAR VMA
x86/vdso: Rename vdso_image {.data=>.text} x86/vdso: Allocate timens vdso
x86/vdso: Switch image on setns()/unshare()/clone()
timens: Add align for timens_offsets selftest/timens: Add Time Namespace test for supported clocks selftest/timens: Add procfs selftest
MAINTAINERS | 3 + arch/Kconfig | 5 + arch/x86/Kconfig | 1 + arch/x86/entry/vdso/Makefile | 16 +- arch/x86/entry/vdso/vclock_gettime.c | 48 +++ arch/x86/entry/vdso/vdso-layout.lds.S | 10 +- arch/x86/entry/vdso/vdso2c.c | 7 +- arch/x86/entry/vdso/vdso2c.h | 24 +- arch/x86/entry/vdso/vma.c | 189 ++++++++- arch/x86/include/asm/jump_label.h | 14 + arch/x86/include/asm/vdso.h | 14 +- fs/proc/base.c | 95 +++++ fs/proc/namespaces.c | 4 + fs/proc/uptime.c | 3 + fs/timerfd.c | 3 + include/linux/hrtimer.h | 2 +- include/linux/jump_label.h | 5 + include/linux/nsproxy.h | 2 + include/linux/posix-timers.h | 3 + include/linux/proc_ns.h | 2 + include/linux/time_namespace.h | 115 ++++++ include/linux/timens_offsets.h | 18 + include/linux/user_namespace.h | 1 + include/uapi/linux/sched.h | 5 + init/Kconfig | 8 + kernel/Makefile | 1 + kernel/fork.c | 29 +- kernel/nsproxy.c | 41 +- kernel/time/alarmtimer.c | 27 +- kernel/time/hrtimer.c | 8 +- kernel/time/posix-clock.c | 8 +- kernel/time/posix-cpu-timers.c | 32 +- kernel/time/posix-stubs.c | 15 +- kernel/time/posix-timers.c | 87 +++-- kernel/time/posix-timers.h | 7 +- kernel/time_namespace.c | 367 ++++++++++++++++++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timens/.gitignore | 8 + tools/testing/selftests/timens/Makefile | 12 + .../selftests/timens/clock_nanosleep.c | 100 +++++ tools/testing/selftests/timens/config | 1 + tools/testing/selftests/timens/exec.c | 91 +++++ tools/testing/selftests/timens/gettime_perf.c | 74 ++++ .../selftests/timens/gettime_perf_cold.c | 63 +++ tools/testing/selftests/timens/log.h | 26 ++ tools/testing/selftests/timens/procfs.c | 142 +++++++ tools/testing/selftests/timens/timens.c | 188 +++++++++ tools/testing/selftests/timens/timens.h | 63 +++ tools/testing/selftests/timens/timer.c | 116 ++++++ tools/testing/selftests/timens/timerfd.c | 127 ++++++ 50 files changed, 2132 insertions(+), 99 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 include/linux/timens_offsets.h create mode 100644 kernel/time_namespace.c create mode 100644 tools/testing/selftests/timens/.gitignore create mode 100644 tools/testing/selftests/timens/Makefile create mode 100644 tools/testing/selftests/timens/clock_nanosleep.c create mode 100644 tools/testing/selftests/timens/config create mode 100644 tools/testing/selftests/timens/exec.c create mode 100644 tools/testing/selftests/timens/gettime_perf.c create mode 100644 tools/testing/selftests/timens/gettime_perf_cold.c create mode 100644 tools/testing/selftests/timens/log.h create mode 100644 tools/testing/selftests/timens/procfs.c create mode 100644 tools/testing/selftests/timens/timens.c create mode 100644 tools/testing/selftests/timens/timens.h create mode 100644 tools/testing/selftests/timens/timer.c create mode 100644 tools/testing/selftests/timens/timerfd.c
Signature · 1 line
2.22.0
PATCH v4 1/28 ns: Introduce Time Namespace
From: Andrei Vagin <[email protected]>
Time Namespace isolates clock values.
The kernel provides access to several clocks CLOCK_REALTIME, CLOCK_MONOTONIC, CLOCK_BOOTTIME, etc.
CLOCK_REALTIME
System-wide clock that measures real (i.e., wall-clock) time.
CLOCK_MONOTONIC
Clock that cannot be set and represents monotonic time since some unspecified starting point.
CLOCK_BOOTTIME
Identical to CLOCK_MONOTONIC, except it also includes any time that the system is suspended.
For many users, the time namespace means the ability to changes date and time in a container (CLOCK_REALTIME).
But in a context of the checkpoint/restore functionality, monotonic and bootime clocks become interesting. Both clocks are monotonic with unspecified staring points. These clocks are widely used to measure time slices and set timers. After restoring or migrating processes, we have to guarantee that they never go backward. In an ideal case, the behavior of these clocks should be the same as for a case when a whole system is suspended. All this means that we need to be able to set CLOCK_MONOTONIC and CLOCK_BOOTTIME clocks, what can be done by adding per-namespace offsets for clocks.
A time namespace is similar to a pid namespace in a way how it is
created: unshare(CLONE_NEWTIME) system call creates a new time namespace, but doesn't set it to the current process. Then all children of the process will be born in the new time namespace, or a process can use the setns() system call to join a namespace.
This scheme allows setting clock offsets for a namespace, before any processes appear in it.
All avaliable clone flags have been used, so CLONE_NEWTIME uses the highest bit of CSIGNAL. It means that we can use it with the unshare system call only. Rith now, this works for us, because time namespace offsets can be set only when a new time namespace is not populated. In a future, we will have the clone3 system call [1] which will allow to use the CSIGNAL mask for clone flags.
[1]: httmps://lkml.kernel.org/r/[email protected]
--- MAINTAINERS | 2 + fs/proc/namespaces.c | 4 + include/linux/nsproxy.h | 2 + include/linux/proc_ns.h | 2 + include/linux/time_namespace.h | 69 +++++++++++ include/linux/user_namespace.h | 1 + include/uapi/linux/sched.h | 5 + init/Kconfig | 7 ++ kernel/Makefile | 1 + kernel/fork.c | 29 ++++- kernel/nsproxy.c | 41 +++++-- kernel/time_namespace.c | 215 +++++++++++++++++++++++++++++++++ 12 files changed, 367 insertions(+), 11 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 kernel/time_namespace.c
MAINTAINERS +2 -0
@@ -12589,6 +12589,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core S: Maintained F: fs/timerfd.c F: include/linux/timer* +F: include/linux/time_namespace.h +F: kernel/time_namespace.c F: kernel/time/*timer* POWER MANAGEMENT CORE
fs/proc/namespaces.c +4 -0
@@ -33,6 +33,10 @@ static const struct proc_ns_operations *ns_entries[] = {#ifdef CONFIG_CGROUPS &cgroupns_operations,#endif +#ifdef CONFIG_TIME_NS + &timens_operations, + &timens_for_children_operations, +#endif }; static const char *proc_ns_get_link(struct dentry *dentry,
include/linux/nsproxy.h +2 -0
@@ -35,6 +35,8 @@ struct nsproxy {struct mnt_namespace *mnt_ns;struct pid_namespace *pid_ns_for_children;struct net *net_ns; +struct time_namespace *time_ns; +struct time_namespace *time_ns_for_children;struct cgroup_namespace *cgroup_ns; };extern struct nsproxy init_nsproxy;
include/linux/proc_ns.h +2 -0
@@ -32,6 +32,8 @@ extern const struct proc_ns_operations pidns_for_children_operations;extern const struct proc_ns_operations userns_operations;extern const struct proc_ns_operations mntns_operations;extern const struct proc_ns_operations cgroupns_operations; +extern const struct proc_ns_operations timens_operations; +extern const struct proc_ns_operations timens_for_children_operations;/* * We always define these enumerators
include/linux/time_namespace.h new file +69 -0
69 lines not on this page · raw message
include/linux/user_namespace.h +1 -0
@@ -45,6 +45,7 @@ enum ucount_type {UCOUNT_NET_NAMESPACES ,UCOUNT_MNT_NAMESPACES ,UCOUNT_CGROUP_NAMESPACES , +UCOUNT_TIME_NAMESPACES , #ifdef CONFIG_INOTIFY_USERUCOUNT_INOTIFY_INSTANCES , UCOUNT_INOTIFY_WATCHES,
include/uapi/linux/sched.h +5 -0
@@ -31,6 +31,11 @@#define CLONE_NEWNET 0x40000000/* New network namespace */ #define CLONE_IO 0x80000000/* Clone io context */ +/* +* cloning flags which can be used with the unshare syscall only: +*/ +#define CLONE_NEWTIME 0x00000080/* New time namespace */ +/* * Scheduling policies */
init/Kconfig +7 -0
@@ -991,6 +991,13 @@ config UTS_NS In this namespace tasks see different info provided with the uname() system call +config TIME_NS + bool "TIME namespace" + default y + help + In this namespace boottime and monotonic clocks can be set. + The time will keep going with the same pace. + config IPC_NS bool "IPC namespace" depends on (SYSVIPC || POSIX_MQUEUE)
kernel/Makefile +1 -0
@@ -68,6 +68,7 @@ obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o obj-$(CONFIG_COMPAT) += compat.o obj-$(CONFIG_CGROUPS) += cgroup/ obj-$(CONFIG_UTS_NS) += utsname.o +obj-$(CONFIG_TIME_NS) += time_namespace.o obj-$(CONFIG_USER_NS) += user_namespace.o obj-$(CONFIG_PID_NS) += pid_namespace.o obj-$(CONFIG_IKCONFIG) += configs.o
kernel/fork.c +25 -4
@@ -1774,6 +1774,15 @@ static __latent_entropy struct task_struct *copy_process(int pidfd =-1 , retval;struct task_struct *p;struct multiprocess_signals delayed; +struct nsproxy *nsp = current->nsproxy; +int exit_signal; + +/* +* Exclude clone flags which intersect with CSIGNAL and can be used +* with the unshare syscall only. +*/ + exit_signal = clone_flags &CSIGNAL ; + clone_flags &= ~CSIGNAL ;/* * Don't allow sharing the root directory with processes in a different
@@ -1816,8 +1825,17 @@ static __latent_entropy struct task_struct *copy_process(*/ if (clone_flags &CLONE_THREAD ) {if ((clone_flags & (CLONE_NEWUSER |CLONE_NEWPID )) || - (task_active_pid_ns (current) != - current->nsproxy->pid_ns_for_children)) + (task_active_pid_ns (current) != nsp->pid_ns_for_children)) +return ERR_PTR (-EINVAL ); + } + +/* +* If the new process will be in a different time namespace +* do not allow it to share VM or a thread group with the forking task. +*/ +if (clone_flags & (CLONE_THREAD |CLONE_VM )) { +if ((clone_flags &CLONE_NEWTIME ) || + (nsp->time_ns != nsp->time_ns_for_children))return ERR_PTR (-EINVAL ); }
@@ -2106,7 +2124,7 @@ static __latent_entropy struct task_struct *copy_process(if (clone_flags &CLONE_PARENT ) p->exit_signal = current->group_leader->exit_signal;else - p->exit_signal = (clone_flags &CSIGNAL ); + p->exit_signal = exit_signal; p->group_leader = p; p->tgid = p->pid; }
@@ -2568,7 +2586,8 @@ static int check_unshare_flags(unsigned long unshare_flags)if (unshare_flags & ~(CLONE_THREAD |CLONE_FS |CLONE_NEWNS |CLONE_SIGHAND |CLONE_VM |CLONE_FILES |CLONE_SYSVSEM |CLONE_NEWUTS |CLONE_NEWIPC |CLONE_NEWNET | -CLONE_NEWUSER |CLONE_NEWPID |CLONE_NEWCGROUP )) +CLONE_NEWUSER |CLONE_NEWPID |CLONE_NEWCGROUP | +CLONE_NEWTIME ))return -EINVAL ;/* * Not implemented, but pretend it works if there is nothing
@@ -2579,6 +2598,8 @@ static int check_unshare_flags(unsigned long unshare_flags)if (unshare_flags & (CLONE_THREAD |CLONE_SIGHAND |CLONE_VM )) {if (!thread_group_empty (current))return -EINVAL ; +if (unshare_flags &CLONE_NEWTIME ) +return -EINVAL ; }if (unshare_flags & (CLONE_SIGHAND |CLONE_VM )) {if (refcount_read (¤t->sighand->count) >1 )
kernel/nsproxy.c +34 -7
88 lines not on this page · raw message
kernel/time_namespace.c new file +215 -0
215 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 2/28 timens: Add timens_offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
Allocate one page for each time namespace that will be premapped into userspace among vvar pages.
--- MAINTAINERS | 1 + include/linux/time_namespace.h | 1 + include/linux/timens_offsets.h | 8 ++++++++ kernel/time_namespace.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 include/linux/timens_offsets.h
MAINTAINERS +1 -0
@@ -12590,6 +12590,7 @@ S: Maintained F: fs/timerfd.c F: include/linux/timer* F: include/linux/time_namespace.h +F: include/linux/timens_offsets.h F: kernel/time_namespace.c F: kernel/time/*timer*
include/linux/time_namespace.h +1 -0
@@ -8,6 +8,7 @@#include <linux/nsproxy.h> #include <linux/ns_common.h> #include <linux/err.h> +#include <linux/timens_offsets.h> struct user_namespace ;extern struct user_namespace init_user_ns;
include/linux/timens_offsets.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_TIME_OFFSETS_H +#define _LINUX_TIME_OFFSETS_H + +struct timens_offsets { +}; + +#endif
kernel/time_namespace.c +12 -2
@@ -13,6 +13,7 @@#include <linux/user_namespace.h> #include <linux/proc_ns.h> #include <linux/sched/task.h> +#include <linux/mm.h> static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {
@@ -46,6 +47,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, {struct time_namespace *ns;struct ucounts *ucounts; +struct page *page;int err; err = -ENOSPC ;
@@ -58,15 +60,22 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns,if (!ns) goto fail_dec; + page =alloc_page (GFP_KERNEL | __GFP_ZERO); +if (!page) + goto fail_free; + ns->offsets =page_address (page); +BUILD_BUG_ON (sizeof (*ns->offsets) >PAGE_SIZE ); + err =ns_alloc_inum (&ns->ns);if (err) - goto fail_free; + goto fail_page; ns->ucounts = ucounts; ns->ns.ops = &timens_operations; ns->user_ns =get_user_ns (user_ns);return ns; - +fail_page: +free_page ((unsigned long )ns->offsets); fail_free:kfree (ns); fail_dec:
@@ -94,6 +103,7 @@ void free_time_ns(struct kref *kref)struct time_namespace *ns; ns = container_of(kref, struct time_namespace, kref); +free_page ((unsigned long )ns->offsets);dec_time_namespaces (ns->ucounts);put_user_ns (ns->user_ns);ns_free_inum (&ns->ns);
Signature · 1 line
2.22.0
Re: [PATCHv4 02/28] timens: Add timens_offsets
Quoted 11 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
Allocate one page for each time namespace that will be premapped into userspace among vvar pages.
index 000000000000..7d7cb68ea778
include/linux/timens_offsets.h line 6
Quoted 6 lines
include/linux/timens_offsets.h new file +6
-0@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_TIME_OFFSETS_H +#define _LINUX_TIME_OFFSETS_H + +struct timens_offsets { +};
That empty struct which is nowhere used looks odd. Can you move that to the patch which actually makes use of it?
Thanks,
tglx
Re: [PATCHv4 02/28] timens: Add timens_offsets
Quoted 7 lines · Thomas Gleixner
Quoted 5 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
Quoted 15 lines
include/linux/timens_offsets.h line 6
Quoted 12 lines
Allocate one page for each time namespace that will be premapped into userspace among vvar pages.
index 000000000000..7d7cb68ea778include/linux/timens_offsets.h new file +6
-0@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_TIME_OFFSETS_H +#define _LINUX_TIME_OFFSETS_H + +struct timens_offsets { +};That empty struct which is nowhere used looks odd. Can you move that to the patch which actually makes use of it?
Sure, makes sense.
Thanks,
Dmitry
Re: [PATCHv4 02/28] timens: Add timens_offsets
In reply to Thomas GleixnerHi Thomas,
Quoted 7 lines · Thomas Gleixner
Quoted 5 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
Quoted 15 lines
include/linux/timens_offsets.h line 6
Quoted 12 lines
Allocate one page for each time namespace that will be premapped into userspace among vvar pages.
index 000000000000..7d7cb68ea778include/linux/timens_offsets.h new file +6
-0@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_TIME_OFFSETS_H +#define _LINUX_TIME_OFFSETS_H + +struct timens_offsets { +};That empty struct which is nowhere used looks odd. Can you move that to the patch which actually makes use of it?
I've tried to move the structure into patch [PATCHv4 05/28] timens: Introduce CLOCK_BOOTTIME offset but that resulted in an ugly patch.
Then I've tried to make it an opaque type here [to keep allocation/freeing in one commit], and change to a full structure in the following CLOCK_BOOTTIME patch, but that wasn't any prettier.
So, we've [with Andrei] addressed your critics but this in v5.
Just to let you know, that we haven't silently ignored your review, but found that it might be prettier to keep the patch as-is.. I'll move it in v6 if it still makes sense in v5.
Thanks much for your time,
Dmitry
PATCH v4 3/28 posix-clocks: add another call back to return clock time in ktime_t
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The callsite in common_timer_get() has already a comment:
/*
* The timespec64 based conversion is suboptimal, but it's not
* worth to implement yet another callback.
*/
kc->clock_get(timr->it_clock, &ts64);
now = timespec64_to_ktime(ts64);Now we are going to add time namespaces and we need to be able to get:
* clock value in a task time namespace to return it from the clock_gettime syscall.
* clock valuse in the root time namespace to use it in common_timer_get().
It looks like another reason why we need a separate callback to return clock value in ktime_t.
--- include/linux/posix-timers.h | 3 ++ kernel/time/alarmtimer.c | 24 ++++++++++--- kernel/time/posix-clock.c | 8 ++--- kernel/time/posix-cpu-timers.c | 32 +++++++++--------- kernel/time/posix-timers.c | 61 ++++++++++++++++++++++------------ kernel/time/posix-timers.h | 7 ++-- 6 files changed, 87 insertions(+), 48 deletions(-)
include/linux/posix-timers.h +3 -0
@@ -127,4 +127,7 @@ void set_process_cpu_timer(struct task_struct *task, unsigned int clock_idx,void update_rlimit_cpu (struct task_struct *task,unsigned long rlim_new);void posixtimer_rearm (struct kernel_siginfo *info); + +int posix_get_timespec (clockid_t which_clock,struct timespec64 *tp); +int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp);#endif
kernel/time/alarmtimer.c +19 -5
@@ -43,6 +43,8 @@ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue;ktime_t (*gettime)(void); +int (*get_timespec)(const clockid_t which_clock, +struct timespec64 *tp);clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -645,21 +647,30 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get interface +* alarm_clock_get_timespec - posix clock_get_timespec interface * @which_clock: clockid * @tp: timespec to fill. * * Provides the underlying alarm base time. */ -static int alarm_clock_get (clockid_t which_clock,struct timespec64 *tp) +static int alarm_clock_get_timespec (clockid_t which_clock,struct timespec64 *tp) {struct alarm_base *base = &alarm_bases[clock2alarm (which_clock)];if (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->gettime ()); -return 0 ; +return base->get_timespec (base->base_clockid, tp); +} + +static ktime_t alarm_clock_get_ktime (clockid_t which_clock) +{ +struct alarm_base *base = &alarm_bases[clock2alarm (which_clock)]; + +if (!alarmtimer_get_rtcdev ()) +return -EINVAL ; + +return base->gettime (); }/**
@@ -825,7 +836,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,const struct k_clock alarm_clock = { .clock_getres = alarm_clock_getres, - .clock_get = alarm_clock_get, + .clock_get_ktime = alarm_clock_get_ktime, + .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
@@ -870,8 +882,10 @@ static int __init alarmtimer_init(void)/* Initialize alarm bases */ alarm_bases[ALARM_REALTIME ].base_clockid =CLOCK_REALTIME ; alarm_bases[ALARM_REALTIME ].gettime = &ktime_get_real; + alarm_bases[ALARM_BOOTTIME ].get_timespec = posix_get_timespec, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].gettime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_timespec = posix_get_boottime_timespec;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
kernel/time/posix-clock.c +4 -4
@@ -315,8 +315,8 @@ static int pc_clock_settime(clockid_t id, const struct timespec64 *ts) }const struct k_clock clock_posix_dynamic = { - .clock_getres = pc_clock_getres, - .clock_set = pc_clock_settime, - .clock_get = pc_clock_gettime, - .clock_adj = pc_clock_adjtime, + .clock_getres = pc_clock_getres, + .clock_set = pc_clock_settime, + .clock_get_timespec = pc_clock_gettime, + .clock_adj = pc_clock_adjtime, };
kernel/time/posix-cpu-timers.c +16 -16
@@ -1417,26 +1417,26 @@ static int thread_cpu_timer_create(struct k_itimer *timer) }const struct k_clock clock_posix_cpu = { - .clock_getres = posix_cpu_clock_getres, - .clock_set = posix_cpu_clock_set, - .clock_get = posix_cpu_clock_get, - .timer_create = posix_cpu_timer_create, - .nsleep = posix_cpu_nsleep, - .timer_set = posix_cpu_timer_set, - .timer_del = posix_cpu_timer_del, - .timer_get = posix_cpu_timer_get, - .timer_rearm = posix_cpu_timer_rearm, + .clock_getres = posix_cpu_clock_getres, + .clock_set = posix_cpu_clock_set, + .clock_get_timespec = posix_cpu_clock_get, + .timer_create = posix_cpu_timer_create, + .nsleep = posix_cpu_nsleep, + .timer_set = posix_cpu_timer_set, + .timer_del = posix_cpu_timer_del, + .timer_get = posix_cpu_timer_get, + .timer_rearm = posix_cpu_timer_rearm, };const struct k_clock clock_process = { - .clock_getres = process_cpu_clock_getres, - .clock_get = process_cpu_clock_get, - .timer_create = process_cpu_timer_create, - .nsleep = process_cpu_nsleep, + .clock_getres = process_cpu_clock_getres, + .clock_get_timespec = process_cpu_clock_get, + .timer_create = process_cpu_timer_create, + .nsleep = process_cpu_nsleep, };const struct k_clock clock_thread = { - .clock_getres = thread_cpu_clock_getres, - .clock_get = thread_cpu_clock_get, - .timer_create = thread_cpu_timer_create, + .clock_getres = thread_cpu_clock_getres, + .clock_get_timespec = thread_cpu_clock_get, + .timer_create = thread_cpu_timer_create, };
kernel/time/posix-timers.c +40 -21
165 lines not on this page · raw message
kernel/time/posix-timers.h +5 -2
@@ -6,8 +6,11 @@ struct k_clock { struct timespec64 *tp);int (*clock_set)(const clockid_t which_clock,const struct timespec64 *tp); -int (*clock_get)(const clockid_t which_clock, -struct timespec64 *tp); +/* return the clock value in the current time namespace. */ +int (*clock_get_timespec)(const clockid_t which_clock, +struct timespec64 *tp); +/* return the clock value in the root time namespace. */ +ktime_t (*clock_get_ktime)(const clockid_t which_clock);int (*clock_adj)(const clockid_t which_clock,struct __kernel_timex *tx);int (*timer_create)(struct k_itimer *timer); int (*nsleep)(const clockid_t which_clock, int flags,
Signature · 1 line
2.22.0
Re: [PATCHv4 03/28] posix-clocks: add another call back to return clock time in ktime_t
Dmitry,
Quoted 11 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
The callsite in
common_timer_get()has already a comment:/* * The timespec64 based conversion is suboptimal, but it's not * worth to implement yet another callback. */ kc->clock_get(timr->it_clock, &ts64); now = timespec64_to_ktime(ts64);Now we are going to add time namespaces and we need to be able to get:
Please avoid 'we' and try to describe the changes in a neutral technical form, e.g.:
The upcoming support for time namespaces requires to have access to:
Quoted 2 lines
* clock value in a task time namespace to return it from the
clock_gettimesyscall.
- The time in a tasks time namespace for sys_clock_gettime()
Quoted 2 lines
* clock valuse in the root time namespace to use it in
common_timer_get().
- The time in the root name space for common_timer_get()
Quoted 2 lines
It looks like another reason why we need a separate callback to return clock value in
ktime_t.
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format.
Hmm?
Quoted 31 lines
include/linux/posix-timers.h +2
-0+int posix_get_timespec (clockid_t which_clock,struct timespec64 *tp); +int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp);#endif kernel/time/alarmtimer.c +4
-2@@ -43,6 +43,8 @@ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue;ktime_t (*gettime)(void); +int (*get_timespec)(const clockid_t which_clock, +struct timespec64 *tp);clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];@@ -645,21 +647,30 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get interface +* alarm_clock_get_timespec - posix clock_get_timespec interface * @which_clock: clockid * @tp: timespec to fill. * * Provides the underlying alarm base time. */ -static int alarm_clock_get (clockid_t which_clock,struct timespec64 *tp) +static int alarm_clock_get_timespec (clockid_t which_clock,struct timespec64 *tp) {struct alarm_base *base = &alarm_bases[clock2alarm (which_clock)];
kernel/time/alarmtimer.c static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp · line 666
Quoted 10 lines
kernel/time/alarmtimer.c +4
-2if (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->gettime ()); -return 0 ; +return base->get_timespec (base->base_clockid, tp); +} + +static ktime_t alarm_clock_get_ktime (clockid_t which_clock)
Please add kernel doc for this function. It does not make sense to have one documented and the other not.
Quoted 15 lines
kernel/time/alarmtimer.c +7
-0+{ +struct alarm_base *base = &alarm_bases[clock2alarm (which_clock)]; + +if (!alarmtimer_get_rtcdev ()) +return -EINVAL ; + +return base->gettime (); }kernel/time/posix-timers.h +0
-0@@ -6,8 +6,11 @@ struct k_clock { struct timespec64 *tp);int (*clock_set)(const clockid_t which_clock,const struct timespec64 *tp);
kernel/time/posix-timers.h struct k_clock { · line 16
Quoted 10 lines
kernel/time/posix-timers.h +5
-2-int (*clock_get)(const clockid_t which_clock, -struct timespec64 *tp); +/* return the clock value in the current time namespace. */ +int (*clock_get_timespec)(const clockid_t which_clock, +struct timespec64 *tp); +/* return the clock value in the root time namespace. */ +ktime_t (*clock_get_ktime)(const clockid_t which_clock);int (*clock_adj)(const clockid_t which_clock,struct __kernel_timex *tx);int (*timer_create)(struct k_itimer *timer); int (*nsleep)(const clockid_t which_clock, int flags,
TBH, this patch is way to big. It changes too many things at once. Can you please structure it this way:
1) Rename k_clock::clock_get to k_clock::clock_get_timespec and fix up all struct initializers
2) Rename the clock_get_timespec functions per instance
3) Add the new callback
4) Add the new functions per instance and add them to the corresponding struct initializers
5) Use the new callback
Thanks,
tglx
Re: [PATCHv4 03/28] posix-clocks: add another call back to return clock time in ktime_t
Hi Thomas,
Thanks much for the review,
Quoted 31 lines · Thomas Gleixner
Dmitry,
Quoted 11 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
The callsite in
common_timer_get()has already a comment:/* * The timespec64 based conversion is suboptimal, but it's not * worth to implement yet another callback. */ kc->clock_get(timr->it_clock, &ts64); now = timespec64_to_ktime(ts64);Now we are going to add time namespaces and we need to be able to get:
Please avoid 'we' and try to describe the changes in a neutral technical form, e.g.:
The upcoming support for time namespaces requires to have access to:
Quoted 2 lines
* clock value in a task time namespace to return it from the
clock_gettimesyscall.- The time in a tasks time namespace for
sys_clock_gettime()Quoted 2 lines
* clock valuse in the root time namespace to use it in
common_timer_get().- The time in the root name space for
common_timer_get()
Quoted 7 lines
Quoted 2 lines
It looks like another reason why we need a separate callback to return clock value in
ktime_t.That adds a valid reason to finally implement a separate callback which returns the time in
ktime_tformat.Hmm?
Agree, the patch has become bigger than wanted and the message could have been better in technical sense. Will split, add kernel doc and fix the commit message(s).
[..]
Quoted 6 lines
TBH, this patch is way to big. It changes too many things at once. Can you please structure it this way:
1) Rename
k_clock::clock_gettok_clock::clock_get_timespecand fix up all struct initializers
Quoted 9 lines
2) Rename the
clock_get_timespecfunctions per instance3) Add the new callback
4) Add the new functions per instance and add them to the corresponding struct initializers
5) Use the new callback
Thanks,
Dima
PATCH v4 4/28 timens: Introduce CLOCK_MONOTONIC offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Add monotonic time virtualisation for time namespace. Introduce timespec for monotionic clock into timens offsets and wire clock_gettime() syscall.
--- include/linux/time_namespace.h | 8 ++++++++ include/linux/timens_offsets.h | 1 + kernel/time/posix-stubs.c | 2 ++ kernel/time/posix-timers.c | 4 ++++ 4 files changed, 15 insertions(+)
include/linux/time_namespace.h +8 -0
@@ -40,6 +40,13 @@ static inline void put_time_ns(struct time_namespace *ns) kref_put(&ns->kref, free_time_ns); } +static inline void timens_add_monotonic (struct timespec64 *ts) +{ +struct timens_offsets *ns_offsets = current->nsproxy->time_ns->offsets; + +if (ns_offsets) + *ts =timespec64_add (*ts, ns_offsets->monotonic); +}#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns)
@@ -65,6 +72,7 @@ static inline int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsreturn 0 ; } +static inline void timens_add_monotonic (struct timespec64 *ts) {}#endif #endif /* _LINUX_TIMENS_H */
include/linux/timens_offsets.h +1 -0
@@ -3,6 +3,7 @@#define _LINUX_TIME_OFFSETS_Hstruct timens_offsets { +struct timespec64 monotonic; };#endif
kernel/time/posix-stubs.c +2 -0
@@ -14,6 +14,7 @@#include <linux/ktime.h> #include <linux/timekeeping.h> #include <linux/posix-timers.h> +#include <linux/time_namespace.h> #include <linux/compat.h> #ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
@@ -77,6 +78,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)break ;case CLOCK_MONOTONIC :ktime_get_ts64 (tp); +timens_add_monotonic (tp);break ;case CLOCK_BOOTTIME :ktime_get_boottime_ts64 (tp);
kernel/time/posix-timers.c +4 -0
@@ -30,6 +30,7 @@#include <linux/hashtable.h> #include <linux/compat.h> #include <linux/nospec.h> +#include <linux/time_namespace.h> #include "timekeeping.h" #include "posix-timers.h"
@@ -196,6 +197,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,int posix_get_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
@@ -210,6 +212,7 @@ static ktime_t posix_get_ktime(clockid_t which_clock)static int posix_get_monotonic_raw (clockid_t which_clock,struct timespec64 *tp) {ktime_get_raw_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
@@ -224,6 +227,7 @@ static int posix_get_monotonic_coarse(clockid_t which_clock, struct timespec64 *tp) {ktime_get_coarse_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
Signature · 1 line
2.22.0
PATCH v4 5/28 timens: Introduce CLOCK_BOOTTIME offset
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Adds boottime virtualisation for time namespace. Introduce timespec for boottime clock into timens offsets and wire clock_gettime() syscall.
--- include/linux/time_namespace.h | 9 +++++++++ include/linux/timens_offsets.h | 1 + kernel/time/alarmtimer.c | 1 + kernel/time/posix-stubs.c | 1 + kernel/time/posix-timers.c | 1 + 5 files changed, 13 insertions(+)
include/linux/time_namespace.h +9 -0
@@ -48,6 +48,14 @@ static inline void timens_add_monotonic(struct timespec64 *ts) *ts = timespec64_add(*ts, ns_offsets->monotonic); } +static inline void timens_add_boottime (struct timespec64 *ts) +{ +struct timens_offsets *ns_offsets = current->nsproxy->time_ns->offsets; + +if (ns_offsets) + *ts =timespec64_add (*ts, ns_offsets->boottime); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -73,6 +81,7 @@ static inline int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *ts }static inline void timens_add_monotonic (struct timespec64 *ts) {} +static inline void timens_add_boottime (struct timespec64 *ts) {}#endif #endif /* _LINUX_TIMENS_H */
include/linux/timens_offsets.h +1 -0
@@ -4,6 +4,7 @@struct timens_offsets {struct timespec64 monotonic; +struct timespec64 boottime; };#endif
kernel/time/alarmtimer.c +1 -0
@@ -26,6 +26,7 @@#include <linux/freezer.h> #include <linux/compat.h> #include <linux/module.h> +#include <linux/time_namespace.h> #include "posix-timers.h"
kernel/time/posix-stubs.c +1 -0
@@ -82,6 +82,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)break ;case CLOCK_BOOTTIME :ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +1 -0
@@ -240,6 +240,7 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp);return 0 ; }
Signature · 1 line
2.22.0
PATCH v4 6/28 timerfd/timens: Take into account ns clock offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Make timerfd respect timens offsets.
Provide a helper timens_ktime_to_host() that is useful to wire up timens to different kernel subsystems.
--- fs/timerfd.c | 3 +++ include/linux/time_namespace.h | 18 ++++++++++++++++++ kernel/time_namespace.c | 27 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+)
fs/timerfd.c +3 -0
@@ -26,6 +26,7 @@#include <linux/syscalls.h> #include <linux/compat.h> #include <linux/rcupdate.h> +#include <linux/time_namespace.h> struct timerfd_ctx { union {
@@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags, }if (texp !=0 ) { +if (flags &TFD_TIMER_ABSTIME ) + texp =timens_ktime_to_host (clockid, texp);if (isalarm (ctx)) {if (flags &TFD_TIMER_ABSTIME )alarm_start (&ctx->t.alarm, texp);
include/linux/time_namespace.h +18 -0
@@ -56,6 +56,19 @@ static inline void timens_add_boottime(struct timespec64 *ts) *ts = timespec64_add(*ts, ns_offsets->boottime); } +ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim, +struct timens_offsets *offsets); +static inline ktime_t timens_ktime_to_host (clockid_t clockid,ktime_t tim) +{ +struct timens_offsets *offsets = current->nsproxy->time_ns->offsets; + +if (!offsets)/* fast-path for the root time namespace */ +return tim; + +return do_timens_ktime_to_host (clockid, tim, offsets); +} + +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -82,6 +95,11 @@ static inline int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsstatic inline void timens_add_monotonic (struct timespec64 *ts) {}static inline void timens_add_boottime (struct timespec64 *ts) {} + +static inline ktime_t timens_ktime_to_host (clockid_t clockid,ktime_t tim) +{ +return tim; +}#endif #endif /* _LINUX_TIMENS_H */
kernel/time_namespace.c +27 -0
@@ -15,6 +15,33 @@#include <linux/sched/task.h> #include <linux/mm.h> +ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim,struct timens_offsets *ns_offsets) +{ +ktime_t koff; + +switch (clockid) { +case CLOCK_MONOTONIC : + koff =timespec64_to_ktime (ns_offsets->monotonic); +break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + koff =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* tim - off has to be in [0, KTIME_MAX) */ +if (tim < koff) + tim =0 ; +else if (KTIME_MAX - tim < -koff) + tim =KTIME_MAX ; +else + tim =ktime_sub (tim, koff); + +return tim; +} +static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {return inc_ucount (ns,current_euid (),UCOUNT_TIME_NAMESPACES );
Signature · 1 line
2.22.0
Re: [PATCHv4 06/28] timerfd/timens: Take into account ns clock offsets
Quoted 5 lines · Dmitry Safonov
--- fs/timerfd.c | 3 +++ include/linux/time_namespace.h | 18 ++++++++++++++++++ kernel/time_namespace.c | 27 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+)
Again, please split that into:
1) Introduce the new function
2) Make use of it
Quoted 26 lines
fs/timerfd.c +3
-0@@ -26,6 +26,7 @@#include <linux/syscalls.h> #include <linux/compat.h> #include <linux/rcupdate.h> +#include <linux/time_namespace.h> struct timerfd_ctx { union {@@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags, }if (texp !=0 ) { +if (flags &TFD_TIMER_ABSTIME ) + texp =timens_ktime_to_host (clockid, texp);if (isalarm (ctx)) {if (flags &TFD_TIMER_ABSTIME )alarm_start (&ctx->t.alarm, texp);include/linux/time_namespace.h +0
-0
include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts) · line 65
Quoted 10 lines
include/linux/time_namespace.h +7
-0@@ -56,6 +56,19 @@ static inline void timens_add_boottime(struct timespec64 *ts) *ts =timespec64_add (*ts, ns_offsets->boottime); } +ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim, +struct timens_offsets *offsets); +static inline ktime_t timens_ktime_to_host (clockid_t clockid,ktime_t tim) +{ +struct timens_offsets *offsets = current->nsproxy->time_ns->offsets; + +if (!offsets)/* fast-path for the root time namespace */
Can you please avoid tail comments. They break the reading flow. Aside of that I don't see the value of documenting the obvious.
include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts) · line 66
Quoted 1 line
include/linux/time_namespace.h +1
-0+ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim,struct timens_offsets *ns_offsets)
Please line break the arguments
ktime_t do_timens_ktime_to_host(clockid_t clockid, ktime_t tim,
struct timens_offsets *ns_offsets)
Quoted 6 lines
include/linux/time_namespace.h +6
-0+{ +ktime_t koff; + +switch (clockid) { +case CLOCK_MONOTONIC : + koff =timespec64_to_ktime (ns_offsets->monotonic);
include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts)
Quoted 10 lines
include/linux/time_namespace.h +10
-0+break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + koff =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* tim - off has to be in [0, KTIME_MAX) */
Please be more elaborate why the below conditions can happen at all.
include/linux/time_namespace.h
Quoted 6 lines
include/linux/time_namespace.h +6
-0+if (tim < koff) + tim =0 ; +else if (KTIME_MAX - tim < -koff) + tim =KTIME_MAX ; +else + tim =ktime_sub (tim, koff);
Thanks,
tglx
Re: [PATCHv4 06/28] timerfd/timens: Take into account ns clock offsets
Quoted 7 lines · Thomas Gleixner
Quoted 5 lines · Dmitry Safonov
--- fs/timerfd.c | 3 +++ include/linux/time_namespace.h | 18 ++++++++++++++++++ kernel/time_namespace.c | 27 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+)
Quoted 5 lines
Again, please split that into:
1) Introduce the new function
2) Make use of it
Will do
Quoted 41 lines
Quoted 27 lines
fs/timerfd.c +3
-0@@ -26,6 +26,7 @@#include <linux/syscalls.h> #include <linux/compat.h> #include <linux/rcupdate.h> +#include <linux/time_namespace.h> struct timerfd_ctx { union {@@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags, }if (texp !=0 ) { +if (flags &TFD_TIMER_ABSTIME ) + texp =timens_ktime_to_host (clockid, texp);if (isalarm (ctx)) {if (flags &TFD_TIMER_ABSTIME )alarm_start (&ctx->t.alarm, texp);include/linux/time_namespace.h +0
-0include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts) · line 65
Quoted 10 lines
include/linux/time_namespace.h +7
-0@@ -56,6 +56,19 @@ static inline void timens_add_boottime(struct timespec64 *ts) *ts =timespec64_add (*ts, ns_offsets->boottime); } +ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim, +struct timens_offsets *offsets); +static inline ktime_t timens_ktime_to_host (clockid_t clockid,ktime_t tim) +{ +struct timens_offsets *offsets = current->nsproxy->time_ns->offsets; + +if (!offsets)/* fast-path for the root time namespace */ Can you please avoid tail comments. They break the reading flow. Aside of that I don't see the value of documenting the obvious.
Quoted 6 lines
include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts) · line 66
Quoted 1 line
include/linux/time_namespace.h +1
-0+ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim,struct timens_offsets *ns_offsets)Please line break the arguments
ktime_tdo_timens_ktime_to_host(clockid_t clockid,ktime_ttim,
structtimens_offsets*ns_offsets)
Sure
Quoted 20 lines
Quoted 7 lines
include/linux/time_namespace.h +6
-0+{ +ktime_t koff; + +switch (clockid) { +case CLOCK_MONOTONIC : + koff =timespec64_to_ktime (ns_offsets->monotonic);include/linux/time_namespace.h static inline void timens_add_boottime(struct timespec64 *ts)
Quoted 10 lines
include/linux/time_namespace.h +10
-0+break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + koff =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* tim - off has to be in [0, KTIME_MAX) */ Please be more elaborate why the below conditions can happen at all.
Quoted 6 lines
include/linux/time_namespace.h
Quoted 6 lines
include/linux/time_namespace.h +6
-0+if (tim < koff) + tim =0 ; +else if (KTIME_MAX - tim < -koff) + tim =KTIME_MAX ; +else + tim =ktime_sub (tim, koff);
Thanks,
Dmitry
PATCH v4 7/28 posix-timers/timens: Take into account clock offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Wire timer_settime() syscall into time namespace virtualization.
--- kernel/time/posix-timers.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/posix-timers.c +2 -0
@@ -857,6 +857,8 @@ int common_timer_set(struct k_itimer *timr, int flags, timr->it_interval =timespec64_to_ktime (new_setting->it_interval); expires =timespec64_to_ktime (new_setting->it_value); +if (flags &TIMER_ABSTIME ) + expires =timens_ktime_to_host (timr->it_clock, expires); sigev_none = timr->it_sigev_notify ==SIGEV_NONE ; kc->timer_arm (timr, expires, flags &TIMER_ABSTIME , sigev_none);
Signature · 1 line
2.22.0
Re: [PATCHv4 07/28] posix-timers/timens: Take into account clock offsets
Quoted 1 line · Dmitry Safonov
Subject: posix-timers/timens: Take into account clock offsets
Please avoid that '/timens' appendix. It's not really a new subsystem or subfunction of posix-timers.
posix-timers: Add time namespace support to common_timer_set()
Quoted 3 lines
From: Andrei Vagin <[email protected]>
Wire
timer_settime()syscall into time namespace virtualization.
Please explain why this only affects common_timer_set() and not any other incarnation along with an explanation why only ABSTIME timers need to be converted.
Thanks,
tglx
Re: [PATCHv4 07/28] posix-timers/timens: Take into account clock offsets
Quoted 8 lines · Thomas Gleixner
Quoted 1 line · Dmitry Safonov
Subject: posix-timers/timens: Take into account clock offsets
Please avoid that '/timens' appendix. It's not really a new subsystem or subfunction of posix-timers.
posix-timers: Add time namespace support to
common_timer_set()
Ok
Quoted 8 lines
Quoted 4 lines
From: Andrei Vagin <[email protected]>
Wire
timer_settime()syscall into time namespace virtualization.Please explain why this only affects
common_timer_set()and not any other incarnation along with an explanation why only ABSTIME timers need to be converted.
Will do.
Thanks,
Dmitry
PATCH v4 8/28 timens/kernel: Take into account timens clock offsets in clock_nanosleep
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Wire up clock_nanosleep() to timens offsets.
--- include/linux/hrtimer.h | 2 +- kernel/time/alarmtimer.c | 2 ++ kernel/time/hrtimer.c | 8 ++++---- kernel/time/posix-stubs.c | 12 ++++++++++-- kernel/time/posix-timers.c | 19 ++++++++++++++++--- 5 files changed, 33 insertions(+), 10 deletions(-)
include/linux/hrtimer.h +1 -1
@@ -473,7 +473,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,/* Precise sleep: */ extern int nanosleep_copyout (struct restart_block *,struct timespec64 *); -extern long hrtimer_nanosleep (const struct timespec64 *rqtp, +extern long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid);
kernel/time/alarmtimer.c +2 -0
@@ -819,6 +819,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,ktime_t now = alarm_bases[type].gettime (); exp =ktime_add_safe (now, exp); + }else { + exp =timens_ktime_to_host (which_clock, exp); } ret =alarmtimer_do_nsleep (&alarm, exp, type);
kernel/time/hrtimer.c +4 -4
@@ -1716,7 +1716,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)return ret; } -long hrtimer_nanosleep (const struct timespec64 *rqtp, +long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid) {struct restart_block *restart;
@@ -1729,7 +1729,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, slack =0 ;hrtimer_init_on_stack (&t.timer, clockid, mode); -hrtimer_set_expires_range_ns (&t.timer,timespec64_to_ktime (*rqtp), slack); +hrtimer_set_expires_range_ns (&t.timer, rqtp, slack); ret =do_nanosleep (&t, mode);if (ret != -ERESTART_RESTARTBLOCK ) goto out;
@@ -1764,7 +1764,7 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, current->restart_block.nanosleep.type = rmtp ?TT_NATIVE :TT_NONE ; current->restart_block.nanosleep.rmtp = rmtp; - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC); + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL, CLOCK_MONOTONIC); }#endif
@@ -1784,7 +1784,7 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp, current->restart_block.nanosleep.type = rmtp ?TT_COMPAT :TT_NONE ; current->restart_block.nanosleep.compat_rmtp = rmtp; - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC); + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL, CLOCK_MONOTONIC); }#endif
kernel/time/posix-stubs.c +10 -2
@@ -129,6 +129,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, struct __kernel_timespec __user *, rmtp) {struct timespec64 t; +ktime_t texp;switch (which_clock) {case CLOCK_REALTIME :
@@ -147,7 +148,10 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, rmtp =NULL ; current->restart_block.nanosleep.type = rmtp ?TT_NATIVE :TT_NONE ; current->restart_block.nanosleep.rmtp = rmtp; -return hrtimer_nanosleep (&t, flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +if (flags &TIMER_ABSTIME ) + texp = timens_ktime_to_host(clockid, texp; +return hrtimer_nanosleep (texp, flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
@@ -215,6 +219,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, struct old_timespec32 __user *, rmtp) {struct timespec64 t; +ktime texp;switch (which_clock) {case CLOCK_REALTIME :
@@ -233,7 +238,10 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, rmtp =NULL ; current->restart_block.nanosleep.type = rmtp ?TT_COMPAT :TT_NONE ; current->restart_block.nanosleep.compat_rmtp = rmtp; -return hrtimer_nanosleep (&t, flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +if (flags &TIMER_ABSTIME ) + texp = timens_ktime_to_host(clockid, texp; +return hrtimer_nanosleep (texp, flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
kernel/time/posix-timers.c +16 -3
@@ -1194,7 +1194,20 @@ SYSCALL_DEFINE2(clock_getres_time32, clockid_t, which_clock,static int common_nsleep (const clockid_t which_clock,int flags,const struct timespec64 *rqtp) { -return hrtimer_nanosleep (rqtp, flags &TIMER_ABSTIME ? +ktime_t texp =timespec64_to_ktime (*rqtp); +return hrtimer_nanosleep (texp, flags &TIMER_ABSTIME ? +HRTIMER_MODE_ABS :HRTIMER_MODE_REL , + which_clock); +} + +static int common_nsleep_timens (const clockid_t which_clock,int flags, +const struct timespec64 *rqtp) +{ +ktime_t texp =timespec64_to_ktime (*rqtp); +if (flags &TIMER_ABSTIME ) + texp =timens_ktime_to_host (which_clock, texp); + +return hrtimer_nanosleep (texp, flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
@@ -1275,7 +1288,7 @@ static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_timespec, .clock_get_ktime = posix_get_ktime, - .nsleep = common_nsleep, + .nsleep = common_nsleep_timens, .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get,
@@ -1322,7 +1335,7 @@ static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, .clock_get_ktime = posix_get_boottime_ktime, .clock_get_timespec = posix_get_boottime_timespec, - .nsleep = common_nsleep, + .nsleep = common_nsleep_timens, .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get,
Signature · 1 line
2.22.0
Re: [PATCHv4 08/28] timens/kernel: Take into account timens clock offsets in clock_nanosleep
On Wed, 12 Jun 2019, Dmitry Safonov wrote:
Again the subsystem prefix is something pulled out of thin air.
Quoted 33 lines
From: Andrei Vagin <[email protected]>
Wire up
clock_nanosleep()to timens offsets.Signed-off-by Andrei Vagin <[email protected]>Co-developed-by Dmitry Safonov <[email protected]>Signed-off-by Dmitry Safonov <[email protected]>--- include/linux/hrtimer.h | 2 +- kernel/time/alarmtimer.c | 2 ++ kernel/time/hrtimer.c | 8 ++++---- kernel/time/posix-stubs.c | 12 ++++++++++-- kernel/time/posix-timers.c | 19 ++++++++++++++++--- 5 files changed, 33 insertions(+), 10 deletions(-)include/linux/hrtimer.h +1
-1@@ -473,7 +473,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,/* Precise sleep: */ extern int nanosleep_copyout (struct restart_block *,struct timespec64 *); -extern long hrtimer_nanosleep (const struct timespec64 *rqtp, +extern long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid);kernel/time/alarmtimer.c +0
-0
kernel/time/alarmtimer.c static int alarm_timer_nsleep(const clockid_t which_clock, int flags, · line 824
Quoted 6 lines
kernel/time/alarmtimer.c +2
-0@@ -819,6 +819,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,ktime_t now = alarm_bases[type].gettime (); exp =ktime_add_safe (now, exp); + }else { + exp =timens_ktime_to_host (which_clock, exp); }
This one is independent of the hrtimer part. Please split it out into
Subject: alarmtimer: Make nanosleep time namespace aware
kernel/time/hrtimer.c static long __sched hrtimer_nanosleep_restart(struct restart_block *restart) · line 1720
Quoted 12 lines
kernel/time/alarmtimer.c +0
-0ret =alarmtimer_do_nsleep (&alarm, exp, type);kernel/time/hrtimer.c +1
-1@@ -1716,7 +1716,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)return ret; } -long hrtimer_nanosleep (const struct timespec64 *rqtp, +long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid)
This signature change wants to be separate.
Subject: hrtimers: Prepare hrtimer_nanosleep() for time namespaces
Quoted 42 lines
kernel/time/hrtimer.c +3
-3{struct restart_block *restart;@@ -1729,7 +1729,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, slack =0 ;hrtimer_init_on_stack (&t.timer, clockid, mode); -hrtimer_set_expires_range_ns (&t.timer,timespec64_to_ktime (*rqtp), slack); +hrtimer_set_expires_range_ns (&t.timer, rqtp, slack); ret =do_nanosleep (&t, mode);if (ret != -ERESTART_RESTARTBLOCK ) goto out;@@ -1764,7 +1764,7 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, current->restart_block.nanosleep.type = rmtp ?TT_NATIVE :TT_NONE ; current->restart_block.nanosleep.rmtp = rmtp; - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC); + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL, CLOCK_MONOTONIC); }#endif @@ -1784,7 +1784,7 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp, current->restart_block.nanosleep.type = rmtp ?TT_COMPAT :TT_NONE ; current->restart_block.nanosleep.compat_rmtp = rmtp; - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC); + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL, CLOCK_MONOTONIC); }#endif kernel/time/posix-stubs.c +1
-0@@ -129,6 +129,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, struct __kernel_timespec __user *, rmtp) {struct timespec64 t; +ktime_t texp;switch (which_clock) {case CLOCK_REALTIME :
kernel/time/posix-stubs.c SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, · line 153
Quoted 7 lines
kernel/time/posix-stubs.c +3
-1@@ -147,7 +148,10 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, rmtp =NULL ; current->restart_block.nanosleep.type = rmtp ?TT_NATIVE :TT_NONE ; current->restart_block.nanosleep.rmtp = rmtp; - return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +if (flags &TIMER_ABSTIME ) + texp = timens_ktime_to_host(clockid, texp;
And then add actual name space support with:
Subject: posix-timers: Make clock_nanosleep() time namespace aware
kernel/time/posix-stubs.c SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, · line 157
Quoted 4 lines
kernel/time/posix-stubs.c +1
-0+return hrtimer_nanosleep (texp, flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
Thanks,
tglx
PATCH v4 9/28 timens: Shift /proc/uptime
In reply to Dmitry SafonovRespect boottime inside time namespace for /proc/uptime
--- fs/proc/uptime.c | 3 +++ 1 file changed, 3 insertions(+)
fs/proc/uptime.c +3 -0
@@ -5,6 +5,7 @@#include <linux/sched.h> #include <linux/seq_file.h> #include <linux/time.h> +#include <linux/time_namespace.h> #include <linux/kernel_stat.h> static int uptime_proc_show (struct seq_file *m,void *v)
@@ -20,6 +21,8 @@ static int uptime_proc_show(struct seq_file *m, void *v) nsec += (__force u64 )kcpustat_cpu (i).cpustat[CPUTIME_IDLE ];ktime_get_boottime_ts64 (&uptime); +timens_add_boottime (&uptime); + idle.tv_sec =div_u64_rem (nsec,NSEC_PER_SEC , &rem); idle.tv_nsec = rem; seq_printf(m, "%lu.%02lu %lu.%02lu\n",
Signature · 1 line
2.22.0
Re: [PATCHv4 09/28] timens: Shift /proc/uptime
On Wed, 12 Jun 2019, Dmitry Safonov wrote:
Again, please use the usual prefix and bolt not everything to timens. timens: is the proper prefix for the actual time namespace core code.
Thanks,
tglx
Re: [PATCHv4 09/28] timens: Shift /proc/uptime
Quoted 5 lines · Thomas Gleixner
On Wed, 12 Jun 2019, Dmitry Safonov wrote:
Again, please use the usual prefix and bolt not everything to timens. timens: is the proper prefix for the actual time namespace core code.
Yep, will do.
Thanks,
Dmitry
PATCH v4 10/28 x86/vdso2c: Correct err messages on file opening
In reply to Dmitry Safonoverr() message in main() is misleading: it should print outfilename, which is argv[3], not argv[2].
Correct error messages to be more precise about what failed and for which file.
--- arch/x86/entry/vdso/vdso2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/entry/vdso/vdso2c.c +2 -2
@@ -184,7 +184,7 @@ static void map_input(const char *name, void **addr, size_t *len, int prot)int fd =open (name,O_RDONLY );if (fd ==-1 ) -err (1 ,"%s" , name); +err (1 ,"open(%s)" , name); tmp_len =lseek (fd,0 ,SEEK_END );if (tmp_len == (off_t)-1 )
@@ -237,7 +237,7 @@ int main(int argc, char **argv) outfilename = argv[3 ]; outfile =fopen (outfilename,"w" );if (!outfile) -err (1 ,"%s" , argv[2 ]); +err (1 ,"fopen(%s)" , outfilename);go (raw_addr, raw_len, stripped_addr, stripped_len, outfile, name);
Signature · 1 line
2.22.0
PATCH v4 11/28 x86/vdso2c: Convert iterator to unsigned
In reply to Dmitry Safonovi and j are used everywhere with unsigned types. Cleanup and prettify the code a bit.
Introduce syms_nr for readability and as a preparation for allocating an array of vDSO entries that will be needed for creating two vdso .so's:
one for host tasks and another for processes inside time namespace.
--- arch/x86/entry/vdso/vdso2c.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/x86/entry/vdso/vdso2c.h +4 -5
@@ -13,7 +13,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,unsigned long load_size =-1 ;/* Work around bogus warning */ unsigned long mapping_size;ELF (Ehdr) *hdr = (ELF (Ehdr) *)raw_addr; -int i; +unsigned int i, syms_nr;unsigned long j;ELF (Shdr) *symtab_hdr =NULL , *strtab_hdr, *secstrings_hdr, *alt_sec =NULL ;
@@ -86,11 +86,10 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, strtab_hdr = raw_addr +GET_LE (&hdr->e_shoff) +GET_LE (&hdr->e_shentsize) *GET_LE (&symtab_hdr->sh_link); + syms_nr =GET_LE (&symtab_hdr->sh_size) /GET_LE (&symtab_hdr->sh_entsize);/* Walk the symbol table */ -for (i =0 ; - i <GET_LE (&symtab_hdr->sh_size) /GET_LE (&symtab_hdr->sh_entsize); - i++) { -int k; +for (i =0 ; i < syms_nr; i++) { +unsigned int k;ELF (Sym) *sym = raw_addr +GET_LE (&symtab_hdr->sh_offset) +GET_LE (&symtab_hdr->sh_entsize) * i; const char *sym_name = raw_addr +
Signature · 1 line
2.22.0
PATCH v4 12/28 x86/vdso/Makefile: Add vobjs32
In reply to Dmitry SafonovTreat ia32/i386 objects in array the same As for 64-bit vdso objects. This is a preparation ground to avoid code duplication on introduction timens vdso.
--- arch/x86/entry/vdso/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/x86/entry/vdso/Makefile +5 -10
@@ -18,6 +18,8 @@ VDSO32-$(CONFIG_IA32_EMULATION) := y # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o +vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o +vobjs32-y += vdso32/vclock_gettime.o # files to link into kernel obj-y += vma.o
@@ -31,10 +33,12 @@ vdso_img-$(VDSO32-y) += 32 obj-$(VDSO32-y) += vdso32-setup.o vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) +vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F) $(obj)/vdso.o: $(obj)/vdso.so targets += vdso.lds $(vobjs-y) +targets += vdso32/vdso32.lds $(vobjs32-y) # Build the vDSO image C files and link them in. vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
@@ -125,10 +129,6 @@ $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds) VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1 -targets += vdso32/vdso32.lds -targets += vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o -targets += vdso32/vclock_gettime.o - KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) -DBUILD_VDSO $(obj)/vdso32.so.dbg: KBUILD_AFLAGS = $(KBUILD_AFLAGS_32) $(obj)/vdso32.so.dbg: asflags-$(CONFIG_X86_64) += -m32
@@ -153,12 +153,7 @@ endif $(obj)/vdso32.so.dbg: KBUILD_CFLAGS = $(KBUILD_CFLAGS_32) -$(obj)/vdso32.so.dbg: FORCE \ - $(obj)/vdso32/vdso32.lds \ - $(obj)/vdso32/vclock_gettime.o \ - $(obj)/vdso32/note.o \ - $(obj)/vdso32/system_call.o \ - $(obj)/vdso32/sigreturn.o +$(obj)/vdso32.so.dbg: $(obj)/vdso32/vdso32.lds $(vobjs32) FORCE $(call if_changed,vdso) #
Signature · 1 line
2.22.0
PATCH v4 13/28 x86/vdso: Restrict splitting VVAR VMA
In reply to Dmitry SafonovAlthough, time namespace can work with VVAR VMA split, it seems worth to forbid splitting VVAR resulting in stricter ABI and reducing amount of corner-cases to consider while working further on VDSO.
I don't think there is any use-case for partial mremap() of vvar, but if there is any - this patch can be easily reverted.
--- arch/x86/entry/vdso/vma.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/entry/vdso/vma.c +13 -0
@@ -84,6 +84,18 @@ static int vdso_mremap(const struct vm_special_mapping *sm,return 0 ; } +static int vvar_mremap (const struct vm_special_mapping *sm, +struct vm_area_struct *new_vma) +{ +unsigned long new_size = new_vma->vm_end - new_vma->vm_start; +const struct vdso_image *image = new_vma->vm_mm->context.vdso_image; + +if (new_size != -image->sym_vvar_start) +return -EINVAL ; + +return 0 ; +} +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {
@@ -136,6 +148,7 @@ static const struct vm_special_mapping vdso_mapping = {static const struct vm_special_mapping vvar_mapping = { .name ="[vvar]" , .fault = vvar_fault, + .mremap = vvar_mremap, };/*
Signature · 1 line
2.22.0
PATCH v4 14/28 x86/vdso: Rename vdso_image {.data=>.text}
In reply to Dmitry SafonovTo avoid any confusion with VVAR.
--- arch/x86/entry/vdso/vdso2c.h | 2 +- arch/x86/entry/vdso/vma.c | 6 +++--- arch/x86/include/asm/vdso.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/entry/vdso/vdso2c.h +1 -1
@@ -158,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"\n};\n\n" );fprintf (outfile,"const struct vdso_image %s = {\n" , image_name); -fprintf (outfile,"\t.data = raw_data,\n" ); +fprintf (outfile,"\t.text = raw_data,\n" );fprintf (outfile,"\t.size = %lu,\n" , mapping_size);if (alt_sec) { fprintf(outfile, "\t.alt = %lu,\n",
arch/x86/entry/vdso/vma.c +3 -3
@@ -32,8 +32,8 @@ void __init init_vdso_image(const struct vdso_image *image) {BUG_ON (image->size %PAGE_SIZE !=0 ); -apply_alternatives ((struct alt_instr *)(image->data + image->alt), - (struct alt_instr *)(image->data + image->alt + +apply_alternatives ((struct alt_instr *)(image->text + image->alt), + (struct alt_instr *)(image->text + image->alt + image->alt_len)); }
@@ -47,7 +47,7 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,if (!image || (vmf->pgoff <<PAGE_SHIFT ) >= image->size)return VM_FAULT_SIGBUS ; - vmf->page =virt_to_page (image->data + (vmf->pgoff <<PAGE_SHIFT )); + vmf->page =virt_to_page (image->text + (vmf->pgoff <<PAGE_SHIFT ));get_page (vmf->page);return 0 ; }
arch/x86/include/asm/vdso.h +1 -1
@@ -11,7 +11,7 @@#include <linux/mm_types.h> struct vdso_image { -void *data; +void *text;unsigned long size;/* Always a multiple of PAGE_SIZE */ unsigned long alt, alt_len;
Signature · 1 line
2.22.0
PATCH v4 15/28 x86/vdso: Add offsets page in vvar
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
As modern applications fetch time from VDSO without entering the kernel, it's needed to provide offsets for userspace code inside time namespace.
A page for timens offsets is allocated on time namespace construction. Put that page into VVAR for tasks inside timens and zero page for host processes.
As VDSO code is already optimized as much as possible in terms of speed, any new if-condition in VDSO code is undesirable; the goal is to provide two .so(s), as was originally suggested by Andy and Thomas:
- for host tasks with optimized-out clk_to_ns() without any penalty
- for processes inside timens with clk_to_ns()
For this purpose, define clk_to_ns() under CONFIG_TIME_NS.
To eliminate any performance regression, clk_to_ns() will be called under static_branch with follow-up patches, that adds support for patching vdso.
VDSO mappings are platform-specific, add Kconfig dependency for arch.
--- arch/Kconfig | 5 ++++ arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vclock_gettime.c | 43 +++++++++++++++++++++++++++ arch/x86/entry/vdso/vdso-layout.lds.S | 9 +++++- arch/x86/entry/vdso/vdso2c.c | 3 ++ arch/x86/entry/vdso/vma.c | 12 ++++++++ arch/x86/include/asm/vdso.h | 1 + init/Kconfig | 1 + 8 files changed, 74 insertions(+), 1 deletion(-)
arch/Kconfig +5 -0
@@ -734,6 +734,11 @@ config HAVE_ARCH_NVRAM_OPS config ISA_BUS_API def_bool ISA +config ARCH_HAS_VDSO_TIME_NS + bool + help + VDSO can add time-ns offsets without entering kernel. + # # ABI hall of shame #
arch/x86/Kconfig +1 -0
@@ -79,6 +79,7 @@ config X86 select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE select ARCH_HAS_UBSAN_SANITIZE_ALL + select ARCH_HAS_VDSO_TIME_NS select ARCH_HAS_ZONE_DEVICE if X86_64 select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
arch/x86/entry/vdso/vclock_gettime.c +43 -0
73 lines not on this page · raw message
arch/x86/entry/vdso/vdso-layout.lds.S +8 -1
@@ -7,6 +7,12 @@ * This script controls its layout. */ +#ifdef CONFIG_TIME_NS +# define TIMENS_SZ PAGE_SIZE +#else +# define TIMENS_SZ 0 +#endif + SECTIONS { /*
@@ -16,7 +22,7 @@ SECTIONS * segment. */ - vvar_start = . - 3 * PAGE_SIZE; + vvar_start = . - (3 * PAGE_SIZE + TIMENS_SZ); vvar_page = vvar_start; /* Place all vvars at the offsets in asm/vvar.h. */
@@ -28,6 +34,7 @@ SECTIONS pvclock_page = vvar_start + PAGE_SIZE; hvclock_page = vvar_start + 2 * PAGE_SIZE; + timens_page = vvar_start + 3 * PAGE_SIZE; . = SIZEOF_HEADERS;
arch/x86/entry/vdso/vdso2c.c +3 -0
@@ -75,12 +75,14 @@ enum { sym_vvar_page, sym_pvclock_page, sym_hvclock_page, + sym_timens_page, };const int special_pages[] = { sym_vvar_page, sym_pvclock_page, sym_hvclock_page, + sym_timens_page, }; struct vdso_sym {
@@ -93,6 +95,7 @@ struct vdso_sym required_syms[] = { [sym_vvar_page] = {"vvar_page", true}, [sym_pvclock_page] = {"pvclock_page", true}, [sym_hvclock_page] = {"hvclock_page", true}, + [sym_timens_page] = {"timens_page", true}, {"VDSO32_NOTE_MASK", true}, {"__kernel_vsyscall", true}, {"__kernel_sigreturn", true},
arch/x86/entry/vdso/vma.c +12 -0
@@ -14,6 +14,7 @@#include <linux/elf.h> #include <linux/cpu.h> #include <linux/ptrace.h> +#include <linux/time_namespace.h> #include <asm/pvclock.h> #include <asm/vgtod.h> #include <asm/proto.h>
@@ -23,6 +24,7 @@#include <asm/desc.h> #include <asm/cpufeature.h> #include <asm/mshyperv.h> +#include <asm/page.h> #if defined(CONFIG_X86_64 )unsigned int __read_mostly vdso64_enabled =1 ;
@@ -135,6 +137,16 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,if (tsc_pg &&vclock_was_used (VCLOCK_HVCLOCK ))return vmf_insert_pfn (vma, vmf->address,vmalloc_to_pfn (tsc_pg)); + }else if (sym_offset == image->sym_timens_page) { +struct time_namespace *ns = current->nsproxy->time_ns; +unsigned long pfn; + +if (!ns->offsets) + pfn =page_to_pfn (ZERO_PAGE (0 )); +else + pfn =page_to_pfn (virt_to_page (ns->offsets)); + +return vmf_insert_pfn (vma, vmf->address, pfn); }return VM_FAULT_SIGBUS ;
arch/x86/include/asm/vdso.h +1 -0
@@ -21,6 +21,7 @@ struct vdso_image {long sym_vvar_page;long sym_pvclock_page;long sym_hvclock_page; +long sym_timens_page;long sym_VDSO32_NOTE_MASK;long sym___kernel_sigreturn;long sym___kernel_rt_sigreturn;
init/Kconfig +1 -0
@@ -993,6 +993,7 @@ config UTS_NS config TIME_NS bool "TIME namespace" + depends on ARCH_HAS_VDSO_TIME_NS default y help In this namespace boottime and monotonic clocks can be set.
Signature · 1 line
2.22.0
Re: [PATCHv4 15/28] x86/vdso: Add offsets page in vvar
Quoted 19 lines · Dmitry Safonov
arch/x86/entry/vdso/vclock_gettime.c +18
-0+#ifdef CONFIG_TIME_NS +notrace static __always_inline void clk_to_ns(clockid_t clk, struct timespec *ts) +{ +struct timens_offsets *timens = (struct timens_offsets *) &timens_page; +struct timespec64 *offset64; + +switch (clk) { +case CLOCK_MONOTONIC : +case CLOCK_MONOTONIC_COARSE : +case CLOCK_MONOTONIC_RAW : + offset64 = &timens->monotonic; +break ; +case CLOCK_BOOTTIME : + offset64 = &timens->boottime; +default : +return ; + } +
arch/x86/entry/vdso/vclock_gettime.c notrace static inline u64 vgetcyc(int mode) · line 175
Quoted 10 lines
arch/x86/entry/vdso/vclock_gettime.c +10
-0+ ts->tv_nsec += offset64->tv_nsec; + ts->tv_sec += offset64->tv_sec; +if (ts->tv_nsec >=NSEC_PER_SEC ) { + ts->tv_nsec -=NSEC_PER_SEC ; + ts->tv_sec++; + } +if (ts->tv_nsec <0 ) { + ts->tv_nsec +=NSEC_PER_SEC ; + ts->tv_sec--; + }
I had to think twice why adding the offset (which can be negative) can never result in negative time being returned. A comment explaining this would be appreciated.
As I'm planning to merge Vincezos VDSO consolidation into 5.3, can you please start to work on top of his series, which should be available as final v7 next week hopefully.
Thanks,
tglx
Re: [PATCHv4 15/28] x86/vdso: Add offsets page in vvar
Quoted 35 lines · Thomas Gleixner
Quoted 19 lines · Dmitry Safonov
arch/x86/entry/vdso/vclock_gettime.c +18
-0+#ifdef CONFIG_TIME_NS +notrace static __always_inline void clk_to_ns(clockid_t clk, struct timespec *ts) +{ +struct timens_offsets *timens = (struct timens_offsets *) &timens_page; +struct timespec64 *offset64; + +switch (clk) { +case CLOCK_MONOTONIC : +case CLOCK_MONOTONIC_COARSE : +case CLOCK_MONOTONIC_RAW : + offset64 = &timens->monotonic; +break ; +case CLOCK_BOOTTIME : + offset64 = &timens->boottime; +default : +return ; + } +arch/x86/entry/vdso/vclock_gettime.c notrace static inline u64 vgetcyc(int mode) · line 175
Quoted 10 lines
arch/x86/entry/vdso/vclock_gettime.c +10
-0+ ts->tv_nsec += offset64->tv_nsec; + ts->tv_sec += offset64->tv_sec; +if (ts->tv_nsec >=NSEC_PER_SEC ) { + ts->tv_nsec -=NSEC_PER_SEC ; + ts->tv_sec++; + } +if (ts->tv_nsec <0 ) { + ts->tv_nsec +=NSEC_PER_SEC ; + ts->tv_sec--; + }I had to think twice why adding the offset (which can be negative) can never result in negative time being returned. A comment explaining this would be appreciated.
Quoted 3 lines
As I'm planning to merge Vincezos VDSO consolidation into 5.3, can you please start to work on top of his series, which should be available as final v7 next week hopefully.
Yes, will rebase on the top of his series.
Thanks much,
Dmitry
PATCH v4 16/28 x86/vdso: Allocate timens vdso
In reply to Dmitry SafonovAs it has been discussed on timens RFC, adding a new conditional branch if (inside_time_ns) on VDSO for all processes is undesirable. It will add a penalty for everybody as branch predictor may mispredict the jump. Also there are instruction cache lines wasted on cmp/jmp.
Those effects of introducing time namespace are very much unwanted having in mind how much work have been spent on micro-optimisation vdso code.
The propose is to allocate a second vdso code with dynamically patched out (disabled by static_branch) timens code on boot time.
Allocate another vdso and copy original code.
--- arch/x86/entry/vdso/vdso2c.h | 2 +- arch/x86/entry/vdso/vma.c | 113 +++++++++++++++++++++++++++++++++-- arch/x86/include/asm/vdso.h | 9 +-- 3 files changed, 114 insertions(+), 10 deletions(-)
arch/x86/entry/vdso/vdso2c.h +1 -1
@@ -157,7 +157,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, }fprintf (outfile,"\n};\n\n" ); -fprintf (outfile,"const struct vdso_image %s = {\n" , image_name); +fprintf (outfile,"struct vdso_image %s __ro_after_init = {\n" , image_name);fprintf (outfile,"\t.text = raw_data,\n" );fprintf (outfile,"\t.size = %lu,\n" , mapping_size);if (alt_sec) {
arch/x86/entry/vdso/vma.c +108 -5
147 lines not on this page · raw message
arch/x86/include/asm/vdso.h +5 -4
@@ -12,6 +12,7 @@struct vdso_image {void *text; +void *text_timens;unsigned long size;/* Always a multiple of PAGE_SIZE */ unsigned long alt, alt_len;
@@ -30,18 +31,18 @@ struct vdso_image { };#ifdef CONFIG_X86_64 -extern const struct vdso_image vdso_image_64; +extern struct vdso_image vdso_image_64;#endif #ifdef CONFIG_X86_X32 -extern const struct vdso_image vdso_image_x32; +extern struct vdso_image vdso_image_x32;#endif #if definedCONFIG_X86_32 || definedCONFIG_COMPAT -extern const struct vdso_image vdso_image_32; +extern struct vdso_image vdso_image_32;#endif -extern void __init init_vdso_image (const struct vdso_image *image); +extern void __init init_vdso_image (struct vdso_image *image);extern int map_vdso_once (const struct vdso_image *image,unsigned long addr);
Signature · 1 line
2.22.0
PATCH v4 17/28 x86/vdso: Switch image on setns()/unshare()/clone()
In reply to Dmitry SafonovAs it has been discussed on timens RFC, adding a new conditional branch if (inside_time_ns) on VDSO for all processes is undesirable. It will add a penalty for everybody as branch predictor may mispredict the jump. Also there are instruction cache lines wasted on cmp/jmp.
Those effects of introducing time namespace are very much unwanted having in mind how much work have been spent on micro-optimisation vdso code.
Addressing those problems, there are two versions of VDSO's .so:
for host tasks (without any penalty) and for processes inside of time namespace with clk_to_ns() that subtracts offsets from host's time.
Whenever a user does setns()/unshare() or clone() with CLONE_TIMENS, change VDSO image in mm and zap existing VVAR/VDSO page tables. They will be re-faulted with corresponding image and VVAR offsets.
--- arch/x86/entry/vdso/vma.c | 28 ++++++++++++++++++++++++++++ arch/x86/include/asm/vdso.h | 1 + kernel/time_namespace.c | 11 +++++++++++ 3 files changed, 40 insertions(+)
arch/x86/entry/vdso/vma.c +28 -0
@@ -25,6 +25,7 @@#include <asm/cpufeature.h> #include <asm/mshyperv.h> #include <asm/page.h> +#include <asm/tlb.h> #if defined(CONFIG_X86_64 )unsigned int __read_mostly vdso64_enabled =1 ;
@@ -266,6 +267,33 @@ static const struct vm_special_mapping vvar_mapping = { .mremap = vvar_mremap, }; +#ifdef CONFIG_TIME_NS +int vdso_join_timens (struct task_struct *task) +{ +struct mm_struct *mm = task->mm; +struct vm_area_struct *vma; + +if (down_write_killable (&mm->mmap_sem)) +return -EINTR ; + +for (vma = mm->mmap; vma; vma = vma->vm_next) { +unsigned long size = vma->vm_end - vma->vm_start; + +if (vma_is_special_mapping (vma, &vvar_mapping) || +vma_is_special_mapping (vma, &vdso_mapping)) +zap_page_range (vma, vma->vm_start, size); + } + +up_write (&mm->mmap_sem); +return 0 ; +} +#else /* CONFIG_TIME_NS */ +int vdso_join_timens (struct task_struct *task) +{ +return -ENXIO ; +} +#endif +/* * Add vdso and vvar mappings to current process. * @image - blob to map
arch/x86/include/asm/vdso.h +1 -0
@@ -45,6 +45,7 @@ extern struct vdso_image vdso_image_32;extern void __init init_vdso_image (struct vdso_image *image);extern int map_vdso_once (const struct vdso_image *image,unsigned long addr); +extern int vdso_join_timens (struct task_struct *task);#endif /* __ASSEMBLER__ */
kernel/time_namespace.c +11 -0
@@ -14,6 +14,7 @@#include <linux/proc_ns.h> #include <linux/sched/task.h> #include <linux/mm.h> +#include <asm/vdso.h> ktime_t do_timens_ktime_to_host (clockid_t clockid,ktime_t tim,struct timens_offsets *ns_offsets) {
@@ -182,11 +183,16 @@ static void timens_put(struct ns_common *ns)static int timens_install (struct nsproxy *nsproxy,struct ns_common *new) {struct time_namespace *ns =to_time_ns (new); +int ret;if (!ns_capable (ns->user_ns,CAP_SYS_ADMIN ) || !ns_capable (current_user_ns (),CAP_SYS_ADMIN ))return -EPERM ; + ret =vdso_join_timens (current); +if (ret) +return ret; +get_time_ns (ns);get_time_ns (ns);put_time_ns (nsproxy->time_ns);
@@ -201,10 +207,15 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk) {struct ns_common *nsc = &nsproxy->time_ns_for_children->ns;struct time_namespace *ns =to_time_ns (nsc); +int ret;if (nsproxy->time_ns == nsproxy->time_ns_for_children)return 0 ; + ret =vdso_join_timens (tsk); +if (ret) +return ret; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
Signature · 1 line
2.22.0
Re: [PATCHv4 17/28] x86/vdso: Switch image on setns()/unshare()/clone()
Quoted 16 lines · Dmitry Safonov
arch/x86/entry/vdso/vma.c +15
-0+#ifdef CONFIG_TIME_NS +int vdso_join_timens (struct task_struct *task) +{ +struct mm_struct *mm = task->mm; +struct vm_area_struct *vma; + +if (down_write_killable (&mm->mmap_sem)) +return -EINTR ; + +for (vma = mm->mmap; vma; vma = vma->vm_next) { +unsigned long size = vma->vm_end - vma->vm_start; + +if (vma_is_special_mapping (vma, &vvar_mapping) || +vma_is_special_mapping (vma, &vdso_mapping)) +zap_page_range (vma, vma->vm_start, size);
arch/x86/entry/vdso/vma.c static const struct vm_special_mapping vvar_mapping = { · line 294
Quoted 10 lines
arch/x86/entry/vdso/vma.c +10
-0+ } + +up_write (&mm->mmap_sem); +return 0 ; +} +#else /* CONFIG_TIME_NS */ +int vdso_join_timens (struct task_struct *task) +{ +return -ENXIO ; +}
Is that else path really required? The callsite is only compiled when CONFIG_TIME_NS is enabled, right?
Thanks,
tglx
Re: [PATCHv4 17/28] x86/vdso: Switch image on setns()/unshare()/clone()
Quoted 22 lines · Thomas Gleixner
Quoted 21 lines · Dmitry Safonov
arch/x86/entry/vdso/vma.c +20
-0+#ifdef CONFIG_TIME_NS +int vdso_join_timens (struct task_struct *task) +{ +struct mm_struct *mm = task->mm; +struct vm_area_struct *vma; + +if (down_write_killable (&mm->mmap_sem)) +return -EINTR ; + +for (vma = mm->mmap; vma; vma = vma->vm_next) { +unsigned long size = vma->vm_end - vma->vm_start; + +if (vma_is_special_mapping (vma, &vvar_mapping) || +vma_is_special_mapping (vma, &vdso_mapping)) +zap_page_range (vma, vma->vm_start, size); + } + +up_write (&mm->mmap_sem); +return 0 ; +}
Quoted 8 lines
arch/x86/entry/vdso/vma.c static const struct vm_special_mapping vvar_mapping = { · line 294
Quoted 5 lines
arch/x86/entry/vdso/vma.c +5
-0+#else /* CONFIG_TIME_NS */ +int vdso_join_timens (struct task_struct *task) +{ +return -ENXIO ; +}Is that else path really required? The callsite is only compiled when
CONFIG_TIME_NSis enabled, right?
Oh, yes - will drop this.
Thanks,
Dmitry
PATCH v4 18/28 vdso: introduce timens_static_branch
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
As it has been discussed on timens RFC, adding a new conditional branch if (inside_time_ns) on VDSO for all processes is undesirable.
Addressing those problems, there are two versions of VDSO's .so:
for host tasks (without any penalty) and for processes inside of time namespace with clk_to_ns() that subtracts offsets from host's time.
This patch introduces timens_static_branch(), which is similar with static_branch_unlikely.
The timens code in vdso looks like this:
if (timens_static_branch()) {
clk_to_ns(clk, ts);
}The version of vdso which is compiled from sources will never execute clk_to_ns(). And then we can patch the 'no-op' in the straight-line codepath with a 'jump' instruction to the out-of-line true branch and get the timens version of the vdso library.
While cooking the patch, an alternative approach has being considered:
to omit no-ops - memcpy() the following asm ret sequience on the place of a function call: https://github.com/0x7f454c46/linux/commit/4cc0180f6d65
Having in mind possible issues with different toolchains, the usual static_branch() approach was choosen.
--- arch/x86/entry/vdso/vclock_gettime.c | 9 +++++-- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + arch/x86/entry/vdso/vdso2c.h | 11 +++++++- arch/x86/entry/vdso/vma.c | 37 ++++++++++++++++++++++----- arch/x86/include/asm/jump_label.h | 14 ++++++++++ arch/x86/include/asm/vdso.h | 1 + include/linux/jump_label.h | 5 ++++ 7 files changed, 69 insertions(+), 9 deletions(-)
arch/x86/entry/vdso/vclock_gettime.c +7 -2
@@ -18,6 +18,7 @@#include <asm/msr.h> #include <asm/pvclock.h> #include <asm/mshyperv.h> +#include <asm/jump_label.h> #include <linux/math64.h> #include <linux/time.h> #include <linux/kernel.h>
@@ -174,8 +175,10 @@ notrace static __always_inline void clk_to_ns(clockid_t clk, struct timespec *ts ts->tv_sec--; } } +#define _timens_static_branch_unlikely timens_static_branch_unlikely#else notrace static __always_inline void clk_to_ns(clockid_t clk, struct timespec *ts) {} +notrace static __always_inline bool _timens_static_branch_unlikely(void) { return false; }#endif notrace static int do_hres(clockid_t clk, struct timespec *ts)
@@ -204,7 +207,8 @@ notrace static int do_hres(clockid_t clk, struct timespec *ts) ts->tv_sec = sec +__iter_div_u64_rem (ns,NSEC_PER_SEC , &ns); ts->tv_nsec = ns; -clk_to_ns (clk, ts); +if (_timens_static_branch_unlikely ()) +clk_to_ns (clk, ts);return 0 ; }
@@ -220,7 +224,8 @@ notrace static void do_coarse(clockid_t clk, struct timespec *ts) ts->tv_nsec = base->nsec; }while (unlikely (gtod_read_retry (gtod, seq))); -clk_to_ns (clk, ts); +if (_timens_static_branch_unlikely ()) +clk_to_ns (clk, ts); } notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
arch/x86/entry/vdso/vdso-layout.lds.S +1 -0
@@ -45,6 +45,7 @@ SECTIONS .gnu.version : { *(.gnu.version) } .gnu.version_d : { *(.gnu.version_d) } .gnu.version_r : { *(.gnu.version_r) } + __jump_table : { *(__jump_table) } :text .dynamic : { *(.dynamic) } :text :dynamic
arch/x86/entry/vdso/vdso2c.h +10 -1
@@ -16,7 +16,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,unsigned int i, syms_nr;unsigned long j;ELF (Shdr) *symtab_hdr =NULL , *strtab_hdr, *secstrings_hdr, - *alt_sec =NULL ; + *alt_sec =NULL , *jump_table_sec =NULL ;ELF (Dyn) *dyn =0 , *dyn_end =0 ;const char *secstrings;INT_BITS syms[NSYMS ] = {};
@@ -78,6 +78,9 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,if (!strcmp (secstrings +GET_LE (&sh->sh_name),".altinstructions" )) alt_sec = sh; +if (!strcmp (secstrings +GET_LE (&sh->sh_name), +"__jump_table" )) + jump_table_sec = sh; }if (!symtab_hdr)
@@ -166,6 +169,12 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"\t.alt_len = %lu,\n" , (unsigned long )GET_LE (&alt_sec->sh_size)); } +if (jump_table_sec) { +fprintf (outfile,"\t.jump_table = %lu,\n" , + (unsigned long )GET_LE (&jump_table_sec->sh_offset)); +fprintf (outfile,"\t.jump_table_len = %lu,\n" , + (unsigned long )GET_LE (&jump_table_sec->sh_size)); + }for (i =0 ; i <NSYMS ; i++) {if (required_syms[i].export && syms[i]) fprintf(outfile, "\t.sym_%s = %" PRIi64 ",\n",
arch/x86/entry/vdso/vma.c +31 -6
@@ -15,6 +15,7 @@#include <linux/cpu.h> #include <linux/ptrace.h> #include <linux/time_namespace.h> +#include <linux/jump_label.h> #include <asm/pvclock.h> #include <asm/vgtod.h> #include <asm/proto.h>
@@ -31,20 +32,44 @@unsigned int __read_mostly vdso64_enabled =1 ;#endif -void __init init_vdso_image (struct vdso_image *image) +#ifdef CONFIG_TIME_NS +static __init void apply_jump_tables (struct vdso_jump_entry *ent,unsigned long nr) { -BUG_ON (image->size %PAGE_SIZE !=0 ); +while (nr--) { +void *code_addr = (void *)ent + ent->code; +long target_addr = (long ) ent->target - (ent->code +JUMP_LABEL_NOP_SIZE ); + ((char *)code_addr)[0 ] =0xe9 ;/* JMP rel32 */ + *((long *)(code_addr +1 )) = (long )target_addr; + + ent++; + } +} + +static __init void init_timens (struct vdso_image *image) +{ +struct vdso_jump_entry *entries; -apply_alternatives ((struct alt_instr *)(image->text + image->alt), - (struct alt_instr *)(image->text + image->alt + - image->alt_len)); -#ifdef CONFIG_TIME_NS image->text_timens =vmalloc_32 (image->size);if (WARN_ON (image->text_timens ==NULL ))return ;memcpy (image->text_timens, image->text, image->size); + + entries = image->text_timens + image->jump_table; +apply_jump_tables (entries, image->jump_table_len /sizeof (struct vdso_jump_entry )); +} +#else +static inline void init_timens (struct vdso_image *image) {}#endif + +void __init init_vdso_image (struct vdso_image *image) +{ +BUG_ON (image->size %PAGE_SIZE !=0 ); + +apply_alternatives ((struct alt_instr *)(image->text + image->alt), + (struct alt_instr *)(image->text + image->alt + + image->alt_len)); +init_timens (image); }struct linux_binprm ;
arch/x86/include/asm/jump_label.h +14 -0
@@ -51,6 +51,20 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, boolreturn true; } +static __always_inline bool timens_static_branch_unlikely(void) +{ + asm_volatile_goto("1:\n\t" + ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" + ".pushsection __jump_table, \"aw\"\n\t" + "2: .word 1b - 2b, %l[l_yes] - 2b\n\t" + ".popsection\n\t" + : : : : l_yes); + +return false; +l_yes: +return true; +} +#else /* __ASSEMBLY__ */ .macro STATIC_JUMP_IF_TRUE target, key, def
arch/x86/include/asm/vdso.h +1 -0
@@ -16,6 +16,7 @@ struct vdso_image {unsigned long size;/* Always a multiple of PAGE_SIZE */ unsigned long alt, alt_len; +unsigned long jump_table, jump_table_len;long sym_vvar_start;/* Negative offset to the vvar area */
include/linux/jump_label.h +5 -0
@@ -125,6 +125,11 @@ struct jump_entry {long key;// key may be far away from the core kernel under KASLR }; +struct vdso_jump_entry { +u16 code; +u16 target; +}; +static inline unsigned long jump_entry_code (const struct jump_entry *entry) {return (unsigned long )&entry->code + entry->code;
Signature · 1 line
2.22.0
PATCH v4 19/28 timens: Add align for timens_offsets
In reply to Dmitry SafonovAlign offsets so that time namespace will work for ia32 applications on x86_64 host.
--- include/linux/timens_offsets.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
include/linux/timens_offsets.h +10 -2
@@ -2,9 +2,17 @@#ifndef _LINUX_TIME_OFFSETS_H#define _LINUX_TIME_OFFSETS_H +/* +* Time offsets need align as they're placed on VVAR page, +* which is used by x86_64 and ia32 VDSO code. +* On ia32 offset::tv_sec (u64) has align(4), so re-align offsets +* to the same positions as 64-bit offsets. +* On 64-bit big-endian systems VDSO should convert to timespec64 +* to timespec because of a padding occurring between the fields. +*/ struct timens_offsets { -struct timespec64 monotonic; -struct timespec64 boottime; +struct timespec64 monotonic__aligned(8) ; +struct timespec64 boottime__aligned(8) ; };#endif
Signature · 1 line
2.22.0
PATCH v4 20/28 timens/fs/proc: Introduce /proc/pid/timens_offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
API to set time namespace offsets for children processes, i.e.:
echo "clockid off_ses off_nsec" > /proc/self/timens_offsets
--- fs/proc/base.c | 95 ++++++++++++++++++++++++++++++ include/linux/time_namespace.h | 10 ++++ kernel/time_namespace.c | 104 +++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+)
fs/proc/base.c +95 -0
@@ -94,6 +94,7 @@#include <linux/sched/debug.h> #include <linux/sched/stat.h> #include <linux/posix-timers.h> +#include <linux/time_namespace.h> #include <trace/events/oom.h> #include "internal.h" #include "fd.h"
@@ -1516,6 +1517,97 @@ static const struct file_operations proc_pid_sched_autogroup_operations = {#endif /* CONFIG_SCHED_AUTOGROUP */ +#ifdef CONFIG_TIME_NS +static int timens_offsets_show (struct seq_file *m,void *v) +{ +struct task_struct *p; + + p =get_proc_task (file_inode (m->file)); +if (!p) +return -ESRCH ; +proc_timens_show_offsets (p, m); + +put_task_struct (p); + +return 0 ; +} + +static ssize_t +timens_offsets_write (struct file *file,const char __user *buf, +size_t count,loff_t *ppos) +{ +struct inode *inode =file_inode (file); +struct proc_timens_offset offsets[2 ]; +char *kbuf =NULL , *pos, *next_line; +struct task_struct *p; +int ret, noffsets; + +/* Only allow < page size writes at the beginning of the file */ +if ((*ppos !=0 ) || (count >=PAGE_SIZE )) +return -EINVAL ; + +/* Slurp in the user data */ + kbuf =memdup_user_nul (buf, count); +if (IS_ERR (kbuf)) +return PTR_ERR (kbuf); + +/* Parse the user data */ + ret = -EINVAL ; + noffsets =0 ; +for (pos = kbuf; pos; pos = next_line) { +struct proc_timens_offset *off = &offsets[noffsets]; +int err; + +/* Find the end of line and ensure we don't look past it */ + next_line =strchr (pos,'\n' ); +if (next_line) { + *next_line ='\0' ; + next_line++; +if (*next_line =='\0' ) + next_line =NULL ; + } + + err =sscanf (pos,"%u %lld %lu" , &off->clockid, + &off->val.tv_sec, &off->val.tv_nsec); +if (err !=3 || off->val.tv_nsec >=NSEC_PER_SEC ) + goto out; + noffsets++; +if (noffsets ==ARRAY_SIZE (offsets)) { +if (next_line) + count = next_line - kbuf; +break ; + } + } + + ret = -ESRCH ; + p =get_proc_task (inode); +if (!p) + goto out; + ret =proc_timens_set_offset (file, p, offsets, noffsets); +put_task_struct (p); +if (ret) + goto out; + + ret = count; +out: +kfree (kbuf); +return ret; +} + +static int timens_offsets_open (struct inode *inode,struct file *filp) +{ +return single_open (filp, timens_offsets_show, inode); +} + +static const struct file_operations proc_timens_offsets_operations = { + .open = timens_offsets_open, + .read = seq_read, + .write = timens_offsets_write, + .llseek = seq_lseek, + .release = single_release, +}; +#endif /* CONFIG_TIME_NS */ +static ssize_t comm_write (struct file *file,const char __user *buf,size_t count,loff_t *offset) {
@@ -2982,6 +3074,9 @@ static const struct pid_entry tgid_base_stuff[] = {#endif #ifdef CONFIG_SCHED_AUTOGROUP REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations), +#endif +#ifdef CONFIG_TIME_NS +REG ("timens_offsets" ,S_IRUGO |S_IWUSR , proc_timens_offsets_operations), #endifREG ("comm" ,S_IRUGO |S_IWUSR , proc_pid_set_comm_operations), #ifdef CONFIG_HAVE_ARCH_TRACEHOOK
include/linux/time_namespace.h +10 -0
@@ -40,6 +40,16 @@ static inline void put_time_ns(struct time_namespace *ns)kref_put (&ns->kref, free_time_ns); } +extern void proc_timens_show_offsets (struct task_struct *p,struct seq_file *m); + +struct proc_timens_offset { +int clockid; +struct timespec64 val; +}; + +extern int proc_timens_set_offset (struct file *file,struct task_struct *p, +struct proc_timens_offset *offsets,int n); +static inline void timens_add_monotonic (struct timespec64 *ts) {struct timens_offsets *ns_offsets = current->nsproxy->time_ns->offsets;
kernel/time_namespace.c +104 -0
116 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 21/28 selftest/timens: Add Time Namespace test for supported clocks
In reply to Dmitry SafonovA test to check that all supported clocks work on host and inside a new time namespace. Use both ways to get time: through VDSO and by entering the kernel with implicit syscall.
Introduce a new timens directory in selftests framework for the next timens tests.
--- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 5 + tools/testing/selftests/timens/config | 1 + tools/testing/selftests/timens/log.h | 26 +++ tools/testing/selftests/timens/timens.c | 188 ++++++++++++++++++++++ tools/testing/selftests/timens/timens.h | 63 ++++++++ 7 files changed, 285 insertions(+) create mode 100644 tools/testing/selftests/timens/.gitignore create mode 100644 tools/testing/selftests/timens/Makefile create mode 100644 tools/testing/selftests/timens/config create mode 100644 tools/testing/selftests/timens/log.h create mode 100644 tools/testing/selftests/timens/timens.c create mode 100644 tools/testing/selftests/timens/timens.h
tools/testing/selftests/Makefile +1 -0
@@ -47,6 +47,7 @@ TARGETS += splice TARGETS += static_keys TARGETS += sync TARGETS += sysctl +TARGETS += timens ifneq (1, $(quicktest)) TARGETS += timers endif
tools/testing/selftests/timens/.gitignore new file +1 -0
@@ -0,0 +1 @@ +timens
tools/testing/selftests/timens/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +TEST_GEN_PROGS := timens + +CFLAGS := -Wall -Werror + +include ../lib.mk
tools/testing/selftests/timens/config new file +1 -0
@@ -0,0 +1 @@ +CONFIG_TIME_NS=y
tools/testing/selftests/timens/log.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __SELFTEST_TIMENS_LOG_H__ +#define __SELFTEST_TIMENS_LOG_H__ + +#define pr_msg (fmt, lvl, ...) \ + ksft_print_msg("[%s] (%s:%d)\t" fmt "\n", \ + lvl, __FILE__, __LINE__, ##__VA_ARGS__) + +#define pr_p (func, fmt, ...) func(fmt ": %m", ##__VA_ARGS__) + +#define pr_err (fmt, ...) \ + ({ \ + ksft_test_result_error(fmt "\n", ##__VA_ARGS__); \ + -1; \ + }) + +#define pr_fail (fmt, ...) \ + ({ \ + ksft_test_result_fail(fmt, ##__VA_ARGS__); \ + -1; \ + }) + +#define pr_perror (fmt, ...) pr_p(pr_err, fmt, ##__VA_ARGS__) + +#endif
tools/testing/selftests/timens/timens.c new file +188 -0
188 lines not on this page · raw message
tools/testing/selftests/timens/timens.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 22/28 selftest/timens: Add a test for timerfd
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Check that timerfd_create() takes into account clock offsets.
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timerfd.c | 127 ++++++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/timerfd.c
tools/testing/selftests/timens/.gitignore +1 -0
@@ -1 +1,2 @@ timens +timerfd
tools/testing/selftests/timens/Makefile +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens +TEST_GEN_PROGS := timens timerfd CFLAGS := -Wall -Werror
tools/testing/selftests/timens/timerfd.c new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 23/28 selftest/timens: Add a test for clock_nanosleep()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Check that clock_nanosleep() takes into account clock offsets.
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- .../selftests/timens/clock_nanosleep.c | 100 ++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/clock_nanosleep.c
tools/testing/selftests/timens/.gitignore +1 -0
@@ -1,2 +1,3 @@ +clock_nanosleep timens timerfd
tools/testing/selftests/timens/Makefile +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd +TEST_GEN_PROGS := timens timerfd clock_nanosleep CFLAGS := -Wall -Werror
tools/testing/selftests/timens/clock_nanosleep.c new file +100 -0
100 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 24/28 selftest/timens: Add procfs selftest
In reply to Dmitry SafonovCheck that /proc/uptime is correct inside a new time namespace.
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 142 ++++++++++++++++++++++ 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/procfs.c
tools/testing/selftests/timens/.gitignore +1 -0
@@ -1,3 +1,4 @@ clock_nanosleep +procfs timens timerfd
tools/testing/selftests/timens/Makefile +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep +TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs CFLAGS := -Wall -Werror
tools/testing/selftests/timens/procfs.c new file +142 -0
142 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 25/28 selftest/timens: Add timer offsets test
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Check that timer_create() takes into account clock offsets.
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 3 +- tools/testing/selftests/timens/timer.c | 116 ++++++++++++++++++++++ 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/timer.c
tools/testing/selftests/timens/.gitignore +1 -0
@@ -1,4 +1,5 @@ clock_nanosleep procfs timens +timer timerfd
tools/testing/selftests/timens/Makefile +2 -1
@@ -1,5 +1,6 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs CFLAGS := -Wall -Werror +LDFLAGS := -lrt include ../lib.mk
tools/testing/selftests/timens/timer.c new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 26/28 x86/vdso: Align VDSO functions by CPU L1 cache line
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
After performance testing VDSO patches a noticeable 20% regression was found on gettime_perf selftest with a cold cache.
As it turns to be, before time namespaces introduction, VDSO functions were quite aligned to cache lines, but adding a new code to adjust timens offset inside namespace created a small shift and vdso functions become unaligned on cache lines.
Add align to vdso functions with gcc option to fix performance drop.
Coping the resulting numbers from cover letter:
Hot CPU cache (more gettime_perf.c cycles - the better):
| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- cycles | 139887013 | 139453003 | 139899785 | 128792458 diff (%)| 100 | 99.7 | 100 | 92
Cold cache (lesser tsc per gettime_perf_cold.c cycle - the better):
| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- tsc | 6748 | 6718 | 6862 | 12682 diff (%)| 100 | 99.6 | 101.7 | 188
Measured on Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz
--- arch/x86/entry/vdso/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/x86/entry/vdso/Makefile +1 -0
@@ -4,6 +4,7 @@ # KBUILD_CFLAGS += $(DISABLE_LTO) +KBUILD_CFLAGS += -falign-functions=$(CONFIG_X86_L1_CACHE_SHIFT) KASAN_SANITIZE := n UBSAN_SANITIZE := n OBJECT_FILES_NON_STANDARD := y
Signature · 1 line
2.22.0
Re: [PATCHv4 26/28] x86/vdso: Align VDSO functions by CPU L1 cache line
Quoted 11 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
After performance testing VDSO patches a noticeable 20% regression was found on
gettime_perfselftest with a cold cache.
As it turns to be, before time namespaces introduction, VDSO functions were quite aligned to cache lines, but adding a new code to adjust timens offset inside namespace created a small shift and vdso functions become unaligned on cache lines.Add align to vdso functions with gcc option to fix performance drop.
Quoted 7 lines
Coping the resulting numbers from cover letter:
Hot CPU cache (more
gettime_perf.ccycles - the better):| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- cycles | 139887013 | 139453003 | 139899785 | 128792458 diff (%)| 100 | 99.7 | 100 | 92
Why is CONFIG_TIME_NS=n behaving worse than current mainline and worse than 'host' mode?
Quoted 5 lines
Cold cache (lesser tsc per
gettime_perf_cold.ccycle - the better):| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- tsc | 6748 | 6718 | 6862 | 12682 diff (%)| 100 | 99.6 | 101.7 | 188
Weird, now CONFIG_TIME_NS=n is better than current mainline and 'host' mode drops.
Either I'm misreading the numbers or missing something or I'm just confused as usual :)
Thanks,
tglx
Re: [PATCHv4 26/28] x86/vdso: Align VDSO functions by CPU L1 cache line
Quoted 15 lines · Thomas Gleixner
Quoted 13 lines · Dmitry Safonov
From: Andrei Vagin <[email protected]>
After performance testing VDSO patches a noticeable 20% regression was found on
gettime_perfselftest with a cold cache.
As it turns to be, before time namespaces introduction, VDSO functions were quite aligned to cache lines, but adding a new code to adjust timens offset inside namespace created a small shift and vdso functions become unaligned on cache lines.Add align to vdso functions with gcc option to fix performance drop.
Coping the resulting numbers from cover letter:
Quoted 8 lines
Quoted 5 lines
Hot CPU cache (more
gettime_perf.ccycles - the better):| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- cycles | 139887013 | 139453003 | 139899785 | 128792458 diff (%)| 100 | 99.7 | 100 | 92Why is
CONFIG_TIME_NS=nbehaving worse than current mainline and worse than 'host' mode?
We had to specify a precision of these numbers, it is more than this 0.3%, so at that time I decided that here is nothing to worry about. I did these measurments a few mounth ago for the second version of this series. I repeated measurments for this set of patches:
| before | CONFIG_TIME_NS=n | host | inside timens
--------------------------------------------------------------
| 144645498 | 142916801 | 140364862 | 132378440
| 143440633 | 141545739 | 140540053 | 132714190
| 144876395 | 144650599 | 140026814 | 131843318
| 143984551 | 144595770 | 140359260 | 131683544
| 144875682 | 143799788 | 140692618 | 131300332
--------------------------------------------------------------
avg | 144364551 | 143501739 | 140396721 | 131983964
diff % | 100 | 99.4 | 97.2 | 91.4-------------------------------------------------------------
stdev % | 0.4 | 0.9 | 0.1 | 0.4
Quoted 9 lines
Quoted 6 lines
Cold cache (lesser tsc per
gettime_perf_cold.ccycle - the better):| before | CONFIG_TIME_NS=n | host | inside timens --------|------------|------------------|-------------|------------- tsc | 6748 | 6718 | 6862 | 12682 diff (%)| 100 | 99.6 | 101.7 | 188Weird, now
CONFIG_TIME_NS=nis better than current mainline and 'host' mode drops.
The precision of these numbers is much smaller than of the previous set. These numbers are for the second version of this series, so I decided to repeat measurements for this version. When I run the test, I found that there is some degradation in compare with v5.0. I bisected and found that the problem is in 2b539aefe9e4 ("mm/resource: Let walk_system_ram_range() search child resources"). At this point, I realized that my test isn't quite right. On each iteration, the test starts a new process, then do start=rdtsc();clock_gettime();end=rdtsc() and prints (end-start). The problem here is that when clock_gettime() is called the first time, vdso pages are not mapped into a process address space, so the test measures how fast vdso pages are mapped into the process address space. I modified this test, now it uses the clflush instruction to drop cpu caches. Here are the results:
| before | CONFIG_TIME_NS=n | host | inside timens
--------------------------------------------------------------
tsc | 434 | 433 | 437 | 477 stdev(tsc) | 5 | 5 | 5 | 3 diff (%) | 1 | 1 | 100.1 | 109
Here is the source code for the modified test:
https://github.com/avagin/linux-task-diag/blob/wip/timens-rfc-v4/tools/testing/selftests/timens/gettime_perf_cold.c
This test does 10K iterations. At the first glance, the numbers look noisy, so I sort them and take only 8K numbers in the middle:
$ ./gettime_perf_cold > raw $ cat raw | sort -n | tail -n 9000 | head -n 8000 > results
Quoted 6 lines
Either I'm misreading the numbers or missing something or I'm just confused as usual :)
Thanks,
> tglx
PATCH v4 27/28 selftests: Add a simple perf test for clock_gettime()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
--- tools/testing/selftests/timens/.gitignore | 2 + tools/testing/selftests/timens/Makefile | 8 +- tools/testing/selftests/timens/gettime_perf.c | 74 +++++++++++++++++++ .../selftests/timens/gettime_perf_cold.c | 63 ++++++++++++++++ 4 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/gettime_perf.c create mode 100644 tools/testing/selftests/timens/gettime_perf_cold.c
tools/testing/selftests/timens/.gitignore +2 -0
@@ -1,4 +1,6 @@ clock_nanosleep +gettime_perf +gettime_perf_cold procfs timens timer
tools/testing/selftests/timens/Makefile +7 -1
@@ -1,4 +1,10 @@ -TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs gettime_perf + +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/) +ifeq ($(ARCH),x86_64) +TEST_GEN_PROGS += gettime_perf_cold +endif CFLAGS := -Wall -Werror LDFLAGS := -lrt
tools/testing/selftests/timens/gettime_perf.c new file +74 -0
74 lines not on this page · raw message
tools/testing/selftests/timens/gettime_perf_cold.c new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v4 28/28 selftest/timens: Check that a right vdso is mapped after fork and exec
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/exec.c | 91 +++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/exec.c
tools/testing/selftests/timens/.gitignore +1 -0
@@ -1,4 +1,5 @@ clock_nanosleep +exec gettime_perf gettime_perf_cold procfs
tools/testing/selftests/timens/Makefile +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs gettime_perf +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs gettime_perf exec uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
tools/testing/selftests/timens/exec.c new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.22.0