kernel: Introduce Time Namespace
Subsystems (17)
v8 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.
v7..v8 Changes:
* Fix compile-time errors:
- on architectures without the support of time namespaces.
- when CONFIG_POSIX_TIMERS isn't set.
* Added checks in selftests for CONFIG_POSIX_TIMERS.
* Inline do_hres and do_coarse.
(And added Tested-by Vincenzo - thanks!)
* Make TIME_NS depends on GENERIC_VDSO_TIME_NS and set it per-arch.
[v1..v7 Changelogs is at the very bottom here]
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):
The first table shows performance of clock_gettime() in the root time namespace.
| before | TIME_NS=n | TIMENS=y
-------------------------------------------
| 150363883 | 167076184 | 164979177
| 150616056 | 167348942 | 165202727
| 150679279 | 167235485 | 165230267
| 150622312 | 167078735 | 165284077
| 150706992 | 167301837 | 165372663
| 150563707 | 167207900 | 165395728
-------------------------------------------
avg | 150592038 | 167208180 | 165244106
diff % | 100 | 111 | 109.7-------------------------------------------
stdev % | 0.08 | 0.07 | 0.1
We can see the 11% performance improvement when CONFIG_TIME_NS is disabled. This is achieved by adding the unlikely hint into vdso_read_begin() and inlining do_hres() and do_coarse().
When CONFIG_TIME_NS is enabled, there is one more clobbered register in the __vdso_clock_gettime function. And this fact explains the performance difference between the two right columns.
The second table shows the performance of clock_gettime in a non-root time namespace.
| before | host | inside timens
----------------------------------------------
| 150363883 | 164979177 | 138133479
| 150616056 | 165202727 | 139047394
| 150679279 | 165230267 | 139284611
| 150622312 | 165284077 | 139263753
| 150706992 | 165372663 | 139175419
| 150563707 | 165395728 | 139334291
----------------------------------------------
avg | 150592038 | 165244106 | 139039824
diff % | 100 | 109.7 | 92.3----------------------------------------------
stdev % | 0.08 | 0.1 | 0.3
In a sub-namespace, the performance hit is 7-8%. The bigger difference between root and non-root namespaces can be explained by the fact that do_{hres,coarse}_timens are not inlined. Inlining these functions improves performance in a sub-namespace, but there will be more clobbered registers in __vdso_clock_gettime what will decrease the performance in the root namespace.
The gettime_perf_cold test does 10K iterations. In each iteration, it drops cpu caches for vdso pages, clflush() is used for this, then it runs rdtsc(); clock_gettime; rdtsc(); and prints the number of tsc cycles.
Cold CPU cache (lesser tsc per cycle - the better):
| before | CONFIG_TIME_NS=n | host | inside timens
--------------------------------------------------------------
tsc | 476 | 480 | 487 | 531 stdev(tsc) | 0.6 | 1.3 | 4.3 | 5.7 diff (%) | 100 | 100.9 | 102 | 112
vdsotest results: https://gist.github.com/avagin/f290afb8b721ae0522a561d585f34de0
The numbers gathered on Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz.
v8 on github (if someone prefers git pull to git am):
https://github.com/0x7f454c46/linux/tree/timens-v8
v7: https://lkml.kernel.org/r/[email protected]
v6: https://lkml.kernel.org/r/[email protected]
v5: https://lkml.kernel.org/r/[email protected]
v4: https://lkml.kernel.org/r/[email protected]
v3: https://lkml.kernel.org/r/[email protected]
v2: https://lore.kernel.org/lkml/[email protected]/
RFC: https://lkml.kernel.org/r/[email protected]/
v6..v7 Changes:
* Based on Andy & Thomas suggestions and the patches that Thomas kindely sent, reworked from two VDSO code images into trick with odd seq number for timens page that goes on the place of vvar page inside ns.
* Moved kernel/time_namespace.c => kernel/time/namespace.c
* Fixed bpf 5sec example
* Added selftests outputs
* By Thomas's suggestion simplified overflow check as ktime_sub(tim, offset)
* Other Thomas's review notes: stylistic, simplifications and clearifications (Thanks!)
* Split VDSO patches on generic/x86 parts
* Fixed kernel-doc warnings
* Added checks in selftests for capabilities
* Fixed bisectability issues
v5..v6 Changes:
* Used current_is_single_threaded() instead of thread_group_empty() (Thanks for the review, Andy).
* Changed errno code when there are threads on timens joining to something more grepabble (EUSERS).
* posix_get_timespec() should have been posix_get_monotonic_timespec() (Thanks, Thomas)
* timens_add_monotonic() & timens_add_boottime() were relocated to the patch that introduces (struct timens_offsets) (Thomas)
* Avoid breaking alarmtimer for ALARM_REALTIME (Thanks, Thomas)
* Nested namespace inherits father's offsets now
(Andrei while working on CRIU side for time namespace)
* A minor conflict with commit dbc1625fc9de ("hrtimer: Consolidate hrtimer_init() + hrtimer_init_sleeper() calls") in linux-next [Sending against next-20190814]
v4..v5 Changes:
* Rebased over generic vdso (already in master)
* Addressing review comments by Thomas Gleixner
(thanks much for your time and patience):
- Dropping timens prefix from subjects (it's not a subsystem)
- Keeping commit messages in a neutral technical form
- Splitting unreasonably large patches
- Document code with missing comments
- Dropped dead code that's not compiled with !CONFIG_TIME_NS
* Updated performance results [here, at the bottom]
* Split vdso jump tables patch
* Allow unshare() with many threads: it's safe until fork()/clone(), where we check for CLONE_THREADS
* Add missed check in setns() for CLONE_VM | CLONE_THREADS
* Fixed compilation with !CONFIG_UTS_NS
* Add a plan in selftests (prevents new warning "Planned tests != run tests")
* Set jump table section address & size to (-1UL) just in case if there is no such section while running vdso2c (and WARN() on boot in such case)
v3..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
v2..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.
v1..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.
Andrei Vagin (23):
lib/vdso: Add unlikely() hint into vdso_read_begin() lib/vdso: make do_hres and do_coarse as __always_inline
ns: Introduce Time Namespace
time: Add timens_offsets to be used for tasks in timens
posix-clocks: Rename the clock_get() callback to clock_get_timespec()
posix-clocks: Rename .clock_get_timespec() callbacks accordingly
alarmtimer: Rename gettime() callback to get_ktime()
alarmtimer: Provide get_timespec() callback
posix-clocks: Introduce clock_get_ktime() callback
posix-timers: Use clock_get_ktime() in common_timer_get()
posix-clocks: Wire up clock_gettime() with timens offsets
kernel: Add do_timens_ktime_to_host() helper
timerfd: Make timerfd_settime() time namespace aware
posix-timers: Make timer_settime() time namespace aware
alarmtimer: Make nanosleep time namespace aware
hrtimers: Prepare hrtimer_nanosleep() for time namespaces
posix-timers: Make clock_nanosleep() time namespace aware fs/proc: Introduce /proc/pid/timens_offsets selftests/timens: Add a test for timerfd
selftests/timens: Add a test for clock_nanosleep() selftests/timens: Add timer offsets test
selftests/timens: Add a simple perf test for clock_gettime() selftests/timens: Check for right timens offsets after fork and exec
Dmitry Safonov (10):
fs/proc: Respect boottime inside time namespace for /proc/uptime x86/vdso: Restrict splitting VVAR VMA
x86/vdso: Provide vdso_data offset on vvar_page x86/vdso: Add timens page
time: Allocate per-timens vvar page
x86/vdso: Handle faults on timens page
x86/vdso: On timens page fault prefault also VVAR page x86/vdso: Zap vvar pages on switch a time namspace selftests/timens: Add Time Namespace test for supported clocks selftests/timens: Add procfs selftest
Thomas Gleixner (1):
lib/vdso: Prepare for time namespace support
MAINTAINERS | 2 + arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vdso-layout.lds.S | 13 +- arch/x86/entry/vdso/vdso2c.c | 3 + arch/x86/entry/vdso/vma.c | 119 ++++- arch/x86/include/asm/vdso.h | 1 + arch/x86/include/asm/vdso/gettimeofday.h | 9 + arch/x86/include/asm/vvar.h | 13 +- arch/x86/kernel/vmlinux.lds.S | 4 +- 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/nsproxy.h | 2 + include/linux/proc_ns.h | 3 + include/linux/time.h | 6 + include/linux/time_namespace.h | 128 +++++ include/linux/user_namespace.h | 1 + include/uapi/linux/sched.h | 6 + include/vdso/datapage.h | 19 +- include/vdso/helpers.h | 2 +- init/Kconfig | 8 + kernel/fork.c | 16 +- kernel/nsproxy.c | 41 +- kernel/time/Makefile | 1 + kernel/time/alarmtimer.c | 73 ++- kernel/time/hrtimer.c | 8 +- kernel/time/namespace.c | 466 ++++++++++++++++++ kernel/time/posix-clock.c | 8 +- kernel/time/posix-cpu-timers.c | 32 +- kernel/time/posix-stubs.c | 15 +- kernel/time/posix-timers.c | 88 +++- kernel/time/posix-timers.h | 7 +- lib/vdso/Kconfig | 6 + lib/vdso/gettimeofday.c | 164 +++++- mm/mmap.c | 2 + tools/perf/examples/bpf/5sec.c | 6 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timens/.gitignore | 8 + tools/testing/selftests/timens/Makefile | 7 + .../selftests/timens/clock_nanosleep.c | 150 ++++++ tools/testing/selftests/timens/config | 1 + tools/testing/selftests/timens/exec.c | 94 ++++ tools/testing/selftests/timens/gettime_perf.c | 95 ++++ tools/testing/selftests/timens/log.h | 26 + tools/testing/selftests/timens/procfs.c | 144 ++++++ tools/testing/selftests/timens/timens.c | 190 +++++++ tools/testing/selftests/timens/timens.h | 100 ++++ tools/testing/selftests/timens/timer.c | 123 +++++ tools/testing/selftests/timens/timerfd.c | 129 +++++ 51 files changed, 2337 insertions(+), 111 deletions(-) create mode 100644 include/linux/time_namespace.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/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.24.0
PATCH v8 1/34 lib/vdso: Add unlikely() hint into vdso_read_begin()
From: Andrei Vagin <[email protected]>
Place the branch with no concurrent write before contended case.
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
| before | after
-----------------------------------
| 150252214 | 153242367
| 150301112 | 153324800
| 150392773 | 153125401
| 150373957 | 153399355
| 150303157 | 153489417
| 150365237 | 153494270-----------------------------------
avg | 150331408 | 153345935
diff % | 2 | 0
-----------------------------------
stdev % | 0.3 | 0.1
--- include/vdso/helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/vdso/helpers.h +1 -1
@@ -10,7 +10,7 @@ static __always_inline u32 vdso_read_begin(const struct vdso_data *vd) {u32 seq; -while ((seq =READ_ONCE (vd->seq)) &1 ) +while (unlikely ((seq =READ_ONCE (vd->seq)) &1 ))cpu_relax ();smp_rmb ();
Signature · 1 line
2.24.0
[tip: timers/core] lib/vdso: Add unlikely() hint into vdso_read_begin()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 79472606d6fba66c20299f4121a657ce73efc302 Gitweb: https://git.kernel.org/tip/79472606d6fba66c20299f4121a657ce73efc302 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:50 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:46 +01:00
lib/vdso: Add unlikely() hint into vdso_read_begin()
Place the branch with no concurrent write before the contended case.
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
| before | after
-----------------------------------
| 150252214 | 153242367
| 150301112 | 153324800
| 150392773 | 153125401
| 150373957 | 153399355
| 150303157 | 153489417
| 150365237 | 153494270-----------------------------------
avg | 150331408 | 153345935
diff % | 2 | 0
-----------------------------------
stdev % | 0.3 | 0.1
--- include/vdso/helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/vdso/helpers.h +1 -1
@@ -10,7 +10,7 @@ static __always_inline u32 vdso_read_begin(const struct vdso_data *vd) {u32 seq; -while ((seq =READ_ONCE (vd->seq)) &1 ) +while (unlikely ((seq =READ_ONCE (vd->seq)) &1 ))cpu_relax ();smp_rmb ();
[tip: timers/core] lib/vdso: Add unlikely() hint into vdso_read_begin()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0898a16a362d436464b34fa644d0d46efc81df92 Gitweb: https://git.kernel.org/tip/0898a16a362d436464b34fa644d0d46efc81df92 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:50 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:47 +01:00
lib/vdso: Add unlikely() hint into vdso_read_begin()
Place the branch with no concurrent write before the contended case.
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
| before | after
-----------------------------------
| 150252214 | 153242367
| 150301112 | 153324800
| 150392773 | 153125401
| 150373957 | 153399355
| 150303157 | 153489417
| 150365237 | 153494270-----------------------------------
avg | 150331408 | 153345935
diff % | 2 | 0
-----------------------------------
stdev % | 0.3 | 0.1
--- include/vdso/helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/vdso/helpers.h +1 -1
@@ -10,7 +10,7 @@ static __always_inline u32 vdso_read_begin(const struct vdso_data *vd) {u32 seq; -while ((seq =READ_ONCE (vd->seq)) &1 ) +while (unlikely ((seq =READ_ONCE (vd->seq)) &1 ))cpu_relax ();smp_rmb ();
PATCH v8 2/34 lib/vdso: make do_hres and do_coarse as __always_inline
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
clock | before | after | diff
----------------------------------------------------------
monotonic | 153222105 | 166775025 | 8.8% monotonic-coarse | 671557054 | 691513017 | 3.0% monotonic-raw | 147116067 | 161057395 | 9.5% boottime | 153446224 | 166962668 | 9.1%
The improvement for arm64 for monotonic and boottime is around 3.5%.
clock | before | after | diff
==================================================
monotonic 17326692 17951770 3.6% monotonic-coarse 43624027 44215292 1.3% monotonic-raw 17541809 17554932 0.1% boottime 17334982 17954361 3.5%
--- lib/vdso/gettimeofday.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
lib/vdso/gettimeofday.c +8 -4
@@ -38,7 +38,7 @@ u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult) }#endif -static int do_hres (const struct vdso_data *vd,clockid_t clk, +static __always_inline int do_hres(const struct vdso_data *vd, clockid_t clk,struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
@@ -68,7 +68,7 @@ static int do_hres(const struct vdso_data *vd, clockid_t clk,return 0 ; } -static void do_coarse (const struct vdso_data *vd,clockid_t clk, +static __always_inline void do_coarse(const struct vdso_data *vd, clockid_t clk,struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
@@ -97,12 +97,16 @@ __cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)*/ msk =1U << clock;if (likely (msk &VDSO_HRES )) { -return do_hres (&vd[CS_HRES_COARSE ], clock, ts); + vd = &vd[CS_HRES_COARSE ]; +out_hres: +return do_hres (vd, clock, ts); }else if (msk &VDSO_COARSE ) {do_coarse (&vd[CS_HRES_COARSE ], clock, ts);return 0 ; }else if (msk &VDSO_RAW ) { -return do_hres (&vd[CS_RAW ], clock, ts); + vd = &vd[CS_RAW ]; +/* goto allows to avoid extra inlining of do_hres. */ + goto out_hres; }return -1 ; }
Signature · 1 line
2.24.0
Vincenzo Frascino
maintainerRe: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
Quoted 11 lines · Dmitry Safonov
+» » vd·=·&vd[CS_HRES_COARSE];
+out_hres:
+» » return·do_hres(vd,·clock,·ts);
» }·else·if·(msk·&·VDSO_COARSE)·{
» »do_coarse(&vd[CS_HRES_COARSE],·clock,·ts);
» » return·0;
» }·else·if·(msk·&·VDSO_RAW)·{
-» » return·do_hres(&vd[CS_RAW],·clock,·ts);
+» » vd·=·&vd[CS_RAW];
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
What is the performance impact of "goto out_hres"?
Signature · 2 lines
Regards, Vincenzo
Re: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
Quoted 13 lines · Vincenzo Frascino
Quoted 11 lines · Dmitry Safonov
+» » vd·=·&vd[CS_HRES_COARSE];
+out_hres:
+» » return·do_hres(vd,·clock,·ts);
» }·else·if·(msk·&·VDSO_COARSE)·{
» »do_coarse(&vd[CS_HRES_COARSE],·clock,·ts);
» » return·0;
» }·else·if·(msk·&·VDSO_RAW)·{
-» » return·do_hres(&vd[CS_RAW],·clock,·ts);
+» » vd·=·&vd[CS_RAW];
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
Quoted 1 line
What is the performance impact of "goto
out_hres"?
On x86 it's invisible at least in my limited testing.
Thanks,
tglx
Vincenzo Frascino
maintainerRe: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
Quoted 14 lines · Thomas Gleixner
Quoted 13 lines · Vincenzo Frascino
Quoted 11 lines · Dmitry Safonov
+» » vd·=·&vd[CS_HRES_COARSE];
+out_hres:
+» » return·do_hres(vd,·clock,·ts);
» }·else·if·(msk·&·VDSO_COARSE)·{
» »do_coarse(&vd[CS_HRES_COARSE],·clock,·ts);
» » return·0;
» }·else·if·(msk·&·VDSO_RAW)·{
-» » return·do_hres(&vd[CS_RAW],·clock,·ts);
+» » vd·=·&vd[CS_RAW];
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
Quoted 3 lines
Quoted 1 line
What is the performance impact of "goto
out_hres"?On x86 it's invisible at least in my limited testing.
On arm64 as well based on mine as well. Shall we keep the code more readable here (without goto)?
Quoted 5 lines
Thanks,
tglx
Signature · 2 lines
Regards, Vincenzo
Re: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
Quoted 10 lines · Vincenzo Frascino
Quoted 6 lines · Thomas Gleixner
Quoted 4 lines
Quoted 2 lines
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
What is the performance impact of "goto
out_hres"?On x86 it's invisible at least in my limited testing.
On arm64 as well based on mine as well. Shall we keep the code more readable here (without goto)?
The delta patch below makes it readable again and also avoids the double inlining. Quick testing shows no difference.
Thanks,
tglx
8<---------------
lib/vdso/gettimeofday.c +3 -5
@@ -98,17 +98,15 @@ static __maybe_unused int msk =1U << clock;if (likely (msk &VDSO_HRES )) { vd = &vd[CS_HRES_COARSE ]; -out_hres: -return do_hres (vd, clock, ts); }else if (msk &VDSO_COARSE ) {do_coarse (&vd[CS_HRES_COARSE ], clock, ts);return 0 ; }else if (msk &VDSO_RAW ) { vd = &vd[CS_RAW ]; -/* This goto avoids extra inlining of do_hres. */ - goto out_hres; + }else { +return -1 ; } -return -1 ; +return do_hres (vd, clock, ts); } static __maybe_unused int
Vincenzo Frascino
maintainerRe: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
Quoted 7 lines · Thomas Gleixner
Quoted 6 lines · Vincenzo Frascino
Quoted 5 lines · Thomas Gleixner
Quoted 4 lines
Quoted 2 lines
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
What is the performance impact of "goto
out_hres"?
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
On x86 it's invisible at least in my limited testing.
On arm64 as well based on mine as well. Shall we keep the code more readable here (without goto)?
The delta patch below makes it readable again and also avoids the double inlining. Quick testing shows no difference.
I tested it on arm64 and it does not show any difference as well. I vote for it :)
Quoted 29 lines
Thanks,
tglx
8<---------------
lib/vdso/gettimeofday.c +3
-5@@ -98,17 +98,15 @@ static __maybe_unused int msk =1U << clock;if (likely (msk &VDSO_HRES )) { vd = &vd[CS_HRES_COARSE ]; -out_hres: -return do_hres (vd, clock, ts); }else if (msk &VDSO_COARSE ) {do_coarse (&vd[CS_HRES_COARSE ], clock, ts);return 0 ; }else if (msk &VDSO_RAW ) { vd = &vd[CS_RAW ]; -/* This goto avoids extra inlining of do_hres. */ - goto out_hres; + }else { +return -1 ; } -return -1 ; +return do_hres (vd, clock, ts); } static __maybe_unused int
Signature · 2 lines
Regards, Vincenzo
Re: [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline
In reply to Thomas GleixnerQuoted 8 lines · Thomas Gleixner
Quoted 6 lines · Vincenzo Frascino
Quoted 5 lines · Thomas Gleixner
Quoted 4 lines
Quoted 2 lines
+» » /*·goto·allows·to·avoid·extra·inlining·of·do_hres.·*/ +» » goto·out_hres;
What is the performance impact of "goto
out_hres"?
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
On x86 it's invisible at least in my limited testing.
On arm64 as well based on mine as well. Shall we keep the code more readable here (without goto)?
The delta patch below makes it readable again and also avoids the double inlining. Quick testing shows no difference.
My tests show no difference too and the code looks more readable. Thanks!
Quoted 4 lines
Thanks,
tglx
[tip: timers/core] lib/vdso: Mark do_hres() and do_coarse() as __always_inline
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9d66475e9b680afb70a49a531287513f1307e623 Gitweb: https://git.kernel.org/tip/9d66475e9b680afb70a49a531287513f1307e623 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:51 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:47 +01:00
lib/vdso: Mark do_hres() and do_coarse() as __always_inline
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
clock | before | after | diff
----------------------------------------------------------
monotonic | 153222105 | 166775025 | 8.8% monotonic-coarse | 671557054 | 691513017 | 3.0% monotonic-raw | 147116067 | 161057395 | 9.5% boottime | 153446224 | 166962668 | 9.1%
The improvement for arm64 for monotonic and boottime is around 3.5%.
clock | before | after | diff
==================================================
monotonic 17326692 17951770 3.6% monotonic-coarse 43624027 44215292 1.3% monotonic-raw 17541809 17554932 0.1% boottime 17334982 17954361 3.5%
[ tglx: Avoid the goto ]
--- lib/vdso/gettimeofday.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
lib/vdso/gettimeofday.c +8 -6
@@ -38,7 +38,7 @@ u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult) }#endif -static int do_hres (const struct vdso_data *vd,clockid_t clk, +static __always_inline int do_hres(const struct vdso_data *vd, clockid_t clk,struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
@@ -68,8 +68,8 @@ static int do_hres(const struct vdso_data *vd, clockid_t clk,return 0 ; } -static int do_coarse (const struct vdso_data *vd,clockid_t clk, -struct __kernel_timespec *ts) +static __always_inline int do_coarse(const struct vdso_data *vd, clockid_t clk, +struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];u32 seq;
@@ -99,13 +99,15 @@ __cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)*/ msk =1U << clock;if (likely (msk &VDSO_HRES )) -return do_hres (&vd[CS_HRES_COARSE ], clock, ts); + vd = &vd[CS_HRES_COARSE ];else if (msk &VDSO_COARSE )return do_coarse (&vd[CS_HRES_COARSE ], clock, ts);else if (msk &VDSO_RAW ) -return do_hres (&vd[CS_RAW ], clock, ts); + vd = &vd[CS_RAW ]; +else +return -1 ; -return -1 ; +return do_hres (vd, clock, ts); } static __maybe_unused int
[tip: timers/core] lib/vdso: Mark do_hres() and do_coarse() as __always_inline
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: c966533f8c6c45f93c52599f8460e7695f0b7eaa Gitweb: https://git.kernel.org/tip/c966533f8c6c45f93c52599f8460e7695f0b7eaa Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:51 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:48 +01:00
lib/vdso: Mark do_hres() and do_coarse() as __always_inline
Performance numbers for Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (more clock_gettime() cycles - the better):
clock | before | after | diff
----------------------------------------------------------
monotonic | 153222105 | 166775025 | 8.8% monotonic-coarse | 671557054 | 691513017 | 3.0% monotonic-raw | 147116067 | 161057395 | 9.5% boottime | 153446224 | 166962668 | 9.1%
The improvement for arm64 for monotonic and boottime is around 3.5%.
clock | before | after | diff
==================================================
monotonic 17326692 17951770 3.6% monotonic-coarse 43624027 44215292 1.3% monotonic-raw 17541809 17554932 0.1% boottime 17334982 17954361 3.5%
[ tglx: Avoid the goto ]
--- lib/vdso/gettimeofday.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
lib/vdso/gettimeofday.c +8 -6
@@ -38,7 +38,7 @@ u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult) }#endif -static int do_hres (const struct vdso_data *vd,clockid_t clk, +static __always_inline int do_hres(const struct vdso_data *vd, clockid_t clk,struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
@@ -68,8 +68,8 @@ static int do_hres(const struct vdso_data *vd, clockid_t clk,return 0 ; } -static int do_coarse (const struct vdso_data *vd,clockid_t clk, -struct __kernel_timespec *ts) +static __always_inline int do_coarse(const struct vdso_data *vd, clockid_t clk, +struct __kernel_timespec *ts) {const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];u32 seq;
@@ -99,13 +99,15 @@ __cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)*/ msk =1U << clock;if (likely (msk &VDSO_HRES )) -return do_hres (&vd[CS_HRES_COARSE ], clock, ts); + vd = &vd[CS_HRES_COARSE ];else if (msk &VDSO_COARSE )return do_coarse (&vd[CS_HRES_COARSE ], clock, ts);else if (msk &VDSO_RAW ) -return do_hres (&vd[CS_RAW ], clock, ts); + vd = &vd[CS_RAW ]; +else +return -1 ; -return -1 ; +return do_hres (vd, clock, ts); } static __maybe_unused int
PATCH v8 3/34 ns: Introduce Time Namespace
In reply to Dmitry SafonovFrom: 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 available 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 | 3 + include/linux/time_namespace.h | 66 ++++++++++ include/linux/user_namespace.h | 1 + include/uapi/linux/sched.h | 6 + init/Kconfig | 7 ++ kernel/fork.c | 16 ++- kernel/nsproxy.c | 41 +++++-- kernel/time/Makefile | 1 + kernel/time/namespace.c | 217 +++++++++++++++++++++++++++++++++ 12 files changed, 356 insertions(+), 10 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 kernel/time/namespace.c
MAINTAINERS +2 -0
@@ -13172,6 +13172,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 +3 -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
@@ -43,6 +45,7 @@ enum {PROC_USER_INIT_INO =0xEFFFFFFDU ,PROC_PID_INIT_INO =0xEFFFFFFCU ,PROC_CGROUP_INIT_INO =0xEFFFFFFBU , + PROC_TIME_INIT_INO = 0xEFFFFFFAU, };#ifdef CONFIG_PROC_FS
include/linux/time_namespace.h new file +66 -0
66 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 +6 -0
@@ -36,6 +36,12 @@/* Flags for the clone3() syscall. */ #define CLONE_CLEAR_SIGHAND 0x100000000ULL/* Clear any signal handler and reset to SIG_DFL. */ +/* +* cloning flags intersect with CSIGNAL so can be used with unshare and clone3 +* syscalls only: +*/ +#define CLONE_NEWTIME 0x00000080/* New time namespace */ +#ifndef __ASSEMBLY__/** * struct clone_args - arguments for the clone3 syscall
init/Kconfig +7 -0
@@ -1096,6 +1096,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/fork.c +13 -3
@@ -1832,6 +1832,7 @@ static __latent_entropy struct task_struct *copy_process(struct multiprocess_signals delayed;struct file *pidfile =NULL ;u64 clone_flags = args->flags; +struct nsproxy *nsp = current->nsproxy;/* * Don't allow sharing the root directory with processes in a different
@@ -1874,8 +1875,16 @@ 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 (nsp->time_ns != nsp->time_ns_for_children)return ERR_PTR (-EINVAL ); }
@@ -2795,7 +2804,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
kernel/nsproxy.c +34 -7
88 lines not on this page · raw message
kernel/time/Makefile +1 -0
@@ -19,3 +19,4 @@ obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o obj-$(CONFIG_HAVE_GENERIC_VDSO) += vsyscall.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o +obj-$(CONFIG_TIME_NS) += namespace.o
kernel/time/namespace.c new file +217 -0
217 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] ns: Introduce Time Namespace
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8a0093f91318cb4117d85f871701b575442c32a1 Gitweb: https://git.kernel.org/tip/8a0093f91318cb4117d85f871701b575442c32a1 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:52 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:47 +01:00
ns: Introduce Time Namespace
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). Providing per namespace notions of CLOCK_REALTIME would be complex with a massive overhead, but has a dubious value.
But in the context of checkpoint/restore functionality, monotonic and boottime clocks become interesting. Both clocks are monotonic with unspecified starting points. These clocks are widely used to measure time slices and set timers. After restoring or migrating processes, it has to be guaranteed 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 it is required to set CLOCK_MONOTONIC and CLOCK_BOOTTIME clocks, which can be achieved by adding per-namespace offsets for clocks.
A time namespace is similar to a pid namespace in the 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 available clone flags have been used, so CLONE_NEWTIME uses the highest bit of CSIGNAL. It means that it can be used only with the unshare() and the clone3() system calls.
[ tglx: Adjusted paragraph about clone3() to reality and massaged the
changelog a bit. ]
--- MAINTAINERS | 2 +- fs/proc/namespaces.c | 4 +- include/linux/nsproxy.h | 2 +- include/linux/proc_ns.h | 3 +- include/linux/time_namespace.h | 71 ++++++++++- include/linux/user_namespace.h | 1 +- include/uapi/linux/sched.h | 6 +- init/Kconfig | 7 +- kernel/fork.c | 16 +- kernel/nsproxy.c | 41 ++++-- kernel/time/Makefile | 1 +- kernel/time/namespace.c | 217 ++++++++++++++++++++++++++++++++- 12 files changed, 361 insertions(+), 10 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 kernel/time/namespace.c
MAINTAINERS +2 -0
@@ -13214,6 +13214,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 +3 -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
@@ -43,6 +45,7 @@ enum {PROC_USER_INIT_INO =0xEFFFFFFDU ,PROC_PID_INIT_INO =0xEFFFFFFCU ,PROC_CGROUP_INIT_INO =0xEFFFFFFBU , + PROC_TIME_INIT_INO = 0xEFFFFFFAU, };#ifdef CONFIG_PROC_FS
include/linux/time_namespace.h new file +71 -0
71 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 +6 -0
@@ -36,6 +36,12 @@/* Flags for the clone3() syscall. */ #define CLONE_CLEAR_SIGHAND 0x100000000ULL/* Clear any signal handler and reset to SIG_DFL. */ +/* +* cloning flags intersect with CSIGNAL so can be used with unshare and clone3 +* syscalls only: +*/ +#define CLONE_NEWTIME 0x00000080/* New time namespace */ +#ifndef __ASSEMBLY__/** * struct clone_args - arguments for the clone3 syscall
init/Kconfig +7 -0
@@ -1080,6 +1080,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/fork.c +13 -3
@@ -1832,6 +1832,7 @@ static __latent_entropy struct task_struct *copy_process(struct multiprocess_signals delayed;struct file *pidfile =NULL ;u64 clone_flags = args->flags; +struct nsproxy *nsp = current->nsproxy;/* * Don't allow sharing the root directory with processes in a different
@@ -1874,8 +1875,16 @@ 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 (nsp->time_ns != nsp->time_ns_for_children)return ERR_PTR (-EINVAL ); }
@@ -2811,7 +2820,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
kernel/nsproxy.c +34 -7
88 lines not on this page · raw message
kernel/time/Makefile +1 -0
@@ -19,3 +19,4 @@ obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o obj-$(CONFIG_HAVE_GENERIC_VDSO) += vsyscall.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o +obj-$(CONFIG_TIME_NS) += namespace.o
kernel/time/namespace.c new file +217 -0
217 lines not on this page · raw message
[tip: timers/core] ns: Introduce Time Namespace
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 769071ac9f20b6a447410c7eaa55d1a5233ef40c Gitweb: https://git.kernel.org/tip/769071ac9f20b6a447410c7eaa55d1a5233ef40c Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:52 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:48 +01:00
ns: Introduce Time Namespace
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). Providing per namespace notions of CLOCK_REALTIME would be complex with a massive overhead, but has a dubious value.
But in the context of checkpoint/restore functionality, monotonic and boottime clocks become interesting. Both clocks are monotonic with unspecified starting points. These clocks are widely used to measure time slices and set timers. After restoring or migrating processes, it has to be guaranteed 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 it is required to set CLOCK_MONOTONIC and CLOCK_BOOTTIME clocks, which can be achieved by adding per-namespace offsets for clocks.
A time namespace is similar to a pid namespace in the 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 available clone flags have been used, so CLONE_NEWTIME uses the highest bit of CSIGNAL. It means that it can be used only with the unshare() and the clone3() system calls.
[ tglx: Adjusted paragraph about clone3() to reality and massaged the
changelog a bit. ]
--- MAINTAINERS | 2 +- fs/proc/namespaces.c | 4 +- include/linux/nsproxy.h | 2 +- include/linux/proc_ns.h | 3 +- include/linux/time_namespace.h | 71 ++++++++++- include/linux/user_namespace.h | 1 +- include/uapi/linux/sched.h | 6 +- init/Kconfig | 7 +- kernel/fork.c | 16 +- kernel/nsproxy.c | 41 ++++-- kernel/time/Makefile | 1 +- kernel/time/namespace.c | 217 ++++++++++++++++++++++++++++++++- 12 files changed, 361 insertions(+), 10 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 kernel/time/namespace.c
MAINTAINERS +2 -0
@@ -13214,6 +13214,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 +3 -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
@@ -43,6 +45,7 @@ enum {PROC_USER_INIT_INO =0xEFFFFFFDU ,PROC_PID_INIT_INO =0xEFFFFFFCU ,PROC_CGROUP_INIT_INO =0xEFFFFFFBU , + PROC_TIME_INIT_INO = 0xEFFFFFFAU, };#ifdef CONFIG_PROC_FS
include/linux/time_namespace.h new file +71 -0
71 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 +6 -0
@@ -36,6 +36,12 @@/* Flags for the clone3() syscall. */ #define CLONE_CLEAR_SIGHAND 0x100000000ULL/* Clear any signal handler and reset to SIG_DFL. */ +/* +* cloning flags intersect with CSIGNAL so can be used with unshare and clone3 +* syscalls only: +*/ +#define CLONE_NEWTIME 0x00000080/* New time namespace */ +#ifndef __ASSEMBLY__/** * struct clone_args - arguments for the clone3 syscall
init/Kconfig +7 -0
@@ -1080,6 +1080,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/fork.c +13 -3
@@ -1832,6 +1832,7 @@ static __latent_entropy struct task_struct *copy_process(struct multiprocess_signals delayed;struct file *pidfile =NULL ;u64 clone_flags = args->flags; +struct nsproxy *nsp = current->nsproxy;/* * Don't allow sharing the root directory with processes in a different
@@ -1874,8 +1875,16 @@ 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 (nsp->time_ns != nsp->time_ns_for_children)return ERR_PTR (-EINVAL ); }
@@ -2811,7 +2820,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
kernel/nsproxy.c +34 -7
88 lines not on this page · raw message
kernel/time/Makefile +1 -0
@@ -19,3 +19,4 @@ obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o obj-$(CONFIG_HAVE_GENERIC_VDSO) += vsyscall.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o +obj-$(CONFIG_TIME_NS) += namespace.o
kernel/time/namespace.c new file +217 -0
217 lines not on this page · raw message
Re: [PATCHv8 03/34] ns: Introduce Time Namespace
In reply to Dmitry SafonovQuoted 77 lines · Dmitry Safonov
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 toCLOCK_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_MONOTONICandCLOCK_BOOTTIMEclocks, 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 thesetns()system call to join a namespace.This scheme allows setting clock offsets for a namespace, before any processes appear in it.
All available clone flags have been used, so
CLONE_NEWTIMEuses the highest bit of CSIGNAL. It means that we can use it with theunshare()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 theclone3()system call [1] which will allow to use the CSIGNAL mask for clone flags.[1]: httmps://lkml.kernel.org/r/20190604160944.4058-1-christian-STijNZzMWpgWenYVfaLwtA@public.gmane.org
Signed-off-by Andrei Vagin <[email protected]>Co-developed-by Dmitry Safonov <[email protected]>Signed-off-by Dmitry Safonov <[email protected]>--- MAINTAINERS | 2 + fs/proc/namespaces.c | 4 + include/linux/nsproxy.h | 2 + include/linux/proc_ns.h | 3 + include/linux/time_namespace.h | 66 ++++++++++ include/linux/user_namespace.h | 1 + include/uapi/linux/sched.h | 6 + init/Kconfig | 7 ++ kernel/fork.c | 16 ++- kernel/nsproxy.c | 41 +++++-- kernel/time/Makefile | 1 + kernel/time/namespace.c | 217 +++++++++++++++++++++++++++++++++ 12 files changed, 356 insertions(+), 10 deletions(-) create mode 100644 include/linux/time_namespace.h create mode 100644 kernel/time/namespace.cMAINTAINERS +0
-0
MAINTAINERS T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core · line 13176
Quoted 5 lines
MAINTAINERS +2
-0@@ -13172,6 +13172,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
Is it supposed to be kernel/time/namespace.c?
Re: [PATCHv8 03/34] ns: Introduce Time Namespace
Hi Dmitry,
Quoted 13 lines · Dmitry Vyukov
MAINTAINERS T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core · line 13176
Quoted 10 lines · Dmitry Safonov
MAINTAINERS +2
-0@@ -13172,6 +13172,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.cIs it supposed to be
kernel/time/namespace.c?
Yes, thanks for catching this.
I'll send a fixup shortly.
Thanks,
Dmitry
Time Namespaces: CLONE_NEWTIME and clone3()?
In reply to Dmitry SafonovHello Dmitry, Andrei,
Is the CLONE_NEWTIME flag intended to be usable with clone3()? The mail quoted below implies (in my reading) that this should be possible once clone3() is available, which it is by now. (See also [1].)
If the answer is yes, CLONE_NEWTIME should be usable with clone3(), then I have a bug report and a question.
I successfully used CLONE_NEWTIME with unshare(). But if I try to use CLONE_NEWSIGNAL with clone3(), it errors out with EINVAL, because of the following check in clone3_args_valid():
/*
* - make the CLONE_DETACHED bit reuseable for clone3
* - make the CSIGNAL bits reuseable for clone3
*/
if (kargs->flags & (CLONE_DETACHED | CSIGNAL))
return false;The problem is that CLONE_NEWTIME matches one of the bits in the CSIGNAL mask. If the intention is to allow CLONE_NEWTIME with clone3(), then either the bit needs to be redefined, or the error checking in clone3_args_valid() needs to be reworked.
And my question: if it is intended that CLONE_NEWTIME should be usable with clone3(), how should that work? What I mean is, clone3(CLONE_NEWTIME) creates a child process in a new time namespace, but, as I understand it, the /proc/PID/timens_offsets must be defined before the first process is created in or joins (setns()) the new namespace. What am I missing?
Thanks,
Michael
[1] The message for commit 769071ac9f20b6a447410c7eaa55d1a5233ef40c, implies rather more strongly that clone3() should be able to use CLONE_NEWCTIME, but perhaps that is a result of Thomas's fix-up:
[[
All available clone flags have been used, so CLONE_NEWTIME uses the highest bit of CSIGNAL. It means that it can be used only with the unshare() and the clone3() system calls.
[ tglx: Adjusted paragraph about clone3() to reality and massaged the
changelog a bit. ]
]]
Quoted 55 lines · Dmitry Safonov
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 toCLOCK_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_MONOTONICandCLOCK_BOOTTIMEclocks, 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 thesetns()system call to join a namespace.This scheme allows setting clock offsets for a namespace, before any processes appear in it.
All available clone flags have been used, so
CLONE_NEWTIMEuses the highest bit of CSIGNAL. It means that we can use it with theunshare()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 theclone3()system call [1] which will allow to use the CSIGNAL mask for clone flags.[1]: httmps://lkml.kernel.org/r/[email protected]
Signed-off-by Andrei Vagin <[email protected]>Co-developed-by Dmitry Safonov <[email protected]>Signed-off-by Dmitry Safonov <[email protected]>
Signature · 3 lines
Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Author of "The Linux Programming Interface", http://blog.man7.org/
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Quoted 11 lines · Michael Kerrisk
Hello Dmitry, Andrei,
Is the
CLONE_NEWTIMEflag intended to be usable withclone3()? The mail quoted below implies (in my reading) that this should be possible onceclone3()is available, which it is by now. (See also [1].)If the answer is yes,
CLONE_NEWTIMEshould be usable withclone3(), then I have a bug report and a question.I successfully used
CLONE_NEWTIMEwithunshare(). But if I try to useCLONE_NEWSIGNALwithclone3(), it errors out with EINVAL, because of
s/CLONE_NEWSIGNAL/CLONE_NEWTIME/
Quoted 9 lines
the following check in
clone3_args_valid():/* * - make the CLONE_DETACHED bit reuseable for clone3 * - make the CSIGNAL bits reuseable for clone3 */ if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) return false;
Quoted 4 lines
The problem is that
CLONE_NEWTIMEmatches one of the bits in the CSIGNAL mask. If the intention is to allowCLONE_NEWTIMEwithclone3(), then either the bit needs to be redefined, or the error checking inclone3_args_valid()needs to be reworked.
If this is intended to be useable with clone3() the check should be adapted to allow for CLONE_NEWTIME. (I asked about this a while ago I think.)
But below rather sounds like it should simply be an unshare() flag. The code seems to set frozen_offsets to true right after copy_namespaces() in timens_on_fork(new_ns, tsk) and so the offsets can't be changed anymore unless I'm reading this wrong.
Alternatives seem to either make timens_offsets writable once after fork and before exec, I guess - though that's probably not going to work with the vdso judging from timens_on_fork().
The other alternative is that Andrei and Dmitry send me a patch to enable CLONE_NEWTIME with clone3() by exposing struct timens_offsets (or a version of it) in the uapi and extend struct clone_args to include a pointer to a struct timens_offset that is _only_ set when CLONE_NEWTIME is set.
Though the unshare() way sounds way less invasive simpler.
Christian
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Hello Christian,
Quoted 41 lines · Christian Brauner
Quoted 11 lines · Michael Kerrisk
Hello Dmitry, Andrei,
Is the
CLONE_NEWTIMEflag intended to be usable withclone3()? The mail quoted below implies (in my reading) that this should be possible onceclone3()is available, which it is by now. (See also [1].)If the answer is yes,
CLONE_NEWTIMEshould be usable withclone3(), then I have a bug report and a question.I successfully used
CLONE_NEWTIMEwithunshare(). But if I try to useCLONE_NEWSIGNALwithclone3(), it errors out with EINVAL, because ofs/CLONE_NEWSIGNAL/CLONE_NEWTIME/
Quoted 9 lines
the following check in
clone3_args_valid():/* * - make the CLONE_DETACHED bit reuseable for clone3 * - make the CSIGNAL bits reuseable for clone3 */ if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) return false;Quoted 4 lines
The problem is that
CLONE_NEWTIMEmatches one of the bits in the CSIGNAL mask. If the intention is to allowCLONE_NEWTIMEwithclone3(), then either the bit needs to be redefined, or the error checking inclone3_args_valid()needs to be reworked.If this is intended to be useable with
clone3()the check should be adapted to allow forCLONE_NEWTIME. (I asked about this a while ago I think.)
But below rather sounds like it should simply be anunshare()flag. The code seems to setfrozen_offsetsto true right aftercopy_namespaces()intimens_on_fork(new_ns, tsk)and so the offsets can't be changed anymore unless I'm reading this wrong.
Alternatives seem to either maketimens_offsetswritable once after fork and before exec, I guess - though that's probably not going to work with the vdso judging fromtimens_on_fork().
Quoted 6 lines
The other alternative is that Andrei and Dmitry send me a patch to enable
CLONE_NEWTIMEwithclone3()by exposing structtimens_offsets(or a version of it) in the uapi and extend structclone_argsto include a pointer to a structtimens_offsetthat is _only_ set whenCLONE_NEWTIMEis set.
Though theunshare()way sounds way less invasive simpler.
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise, clone3() becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)
Thanks,
Michael
Signature · 3 lines
Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Linux/UNIX System Programming Training: http://man7.org/training/
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Quoted 52 lines · Michael Kerrisk (man-pages)
Hello Christian,
Quoted 41 lines · Christian Brauner
Quoted 11 lines · Michael Kerrisk
Hello Dmitry, Andrei,
Is the
CLONE_NEWTIMEflag intended to be usable withclone3()? The mail quoted below implies (in my reading) that this should be possible onceclone3()is available, which it is by now. (See also [1].)If the answer is yes,
CLONE_NEWTIMEshould be usable withclone3(), then I have a bug report and a question.I successfully used
CLONE_NEWTIMEwithunshare(). But if I try to useCLONE_NEWSIGNALwithclone3(), it errors out with EINVAL, because ofs/CLONE_NEWSIGNAL/CLONE_NEWTIME/
Quoted 9 lines
the following check in
clone3_args_valid():/* * - make the CLONE_DETACHED bit reuseable for clone3 * - make the CSIGNAL bits reuseable for clone3 */ if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) return false;Quoted 4 lines
The problem is that
CLONE_NEWTIMEmatches one of the bits in the CSIGNAL mask. If the intention is to allowCLONE_NEWTIMEwithclone3(), then either the bit needs to be redefined, or the error checking inclone3_args_valid()needs to be reworked.If this is intended to be useable with
clone3()the check should be adapted to allow forCLONE_NEWTIME. (I asked about this a while ago I think.)
But below rather sounds like it should simply be anunshare()flag. The code seems to setfrozen_offsetsto true right aftercopy_namespaces()intimens_on_fork(new_ns, tsk)and so the offsets can't be changed anymore unless I'm reading this wrong.
Alternatives seem to either maketimens_offsetswritable once after fork and before exec, I guess - though that's probably not going to work with the vdso judging fromtimens_on_fork().Quoted 6 lines
The other alternative is that Andrei and Dmitry send me a patch to enable
CLONE_NEWTIMEwithclone3()by exposing structtimens_offsets(or a version of it) in the uapi and extend structclone_argsto include a pointer to a structtimens_offsetthat is _only_ set whenCLONE_NEWTIMEis set.
Though theunshare()way sounds way less invasive simpler.
Quoted 8 lines
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to
clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise,clone3()becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)
I don't particularly mind either way. If there's actual users that need to set it at clone3() time then we can extend it. So I'd like to hear what Adrian, Dmitry, and Thomas think since they are well-versed how this will be used in the wild. I'm weary of exposing a whole new uapi struct and extending clone3() without any real use-case but I'm happy to if there is!
Christian
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Quoted 10 lines · Christian Brauner
Quoted 8 lines · Michael Kerrisk (man-pages)
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to
clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise,clone3()becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)
Quoted 6 lines
I don't particularly mind either way. If there's actual users that need to set it at
clone3()time then we can extend it. So I'd like to hear what Adrian, Dmitry, and Thomas think since they are well-versed how this will be used in the wild. I'm weary of exposing a whole new uapi struct and extendingclone3()without any real use-case but I'm happy to if there is!
I really have no clue. I merily helped getting this in shape without creating havoc for timekeeping and VDSO. I have to punt to the container wizards.
Thanks,
tglx
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Quoted 18 lines · Thomas Gleixner
Quoted 10 lines · Christian Brauner
Quoted 8 lines · Michael Kerrisk (man-pages)
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to
clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise,clone3()becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)Quoted 6 lines
I don't particularly mind either way. If there's actual users that need to set it at
clone3()time then we can extend it. So I'd like to hear what Adrian, Dmitry, and Thomas think since they are well-versed how this will be used in the wild. I'm weary of exposing a whole new uapi struct and extendingclone3()without any real use-case but I'm happy to if there is!
Quoted 3 lines
I really have no clue. I merily helped getting this in shape without creating havoc for timekeeping and VDSO. I have to punt to the container wizards.
Short version. If you are going to do migration of a container with CRIU you want the time namespace in your container. Possibly you can avoid creating the time namespace until restore, but I don't think so.
Without the time namespace you get all kinds of applications that use monotonic timers that will see their timers be ill behaved (probably going backwards) over a checkpoint-restart event.
Eric
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
In reply to Christian BraunerQuoted 62 lines · Christian Brauner
Quoted 52 lines · Michael Kerrisk (man-pages)
Hello Christian,
Quoted 41 lines · Christian Brauner
Quoted 11 lines · Michael Kerrisk
Hello Dmitry, Andrei,
Is the
CLONE_NEWTIMEflag intended to be usable withclone3()? The mail quoted below implies (in my reading) that this should be possible onceclone3()is available, which it is by now. (See also [1].)If the answer is yes,
CLONE_NEWTIMEshould be usable withclone3(), then I have a bug report and a question.I successfully used
CLONE_NEWTIMEwithunshare(). But if I try to useCLONE_NEWSIGNALwithclone3(), it errors out with EINVAL, because ofs/CLONE_NEWSIGNAL/CLONE_NEWTIME/
Quoted 9 lines
the following check in
clone3_args_valid():/* * - make the CLONE_DETACHED bit reuseable for clone3 * - make the CSIGNAL bits reuseable for clone3 */ if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) return false;Quoted 4 lines
The problem is that
CLONE_NEWTIMEmatches one of the bits in the CSIGNAL mask. If the intention is to allowCLONE_NEWTIMEwithclone3(), then either the bit needs to be redefined, or the error checking inclone3_args_valid()needs to be reworked.If this is intended to be useable with
clone3()the check should be adapted to allow forCLONE_NEWTIME. (I asked about this a while ago I think.)
But below rather sounds like it should simply be anunshare()flag. The code seems to setfrozen_offsetsto true right aftercopy_namespaces()intimens_on_fork(new_ns, tsk)and so the offsets can't be changed anymore unless I'm reading this wrong.
Alternatives seem to either maketimens_offsetswritable once after fork and before exec, I guess - though that's probably not going to work with the vdso judging fromtimens_on_fork().Quoted 6 lines
The other alternative is that Andrei and Dmitry send me a patch to enable
CLONE_NEWTIMEwithclone3()by exposing structtimens_offsets(or a version of it) in the uapi and extend structclone_argsto include a pointer to a structtimens_offsetthat is _only_ set whenCLONE_NEWTIMEis set.
Though theunshare()way sounds way less invasive simpler.Quoted 8 lines
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to
clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise,clone3()becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)
Quoted 6 lines
I don't particularly mind either way. If there's actual users that need to set it at
clone3()time then we can extend it. So I'd like to hear what Adrian, Dmitry, and Thomas think since they are well-versed how this will be used in the wild. I'm weary of exposing a whole new uapi struct and extendingclone3()without any real use-case but I'm happy to if there is!
Re-creating a time namespace during restore via clone3() would be CRIU's preferred way of doing this. If available CRIU is already using clone3(), especially because of set_tid, and for the time namespace we would also rely on clone3() to re-create it.
I will provide a patch to extend clone3() to handle the creation of a new time namespace.
Adrian
Re: Time Namespaces: CLONE_NEWTIME and clone3()?
Quoted 70 lines · Adrian Reber
Quoted 62 lines · Christian Brauner
Quoted 52 lines · Michael Kerrisk (man-pages)
Hello Christian,
Quoted 41 lines · Christian Brauner
Quoted 11 lines · Michael Kerrisk
Hello Dmitry, Andrei,
Is the
CLONE_NEWTIMEflag intended to be usable withclone3()? The mail quoted below implies (in my reading) that this should be possible onceclone3()is available, which it is by now. (See also [1].)If the answer is yes,
CLONE_NEWTIMEshould be usable withclone3(), then I have a bug report and a question.I successfully used
CLONE_NEWTIMEwithunshare(). But if I try to useCLONE_NEWSIGNALwithclone3(), it errors out with EINVAL, because ofs/CLONE_NEWSIGNAL/CLONE_NEWTIME/
Quoted 9 lines
the following check in
clone3_args_valid():/* * - make the CLONE_DETACHED bit reuseable for clone3 * - make the CSIGNAL bits reuseable for clone3 */ if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) return false;Quoted 4 lines
The problem is that
CLONE_NEWTIMEmatches one of the bits in the CSIGNAL mask. If the intention is to allowCLONE_NEWTIMEwithclone3(), then either the bit needs to be redefined, or the error checking inclone3_args_valid()needs to be reworked.If this is intended to be useable with
clone3()the check should be adapted to allow forCLONE_NEWTIME. (I asked about this a while ago I think.)
But below rather sounds like it should simply be anunshare()flag. The code seems to setfrozen_offsetsto true right aftercopy_namespaces()intimens_on_fork(new_ns, tsk)and so the offsets can't be changed anymore unless I'm reading this wrong.
Alternatives seem to either maketimens_offsetswritable once after fork and before exec, I guess - though that's probably not going to work with the vdso judging fromtimens_on_fork().Quoted 6 lines
The other alternative is that Andrei and Dmitry send me a patch to enable
CLONE_NEWTIMEwithclone3()by exposing structtimens_offsets(or a version of it) in the uapi and extend structclone_argsto include a pointer to a structtimens_offsetthat is _only_ set whenCLONE_NEWTIMEis set.
Though theunshare()way sounds way less invasive simpler.Quoted 8 lines
Actually, I think the alternative you propose just here is better. I imagine there are times when one will want to create multiple namespaces with a single call to
clone3(), including a time namespace. I think this should be allowed by the API. And, otherwise,clone3()becomes something of a second-class citizen for creating namespaces. (I don't really get the "less invasive" argument. Implementing this is just a piece of kernel to code to make user-space's life a bit simpler and more consistent.)Quoted 6 lines
I don't particularly mind either way. If there's actual users that need to set it at
clone3()time then we can extend it. So I'd like to hear what Adrian, Dmitry, and Thomas think since they are well-versed how this will be used in the wild. I'm weary of exposing a whole new uapi struct and extendingclone3()without any real use-case but I'm happy to if there is!
Quoted 7 lines
Re-creating a time namespace during restore via
clone3()would be CRIU's preferred way of doing this. If available CRIU is already usingclone3(), especially because ofset_tid, and for the time namespace we would also rely onclone3()to re-create it.I will provide a patch to extend
clone3()to handle the creation of a new time namespace.
Great, thanks!
Christian
PATCH v8 4/34 time: Add timens_offsets to be used for tasks in timens
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.
A new namespace is created with the same offsets as the time namespace of the current process.
--- include/linux/time_namespace.h | 22 ++++++++++++++++++++++ kernel/time/namespace.c | 2 ++ 2 files changed, 24 insertions(+)
include/linux/time_namespace.h +22 -0
@@ -12,11 +12,17 @@struct user_namespace ;extern struct user_namespace init_user_ns; +struct timens_offsets { +struct timespec64 monotonic; +struct timespec64 boottime; +}; +struct time_namespace {struct kref kref;struct user_namespace *user_ns;struct ucounts *ucounts;struct ns_common ns; +struct timens_offsets offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
@@ -37,6 +43,20 @@ 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 = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->monotonic); +} + +static inline void timens_add_boottime (struct timespec64 *ts) +{ +struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->boottime); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -61,6 +81,8 @@ static inline int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsreturn 0 ; } +static inline void timens_add_monotonic (struct timespec64 *ts) {} +static inline void timens_add_boottime (struct timespec64 *ts) {}#endif #endif /* _LINUX_TIMENS_H */
kernel/time/namespace.c +2 -0
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/cred.h> #include <linux/err.h> +#include <linux/mm.h> static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {
@@ -60,6 +61,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, ns->ucounts = ucounts; ns->ns.ops = &timens_operations; ns->user_ns =get_user_ns (user_ns); + ns->offsets = old_ns->offsets;return ns; fail_free:
Signature · 1 line
2.24.0
[tip: timers/core] time: Add timens_offsets to be used for tasks in time namespace
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: cad1baec2018c6c0776c4b6a49532b9e44dc3f14 Gitweb: https://git.kernel.org/tip/cad1baec2018c6c0776c4b6a49532b9e44dc3f14 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:53 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:48 +01:00
time: Add timens_offsets to be used for tasks in time namespace
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
A new namespace is created with the same offsets as the time namespace of the current process.
--- include/linux/time_namespace.h | 22 ++++++++++++++++++++++ kernel/time/namespace.c | 2 ++ 2 files changed, 24 insertions(+)
include/linux/time_namespace.h +22 -0
@@ -12,11 +12,17 @@struct user_namespace ;extern struct user_namespace init_user_ns; +struct timens_offsets { +struct timespec64 monotonic; +struct timespec64 boottime; +}; +struct time_namespace {struct kref kref;struct user_namespace *user_ns;struct ucounts *ucounts;struct ns_common ns; +struct timens_offsets offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
@@ -39,6 +45,20 @@ 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 = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->monotonic); +} + +static inline void timens_add_boottime (struct timespec64 *ts) +{ +struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->boottime); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -66,6 +86,8 @@ static inline int timens_on_fork(struct nsproxy *nsproxy,return 0 ; } +static inline void timens_add_monotonic (struct timespec64 *ts) { } +static inline void timens_add_boottime (struct timespec64 *ts) { }#endif #endif /* _LINUX_TIMENS_H */
kernel/time/namespace.c +2 -0
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/cred.h> #include <linux/err.h> +#include <linux/mm.h> static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {
@@ -60,6 +61,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, ns->ucounts = ucounts; ns->ns.ops = &timens_operations; ns->user_ns =get_user_ns (user_ns); + ns->offsets = old_ns->offsets;return ns; fail_free:
[tip: timers/core] time: Add timens_offsets to be used for tasks in time namespace
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: af993f58d69ee9c1f421dfc87c3ed231c113989c Gitweb: https://git.kernel.org/tip/af993f58d69ee9c1f421dfc87c3ed231c113989c Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:53 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:49 +01:00
time: Add timens_offsets to be used for tasks in time namespace
Introduce offsets for time namespace. They will contain an adjustment needed to convert clocks to/from host's.
A new namespace is created with the same offsets as the time namespace of the current process.
--- include/linux/time_namespace.h | 22 ++++++++++++++++++++++ kernel/time/namespace.c | 2 ++ 2 files changed, 24 insertions(+)
include/linux/time_namespace.h +22 -0
@@ -12,11 +12,17 @@struct user_namespace ;extern struct user_namespace init_user_ns; +struct timens_offsets { +struct timespec64 monotonic; +struct timespec64 boottime; +}; +struct time_namespace {struct kref kref;struct user_namespace *user_ns;struct ucounts *ucounts;struct ns_common ns; +struct timens_offsets offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
@@ -39,6 +45,20 @@ 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 = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->monotonic); +} + +static inline void timens_add_boottime (struct timespec64 *ts) +{ +struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets; + + *ts =timespec64_add (*ts, ns_offsets->boottime); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -66,6 +86,8 @@ static inline int timens_on_fork(struct nsproxy *nsproxy,return 0 ; } +static inline void timens_add_monotonic (struct timespec64 *ts) { } +static inline void timens_add_boottime (struct timespec64 *ts) { }#endif #endif /* _LINUX_TIMENS_H */
kernel/time/namespace.c +2 -0
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/cred.h> #include <linux/err.h> +#include <linux/mm.h> static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {
@@ -60,6 +61,7 @@ static struct time_namespace *clone_time_ns(struct user_namespace *user_ns, ns->ucounts = ucounts; ns->ns.ops = &timens_operations; ns->user_ns =get_user_ns (user_ns); + ns->offsets = old_ns->offsets;return ns; fail_free:
PATCH v8 5/34 posix-clocks: Rename the clock_get() callback to clock_get_timespec()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format, rather than in (struct timespec).
Rename the clock_get() callback to clock_get_timespec() as a preparation for introducing clock_get_ktime().
--- kernel/time/alarmtimer.c | 4 ++-- kernel/time/posix-clock.c | 8 ++++---- kernel/time/posix-cpu-timers.c | 32 ++++++++++++++++---------------- kernel/time/posix-timers.c | 22 +++++++++++----------- kernel/time/posix-timers.h | 4 ++-- 5 files changed, 35 insertions(+), 35 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -657,7 +657,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get interface +* alarm_clock_get - posix clock_get_timespec interface * @which_clock: clockid * @tp: timespec to fill. *
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
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
@@ -1391,26 +1391,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 +11 -11
@@ -667,7 +667,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)* The timespec64 based conversion is suboptimal, but it's not * worth to implement yet another callback. */ - kc->clock_get (timr->it_clock, &ts64); + kc->clock_get_timespec (timr->it_clock, &ts64); now =timespec64_to_ktime (ts64);/*
@@ -781,7 +781,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get() work. +* functions which use timr->kclock->clock_get_timespec() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1067,7 +1067,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,if (!kc)return -EINVAL ; - error = kc->clock_get (which_clock, &kernel_tp); + error = kc->clock_get_timespec (which_clock, &kernel_tp);if (!error &&put_timespec64 (&kernel_tp, tp)) error = -EFAULT ;
@@ -1149,7 +1149,7 @@ SYSCALL_DEFINE2(clock_gettime32, clockid_t, which_clock,if (!kc)return -EINVAL ; - err = kc->clock_get (which_clock, &ts); + err = kc->clock_get_timespec (which_clock, &ts);if (!err &&put_old_timespec32 (&ts, tp)) err = -EFAULT ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_clock_realtime_get, + .clock_get_timespec = posix_clock_realtime_get, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_ktime_get_ts, + .clock_get_timespec = posix_ktime_get_ts, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1295,22 +1295,22 @@ static const struct k_clock clock_monotonic = {static const struct k_clock clock_monotonic_raw = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_monotonic_raw, + .clock_get_timespec = posix_get_monotonic_raw, };static const struct k_clock clock_realtime_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_realtime_coarse, + .clock_get_timespec = posix_get_realtime_coarse, };static const struct k_clock clock_monotonic_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_monotonic_coarse, + .clock_get_timespec = posix_get_monotonic_coarse, };static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_tai, + .clock_get_timespec = posix_get_tai, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_boottime, + .clock_get_timespec = posix_get_boottime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.h +2 -2
@@ -6,8 +6,8 @@ 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); +int (*clock_get_timespec)(const clockid_t which_clock, +struct timespec64 *tp);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.24.0
[tip: timers/core] posix-clocks: Rename the clock_get() callback to clock_get_timespec()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9552f6a3e9fc221e8fdcffbdf7b56df0483daa59 Gitweb: https://git.kernel.org/tip/9552f6a3e9fc221e8fdcffbdf7b56df0483daa59 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:54 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:48 +01:00
posix-clocks: Rename the clock_get() callback to clock_get_timespec()
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format, rather than in (struct timespec).
Rename the clock_get() callback to clock_get_timespec() as a preparation for introducing clock_get_ktime().
--- kernel/time/alarmtimer.c | 4 ++-- kernel/time/posix-clock.c | 8 ++++---- kernel/time/posix-cpu-timers.c | 32 ++++++++++++++++---------------- kernel/time/posix-timers.c | 22 +++++++++++----------- kernel/time/posix-timers.h | 4 ++-- 5 files changed, 35 insertions(+), 35 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -657,7 +657,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get interface +* alarm_clock_get - posix clock_get_timespec interface * @which_clock: clockid * @tp: timespec to fill. *
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
kernel/time/posix-clock.c +4 -4
@@ -310,8 +310,8 @@ out: }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
@@ -1391,26 +1391,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 +11 -11
@@ -667,7 +667,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)* The timespec64 based conversion is suboptimal, but it's not * worth to implement yet another callback. */ - kc->clock_get (timr->it_clock, &ts64); + kc->clock_get_timespec (timr->it_clock, &ts64); now =timespec64_to_ktime (ts64);/*
@@ -781,7 +781,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get() work. +* functions which use timr->kclock->clock_get_timespec() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1067,7 +1067,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,if (!kc)return -EINVAL ; - error = kc->clock_get (which_clock, &kernel_tp); + error = kc->clock_get_timespec (which_clock, &kernel_tp);if (!error &&put_timespec64 (&kernel_tp, tp)) error = -EFAULT ;
@@ -1149,7 +1149,7 @@ SYSCALL_DEFINE2(clock_gettime32, clockid_t, which_clock,if (!kc)return -EINVAL ; - err = kc->clock_get (which_clock, &ts); + err = kc->clock_get_timespec (which_clock, &ts);if (!err &&put_old_timespec32 (&ts, tp)) err = -EFAULT ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_clock_realtime_get, + .clock_get_timespec = posix_clock_realtime_get, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_ktime_get_ts, + .clock_get_timespec = posix_ktime_get_ts, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1295,22 +1295,22 @@ static const struct k_clock clock_monotonic = {static const struct k_clock clock_monotonic_raw = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_monotonic_raw, + .clock_get_timespec = posix_get_monotonic_raw, };static const struct k_clock clock_realtime_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_realtime_coarse, + .clock_get_timespec = posix_get_realtime_coarse, };static const struct k_clock clock_monotonic_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_monotonic_coarse, + .clock_get_timespec = posix_get_monotonic_coarse, };static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_tai, + .clock_get_timespec = posix_get_tai, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_boottime, + .clock_get_timespec = posix_get_boottime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.h +2 -2
@@ -6,8 +6,8 @@ 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); +int (*clock_get_timespec)(const clockid_t which_clock, +struct timespec64 *tp);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,
[tip: timers/core] posix-clocks: Rename the clock_get() callback to clock_get_timespec()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 819a95fe3adfc7b558bfd96dd5ac589c4f543fd4 Gitweb: https://git.kernel.org/tip/819a95fe3adfc7b558bfd96dd5ac589c4f543fd4 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:54 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:49 +01:00
posix-clocks: Rename the clock_get() callback to clock_get_timespec()
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format, rather than in (struct timespec).
Rename the clock_get() callback to clock_get_timespec() as a preparation for introducing clock_get_ktime().
--- kernel/time/alarmtimer.c | 4 ++-- kernel/time/posix-clock.c | 8 ++++---- kernel/time/posix-cpu-timers.c | 32 ++++++++++++++++---------------- kernel/time/posix-timers.c | 22 +++++++++++----------- kernel/time/posix-timers.h | 4 ++-- 5 files changed, 35 insertions(+), 35 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -657,7 +657,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get interface +* alarm_clock_get - posix clock_get_timespec interface * @which_clock: clockid * @tp: timespec to fill. *
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
kernel/time/posix-clock.c +4 -4
@@ -310,8 +310,8 @@ out: }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
@@ -1391,26 +1391,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 +11 -11
@@ -667,7 +667,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)* The timespec64 based conversion is suboptimal, but it's not * worth to implement yet another callback. */ - kc->clock_get (timr->it_clock, &ts64); + kc->clock_get_timespec (timr->it_clock, &ts64); now =timespec64_to_ktime (ts64);/*
@@ -781,7 +781,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get() work. +* functions which use timr->kclock->clock_get_timespec() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1067,7 +1067,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,if (!kc)return -EINVAL ; - error = kc->clock_get (which_clock, &kernel_tp); + error = kc->clock_get_timespec (which_clock, &kernel_tp);if (!error &&put_timespec64 (&kernel_tp, tp)) error = -EFAULT ;
@@ -1149,7 +1149,7 @@ SYSCALL_DEFINE2(clock_gettime32, clockid_t, which_clock,if (!kc)return -EINVAL ; - err = kc->clock_get (which_clock, &ts); + err = kc->clock_get_timespec (which_clock, &ts);if (!err &&put_old_timespec32 (&ts, tp)) err = -EFAULT ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_clock_realtime_get, + .clock_get_timespec = posix_clock_realtime_get, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_ktime_get_ts, + .clock_get_timespec = posix_ktime_get_ts, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1295,22 +1295,22 @@ static const struct k_clock clock_monotonic = {static const struct k_clock clock_monotonic_raw = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_monotonic_raw, + .clock_get_timespec = posix_get_monotonic_raw, };static const struct k_clock clock_realtime_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_realtime_coarse, + .clock_get_timespec = posix_get_realtime_coarse, };static const struct k_clock clock_monotonic_coarse = { .clock_getres = posix_get_coarse_res, - .clock_get = posix_get_monotonic_coarse, + .clock_get_timespec = posix_get_monotonic_coarse, };static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_tai, + .clock_get_timespec = posix_get_tai, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get = posix_get_boottime, + .clock_get_timespec = posix_get_boottime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.h +2 -2
@@ -6,8 +6,8 @@ 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); +int (*clock_get_timespec)(const clockid_t which_clock, +struct timespec64 *tp);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,
PATCH v8 6/34 posix-clocks: Rename .clock_get_timespec() callbacks accordingly
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format in (struct k_clock).
As a preparation ground for introducing clock_get_ktime(), the original callback clock_get() was renamed into clock_get_timespec(). Reflect the renaming into callbacks realizations.
--- kernel/time/alarmtimer.c | 6 +++--- kernel/time/posix-timers.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
kernel/time/alarmtimer.c +3 -3
@@ -657,13 +657,13 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get_timespec 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)];
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, + .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
kernel/time/posix-timers.c +8 -8
@@ -165,7 +165,7 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) }/* Get clock_realtime */ -static int posix_clock_realtime_get (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_realtime_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_real_ts64 (tp);return 0 ;
@@ -187,7 +187,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,/* * Get monotonic time for posix timers */ -static int posix_ktime_get_ts (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp);return 0 ;
@@ -222,13 +222,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *return 0 ; } -static int posix_get_boottime (const clockid_t which_clock,struct timespec64 *tp) +static int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp);return 0 ; } -static int posix_get_tai (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_clock_realtime_get, + .clock_get_timespec = posix_get_realtime_timespec, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_ktime_get_ts, + .clock_get_timespec = posix_get_monotonic_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,7 +1310,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_tai, + .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_boottime, + .clock_get_timespec = posix_get_boottime_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
Signature · 1 line
2.24.0
[tip: timers/core] posix-clocks: Rename .clock_get_timespec() callbacks accordingly
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 80703145d5feb87c34333d1a136b5ecbcfa09eef Gitweb: https://git.kernel.org/tip/80703145d5feb87c34333d1a136b5ecbcfa09eef Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:55 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:48 +01:00
posix-clocks: Rename .clock_get_timespec() callbacks accordingly
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format in (struct k_clock).
As a preparation ground for introducing clock_get_ktime(), the original callback clock_get() was renamed into clock_get_timespec(). Reflect the renaming into the callback implementations.
--- kernel/time/alarmtimer.c | 6 +++--- kernel/time/posix-timers.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
kernel/time/alarmtimer.c +3 -3
@@ -657,13 +657,13 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get_timespec 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)];
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, + .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
kernel/time/posix-timers.c +8 -8
@@ -165,7 +165,7 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) }/* Get clock_realtime */ -static int posix_clock_realtime_get (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_realtime_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_real_ts64 (tp);return 0 ;
@@ -187,7 +187,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,/* * Get monotonic time for posix timers */ -static int posix_ktime_get_ts (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp);return 0 ;
@@ -222,13 +222,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *return 0 ; } -static int posix_get_boottime (const clockid_t which_clock,struct timespec64 *tp) +static int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp);return 0 ; } -static int posix_get_tai (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_clock_realtime_get, + .clock_get_timespec = posix_get_realtime_timespec, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_ktime_get_ts, + .clock_get_timespec = posix_get_monotonic_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,7 +1310,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_tai, + .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_boottime, + .clock_get_timespec = posix_get_boottime_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
[tip: timers/core] posix-clocks: Rename .clock_get_timespec() callbacks accordingly
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: eaf80194d0fe48be393587541c48a799a9a06a70 Gitweb: https://git.kernel.org/tip/eaf80194d0fe48be393587541c48a799a9a06a70 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:55 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:50 +01:00
posix-clocks: Rename .clock_get_timespec() callbacks accordingly
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format in (struct k_clock).
As a preparation ground for introducing clock_get_ktime(), the original callback clock_get() was renamed into clock_get_timespec(). Reflect the renaming into the callback implementations.
--- kernel/time/alarmtimer.c | 6 +++--- kernel/time/posix-timers.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
kernel/time/alarmtimer.c +3 -3
@@ -657,13 +657,13 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp }/** -* alarm_clock_get - posix clock_get_timespec 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)];
@@ -837,7 +837,7 @@ 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_timespec = alarm_clock_get, + .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set, .timer_del = common_timer_del,
kernel/time/posix-timers.c +8 -8
@@ -165,7 +165,7 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) }/* Get clock_realtime */ -static int posix_clock_realtime_get (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_realtime_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_real_ts64 (tp);return 0 ;
@@ -187,7 +187,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,/* * Get monotonic time for posix timers */ -static int posix_ktime_get_ts (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp);return 0 ;
@@ -222,13 +222,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *return 0 ; } -static int posix_get_boottime (const clockid_t which_clock,struct timespec64 *tp) +static int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp);return 0 ; } -static int posix_get_tai (clockid_t which_clock,struct timespec64 *tp) +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_clock_realtime_get, + .clock_get_timespec = posix_get_realtime_timespec, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_ktime_get_ts, + .clock_get_timespec = posix_get_monotonic_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,7 +1310,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_tai, + .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {static const struct k_clock clock_boottime = { .clock_getres = posix_get_hrtimer_res, - .clock_get_timespec = posix_get_boottime, + .clock_get_timespec = posix_get_boottime_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
PATCH v8 7/34 alarmtimer: Rename gettime() callback to get_ktime()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The upcoming support for time namespaces requires to have access to:
- The time in a tasks time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
struct alarm_base needs to follow the same name convention, so rename .gettime() callback into get_ktime() as a preparation for introducing get_timespec().
--- kernel/time/alarmtimer.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
kernel/time/alarmtimer.c +17 -17
@@ -36,13 +36,13 @@* struct alarm_base - Alarm timer bases * @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events -* @gettime: Function to read the time correlating to the base +* @get_ktime: Function to read the time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue; -ktime_t (*gettime)(void ); +ktime_t (*get_ktime)(void );clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -207,7 +207,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)spin_unlock_irqrestore (&base->lock, flags);if (alarm->function) - restart = alarm->function (alarm, base->gettime ()); + restart = alarm->function (alarm, base->get_ktime ());spin_lock_irqsave (&base->lock, flags);if (restart !=ALARMTIMER_NORESTART ) {
@@ -217,7 +217,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) }spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_fired (alarm, base->gettime ()); +trace_alarmtimer_fired (alarm, base->get_ktime ());return ret; }
@@ -225,7 +225,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)ktime_t alarm_expires_remaining (const struct alarm *alarm) {struct alarm_base *base = &alarm_bases[alarm->type]; -return ktime_sub (alarm->node.expires, base->gettime ()); +return ktime_sub (alarm->node.expires, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_expires_remaining);
@@ -270,7 +270,7 @@ static int alarmtimer_suspend(struct device *dev)spin_unlock_irqrestore (&base->lock, flags);if (!next)continue ; - delta =ktime_sub (next->expires, base->gettime ()); + delta =ktime_sub (next->expires, base->get_ktime ());if (!min || (delta < min)) { expires = next->expires; min = delta;
@@ -364,7 +364,7 @@ void alarm_start(struct alarm *alarm, ktime_t start)hrtimer_start (&alarm->timer, alarm->node.expires,HRTIMER_MODE_ABS );spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_start (alarm, base->gettime ()); +trace_alarmtimer_start (alarm, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_start);
@@ -377,7 +377,7 @@ void alarm_start_relative(struct alarm *alarm, ktime_t start) {struct alarm_base *base = &alarm_bases[alarm->type]; - start =ktime_add_safe (start, base->gettime ()); + start =ktime_add_safe (start, base->get_ktime ());alarm_start (alarm, start); }EXPORT_SYMBOL_GPL (alarm_start_relative);
@@ -414,7 +414,7 @@ int alarm_try_to_cancel(struct alarm *alarm)alarmtimer_dequeue (base, alarm);spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_cancel (alarm, base->gettime ()); +trace_alarmtimer_cancel (alarm, base->get_ktime ());return ret; }EXPORT_SYMBOL_GPL (alarm_try_to_cancel);
@@ -474,7 +474,7 @@ u64 alarm_forward_now(struct alarm *alarm, ktime_t interval) {struct alarm_base *base = &alarm_bases[alarm->type]; -return alarm_forward (alarm, base->gettime (), interval); +return alarm_forward (alarm, base->get_ktime (), interval); }EXPORT_SYMBOL_GPL (alarm_forward_now);
@@ -500,7 +500,7 @@ static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)return ; } - delta =ktime_sub (absexp, base->gettime ()); + delta =ktime_sub (absexp, base->get_ktime ());spin_lock_irqsave (&freezer_delta_lock, flags);if (!freezer_delta || (delta < freezer_delta)) {
@@ -632,7 +632,7 @@ static void alarm_timer_arm(struct k_itimer *timr, ktime_t expires,struct alarm_base *base = &alarm_bases[alarm->type];if (!absolute) - expires =ktime_add_safe (expires, base->gettime ()); + expires =ktime_add_safe (expires, base->get_ktime ());if (sigev_none) alarm->node.expires = expires;else
@@ -670,7 +670,7 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->gettime ()); + *tp =ktime_to_timespec64 (base->get_ktime ());return 0 ; }
@@ -747,7 +747,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,struct timespec64 rmt;ktime_t rem; - rem =ktime_sub (absexp, alarm_bases[type].gettime ()); + rem =ktime_sub (absexp, alarm_bases[type].get_ktime ());if (rem <=0 )return 0 ;
@@ -816,7 +816,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, exp =timespec64_to_ktime (*tsreq);/* Convert (if necessary) to absolute time */ if (flags !=TIMER_ABSTIME ) { -ktime_t now = alarm_bases[type].gettime (); +ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); }
@@ -882,9 +882,9 @@ 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_REALTIME ].get_ktime = &ktime_get_real; alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; - alarm_bases[ALARM_BOOTTIME ].gettime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
Signature · 1 line
2.24.0
[tip: timers/core] alarmtimer: Rename gettime() callback to get_ktime()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 7599bee13643a1401e1dca26cfaf18cacc444c65 Gitweb: https://git.kernel.org/tip/7599bee13643a1401e1dca26cfaf18cacc444c65 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:56 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:49 +01:00
alarmtimer: Rename gettime() callback to get_ktime()
The upcoming support for time namespaces requires to have access to:
- The time in a tasks time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
struct alarm_base needs to follow the same naming convention, so rename .gettime() callback into get_ktime() as a preparation for introducing get_timespec().
--- kernel/time/alarmtimer.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
kernel/time/alarmtimer.c +17 -17
@@ -36,13 +36,13 @@* struct alarm_base - Alarm timer bases * @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events -* @gettime: Function to read the time correlating to the base +* @get_ktime: Function to read the time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue; -ktime_t (*gettime)(void ); +ktime_t (*get_ktime)(void );clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -207,7 +207,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)spin_unlock_irqrestore (&base->lock, flags);if (alarm->function) - restart = alarm->function (alarm, base->gettime ()); + restart = alarm->function (alarm, base->get_ktime ());spin_lock_irqsave (&base->lock, flags);if (restart !=ALARMTIMER_NORESTART ) {
@@ -217,7 +217,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) }spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_fired (alarm, base->gettime ()); +trace_alarmtimer_fired (alarm, base->get_ktime ());return ret; }
@@ -225,7 +225,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)ktime_t alarm_expires_remaining (const struct alarm *alarm) {struct alarm_base *base = &alarm_bases[alarm->type]; -return ktime_sub (alarm->node.expires, base->gettime ()); +return ktime_sub (alarm->node.expires, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_expires_remaining);
@@ -270,7 +270,7 @@ static int alarmtimer_suspend(struct device *dev)spin_unlock_irqrestore (&base->lock, flags);if (!next)continue ; - delta =ktime_sub (next->expires, base->gettime ()); + delta =ktime_sub (next->expires, base->get_ktime ());if (!min || (delta < min)) { expires = next->expires; min = delta;
@@ -364,7 +364,7 @@ void alarm_start(struct alarm *alarm, ktime_t start)hrtimer_start (&alarm->timer, alarm->node.expires,HRTIMER_MODE_ABS );spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_start (alarm, base->gettime ()); +trace_alarmtimer_start (alarm, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_start);
@@ -377,7 +377,7 @@ void alarm_start_relative(struct alarm *alarm, ktime_t start) {struct alarm_base *base = &alarm_bases[alarm->type]; - start =ktime_add_safe (start, base->gettime ()); + start =ktime_add_safe (start, base->get_ktime ());alarm_start (alarm, start); }EXPORT_SYMBOL_GPL (alarm_start_relative);
@@ -414,7 +414,7 @@ int alarm_try_to_cancel(struct alarm *alarm)alarmtimer_dequeue (base, alarm);spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_cancel (alarm, base->gettime ()); +trace_alarmtimer_cancel (alarm, base->get_ktime ());return ret; }EXPORT_SYMBOL_GPL (alarm_try_to_cancel);
@@ -474,7 +474,7 @@ u64 alarm_forward_now(struct alarm *alarm, ktime_t interval) {struct alarm_base *base = &alarm_bases[alarm->type]; -return alarm_forward (alarm, base->gettime (), interval); +return alarm_forward (alarm, base->get_ktime (), interval); }EXPORT_SYMBOL_GPL (alarm_forward_now);
@@ -500,7 +500,7 @@ static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)return ; } - delta =ktime_sub (absexp, base->gettime ()); + delta =ktime_sub (absexp, base->get_ktime ());spin_lock_irqsave (&freezer_delta_lock, flags);if (!freezer_delta || (delta < freezer_delta)) {
@@ -632,7 +632,7 @@ static void alarm_timer_arm(struct k_itimer *timr, ktime_t expires,struct alarm_base *base = &alarm_bases[alarm->type];if (!absolute) - expires =ktime_add_safe (expires, base->gettime ()); + expires =ktime_add_safe (expires, base->get_ktime ());if (sigev_none) alarm->node.expires = expires;else
@@ -670,7 +670,7 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->gettime ()); + *tp =ktime_to_timespec64 (base->get_ktime ());return 0 ; }
@@ -747,7 +747,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,struct timespec64 rmt;ktime_t rem; - rem =ktime_sub (absexp, alarm_bases[type].gettime ()); + rem =ktime_sub (absexp, alarm_bases[type].get_ktime ());if (rem <=0 )return 0 ;
@@ -816,7 +816,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, exp =timespec64_to_ktime (*tsreq);/* Convert (if necessary) to absolute time */ if (flags !=TIMER_ABSTIME ) { -ktime_t now = alarm_bases[type].gettime (); +ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); }
@@ -882,9 +882,9 @@ 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_REALTIME ].get_ktime = &ktime_get_real; alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; - alarm_bases[ALARM_BOOTTIME ].gettime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
[tip: timers/core] alarmtimer: Rename gettime() callback to get_ktime()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 41b3b8dffc1f84e581addfbc09bec0289db3315e Gitweb: https://git.kernel.org/tip/41b3b8dffc1f84e581addfbc09bec0289db3315e Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:56 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:50 +01:00
alarmtimer: Rename gettime() callback to get_ktime()
The upcoming support for time namespaces requires to have access to:
- The time in a tasks time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
struct alarm_base needs to follow the same naming convention, so rename .gettime() callback into get_ktime() as a preparation for introducing get_timespec().
--- kernel/time/alarmtimer.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
kernel/time/alarmtimer.c +17 -17
@@ -36,13 +36,13 @@* struct alarm_base - Alarm timer bases * @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events -* @gettime: Function to read the time correlating to the base +* @get_ktime: Function to read the time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue; -ktime_t (*gettime)(void ); +ktime_t (*get_ktime)(void );clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -207,7 +207,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)spin_unlock_irqrestore (&base->lock, flags);if (alarm->function) - restart = alarm->function (alarm, base->gettime ()); + restart = alarm->function (alarm, base->get_ktime ());spin_lock_irqsave (&base->lock, flags);if (restart !=ALARMTIMER_NORESTART ) {
@@ -217,7 +217,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer) }spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_fired (alarm, base->gettime ()); +trace_alarmtimer_fired (alarm, base->get_ktime ());return ret; }
@@ -225,7 +225,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)ktime_t alarm_expires_remaining (const struct alarm *alarm) {struct alarm_base *base = &alarm_bases[alarm->type]; -return ktime_sub (alarm->node.expires, base->gettime ()); +return ktime_sub (alarm->node.expires, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_expires_remaining);
@@ -270,7 +270,7 @@ static int alarmtimer_suspend(struct device *dev)spin_unlock_irqrestore (&base->lock, flags);if (!next)continue ; - delta =ktime_sub (next->expires, base->gettime ()); + delta =ktime_sub (next->expires, base->get_ktime ());if (!min || (delta < min)) { expires = next->expires; min = delta;
@@ -364,7 +364,7 @@ void alarm_start(struct alarm *alarm, ktime_t start)hrtimer_start (&alarm->timer, alarm->node.expires,HRTIMER_MODE_ABS );spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_start (alarm, base->gettime ()); +trace_alarmtimer_start (alarm, base->get_ktime ()); }EXPORT_SYMBOL_GPL (alarm_start);
@@ -377,7 +377,7 @@ void alarm_start_relative(struct alarm *alarm, ktime_t start) {struct alarm_base *base = &alarm_bases[alarm->type]; - start =ktime_add_safe (start, base->gettime ()); + start =ktime_add_safe (start, base->get_ktime ());alarm_start (alarm, start); }EXPORT_SYMBOL_GPL (alarm_start_relative);
@@ -414,7 +414,7 @@ int alarm_try_to_cancel(struct alarm *alarm)alarmtimer_dequeue (base, alarm);spin_unlock_irqrestore (&base->lock, flags); -trace_alarmtimer_cancel (alarm, base->gettime ()); +trace_alarmtimer_cancel (alarm, base->get_ktime ());return ret; }EXPORT_SYMBOL_GPL (alarm_try_to_cancel);
@@ -474,7 +474,7 @@ u64 alarm_forward_now(struct alarm *alarm, ktime_t interval) {struct alarm_base *base = &alarm_bases[alarm->type]; -return alarm_forward (alarm, base->gettime (), interval); +return alarm_forward (alarm, base->get_ktime (), interval); }EXPORT_SYMBOL_GPL (alarm_forward_now);
@@ -500,7 +500,7 @@ static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)return ; } - delta =ktime_sub (absexp, base->gettime ()); + delta =ktime_sub (absexp, base->get_ktime ());spin_lock_irqsave (&freezer_delta_lock, flags);if (!freezer_delta || (delta < freezer_delta)) {
@@ -632,7 +632,7 @@ static void alarm_timer_arm(struct k_itimer *timr, ktime_t expires,struct alarm_base *base = &alarm_bases[alarm->type];if (!absolute) - expires =ktime_add_safe (expires, base->gettime ()); + expires =ktime_add_safe (expires, base->get_ktime ());if (sigev_none) alarm->node.expires = expires;else
@@ -670,7 +670,7 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->gettime ()); + *tp =ktime_to_timespec64 (base->get_ktime ());return 0 ; }
@@ -747,7 +747,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,struct timespec64 rmt;ktime_t rem; - rem =ktime_sub (absexp, alarm_bases[type].gettime ()); + rem =ktime_sub (absexp, alarm_bases[type].get_ktime ());if (rem <=0 )return 0 ;
@@ -816,7 +816,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, exp =timespec64_to_ktime (*tsreq);/* Convert (if necessary) to absolute time */ if (flags !=TIMER_ABSTIME ) { -ktime_t now = alarm_bases[type].gettime (); +ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); }
@@ -882,9 +882,9 @@ 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_REALTIME ].get_ktime = &ktime_get_real; alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; - alarm_bases[ALARM_BOOTTIME ].gettime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
PATCH v8 8/34 alarmtimer: Provide get_timespec() callback
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
Wire up alarm bases with get_timespec().
--- kernel/time/alarmtimer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +6 -1
@@ -37,12 +37,14 @@* @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events * @get_ktime: Function to read the time correlating to the base +* @get_timespec: Function to read the namespace time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue;ktime_t (*get_ktime)(void ); +void (*get_timespec)(struct timespec64 *tp);clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -670,7 +672,8 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->get_ktime ()); + base->get_timespec (tp); +return 0 ; }
@@ -883,8 +886,10 @@ static int __init alarmtimer_init(void)/* Initialize alarm bases */ alarm_bases[ALARM_REALTIME ].base_clockid =CLOCK_REALTIME ; alarm_bases[ALARM_REALTIME ].get_ktime = &ktime_get_real; + alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
Signature · 1 line
2.24.0
[tip: timers/core] alarmtimer: Provide get_timespec() callback
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: c8ff8b6c6f12d13dcdf2c948b197eb3d362600e0 Gitweb: https://git.kernel.org/tip/c8ff8b6c6f12d13dcdf2c948b197eb3d362600e0 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:57 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:49 +01:00
alarmtimer: Provide get_timespec() callback
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
Wire up alarm bases with get_timespec().
--- kernel/time/alarmtimer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +6 -1
@@ -37,12 +37,14 @@* @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events * @get_ktime: Function to read the time correlating to the base +* @get_timespec: Function to read the namespace time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue;ktime_t (*get_ktime)(void ); +void (*get_timespec)(struct timespec64 *tp);clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -670,7 +672,8 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->get_ktime ()); + base->get_timespec (tp); +return 0 ; }
@@ -883,8 +886,10 @@ static int __init alarmtimer_init(void)/* Initialize alarm bases */ alarm_bases[ALARM_REALTIME ].base_clockid =CLOCK_REALTIME ; alarm_bases[ALARM_REALTIME ].get_ktime = &ktime_get_real; + alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
[tip: timers/core] alarmtimer: Provide get_timespec() callback
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 2f58bf909abf9670fa4e848b433dc12ba4c2a44e Gitweb: https://git.kernel.org/tip/2f58bf909abf9670fa4e848b433dc12ba4c2a44e Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:57 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:51 +01:00
alarmtimer: Provide get_timespec() callback
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
Wire up alarm bases with get_timespec().
--- kernel/time/alarmtimer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +6 -1
@@ -37,12 +37,14 @@* @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events * @get_ktime: Function to read the time correlating to the base +* @get_timespec: Function to read the namespace time correlating to the base * @base_clockid: clockid for the base */ static struct alarm_base {spinlock_t lock;struct timerqueue_head timerqueue;ktime_t (*get_ktime)(void ); +void (*get_timespec)(struct timespec64 *tp);clockid_t base_clockid; } alarm_bases[ALARM_NUMTYPE ];
@@ -670,7 +672,8 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpif (!alarmtimer_get_rtcdev ())return -EINVAL ; - *tp =ktime_to_timespec64 (base->get_ktime ()); + base->get_timespec (tp); +return 0 ; }
@@ -883,8 +886,10 @@ static int __init alarmtimer_init(void)/* Initialize alarm bases */ alarm_bases[ALARM_REALTIME ].base_clockid =CLOCK_REALTIME ; alarm_bases[ALARM_REALTIME ].get_ktime = &ktime_get_real; + alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; + alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64;for (i =0 ; i <ALARM_NUMTYPE ; i++) {timerqueue_init_head (&alarm_bases[i].timerqueue);spin_lock_init (&alarm_bases[i].lock);
PATCH v8 9/34 posix-clocks: Introduce clock_get_ktime() callback
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);The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format.
--- kernel/time/alarmtimer.c | 19 ++++++++++++++++++- kernel/time/posix-timers.c | 26 +++++++++++++++++++++++++- kernel/time/posix-timers.h | 3 +++ 3 files changed, 46 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +18 -1
@@ -663,7 +663,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp* @which_clock: clockid * @tp: timespec to fill. * -* Provides the underlying alarm base time. +* Provides the underlying alarm base time in a tasks time namespace. */ static int alarm_clock_get_timespec (clockid_t which_clock,struct timespec64 *tp) {
@@ -677,6 +677,22 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tpreturn 0 ; } +/** +* alarm_clock_get_ktime - posix clock_get_ktime interface +* @which_clock: clockid +* +* Provides the underlying alarm base time in the root namespace. +*/ +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->get_ktime (); +} +/** * alarm_timer_create - posix timer_create interface * @new_timer: k_itimer pointer to manage
@@ -840,6 +856,7 @@ 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_ktime = alarm_clock_get_ktime, .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.c +25 -1
@@ -171,6 +171,11 @@ static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_realtime_ktime (clockid_t which_clock) +{ +return ktime_get_real (); +} +/* Set clock_realtime */ static int posix_clock_realtime_set (const clockid_t which_clock,const struct timespec64 *tp)
@@ -193,6 +198,11 @@ static int posix_get_monotonic_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_monotonic_ktime (clockid_t which_clock) +{ +return ktime_get (); +} +/* * Get monotonic-raw time for posix timers */
@@ -228,12 +238,22 @@ static int posix_get_boottime_timespec(const clockid_t which_clock, struct timesreturn 0 ; } +static ktime_t posix_get_boottime_ktime (const clockid_t which_clock) +{ +return ktime_get_boottime (); +} +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ; } +static ktime_t posix_get_tai_ktime (clockid_t which_clock) +{ +return ktime_get_clocktai (); +} +static int posix_get_hrtimer_res (clockid_t which_clock,struct timespec64 *tp) { tp->tv_sec =0 ;
@@ -781,7 +801,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get_timespec() work. +* functions which use timr->kclock->clock_get_*() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1262,6 +1282,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_realtime_timespec, + .clock_get_ktime = posix_get_realtime_ktime, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1280,6 +1301,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, + .clock_get_ktime = posix_get_monotonic_ktime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,6 +1332,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, + .clock_get_ktime = posix_get_tai_ktime, .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create,
@@ -1326,6 +1349,7 @@ static const struct k_clock clock_tai = {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, .timer_create = common_timer_create,
kernel/time/posix-timers.h +3 -0
@@ -6,8 +6,11 @@ struct k_clock { struct timespec64 *tp);int (*clock_set)(const clockid_t which_clock,const struct timespec64 *tp); +/* Returns the clock value in the current time namespace. */ int (*clock_get_timespec)(const clockid_t which_clock,struct timespec64 *tp); +/* Returns 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.24.0
[tip: timers/core] posix-clocks: Introduce clock_get_ktime() callback
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8bebca2b1379c749b3f98e2678861f546225e75b Gitweb: https://git.kernel.org/tip/8bebca2b1379c749b3f98e2678861f546225e75b Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:58 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:50 +01:00
posix-clocks: Introduce clock_get_ktime() callback
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);The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format.
--- kernel/time/alarmtimer.c | 19 ++++++++++++++++++- kernel/time/posix-timers.c | 26 +++++++++++++++++++++++++- kernel/time/posix-timers.h | 3 +++ 3 files changed, 46 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +18 -1
@@ -663,7 +663,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp* @which_clock: clockid * @tp: timespec to fill. * -* Provides the underlying alarm base time. +* Provides the underlying alarm base time in a tasks time namespace. */ static int alarm_clock_get_timespec (clockid_t which_clock,struct timespec64 *tp) {
@@ -678,6 +678,22 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tp }/** +* alarm_clock_get_ktime - posix clock_get_ktime interface +* @which_clock: clockid +* +* Provides the underlying alarm base time in the root namespace. +*/ +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->get_ktime (); +} + +/** * alarm_timer_create - posix timer_create interface * @new_timer: k_itimer pointer to manage *
@@ -840,6 +856,7 @@ 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_ktime = alarm_clock_get_ktime, .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.c +25 -1
@@ -171,6 +171,11 @@ static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_realtime_ktime (clockid_t which_clock) +{ +return ktime_get_real (); +} +/* Set clock_realtime */ static int posix_clock_realtime_set (const clockid_t which_clock,const struct timespec64 *tp)
@@ -193,6 +198,11 @@ static int posix_get_monotonic_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_monotonic_ktime (clockid_t which_clock) +{ +return ktime_get (); +} +/* * Get monotonic-raw time for posix timers */
@@ -228,12 +238,22 @@ static int posix_get_boottime_timespec(const clockid_t which_clock, struct timesreturn 0 ; } +static ktime_t posix_get_boottime_ktime (const clockid_t which_clock) +{ +return ktime_get_boottime (); +} +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ; } +static ktime_t posix_get_tai_ktime (clockid_t which_clock) +{ +return ktime_get_clocktai (); +} +static int posix_get_hrtimer_res (clockid_t which_clock,struct timespec64 *tp) { tp->tv_sec =0 ;
@@ -781,7 +801,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get_timespec() work. +* functions which use timr->kclock->clock_get_*() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1262,6 +1282,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_realtime_timespec, + .clock_get_ktime = posix_get_realtime_ktime, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1280,6 +1301,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, + .clock_get_ktime = posix_get_monotonic_ktime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,6 +1332,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, + .clock_get_ktime = posix_get_tai_ktime, .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create,
@@ -1326,6 +1349,7 @@ static const struct k_clock clock_tai = {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, .timer_create = common_timer_create,
kernel/time/posix-timers.h +3 -0
@@ -6,8 +6,11 @@ struct k_clock { struct timespec64 *tp);int (*clock_set)(const clockid_t which_clock,const struct timespec64 *tp); +/* Returns the clock value in the current time namespace. */ int (*clock_get_timespec)(const clockid_t which_clock,struct timespec64 *tp); +/* Returns 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,
[tip: timers/core] posix-clocks: Introduce clock_get_ktime() callback
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9c71a2e8a757bc6aee256bc97c6fb711144b0a0f Gitweb: https://git.kernel.org/tip/9c71a2e8a757bc6aee256bc97c6fb711144b0a0f Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:58 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:51 +01:00
posix-clocks: Introduce clock_get_ktime() callback
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);The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which returns the time in ktime_t format.
--- kernel/time/alarmtimer.c | 19 ++++++++++++++++++- kernel/time/posix-timers.c | 26 +++++++++++++++++++++++++- kernel/time/posix-timers.h | 3 +++ 3 files changed, 46 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +18 -1
@@ -663,7 +663,7 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp* @which_clock: clockid * @tp: timespec to fill. * -* Provides the underlying alarm base time. +* Provides the underlying alarm base time in a tasks time namespace. */ static int alarm_clock_get_timespec (clockid_t which_clock,struct timespec64 *tp) {
@@ -678,6 +678,22 @@ static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tp }/** +* alarm_clock_get_ktime - posix clock_get_ktime interface +* @which_clock: clockid +* +* Provides the underlying alarm base time in the root namespace. +*/ +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->get_ktime (); +} + +/** * alarm_timer_create - posix timer_create interface * @new_timer: k_itimer pointer to manage *
@@ -840,6 +856,7 @@ 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_ktime = alarm_clock_get_ktime, .clock_get_timespec = alarm_clock_get_timespec, .timer_create = alarm_timer_create, .timer_set = common_timer_set,
kernel/time/posix-timers.c +25 -1
@@ -171,6 +171,11 @@ static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_realtime_ktime (clockid_t which_clock) +{ +return ktime_get_real (); +} +/* Set clock_realtime */ static int posix_clock_realtime_set (const clockid_t which_clock,const struct timespec64 *tp)
@@ -193,6 +198,11 @@ static int posix_get_monotonic_timespec(clockid_t which_clock, struct timespec64return 0 ; } +static ktime_t posix_get_monotonic_ktime (clockid_t which_clock) +{ +return ktime_get (); +} +/* * Get monotonic-raw time for posix timers */
@@ -228,12 +238,22 @@ static int posix_get_boottime_timespec(const clockid_t which_clock, struct timesreturn 0 ; } +static ktime_t posix_get_boottime_ktime (const clockid_t which_clock) +{ +return ktime_get_boottime (); +} +static int posix_get_tai_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_clocktai_ts64 (tp);return 0 ; } +static ktime_t posix_get_tai_ktime (clockid_t which_clock) +{ +return ktime_get_clocktai (); +} +static int posix_get_hrtimer_res (clockid_t which_clock,struct timespec64 *tp) { tp->tv_sec =0 ;
@@ -781,7 +801,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,* Posix magic: Relative CLOCK_REALTIME timers are not affected by * clock modifications, so they become CLOCK_MONOTONIC based under the * hood. See hrtimer_init(). Update timr->kclock, so the generic -* functions which use timr->kclock->clock_get_timespec() work. +* functions which use timr->kclock->clock_get_*() work. * * Note: it_clock stays unmodified, because the next timer_set() might * use ABSTIME, so it needs to switch back.
@@ -1262,6 +1282,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,static const struct k_clock clock_realtime = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_realtime_timespec, + .clock_get_ktime = posix_get_realtime_ktime, .clock_set = posix_clock_realtime_set, .clock_adj = posix_clock_realtime_adj, .nsleep = common_nsleep,
@@ -1280,6 +1301,7 @@ static const struct k_clock clock_realtime = {static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, + .clock_get_ktime = posix_get_monotonic_ktime, .nsleep = common_nsleep, .timer_create = common_timer_create, .timer_set = common_timer_set,
@@ -1310,6 +1332,7 @@ static const struct k_clock clock_monotonic_coarse = {static const struct k_clock clock_tai = { .clock_getres = posix_get_hrtimer_res, + .clock_get_ktime = posix_get_tai_ktime, .clock_get_timespec = posix_get_tai_timespec, .nsleep = common_nsleep, .timer_create = common_timer_create,
@@ -1326,6 +1349,7 @@ static const struct k_clock clock_tai = {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, .timer_create = common_timer_create,
kernel/time/posix-timers.h +3 -0
@@ -6,8 +6,11 @@ struct k_clock { struct timespec64 *tp);int (*clock_set)(const clockid_t which_clock,const struct timespec64 *tp); +/* Returns the clock value in the current time namespace. */ int (*clock_get_timespec)(const clockid_t which_clock,struct timespec64 *tp); +/* Returns 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,
PATCH v8 10/34 posix-timers: Use clock_get_ktime() in common_timer_get()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Now, when the clock_get_ktime() callback exists, the suboptimal timespec64-based conversion can be removed from common_timer_get().
--- kernel/time/posix-timers.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
kernel/time/posix-timers.c +1 -7
@@ -665,7 +665,6 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting) {const struct k_clock *kc = timr->kclock;ktime_t now, remaining, iv; -struct timespec64 ts64;bool sig_none; sig_none = timr->it_sigev_notify ==SIGEV_NONE ;
@@ -683,12 +682,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)return ; } -/* -* The timespec64 based conversion is suboptimal, but it's not -* worth to implement yet another callback. -*/ - kc->clock_get_timespec (timr->it_clock, &ts64); - now =timespec64_to_ktime (ts64); + now = kc->clock_get_ktime (timr->it_clock);/* * When a requeue is pending or this is a SIGEV_NONE timer move the
Signature · 1 line
2.24.0
[tip: timers/core] posix-timers: Use clock_get_ktime() in common_timer_get()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: fe45ad37b4ae70db3923263d0b67313b7e1d746a Gitweb: https://git.kernel.org/tip/fe45ad37b4ae70db3923263d0b67313b7e1d746a Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:59 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:50 +01:00
posix-timers: Use clock_get_ktime() in common_timer_get()
Now, when the clock_get_ktime() callback exists, the suboptimal timespec64-based conversion can be removed from common_timer_get().
--- kernel/time/posix-timers.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
kernel/time/posix-timers.c +1 -7
@@ -665,7 +665,6 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting) {const struct k_clock *kc = timr->kclock;ktime_t now, remaining, iv; -struct timespec64 ts64;bool sig_none; sig_none = timr->it_sigev_notify ==SIGEV_NONE ;
@@ -683,12 +682,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)return ; } -/* -* The timespec64 based conversion is suboptimal, but it's not -* worth to implement yet another callback. -*/ - kc->clock_get_timespec (timr->it_clock, &ts64); - now =timespec64_to_ktime (ts64); + now = kc->clock_get_ktime (timr->it_clock);/* * When a requeue is pending or this is a SIGEV_NONE timer move the
[tip: timers/core] posix-timers: Use clock_get_ktime() in common_timer_get()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 198fa445d5c4c1a1c6c1d39f962559f8d008e79d Gitweb: https://git.kernel.org/tip/198fa445d5c4c1a1c6c1d39f962559f8d008e79d Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:26:59 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:52 +01:00
posix-timers: Use clock_get_ktime() in common_timer_get()
Now, when the clock_get_ktime() callback exists, the suboptimal timespec64-based conversion can be removed from common_timer_get().
--- kernel/time/posix-timers.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
kernel/time/posix-timers.c +1 -7
@@ -665,7 +665,6 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting) {const struct k_clock *kc = timr->kclock;ktime_t now, remaining, iv; -struct timespec64 ts64;bool sig_none; sig_none = timr->it_sigev_notify ==SIGEV_NONE ;
@@ -683,12 +682,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)return ; } -/* -* The timespec64 based conversion is suboptimal, but it's not -* worth to implement yet another callback. -*/ - kc->clock_get_timespec (timr->it_clock, &ts64); - now =timespec64_to_ktime (ts64); + now = kc->clock_get_ktime (timr->it_clock);/* * When a requeue is pending or this is a SIGEV_NONE timer move the
PATCH v8 11/34 posix-clocks: Wire up clock_gettime() with timens offsets
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Adjust monotonic and boottime clocks with per-timens offsets. As the result a process inside time namespace will see timers and clocks corrected to offsets that were set on creating namespace.
Note that applications usually go through vDSO to get time, which is not yet adjusted. Further changes complete time namespace virtualisation with vDSO support.
--- kernel/time/alarmtimer.c | 9 ++++++++- kernel/time/posix-stubs.c | 3 +++ kernel/time/posix-timers.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +8 -1
@@ -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"
@@ -886,6 +887,12 @@ static struct platform_driver alarmtimer_driver = { } }; +static void get_boottime_timespec (struct timespec64 *tp) +{ +ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp); +} +/** * alarmtimer_init - Initialize alarm timer code *
@@ -906,7 +913,7 @@ static int __init alarmtimer_init(void) alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; - alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64; + alarm_bases[ALARM_BOOTTIME ].get_timespec = 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-stubs.c +3 -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,9 +78,11 @@ 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); +timens_add_boottime (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +5 -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"
@@ -195,6 +196,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
@@ -209,6 +211,7 @@ static ktime_t posix_get_monotonic_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 ; }
@@ -223,6 +226,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 ; }
@@ -235,6 +239,7 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *static 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.24.0
[tip: timers/core] posix-clocks: Wire up clock_gettime() with timens offsets
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 22b16bfa948bca922614699c717aea055d759d82 Gitweb: https://git.kernel.org/tip/22b16bfa948bca922614699c717aea055d759d82 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:50 +01:00
posix-clocks: Wire up clock_gettime() with timens offsets
Adjust monotonic and boottime clocks with per-timens offsets. As the result a process inside time namespace will see timers and clocks corrected to offsets that were set when the namespace was created
Note that applications usually go through vDSO to get time, which is not yet adjusted. Further changes will complete time namespace virtualisation with vDSO support.
--- kernel/time/alarmtimer.c | 9 ++++++++- kernel/time/posix-stubs.c | 3 +++ kernel/time/posix-timers.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +8 -1
@@ -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"
@@ -886,6 +887,12 @@ static struct platform_driver alarmtimer_driver = { } }; +static void get_boottime_timespec (struct timespec64 *tp) +{ +ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp); +} +/** * alarmtimer_init - Initialize alarm timer code *
@@ -906,7 +913,7 @@ static int __init alarmtimer_init(void) alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; - alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64; + alarm_bases[ALARM_BOOTTIME ].get_timespec = 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-stubs.c +3 -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,9 +78,11 @@ 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); +timens_add_boottime (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +5 -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"
@@ -195,6 +196,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
@@ -209,6 +211,7 @@ static ktime_t posix_get_monotonic_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 ; }
@@ -223,6 +226,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 ; }
@@ -235,6 +239,7 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *static int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp);return 0 ; }
[tip: timers/core] posix-clocks: Wire up clock_gettime() with timens offsets
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 5a590f35add93c2bdf3ed83eee73111021679562 Gitweb: https://git.kernel.org/tip/5a590f35add93c2bdf3ed83eee73111021679562 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:52 +01:00
posix-clocks: Wire up clock_gettime() with timens offsets
Adjust monotonic and boottime clocks with per-timens offsets. As the result a process inside time namespace will see timers and clocks corrected to offsets that were set when the namespace was created
Note that applications usually go through vDSO to get time, which is not yet adjusted. Further changes will complete time namespace virtualisation with vDSO support.
--- kernel/time/alarmtimer.c | 9 ++++++++- kernel/time/posix-stubs.c | 3 +++ kernel/time/posix-timers.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +8 -1
@@ -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"
@@ -886,6 +887,12 @@ static struct platform_driver alarmtimer_driver = { } }; +static void get_boottime_timespec (struct timespec64 *tp) +{ +ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp); +} +/** * alarmtimer_init - Initialize alarm timer code *
@@ -906,7 +913,7 @@ static int __init alarmtimer_init(void) alarm_bases[ALARM_REALTIME ].get_timespec = ktime_get_real_ts64, alarm_bases[ALARM_BOOTTIME ].base_clockid =CLOCK_BOOTTIME ; alarm_bases[ALARM_BOOTTIME ].get_ktime = &ktime_get_boottime; - alarm_bases[ALARM_BOOTTIME ].get_timespec = ktime_get_boottime_ts64; + alarm_bases[ALARM_BOOTTIME ].get_timespec = 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-stubs.c +3 -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,9 +78,11 @@ 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); +timens_add_boottime (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +5 -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"
@@ -195,6 +196,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,static int posix_get_monotonic_timespec (clockid_t which_clock,struct timespec64 *tp) {ktime_get_ts64 (tp); +timens_add_monotonic (tp);return 0 ; }
@@ -209,6 +211,7 @@ static ktime_t posix_get_monotonic_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 ; }
@@ -223,6 +226,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 ; }
@@ -235,6 +239,7 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *static int posix_get_boottime_timespec (const clockid_t which_clock,struct timespec64 *tp) {ktime_get_boottime_ts64 (tp); +timens_add_boottime (tp);return 0 ; }
PATCH v8 12/34 kernel: Add do_timens_ktime_to_host() helper
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
The helper subtracts namespace's clock offset from the given time and checks that the result is in [0, KTIME_MAX].
--- include/linux/time_namespace.h | 17 ++++++++++++++++ kernel/time/namespace.c | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+)
include/linux/time_namespace.h +17 -0
@@ -57,6 +57,18 @@ 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 time_namespace *ns = current->nsproxy->time_ns; + +if (likely (ns == &init_time_ns)) +return tim; + +return do_timens_ktime_to_host (clockid, tim, &ns->offsets); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -83,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 +36 -0
@@ -16,6 +16,42 @@#include <linux/err.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 offset; + +switch (clockid) { +case CLOCK_MONOTONIC : + offset =timespec64_to_ktime (ns_offsets->monotonic); +break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + offset =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* +* Check that @tim value is in [offset, KTIME_MAX + offset] +* and subtract offset. +*/ +if (tim < offset) { +/* +* User can specify @tim *absolute* value - if it's lesser than +* the time namespace's offset - it's already expired. +*/ + tim =0 ; + }else { + tim =ktime_sub (tim, offset); +if (unlikely (tim >KTIME_MAX )) + tim =KTIME_MAX ; + } + +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.24.0
[tip: timers/core] time: Add do_timens_ktime_to_host() helper
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 6c9c1492c9fd0732dfa85c9cb55f71f2571c3825 Gitweb: https://git.kernel.org/tip/6c9c1492c9fd0732dfa85c9cb55f71f2571c3825 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:01 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:51 +01:00
time: Add do_timens_ktime_to_host() helper
The helper subtracts namespace's clock offset from the given time and ensures that the result is within [0, KTIME_MAX].
--- include/linux/time_namespace.h | 17 ++++++++++++++++- kernel/time/namespace.c | 36 +++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+)
include/linux/time_namespace.h +17 -0
@@ -59,6 +59,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 time_namespace *ns = current->nsproxy->time_ns; + +if (likely (ns == &init_time_ns)) +return tim; + +return do_timens_ktime_to_host (clockid, tim, &ns->offsets); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -88,6 +101,10 @@ static inline int timens_on_fork(struct nsproxy *nsproxy,static 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 +36 -0
@@ -16,6 +16,42 @@#include <linux/err.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 offset; + +switch (clockid) { +case CLOCK_MONOTONIC : + offset =timespec64_to_ktime (ns_offsets->monotonic); +break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + offset =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* +* Check that @tim value is in [offset, KTIME_MAX + offset] +* and subtract offset. +*/ +if (tim < offset) { +/* +* User can specify @tim *absolute* value - if it's lesser than +* the time namespace's offset - it's already expired. +*/ + tim =0 ; + }else { + tim =ktime_sub (tim, offset); +if (unlikely (tim >KTIME_MAX )) + tim =KTIME_MAX ; + } + +return tim; +} +static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {return inc_ucount (ns,current_euid (),UCOUNT_TIME_NAMESPACES );
[tip: timers/core] time: Add do_timens_ktime_to_host() helper
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 89dd8eecfe961fab4924dcd14f80cf2ab2820044 Gitweb: https://git.kernel.org/tip/89dd8eecfe961fab4924dcd14f80cf2ab2820044 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:01 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:53 +01:00
time: Add do_timens_ktime_to_host() helper
The helper subtracts namespace's clock offset from the given time and ensures that the result is within [0, KTIME_MAX].
--- include/linux/time_namespace.h | 17 ++++++++++++++++- kernel/time/namespace.c | 36 +++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+)
include/linux/time_namespace.h +17 -0
@@ -59,6 +59,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 time_namespace *ns = current->nsproxy->time_ns; + +if (likely (ns == &init_time_ns)) +return tim; + +return do_timens_ktime_to_host (clockid, tim, &ns->offsets); +} +#else static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {
@@ -88,6 +101,10 @@ static inline int timens_on_fork(struct nsproxy *nsproxy,static 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 +36 -0
@@ -16,6 +16,42 @@#include <linux/err.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 offset; + +switch (clockid) { +case CLOCK_MONOTONIC : + offset =timespec64_to_ktime (ns_offsets->monotonic); +break ; +case CLOCK_BOOTTIME : +case CLOCK_BOOTTIME_ALARM : + offset =timespec64_to_ktime (ns_offsets->boottime); +break ; +default : +return tim; + } + +/* +* Check that @tim value is in [offset, KTIME_MAX + offset] +* and subtract offset. +*/ +if (tim < offset) { +/* +* User can specify @tim *absolute* value - if it's lesser than +* the time namespace's offset - it's already expired. +*/ + tim =0 ; + }else { + tim =ktime_sub (tim, offset); +if (unlikely (tim >KTIME_MAX )) + tim =KTIME_MAX ; + } + +return tim; +} +static struct ucounts *inc_time_namespaces (struct user_namespace *ns) {return inc_ucount (ns,current_euid (),UCOUNT_TIME_NAMESPACES );
PATCH v8 13/34 timerfd: Make timerfd_settime() time namespace aware
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
timerfd_settime() accepts an absolute value of the expiration time if TFD_TIMER_ABSTIME is specified. This value is in task's time namespace and has to be converted to the host's time namespace.
--- fs/timerfd.c | 3 +++ 1 file changed, 3 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);
Signature · 1 line
2.24.0
[tip: timers/core] timerfd: Make timerfd_settime() time namespace aware
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 20a40308f2ce12392e2cfa662494b5079ea67bdf Gitweb: https://git.kernel.org/tip/20a40308f2ce12392e2cfa662494b5079ea67bdf Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:02 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:51 +01:00
timerfd: Make timerfd_settime() time namespace aware
timerfd_settime() accepts an absolute value of the expiration time if TFD_TIMER_ABSTIME is specified. This value is in the task's time namespace and has to be converted to the host's time namespace.
--- fs/timerfd.c | 3 +++ 1 file changed, 3 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);
[tip: timers/core] timerfd: Make timerfd_settime() time namespace aware
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 6cd889d43c40b13f81a44c41896781ce70244769 Gitweb: https://git.kernel.org/tip/6cd889d43c40b13f81a44c41896781ce70244769 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:02 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:53 +01:00
timerfd: Make timerfd_settime() time namespace aware
timerfd_settime() accepts an absolute value of the expiration time if TFD_TIMER_ABSTIME is specified. This value is in the task's time namespace and has to be converted to the host's time namespace.
--- fs/timerfd.c | 3 +++ 1 file changed, 3 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);
PATCH v8 14/34 posix-timers: Make timer_settime() time namespace aware
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Wire timer_settime() syscall into time namespace virtualization.
sys_timer_settime() calls the ktime->timer_set() callback. Right now, common_timer_set() is the only implementation for the callback.
There user-supplied timer's value is converted from timespec64 to ktime and then timens_ktime_to_host() can be used to convert namespace's time to the host time.
Inside a time namespace kernel's time differ on a fixed offset from a user-supplied, but only absolute values (TIMER_ABSTIME) must be converted.
--- kernel/time/posix-timers.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/posix-timers.c +2 -0
@@ -885,6 +885,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.24.0
[tip: timers/core] posix-timers: Make timer_settime() time namespace aware
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: d1ba7dda1bc0129bc8f85bff530748aef1e99e70 Gitweb: https://git.kernel.org/tip/d1ba7dda1bc0129bc8f85bff530748aef1e99e70 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:03 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:52 +01:00
posix-timers: Make timer_settime() time namespace aware
Wire timer_settime() syscall into time namespace virtualization.
sys_timer_settime() calls the ktime->timer_set() callback. Right now, common_timer_set() is the only implementation for the callback.
The user-supplied expiry value is converted from timespec64 to ktime and then timens_ktime_to_host() can be used to convert namespace's time to the host time.
Inside a time namespace kernel's time differs by a fixed offset from a user-supplied time, but only absolute values (TIMER_ABSTIME) must be converted.
--- kernel/time/posix-timers.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/posix-timers.c +2 -0
@@ -885,6 +885,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);
[tip: timers/core] posix-timers: Make timer_settime() time namespace aware
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 7da8b3a44bb426a43670b3a97ed61085018a9d43 Gitweb: https://git.kernel.org/tip/7da8b3a44bb426a43670b3a97ed61085018a9d43 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:03 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:54 +01:00
posix-timers: Make timer_settime() time namespace aware
Wire timer_settime() syscall into time namespace virtualization.
sys_timer_settime() calls the ktime->timer_set() callback. Right now, common_timer_set() is the only implementation for the callback.
The user-supplied expiry value is converted from timespec64 to ktime and then timens_ktime_to_host() can be used to convert namespace's time to the host time.
Inside a time namespace kernel's time differs by a fixed offset from a user-supplied time, but only absolute values (TIMER_ABSTIME) must be converted.
--- kernel/time/posix-timers.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/posix-timers.c +2 -0
@@ -885,6 +885,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);
PATCH v8 15/34 alarmtimer: Make nanosleep time namespace aware
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
clock_nanosleep() accepts absolute values of expiration time when TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace, and has to be converted to the host's time.
--- kernel/time/alarmtimer.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/alarmtimer.c +2 -0
@@ -839,6 +839,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); + }else { + exp =timens_ktime_to_host (which_clock, exp); } ret =alarmtimer_do_nsleep (&alarm, exp, type);
Signature · 1 line
2.24.0
[tip: timers/core] alarmtimer: Make nanosleep() time namespace aware
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: a27f00cd18d392fadcaca463506303ab668a6891 Gitweb: https://git.kernel.org/tip/a27f00cd18d392fadcaca463506303ab668a6891 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:04 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:52 +01:00
alarmtimer: Make nanosleep() time namespace aware
clock_nanosleep() accepts absolute values of expiration time when the TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace and has to be converted to the host's time.
--- kernel/time/alarmtimer.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/alarmtimer.c +2 -0
@@ -839,6 +839,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); + }else { + exp =timens_ktime_to_host (which_clock, exp); } ret =alarmtimer_do_nsleep (&alarm, exp, type);
[tip: timers/core] alarmtimer: Make nanosleep() time namespace aware
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0b9b9a3b162e85e620e3598f1badc45b8a177492 Gitweb: https://git.kernel.org/tip/0b9b9a3b162e85e620e3598f1badc45b8a177492 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:04 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:55 +01:00
alarmtimer: Make nanosleep() time namespace aware
clock_nanosleep() accepts absolute values of expiration time when the TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace and has to be converted to the host's time.
--- kernel/time/alarmtimer.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/alarmtimer.c +2 -0
@@ -839,6 +839,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,ktime_t now = alarm_bases[type].get_ktime (); exp =ktime_add_safe (now, exp); + }else { + exp =timens_ktime_to_host (which_clock, exp); } ret =alarmtimer_do_nsleep (&alarm, exp, type);
PATCH v8 16/34 hrtimers: Prepare hrtimer_nanosleep() for time namespaces
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
clock_nanosleep() accepts absolute values of expiration time when TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace, and has to be converted to the host's time.
There is timens_ktime_to_host() helper for converting time, but it accepts ktime argument.
As a preparation, make hrtimer_nanosleep() accept a clock value in ktime instead of timespec64.
--- include/linux/hrtimer.h | 2 +- kernel/time/hrtimer.c | 8 ++++---- kernel/time/posix-stubs.c | 4 ++-- kernel/time/posix-timers.c | 4 +++- tools/perf/examples/bpf/5sec.c | 6 ++++-- 5 files changed, 14 insertions(+), 10 deletions(-)
include/linux/hrtimer.h +1 -1
@@ -508,7 +508,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/hrtimer.c +4 -4
@@ -1910,7 +1910,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;
@@ -1923,7 +1923,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, slack =0 ;hrtimer_init_sleeper_on_stack (&t, 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;
@@ -1958,7 +1958,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
@@ -1978,7 +1978,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 +2 -2
@@ -147,7 +147,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
@@ -233,7 +233,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
kernel/time/posix-timers.c +3 -1
@@ -1221,7 +1221,9 @@ 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); }
tools/perf/examples/bpf/5sec.c +4 -2
@@ -41,9 +41,11 @@#include <bpf.h> -int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec) +#define NSEC_PER_SEC 1000000000L + +int probe (hrtimer_nanosleep ,rqtp )(void *ctx,int err,long long sec) { -return sec ==5 ; +return sec /NSEC_PER_SEC ==5ULL ; }license (GPL );
Signature · 1 line
2.24.0
[tip: timers/core] hrtimers: Prepare hrtimer_nanosleep() for time namespaces
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ee83d9ac18186734579adf4dfd54f74bc762f65e Gitweb: https://git.kernel.org/tip/ee83d9ac18186734579adf4dfd54f74bc762f65e Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:05 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:52 +01:00
hrtimers: Prepare hrtimer_nanosleep() for time namespaces
clock_nanosleep() accepts absolute values of expiration time when TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace, and has to be converted to the host's time.
There is timens_ktime_to_host() helper for converting time, but it accepts ktime argument.
As a preparation, make hrtimer_nanosleep() accept a clock value in ktime instead of timespec64.
--- include/linux/hrtimer.h | 3 +-- kernel/time/hrtimer.c | 12 +++++++----- kernel/time/posix-stubs.c | 4 ++-- kernel/time/posix-timers.c | 4 +++- tools/perf/examples/bpf/5sec.c | 6 ++++-- 5 files changed, 17 insertions(+), 12 deletions(-)
include/linux/hrtimer.h +1 -2
@@ -508,8 +508,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, -const enum hrtimer_mode mode, +extern long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid); extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
kernel/time/hrtimer.c +7 -5
@@ -1910,8 +1910,8 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)return ret; } -long hrtimer_nanosleep (const struct timespec64 *rqtp, -const enum hrtimer_mode mode,const clockid_t clockid) +long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode, +const clockid_t clockid) {struct restart_block *restart;struct hrtimer_sleeper t;
@@ -1923,7 +1923,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, slack =0 ;hrtimer_init_sleeper_on_stack (&t, 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;
@@ -1958,7 +1958,8 @@ 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
@@ -1978,7 +1979,8 @@ 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 +2 -2
@@ -147,7 +147,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
@@ -236,7 +236,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
kernel/time/posix-timers.c +3 -1
@@ -1221,7 +1221,9 @@ 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); }
tools/perf/examples/bpf/5sec.c +4 -2
@@ -41,9 +41,11 @@#include <bpf.h> -int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec) +#define NSEC_PER_SEC 1000000000L + +int probe (hrtimer_nanosleep ,rqtp )(void *ctx,int err,long long sec) { -return sec ==5 ; +return sec /NSEC_PER_SEC ==5ULL ; }license (GPL );
[tip: timers/core] hrtimers: Prepare hrtimer_nanosleep() for time namespaces
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ea2d1f7fce0f18b67f915c00c6a7a6860116bc92 Gitweb: https://git.kernel.org/tip/ea2d1f7fce0f18b67f915c00c6a7a6860116bc92 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:05 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:55 +01:00
hrtimers: Prepare hrtimer_nanosleep() for time namespaces
clock_nanosleep() accepts absolute values of expiration time when TIMER_ABSTIME flag is set. This absolute value is inside the task's time namespace, and has to be converted to the host's time.
There is timens_ktime_to_host() helper for converting time, but it accepts ktime argument.
As a preparation, make hrtimer_nanosleep() accept a clock value in ktime instead of timespec64.
--- include/linux/hrtimer.h | 3 +-- kernel/time/hrtimer.c | 12 +++++++----- kernel/time/posix-stubs.c | 4 ++-- kernel/time/posix-timers.c | 4 +++- tools/perf/examples/bpf/5sec.c | 6 ++++-- 5 files changed, 17 insertions(+), 12 deletions(-)
include/linux/hrtimer.h +1 -2
@@ -508,8 +508,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, -const enum hrtimer_mode mode, +extern long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode,const clockid_t clockid); extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
kernel/time/hrtimer.c +7 -5
@@ -1910,8 +1910,8 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)return ret; } -long hrtimer_nanosleep (const struct timespec64 *rqtp, -const enum hrtimer_mode mode,const clockid_t clockid) +long hrtimer_nanosleep (ktime_t rqtp,const enum hrtimer_mode mode, +const clockid_t clockid) {struct restart_block *restart;struct hrtimer_sleeper t;
@@ -1923,7 +1923,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, slack =0 ;hrtimer_init_sleeper_on_stack (&t, 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;
@@ -1958,7 +1958,8 @@ 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
@@ -1978,7 +1979,8 @@ 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 +2 -2
@@ -147,7 +147,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
@@ -236,7 +236,7 @@ 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 ? +return hrtimer_nanosleep (timespec64_to_ktime (t), flags &TIMER_ABSTIME ?HRTIMER_MODE_ABS :HRTIMER_MODE_REL , which_clock); }
kernel/time/posix-timers.c +3 -1
@@ -1221,7 +1221,9 @@ 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); }
tools/perf/examples/bpf/5sec.c +4 -2
@@ -41,9 +41,11 @@#include <bpf.h> -int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec) +#define NSEC_PER_SEC 1000000000L + +int probe (hrtimer_nanosleep ,rqtp )(void *ctx,int err,long long sec) { -return sec ==5 ; +return sec /NSEC_PER_SEC ==5ULL ; }license (GPL );
PATCH v8 17/34 posix-timers: Make clock_nanosleep() time namespace aware
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
clock_nanosleep() accepts absolute values of expiration time, if the TIMER_ABSTIME flag is set. This value is in the task time namespace, which has to be converted to the host time namespace.
--- kernel/time/posix-stubs.c | 12 ++++++++++-- kernel/time/posix-timers.c | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-)
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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
@@ -215,6 +219,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, struct old_timespec32 __user *, rmtp) {struct timespec64 t; +ktime_t 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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
kernel/time/posix-timers.c +15 -2
@@ -1228,6 +1228,19 @@ static int common_nsleep(const clockid_t which_clock, int flags, 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); +} + SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, const struct __kernel_timespec __user *, rqtp, struct __kernel_timespec __user *, rmtp)
@@ -1305,7 +1318,7 @@ static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, .clock_get_ktime = posix_get_monotonic_ktime, - .nsleep = common_nsleep, + .nsleep = common_nsleep_timens, .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get,
@@ -1354,7 +1367,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.24.0
[tip: timers/core] posix-timers: Make clock_nanosleep() time namespace aware
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 1088a867c70919d99d513ff00cd622d2988b8114 Gitweb: https://git.kernel.org/tip/1088a867c70919d99d513ff00cd622d2988b8114 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:06 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:53 +01:00
posix-timers: Make clock_nanosleep() time namespace aware
clock_nanosleep() accepts absolute values of expiration time, if the TIMER_ABSTIME flag is set. This value is in the tasks time namespace, which has to be converted to the host time namespace.
--- kernel/time/posix-stubs.c | 12 ++++++++++-- kernel/time/posix-timers.c | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-)
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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
@@ -218,6 +222,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, struct old_timespec32 __user *, rmtp) {struct timespec64 t; +ktime_t texp;switch (which_clock) {case CLOCK_REALTIME :
@@ -236,7 +241,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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
kernel/time/posix-timers.c +15 -2
@@ -1228,6 +1228,19 @@ static int common_nsleep(const clockid_t which_clock, int flags, 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); +} + SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, const struct __kernel_timespec __user *, rqtp, struct __kernel_timespec __user *, rmtp)
@@ -1305,7 +1318,7 @@ static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, .clock_get_ktime = posix_get_monotonic_ktime, - .nsleep = common_nsleep, + .nsleep = common_nsleep_timens, .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get,
@@ -1354,7 +1367,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,
[tip: timers/core] posix-timers: Make clock_nanosleep() time namespace aware
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 1f9b37bfbb607a09d838c248843e63a2cafe1080 Gitweb: https://git.kernel.org/tip/1f9b37bfbb607a09d838c248843e63a2cafe1080 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:06 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:55 +01:00
posix-timers: Make clock_nanosleep() time namespace aware
clock_nanosleep() accepts absolute values of expiration time, if the TIMER_ABSTIME flag is set. This value is in the tasks time namespace, which has to be converted to the host time namespace.
--- kernel/time/posix-stubs.c | 12 ++++++++++-- kernel/time/posix-timers.c | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-)
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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
@@ -218,6 +222,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, struct old_timespec32 __user *, rmtp) {struct timespec64 t; +ktime_t texp;switch (which_clock) {case CLOCK_REALTIME :
@@ -236,7 +241,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 (timespec64_to_ktime (t), flags &TIMER_ABSTIME ? + texp =timespec64_to_ktime (t); +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); }
kernel/time/posix-timers.c +15 -2
@@ -1228,6 +1228,19 @@ static int common_nsleep(const clockid_t which_clock, int flags, 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); +} + SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, const struct __kernel_timespec __user *, rqtp, struct __kernel_timespec __user *, rmtp)
@@ -1305,7 +1318,7 @@ static const struct k_clock clock_monotonic = { .clock_getres = posix_get_hrtimer_res, .clock_get_timespec = posix_get_monotonic_timespec, .clock_get_ktime = posix_get_monotonic_ktime, - .nsleep = common_nsleep, + .nsleep = common_nsleep_timens, .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get,
@@ -1354,7 +1367,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,
PATCH v8 18/34 fs/proc: Respect boottime inside time namespace for /proc/uptime
In reply to Dmitry Safonov--- 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.24.0
[tip: timers/core] fs/proc: Respect boottime inside time namespace for /proc/uptime
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8a49cd5ef7796a589e68cc975e30cac98edbd757 Gitweb: https://git.kernel.org/tip/8a49cd5ef7796a589e68cc975e30cac98edbd757 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:07 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:53 +01:00
fs/proc: Respect boottime inside time namespace for /proc/uptime
Make sure that /proc/uptime is adjusted to the tasks time namespace.
--- 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",
[tip: timers/core] fs/proc: Respect boottime inside time namespace for /proc/uptime
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0efc8bb0bb5fdfd529a23073ee15478b5d5e3839 Gitweb: https://git.kernel.org/tip/0efc8bb0bb5fdfd529a23073ee15478b5d5e3839 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:07 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:56 +01:00
fs/proc: Respect boottime inside time namespace for /proc/uptime
Make sure that /proc/uptime is adjusted to the tasks time namespace.
--- 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",
PATCH v8 19/34 x86/vdso: Restrict splitting VVAR VMA
In reply to Dmitry SafonovForbid splitting VVAR resulting in stricter ABI and reducing amount of corner-cases to consider while working further on VDSO.
As offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed.
--- 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.24.0
[tip: timers/core] x86/vdso: Restrict splitting VVAR VMA
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 35825d690265b6433faa2ba47fa7669ea7e125eb Gitweb: https://git.kernel.org/tip/35825d690265b6433faa2ba47fa7669ea7e125eb Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:08 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:54 +01:00
x86/vdso: Restrict splitting VVAR VMA
Forbid splitting VVAR VMA resulting in a stricter ABI and reducing the amount of corner-cases to consider while working further on VDSO time namespace support.
As the offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed.
--- 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) +{ +const struct vdso_image *image = new_vma->vm_mm->context.vdso_image; +unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + +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, };/*
[tip: timers/core] x86/vdso: Restrict splitting VVAR VMA
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 6f74acfde20af1eb2178d0bd846bfd8f50b3be32 Gitweb: https://git.kernel.org/tip/6f74acfde20af1eb2178d0bd846bfd8f50b3be32 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:08 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:56 +01:00
x86/vdso: Restrict splitting VVAR VMA
Forbid splitting VVAR VMA resulting in a stricter ABI and reducing the amount of corner-cases to consider while working further on VDSO time namespace support.
As the offset from timens to VVAR page is computed compile-time, the pages in VVAR should stay together and not being partically mremap()'ed.
--- 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) +{ +const struct vdso_image *image = new_vma->vm_mm->context.vdso_image; +unsigned long new_size = new_vma->vm_end - new_vma->vm_start; + +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, };/*
PATCH v8 20/34 lib/vdso: Prepare for time namespace support
In reply to Dmitry SafonovFrom: Thomas Gleixner <[email protected]>
To support time namespaces in the vdso with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide vdso data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the vdso data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
If VDSO time namespace support is disabled the whole magic is compiled out.
Initial testing shows that the disabled case is almost identical to the host case which does not take the slow timens path. With the special timens page installed the performance hit is constant time and in the range of 5-7%.
For the vdso functions which are not using the sequence count an unconditional check for vdso_data->clock_mode is added which switches to the real vdso when the clock_mode is VCLOCK_TIMENS.
[Make do_hres_timens() work with raw clocks too: choose vdso_data
pointer by CS_RAW offset.]
--- include/linux/time.h | 6 ++ include/vdso/datapage.h | 19 ++++- init/Kconfig | 1 + lib/vdso/Kconfig | 6 ++ lib/vdso/gettimeofday.c | 152 ++++++++++++++++++++++++++++++++++++++-- 5 files changed, 178 insertions(+), 6 deletions(-)
include/linux/time.h +6 -0
@@ -96,4 +96,10 @@ static inline bool itimerspec64_valid(const struct itimerspec64 *its)*/ #define time_after32 (a, b) ((s32)((u32)(b) - (u32)(a)) < 0)#define time_before32 (b, a) time_after32(a, b) + +struct timens_offset { +s64 sec; +u64 nsec; +}; +#endif
include/vdso/datapage.h +18 -1
@@ -21,6 +21,8 @@#define CS_RAW 1#define CS_BASES (CS_RAW + 1) +#define VCLOCK_TIMENS UINT_MAX +/** * struct vdso_timestamp - basetime per clock_id * @sec: seconds
@@ -48,6 +50,7 @@ struct vdso_timestamp {* @mult: clocksource multiplier * @shift: clocksource shift * @basetime[clock_id]: basetime per clock_id +* @offset[clock_id]: time namespace offset per clock_id * @tz_minuteswest: minutes west of Greenwich * @tz_dsttime: type of DST correction * @hrtimer_res: hrtimer resolution
@@ -55,6 +58,17 @@ struct vdso_timestamp {* * vdso_data will be accessed by 64 bit and compat code at the same time * so we should be careful before modifying this structure. +* +* @basetime is used to store the base time for the system wide time getter +* VVAR page. +* +* @offset is used by the special time namespace VVAR pages which are +* installed instead of the real VVAR page. These namespace pages must set +* @seq to 1 and @clock_mode to VLOCK_TIMENS to force the code into the +* time namespace slow path. The namespace aware functions retrieve the +* real system wide VVAR page, read host time and add the per clock offset. +* For clocks which are not affected by time namespace adjustement the +* offset must be zero. */ struct vdso_data {u32 seq;
@@ -65,7 +79,10 @@ struct vdso_data {u32 mult;u32 shift; -struct vdso_timestamp basetime[VDSO_BASES ]; +union { +struct vdso_timestamp basetime[VDSO_BASES ]; +struct timens_offset offset[VDSO_BASES ]; + };s32 tz_minuteswest;s32 tz_dsttime;
init/Kconfig +1 -0
@@ -1098,6 +1098,7 @@ config UTS_NS config TIME_NS bool "TIME namespace" + depends on GENERIC_VDSO_TIME_NS default y help In this namespace boottime and monotonic clocks can be set.
lib/vdso/Kconfig +6 -0
@@ -24,4 +24,10 @@ config GENERIC_COMPAT_VDSO help This config option enables the compat VDSO layer. +config GENERIC_VDSO_TIME_NS + bool + help + Selected by architectures which support time namespaces in the + VDSO + endif
lib/vdso/gettimeofday.c +147 -5
195 lines not on this page · raw message
Signature · 1 line
2.24.0
Re: [PATCHv8 20/34] lib/vdso: Prepare for time namespace support
Quoted 9 lines · Dmitry Safonov
From: Thomas Gleixner <[email protected]>
lib/vdso/gettimeofday.c +8
-0+#ifdef CONFIG_TIME_NS +static int do_hres_timens (const struct vdso_data *vdns,clockid_t clk, +struct __kernel_timespec *ts) +{ +const struct vdso_data *vd =__arch_get_timens_vdso_data (); +const struct vdso_timestamp *vdso_ts; +const struct timens_offset *offs = &vdns->offset[clk]; +u64 cycles, last, ns;
lib/vdso/gettimeofday.c u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult) · line 58
Quoted 10 lines
lib/vdso/gettimeofday.c +10
-0+u32 seq, msk; +s64 sec; + + msk =1U << clk; +if (msk &VDSO_HRES ) + vd = &vd[CS_HRES_COARSE ]; +else if (msk &VDSO_RAW ) + vd = &vd[CS_RAW ]; +else +return -1 ;
This part is redundant. The initial call site already made sure that this is only called for clocks matching VDSO_HRES or VDSO_RAW. I just drop it.
Thanks,
tglx
[tip: timers/core] lib/vdso: Prepare for time namespace support
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 5b319c3b54af326da00d31c67a8a5e185532f863 Gitweb: https://git.kernel.org/tip/5b319c3b54af326da00d31c67a8a5e185532f863 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:09 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:54 +01:00
lib/vdso: Prepare for time namespace support
To support time namespaces in the vdso with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide vdso data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the vdso data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
If VDSO time namespace support is disabled the whole magic is compiled out.
Initial testing shows that the disabled case is almost identical to the host case which does not take the slow timens path. With the special timens page installed the performance hit is constant time and in the range of 5-7%.
For the vdso functions which are not using the sequence count an unconditional check for vdso_data->clock_mode is added which switches to the real vdso when the clock_mode is VCLOCK_TIMENS.
[avagin: Make do_hres_timens() work with raw clocks too: choose vdso_data
pointer by CS_RAW offset.]
--- include/linux/time.h | 6 ++- include/vdso/datapage.h | 19 ++++- init/Kconfig | 1 +- lib/vdso/Kconfig | 6 ++- lib/vdso/gettimeofday.c | 142 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 169 insertions(+), 5 deletions(-)
include/linux/time.h +6 -0
@@ -110,4 +110,10 @@ static inline bool itimerspec64_valid(const struct itimerspec64 *its)* Equivalent to !(time_before32(@t, @l) || time_after32(@t, @h)). */ #define time_between32 (t, l, h) ((u32)(h) - (u32)(l) >= (u32)(t) - (u32)(l)) + +struct timens_offset { +s64 sec; +u64 nsec; +}; +#endif
include/vdso/datapage.h +18 -1
@@ -21,6 +21,8 @@#define CS_RAW 1#define CS_BASES (CS_RAW + 1) +#define VCLOCK_TIMENS UINT_MAX +/** * struct vdso_timestamp - basetime per clock_id * @sec: seconds
@@ -48,6 +50,7 @@ struct vdso_timestamp {* @mult: clocksource multiplier * @shift: clocksource shift * @basetime[clock_id]: basetime per clock_id +* @offset[clock_id]: time namespace offset per clock_id * @tz_minuteswest: minutes west of Greenwich * @tz_dsttime: type of DST correction * @hrtimer_res: hrtimer resolution
@@ -55,6 +58,17 @@ struct vdso_timestamp {* * vdso_data will be accessed by 64 bit and compat code at the same time * so we should be careful before modifying this structure. +* +* @basetime is used to store the base time for the system wide time getter +* VVAR page. +* +* @offset is used by the special time namespace VVAR pages which are +* installed instead of the real VVAR page. These namespace pages must set +* @seq to 1 and @clock_mode to VLOCK_TIMENS to force the code into the +* time namespace slow path. The namespace aware functions retrieve the +* real system wide VVAR page, read host time and add the per clock offset. +* For clocks which are not affected by time namespace adjustment the +* offset must be zero. */ struct vdso_data {u32 seq;
@@ -65,7 +79,10 @@ struct vdso_data {u32 mult;u32 shift; -struct vdso_timestamp basetime[VDSO_BASES ]; +union { +struct vdso_timestamp basetime[VDSO_BASES ]; +struct timens_offset offset[VDSO_BASES ]; + };s32 tz_minuteswest;s32 tz_dsttime;
init/Kconfig +1 -0
@@ -1082,6 +1082,7 @@ config UTS_NS config TIME_NS bool "TIME namespace" + depends on GENERIC_VDSO_TIME_NS default y help In this namespace boottime and monotonic clocks can be set.
lib/vdso/Kconfig +6 -0
@@ -24,4 +24,10 @@ config GENERIC_COMPAT_VDSO help This config option enables the compat VDSO layer. +config GENERIC_VDSO_TIME_NS + bool + help + Selected by architectures which support time namespaces in the + VDSO + endif
lib/vdso/gettimeofday.c +138 -4
185 lines not on this page · raw message
[tip: timers/core] lib/vdso: Prepare for time namespace support
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 660fd04f9317172ae90f414c68b18a26ae88a829 Gitweb: https://git.kernel.org/tip/660fd04f9317172ae90f414c68b18a26ae88a829 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:09 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:57 +01:00
lib/vdso: Prepare for time namespace support
To support time namespaces in the vdso with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide vdso data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the vdso data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
If VDSO time namespace support is disabled the whole magic is compiled out.
Initial testing shows that the disabled case is almost identical to the host case which does not take the slow timens path. With the special timens page installed the performance hit is constant time and in the range of 5-7%.
For the vdso functions which are not using the sequence count an unconditional check for vdso_data->clock_mode is added which switches to the real vdso when the clock_mode is VCLOCK_TIMENS.
[avagin: Make do_hres_timens() work with raw clocks too: choose vdso_data
pointer by CS_RAW offset.]
--- include/linux/time.h | 6 ++- include/vdso/datapage.h | 19 ++++- init/Kconfig | 1 +- lib/vdso/Kconfig | 6 ++- lib/vdso/gettimeofday.c | 142 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 169 insertions(+), 5 deletions(-)
include/linux/time.h +6 -0
@@ -110,4 +110,10 @@ static inline bool itimerspec64_valid(const struct itimerspec64 *its)* Equivalent to !(time_before32(@t, @l) || time_after32(@t, @h)). */ #define time_between32 (t, l, h) ((u32)(h) - (u32)(l) >= (u32)(t) - (u32)(l)) + +struct timens_offset { +s64 sec; +u64 nsec; +}; +#endif
include/vdso/datapage.h +18 -1
@@ -21,6 +21,8 @@#define CS_RAW 1#define CS_BASES (CS_RAW + 1) +#define VCLOCK_TIMENS UINT_MAX +/** * struct vdso_timestamp - basetime per clock_id * @sec: seconds
@@ -48,6 +50,7 @@ struct vdso_timestamp {* @mult: clocksource multiplier * @shift: clocksource shift * @basetime[clock_id]: basetime per clock_id +* @offset[clock_id]: time namespace offset per clock_id * @tz_minuteswest: minutes west of Greenwich * @tz_dsttime: type of DST correction * @hrtimer_res: hrtimer resolution
@@ -55,6 +58,17 @@ struct vdso_timestamp {* * vdso_data will be accessed by 64 bit and compat code at the same time * so we should be careful before modifying this structure. +* +* @basetime is used to store the base time for the system wide time getter +* VVAR page. +* +* @offset is used by the special time namespace VVAR pages which are +* installed instead of the real VVAR page. These namespace pages must set +* @seq to 1 and @clock_mode to VLOCK_TIMENS to force the code into the +* time namespace slow path. The namespace aware functions retrieve the +* real system wide VVAR page, read host time and add the per clock offset. +* For clocks which are not affected by time namespace adjustment the +* offset must be zero. */ struct vdso_data {u32 seq;
@@ -65,7 +79,10 @@ struct vdso_data {u32 mult;u32 shift; -struct vdso_timestamp basetime[VDSO_BASES ]; +union { +struct vdso_timestamp basetime[VDSO_BASES ]; +struct timens_offset offset[VDSO_BASES ]; + };s32 tz_minuteswest;s32 tz_dsttime;
init/Kconfig +1 -0
@@ -1082,6 +1082,7 @@ config UTS_NS config TIME_NS bool "TIME namespace" + depends on GENERIC_VDSO_TIME_NS default y help In this namespace boottime and monotonic clocks can be set.
lib/vdso/Kconfig +6 -0
@@ -24,4 +24,10 @@ config GENERIC_COMPAT_VDSO help This config option enables the compat VDSO layer. +config GENERIC_VDSO_TIME_NS + bool + help + Selected by architectures which support time namespaces in the + VDSO + endif
lib/vdso/gettimeofday.c +138 -4
185 lines not on this page · raw message
PATCH v8 21/34 x86/vdso: Provide vdso_data offset on vvar_page
In reply to Dmitry SafonovVDSO support for Time namespace needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
To prepare timens page kernel needs to know the vdso_data offset. Provide arch_get_vdso_data() helper for locating vdso_data on VVAR page.
--- arch/x86/entry/vdso/vdso-layout.lds.S | 2 -- arch/x86/entry/vdso/vma.c | 11 +++++++++++ arch/x86/include/asm/vvar.h | 8 ++++---- arch/x86/kernel/vmlinux.lds.S | 4 +--- include/linux/time_namespace.h | 1 + 5 files changed, 17 insertions(+), 9 deletions(-)
arch/x86/entry/vdso/vdso-layout.lds.S +0 -2
@@ -21,9 +21,7 @@ SECTIONS /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset; -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR pvclock_page = vvar_start + PAGE_SIZE;
arch/x86/entry/vdso/vma.c +11 -0
@@ -24,6 +24,17 @@#include <asm/cpufeature.h> #include <clocksource/hyperv_timer.h> +#undef _ASM_X86_VVAR_H +#define EMIT_VVAR (name, offset) \ + const size_t name ## _offset = offset; +#include <asm/vvar.h> + +struct vdso_data *arch_get_vdso_data (void *vvar_page) +{ +return (struct vdso_data *)(vvar_page + _vdso_data_offset); +} +#undef EMIT_VVAR +#if defined(CONFIG_X86_64 )unsigned int __read_mostly vdso64_enabled =1 ;#endif
arch/x86/include/asm/vvar.h +4 -4
@@ -19,10 +19,10 @@#ifndef _ASM_X86_VVAR_H#define _ASM_X86_VVAR_H -#if defined(__VVAR_KERNEL_LDS) - -/* The kernel linker script defines its own magic to put vvars in the -* right place. +#ifdef EMIT_VVAR +/* +* EMIT_VVAR() is used by the kernel linker script to put vvars in the +* right place. Also, it's used by kernel code to import offsets values. */ #define DECLARE_VVAR (offset, type, name) \ EMIT_VVAR(name, offset)
arch/x86/kernel/vmlinux.lds.S +1 -3
@@ -193,12 +193,10 @@ SECTIONS __vvar_beginning_hack = .; /* Place all vvars at the offsets in asm/vvar.h. */ -#define EMIT_VVAR(name, offset) \ +#define EMIT_VVAR(name, offset) \ . = __vvar_beginning_hack + offset; \ *(.vvar_ ## name) -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR /*
include/linux/time_namespace.h +1 -0
@@ -37,6 +37,7 @@ extern struct time_namespace *copy_time_ns(unsigned long flags, struct user_namespace *user_ns, struct time_namespace *old_ns);extern void free_time_ns (struct kref *kref);extern int timens_on_fork (struct nsproxy *nsproxy,struct task_struct *tsk); +extern struct vdso_data *arch_get_vdso_data (void *vvar_page);static inline void put_time_ns (struct time_namespace *ns) {
Signature · 1 line
2.24.0
[tip: timers/core] x86/vdso: Provide vdso_data offset on vvar_page
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9bec781deb4d5f23ee6346873805058bd0f6c88b Gitweb: https://git.kernel.org/tip/9bec781deb4d5f23ee6346873805058bd0f6c88b Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:10 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:55 +01:00
x86/vdso: Provide vdso_data offset on vvar_page
VDSO support for time namespaces needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
To prepare the time namespace page the kernel needs to know the vdso_data offset. Provide arch_get_vdso_data() helper for locating vdso_data on VVAR page.
--- arch/x86/entry/vdso/vdso-layout.lds.S | 2 -- arch/x86/entry/vdso/vma.c | 11 +++++++++++ arch/x86/include/asm/vvar.h | 8 ++++---- arch/x86/kernel/vmlinux.lds.S | 4 +--- include/linux/time_namespace.h | 1 + 5 files changed, 17 insertions(+), 9 deletions(-)
arch/x86/entry/vdso/vdso-layout.lds.S +0 -2
@@ -21,9 +21,7 @@ SECTIONS /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset; -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR pvclock_page = vvar_start + PAGE_SIZE;
arch/x86/entry/vdso/vma.c +11 -0
@@ -24,6 +24,17 @@#include <asm/cpufeature.h> #include <clocksource/hyperv_timer.h> +#undef _ASM_X86_VVAR_H +#define EMIT_VVAR (name, offset) \ + const size_t name ## _offset = offset; +#include <asm/vvar.h> + +struct vdso_data *arch_get_vdso_data (void *vvar_page) +{ +return (struct vdso_data *)(vvar_page + _vdso_data_offset); +} +#undef EMIT_VVAR +#if defined(CONFIG_X86_64 )unsigned int __read_mostly vdso64_enabled =1 ;#endif
arch/x86/include/asm/vvar.h +4 -4
@@ -19,10 +19,10 @@#ifndef _ASM_X86_VVAR_H#define _ASM_X86_VVAR_H -#if defined(__VVAR_KERNEL_LDS) - -/* The kernel linker script defines its own magic to put vvars in the -* right place. +#ifdef EMIT_VVAR +/* +* EMIT_VVAR() is used by the kernel linker script to put vvars in the +* right place. Also, it's used by kernel code to import offsets values. */ #define DECLARE_VVAR (offset, type, name) \ EMIT_VVAR(name, offset)
arch/x86/kernel/vmlinux.lds.S +1 -3
@@ -193,12 +193,10 @@ SECTIONS __vvar_beginning_hack = .; /* Place all vvars at the offsets in asm/vvar.h. */ -#define EMIT_VVAR(name, offset) \ +#define EMIT_VVAR(name, offset) \ . = __vvar_beginning_hack + offset; \ *(.vvar_ ## name) -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR /*
include/linux/time_namespace.h +1 -0
@@ -39,6 +39,7 @@ struct time_namespace *copy_time_ns(unsigned long flags, struct time_namespace *old_ns);void free_time_ns (struct kref *kref);int timens_on_fork (struct nsproxy *nsproxy,struct task_struct *tsk); +struct vdso_data *arch_get_vdso_data (void *vvar_page);static inline void put_time_ns (struct time_namespace *ns) {
[tip: timers/core] x86/vdso: Provide vdso_data offset on vvar_page
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 64b302ab66c5965702693e79690823ca120288b9 Gitweb: https://git.kernel.org/tip/64b302ab66c5965702693e79690823ca120288b9 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:10 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:57 +01:00
x86/vdso: Provide vdso_data offset on vvar_page
VDSO support for time namespaces needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
To prepare the time namespace page the kernel needs to know the vdso_data offset. Provide arch_get_vdso_data() helper for locating vdso_data on VVAR page.
--- arch/x86/entry/vdso/vdso-layout.lds.S | 2 -- arch/x86/entry/vdso/vma.c | 11 +++++++++++ arch/x86/include/asm/vvar.h | 8 ++++---- arch/x86/kernel/vmlinux.lds.S | 4 +--- include/linux/time_namespace.h | 1 + 5 files changed, 17 insertions(+), 9 deletions(-)
arch/x86/entry/vdso/vdso-layout.lds.S +0 -2
@@ -21,9 +21,7 @@ SECTIONS /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset; -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR pvclock_page = vvar_start + PAGE_SIZE;
arch/x86/entry/vdso/vma.c +11 -0
@@ -24,6 +24,17 @@#include <asm/cpufeature.h> #include <clocksource/hyperv_timer.h> +#undef _ASM_X86_VVAR_H +#define EMIT_VVAR (name, offset) \ + const size_t name ## _offset = offset; +#include <asm/vvar.h> + +struct vdso_data *arch_get_vdso_data (void *vvar_page) +{ +return (struct vdso_data *)(vvar_page + _vdso_data_offset); +} +#undef EMIT_VVAR +#if defined(CONFIG_X86_64 )unsigned int __read_mostly vdso64_enabled =1 ;#endif
arch/x86/include/asm/vvar.h +4 -4
@@ -19,10 +19,10 @@#ifndef _ASM_X86_VVAR_H#define _ASM_X86_VVAR_H -#if defined(__VVAR_KERNEL_LDS) - -/* The kernel linker script defines its own magic to put vvars in the -* right place. +#ifdef EMIT_VVAR +/* +* EMIT_VVAR() is used by the kernel linker script to put vvars in the +* right place. Also, it's used by kernel code to import offsets values. */ #define DECLARE_VVAR (offset, type, name) \ EMIT_VVAR(name, offset)
arch/x86/kernel/vmlinux.lds.S +1 -3
@@ -193,12 +193,10 @@ SECTIONS __vvar_beginning_hack = .; /* Place all vvars at the offsets in asm/vvar.h. */ -#define EMIT_VVAR(name, offset) \ +#define EMIT_VVAR(name, offset) \ . = __vvar_beginning_hack + offset; \ *(.vvar_ ## name) -#define __VVAR_KERNEL_LDS #include <asm/vvar.h> -#undef __VVAR_KERNEL_LDS #undef EMIT_VVAR /*
include/linux/time_namespace.h +1 -0
@@ -39,6 +39,7 @@ struct time_namespace *copy_time_ns(unsigned long flags, struct time_namespace *old_ns);void free_time_ns (struct kref *kref);int timens_on_fork (struct nsproxy *nsproxy,struct task_struct *tsk); +struct vdso_data *arch_get_vdso_data (void *vvar_page);static inline void put_time_ns (struct time_namespace *ns) {
PATCH v8 22/34 x86/vdso: Add timens page
In reply to Dmitry SafonovTo support time namespaces in the VDSO with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
Allocate Timens page among VVAR pages and place vdso_data on it. Provide __arch_get_timens_vdso_data() helper for VDSO code to get the code-relative position of VVARs on that special page.
--- arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vdso-layout.lds.S | 11 +++++++++-- arch/x86/entry/vdso/vdso2c.c | 3 +++ arch/x86/include/asm/vdso.h | 1 + arch/x86/include/asm/vdso/gettimeofday.h | 9 +++++++++ arch/x86/include/asm/vvar.h | 5 ++++- 6 files changed, 27 insertions(+), 3 deletions(-)
arch/x86/Kconfig +1 -0
@@ -126,6 +126,7 @@ config X86 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY + select GENERIC_VDSO_TIME_NS select GUP_GET_PTE_LOW_HIGH if X86_PAE select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 select HAVE_ACPI_APEI if ACPI
arch/x86/entry/vdso/vdso-layout.lds.S +9 -2
@@ -16,8 +16,8 @@ SECTIONS * segment. */ - vvar_start = . - 3 * PAGE_SIZE; - vvar_page = vvar_start; + vvar_start = . - 4 * PAGE_SIZE; + vvar_page = vvar_start; /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset;
@@ -26,6 +26,13 @@ SECTIONS pvclock_page = vvar_start + PAGE_SIZE; hvclock_page = vvar_start + 2 * PAGE_SIZE; + timens_page = vvar_start + 3 * PAGE_SIZE; + +#undef _ASM_X86_VVAR_H + /* Place all vvars in timens too at the offsets in asm/vvar.h. */ +#define EMIT_VVAR(name, offset) timens_ ## name = timens_page + offset; +#include <asm/vvar.h> +#undef EMIT_VVAR . = 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/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;
arch/x86/include/asm/vdso/gettimeofday.h +9 -0
@@ -21,6 +21,7 @@#include <clocksource/hyperv_timer.h> #define __vdso_data (VVAR(_vdso_data)) +#define __timens_vdso_data (TIMENS(_vdso_data))#define VDSO_HAS_TIME 1
@@ -56,6 +57,14 @@ extern struct ms_hyperv_tsc_page hvclock_page __attribute__((visibility("hidden")));#endif +#ifdef CONFIG_TIME_NS +static __always_inline +const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +return __timens_vdso_data; +} +#endif +#ifndef BUILD_VDSO32 static __always_inline
arch/x86/include/asm/vvar.h +4 -1
@@ -33,9 +33,12 @@ extern char __vvar_page;#define DECLARE_VVAR (offset, type, name) \ extern type vvar_ ## name[CS_BASES] \ - __attribute__((visibility("hidden"))); + __attribute__((visibility("hidden"))); \ + extern type timens_ ## name[CS_BASES] \ + __attribute__((visibility("hidden"))); \#define VVAR (name) (vvar_ ## name) +#define TIMENS (name) (timens_ ## name)#define DEFINE_VVAR (type, name) \ type name[CS_BASES] \
Signature · 1 line
2.24.0
[tip: timers/core] x86/vdso: Add time napespace page
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: f02341d83a4d071dbc85431fa3d51c0dcd02dec9 Gitweb: https://git.kernel.org/tip/f02341d83a4d071dbc85431fa3d51c0dcd02dec9 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:11 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:55 +01:00
x86/vdso: Add time napespace page
To support time namespaces in the VDSO with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
Allocate the time namespace page among VVAR pages and place vdso_data on it. Provide __arch_get_timens_vdso_data() helper for VDSO code to get the code-relative position of VVARs on that special page.
--- arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vdso-layout.lds.S | 11 +++++++++-- arch/x86/entry/vdso/vdso2c.c | 3 +++ arch/x86/include/asm/vdso.h | 1 + arch/x86/include/asm/vdso/gettimeofday.h | 8 ++++++++ arch/x86/include/asm/vvar.h | 5 ++++- 6 files changed, 26 insertions(+), 3 deletions(-)
arch/x86/Kconfig +1 -0
@@ -124,6 +124,7 @@ config X86 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY + select GENERIC_VDSO_TIME_NS select GUP_GET_PTE_LOW_HIGH if X86_PAE select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 select HAVE_ACPI_APEI if ACPI
arch/x86/entry/vdso/vdso-layout.lds.S +9 -2
@@ -16,8 +16,8 @@ SECTIONS * segment. */ - vvar_start = . - 3 * PAGE_SIZE; - vvar_page = vvar_start; + vvar_start = . - 4 * PAGE_SIZE; + vvar_page = vvar_start; /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset;
@@ -26,6 +26,13 @@ SECTIONS pvclock_page = vvar_start + PAGE_SIZE; hvclock_page = vvar_start + 2 * PAGE_SIZE; + timens_page = vvar_start + 3 * PAGE_SIZE; + +#undef _ASM_X86_VVAR_H + /* Place all vvars in timens too at the offsets in asm/vvar.h. */ +#define EMIT_VVAR(name, offset) timens_ ## name = timens_page + offset; +#include <asm/vvar.h> +#undef EMIT_VVAR . = 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/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;
arch/x86/include/asm/vdso/gettimeofday.h +8 -0
@@ -21,6 +21,7 @@#include <clocksource/hyperv_timer.h> #define __vdso_data (VVAR(_vdso_data)) +#define __timens_vdso_data (TIMENS(_vdso_data))#define VDSO_HAS_TIME 1
@@ -56,6 +57,13 @@ extern struct ms_hyperv_tsc_page hvclock_page __attribute__((visibility("hidden")));#endif +#ifdef CONFIG_TIME_NS +static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +return __timens_vdso_data; +} +#endif +#ifndef BUILD_VDSO32 static __always_inline
arch/x86/include/asm/vvar.h +4 -1
@@ -33,9 +33,12 @@ extern char __vvar_page;#define DECLARE_VVAR (offset, type, name) \ extern type vvar_ ## name[CS_BASES] \ - __attribute__((visibility("hidden"))); + __attribute__((visibility("hidden"))); \ + extern type timens_ ## name[CS_BASES] \ + __attribute__((visibility("hidden"))); \#define VVAR (name) (vvar_ ## name) +#define TIMENS (name) (timens_ ## name)#define DEFINE_VVAR (type, name) \ type name[CS_BASES] \
[tip: timers/core] x86/vdso: Add time napespace page
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 550a77a74c87ecfdadc2214fef4b25ff125f65ab Gitweb: https://git.kernel.org/tip/550a77a74c87ecfdadc2214fef4b25ff125f65ab Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:11 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:58 +01:00
x86/vdso: Add time napespace page
To support time namespaces in the VDSO with a minimal impact on regular non time namespace affected tasks, the namespace handling needs to be hidden in a slow path.
The most obvious place is vdso_seq_begin(). If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page. That page has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
The extra check in the case that vdso_data->seq is odd, e.g. a concurrent update of the VDSO data is in progress, is not really affecting regular tasks which are not part of a time namespace as the task is spin waiting for the update to finish and vdso_data->seq to become even again.
If a time namespace task hits that code path, it invokes the corresponding time getter function which retrieves the real VVAR page, reads host time and then adds the offset for the requested clock which is stored in the special VVAR page.
Allocate the time namespace page among VVAR pages and place vdso_data on it. Provide __arch_get_timens_vdso_data() helper for VDSO code to get the code-relative position of VVARs on that special page.
--- arch/x86/Kconfig | 1 + arch/x86/entry/vdso/vdso-layout.lds.S | 11 +++++++++-- arch/x86/entry/vdso/vdso2c.c | 3 +++ arch/x86/include/asm/vdso.h | 1 + arch/x86/include/asm/vdso/gettimeofday.h | 8 ++++++++ arch/x86/include/asm/vvar.h | 5 ++++- 6 files changed, 26 insertions(+), 3 deletions(-)
arch/x86/Kconfig +1 -0
@@ -124,6 +124,7 @@ config X86 select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY + select GENERIC_VDSO_TIME_NS select GUP_GET_PTE_LOW_HIGH if X86_PAE select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 select HAVE_ACPI_APEI if ACPI
arch/x86/entry/vdso/vdso-layout.lds.S +9 -2
@@ -16,8 +16,8 @@ SECTIONS * segment. */ - vvar_start = . - 3 * PAGE_SIZE; - vvar_page = vvar_start; + vvar_start = . - 4 * PAGE_SIZE; + vvar_page = vvar_start; /* Place all vvars at the offsets in asm/vvar.h. */ #define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset;
@@ -26,6 +26,13 @@ SECTIONS pvclock_page = vvar_start + PAGE_SIZE; hvclock_page = vvar_start + 2 * PAGE_SIZE; + timens_page = vvar_start + 3 * PAGE_SIZE; + +#undef _ASM_X86_VVAR_H + /* Place all vvars in timens too at the offsets in asm/vvar.h. */ +#define EMIT_VVAR(name, offset) timens_ ## name = timens_page + offset; +#include <asm/vvar.h> +#undef EMIT_VVAR . = 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/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;
arch/x86/include/asm/vdso/gettimeofday.h +8 -0
@@ -21,6 +21,7 @@#include <clocksource/hyperv_timer.h> #define __vdso_data (VVAR(_vdso_data)) +#define __timens_vdso_data (TIMENS(_vdso_data))#define VDSO_HAS_TIME 1
@@ -56,6 +57,13 @@ extern struct ms_hyperv_tsc_page hvclock_page __attribute__((visibility("hidden")));#endif +#ifdef CONFIG_TIME_NS +static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) +{ +return __timens_vdso_data; +} +#endif +#ifndef BUILD_VDSO32 static __always_inline
arch/x86/include/asm/vvar.h +4 -1
@@ -33,9 +33,12 @@ extern char __vvar_page;#define DECLARE_VVAR (offset, type, name) \ extern type vvar_ ## name[CS_BASES] \ - __attribute__((visibility("hidden"))); + __attribute__((visibility("hidden"))); \ + extern type timens_ ## name[CS_BASES] \ + __attribute__((visibility("hidden"))); \#define VVAR (name) (vvar_ ## name) +#define TIMENS (name) (timens_ ## name)#define DEFINE_VVAR (type, name) \ type name[CS_BASES] \
PATCH v8 23/34 time: Allocate per-timens vvar page
In reply to Dmitry SafonovVDSO support for Time namespace needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page contains time namespace clock offsets and it has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
Allocate the timens page during namespace creation. Setup the offsets when the first task enters the ns and freeze them to guarantee the pace of monotonic/boottime clocks and to avoid breakage of applications.
The design decision is to have a global offset_lock which is used during namespace offsets set up and to freeze offsets when first task joins the new ns. That is better in terms of memory usage comparing to having per-ns mutex that's used only during the set up period.
--- include/linux/time_namespace.h | 3 + kernel/time/namespace.c | 103 ++++++++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 1 deletion(-)
include/linux/time_namespace.h +3 -0
@@ -23,6 +23,9 @@ struct time_namespace {struct ucounts *ucounts;struct ns_common ns;struct timens_offsets offsets; +struct page *vvar_page; +/* Disallow changing offsets after any task joined namespace. */ +bool frozen_offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
kernel/time/namespace.c +102 -1
154 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] time: Allocate per-timens vvar page
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: bb6e82c9b3d6d2cf03d145e175afb42f1f75ef86 Gitweb: https://git.kernel.org/tip/bb6e82c9b3d6d2cf03d145e175afb42f1f75ef86 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:12 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:56 +01:00
time: Allocate per-timens vvar page
VDSO support for Time namespace needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page contains time namespace clock offsets and it has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
Allocate the timens page during namespace creation. Setup the offsets when the first task enters the ns and freeze them to guarantee the pace of monotonic/boottime clocks and to avoid breakage of applications.
The design decision is to have a global offset_lock which is used during namespace offsets setup and to freeze offsets when the first task joins the new time namespace. That is better in terms of memory usage compared to having a per namespace mutex that's used only during the setup period.
--- include/linux/time_namespace.h | 3 +- kernel/time/namespace.c | 104 +++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)
include/linux/time_namespace.h +3 -0
@@ -23,6 +23,9 @@ struct time_namespace {struct ucounts *ucounts;struct ns_common ns;struct timens_offsets offsets; +struct page *vvar_page; +/* If set prevents changing offsets after any task joined namespace. */ +bool frozen_offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
kernel/time/namespace.c +103 -1
155 lines not on this page · raw message
[tip: timers/core] time: Allocate per-timens vvar page
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: afaa7b5ac7c87479fb5a626f87d2157af30d6401 Gitweb: https://git.kernel.org/tip/afaa7b5ac7c87479fb5a626f87d2157af30d6401 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:12 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:58 +01:00
time: Allocate per-timens vvar page
VDSO support for Time namespace needs to set up a page with the same layout as VVAR. That timens page will be placed on position of VVAR page inside namespace. That page contains time namespace clock offsets and it has vdso_data->seq set to 1 to enforce the slow path and vdso_data->clock_mode set to VCLOCK_TIMENS to enforce the time namespace handling path.
Allocate the timens page during namespace creation. Setup the offsets when the first task enters the ns and freeze them to guarantee the pace of monotonic/boottime clocks and to avoid breakage of applications.
The design decision is to have a global offset_lock which is used during namespace offsets setup and to freeze offsets when the first task joins the new time namespace. That is better in terms of memory usage compared to having a per namespace mutex that's used only during the setup period.
--- include/linux/time_namespace.h | 3 +- kernel/time/namespace.c | 104 +++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-)
include/linux/time_namespace.h +3 -0
@@ -23,6 +23,9 @@ struct time_namespace {struct ucounts *ucounts;struct ns_common ns;struct timens_offsets offsets; +struct page *vvar_page; +/* If set prevents changing offsets after any task joined namespace. */ +bool frozen_offsets; } __randomize_layout;extern struct time_namespace init_time_ns;
kernel/time/namespace.c +103 -1
155 lines not on this page · raw message
PATCH v8 24/34 x86/vdso: Handle faults on timens page
In reply to Dmitry SafonovIf a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page.
--- arch/x86/entry/vdso/vma.c | 53 +++++++++++++++++++++++++++++++++++++-- mm/mmap.c | 2 ++ 2 files changed, 53 insertions(+), 2 deletions(-)
arch/x86/entry/vdso/vma.c +51 -2
@@ -14,11 +14,13 @@#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> #include <asm/vdso.h> #include <asm/vvar.h> +#include <asm/tlb.h> #include <asm/page.h> #include <asm/desc.h> #include <asm/cpufeature.h>
@@ -107,10 +109,36 @@ static int vvar_mremap(const struct vm_special_mapping *sm,return 0 ; } +#ifdef CONFIG_TIME_NS +static struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +if (likely (vma->vm_mm == current->mm)) +return current->nsproxy->time_ns->vvar_page; + +/* +* VM_PFNMAP | VM_IO protect .fault() handler from being called +* through interfaces like /proc/$pid/mem or +* process_vm_{readv,writev}() as long as there's no .access() +* in special_mapping_vmops(). +* For more details check_vma_flags() and __access_remote_vm() +*/ + +WARN (1 ,"vvar_page accessed remotely" ); + +return NULL ; +} +#else +static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +return NULL ; +} +#endif +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {const struct vdso_image *image = vma->vm_mm->context.vdso_image; +unsigned long pfn;long sym_offset;if (!image)
@@ -130,8 +158,21 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,return VM_FAULT_SIGBUS ;if (sym_offset == image->sym_vvar_page) { -return vmf_insert_pfn (vma, vmf->address, -__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); +struct page *timens_page =find_timens_vvar_page (vma); + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; + +/* +* If a task belongs to a time namespace then a namespace +* specific VVAR is mapped with the sym_vvar_page offset and +* the real VVAR page is mapped with the sym_timens_page +* offset. +* See also the comment near timens_setup_vdso_data(). +*/ +if (timens_page) + pfn =page_to_pfn (timens_page); + +return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {struct pvclock_vsyscall_time_info *pvti =pvclock_get_pvti_cpu0_va ();
@@ -146,6 +187,14 @@ 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,virt_to_phys (tsc_pg) >>PAGE_SHIFT ); + }else if (sym_offset == image->sym_timens_page) { +struct page *timens_page =find_timens_vvar_page (vma); + +if (!timens_page) +return VM_FAULT_SIGBUS ; + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; +return vmf_insert_pfn (vma, vmf->address, pfn); }return VM_FAULT_SIGBUS ;
mm/mmap.c +2 -0
@@ -3357,6 +3357,8 @@ static const struct vm_operations_struct special_mapping_vmops = { .fault = special_mapping_fault, .mremap = special_mapping_mremap, .name = special_mapping_name, + /* vDSO code relies that VVAR can't be accessed remotely */ + .access = NULL, };static const struct vm_operations_struct legacy_special_mapping_vmops = {
Signature · 1 line
2.24.0
[tip: timers/core] x86/vdso: Handle faults on timens page
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ad22c315d67e713e4e107f9db2b7c27e2a245377 Gitweb: https://git.kernel.org/tip/ad22c315d67e713e4e107f9db2b7c27e2a245377 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:13 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:56 +01:00
x86/vdso: Handle faults on timens page
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page.
--- arch/x86/entry/vdso/vma.c | 54 ++++++++++++++++++++++++++++++++++++-- mm/mmap.c | 2 +- 2 files changed, 54 insertions(+), 2 deletions(-)
arch/x86/entry/vdso/vma.c +52 -2
@@ -14,11 +14,14 @@#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> #include <asm/vdso.h> #include <asm/vvar.h> +#include <asm/tlb.h> #include <asm/page.h> #include <asm/desc.h> #include <asm/cpufeature.h>
@@ -107,10 +110,36 @@ static int vvar_mremap(const struct vm_special_mapping *sm,return 0 ; } +#ifdef CONFIG_TIME_NS +static struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +if (likely (vma->vm_mm == current->mm)) +return current->nsproxy->time_ns->vvar_page; + +/* +* VM_PFNMAP | VM_IO protect .fault() handler from being called +* through interfaces like /proc/$pid/mem or +* process_vm_{readv,writev}() as long as there's no .access() +* in special_mapping_vmops(). +* For more details check_vma_flags() and __access_remote_vm() +*/ + +WARN (1 ,"vvar_page accessed remotely" ); + +return NULL ; +} +#else +static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +return NULL ; +} +#endif +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {const struct vdso_image *image = vma->vm_mm->context.vdso_image; +unsigned long pfn;long sym_offset;if (!image)
@@ -130,8 +159,21 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,return VM_FAULT_SIGBUS ;if (sym_offset == image->sym_vvar_page) { -return vmf_insert_pfn (vma, vmf->address, -__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); +struct page *timens_page =find_timens_vvar_page (vma); + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; + +/* +* If a task belongs to a time namespace then a namespace +* specific VVAR is mapped with the sym_vvar_page offset and +* the real VVAR page is mapped with the sym_timens_page +* offset. +* See also the comment near timens_setup_vdso_data(). +*/ +if (timens_page) + pfn =page_to_pfn (timens_page); + +return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {struct pvclock_vsyscall_time_info *pvti =pvclock_get_pvti_cpu0_va ();
@@ -146,6 +188,14 @@ 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,virt_to_phys (tsc_pg) >>PAGE_SHIFT ); + }else if (sym_offset == image->sym_timens_page) { +struct page *timens_page =find_timens_vvar_page (vma); + +if (!timens_page) +return VM_FAULT_SIGBUS ; + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; +return vmf_insert_pfn (vma, vmf->address, pfn); }return VM_FAULT_SIGBUS ;
mm/mmap.c +2 -0
@@ -3342,6 +3342,8 @@ static const struct vm_operations_struct special_mapping_vmops = { .fault = special_mapping_fault, .mremap = special_mapping_mremap, .name = special_mapping_name, + /* vDSO code relies that VVAR can't be accessed remotely */ + .access = NULL, };static const struct vm_operations_struct legacy_special_mapping_vmops = {
[tip: timers/core] x86/vdso: Handle faults on timens page
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: af34ebeb866fafc0a9a09dda51c52ccec007ace0 Gitweb: https://git.kernel.org/tip/af34ebeb866fafc0a9a09dda51c52ccec007ace0 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:13 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:58 +01:00
x86/vdso: Handle faults on timens page
If a task belongs to a time namespace then the VVAR page which contains the system wide VDSO data is replaced with a namespace specific page which has the same layout as the VVAR page.
--- arch/x86/entry/vdso/vma.c | 54 ++++++++++++++++++++++++++++++++++++-- mm/mmap.c | 2 +- 2 files changed, 54 insertions(+), 2 deletions(-)
arch/x86/entry/vdso/vma.c +52 -2
@@ -14,11 +14,14 @@#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> #include <asm/vdso.h> #include <asm/vvar.h> +#include <asm/tlb.h> #include <asm/page.h> #include <asm/desc.h> #include <asm/cpufeature.h>
@@ -107,10 +110,36 @@ static int vvar_mremap(const struct vm_special_mapping *sm,return 0 ; } +#ifdef CONFIG_TIME_NS +static struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +if (likely (vma->vm_mm == current->mm)) +return current->nsproxy->time_ns->vvar_page; + +/* +* VM_PFNMAP | VM_IO protect .fault() handler from being called +* through interfaces like /proc/$pid/mem or +* process_vm_{readv,writev}() as long as there's no .access() +* in special_mapping_vmops(). +* For more details check_vma_flags() and __access_remote_vm() +*/ + +WARN (1 ,"vvar_page accessed remotely" ); + +return NULL ; +} +#else +static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) +{ +return NULL ; +} +#endif +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {const struct vdso_image *image = vma->vm_mm->context.vdso_image; +unsigned long pfn;long sym_offset;if (!image)
@@ -130,8 +159,21 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,return VM_FAULT_SIGBUS ;if (sym_offset == image->sym_vvar_page) { -return vmf_insert_pfn (vma, vmf->address, -__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); +struct page *timens_page =find_timens_vvar_page (vma); + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; + +/* +* If a task belongs to a time namespace then a namespace +* specific VVAR is mapped with the sym_vvar_page offset and +* the real VVAR page is mapped with the sym_timens_page +* offset. +* See also the comment near timens_setup_vdso_data(). +*/ +if (timens_page) + pfn =page_to_pfn (timens_page); + +return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {struct pvclock_vsyscall_time_info *pvti =pvclock_get_pvti_cpu0_va ();
@@ -146,6 +188,14 @@ 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,virt_to_phys (tsc_pg) >>PAGE_SHIFT ); + }else if (sym_offset == image->sym_timens_page) { +struct page *timens_page =find_timens_vvar_page (vma); + +if (!timens_page) +return VM_FAULT_SIGBUS ; + + pfn =__pa_symbol (&__vvar_page) >>PAGE_SHIFT ; +return vmf_insert_pfn (vma, vmf->address, pfn); }return VM_FAULT_SIGBUS ;
mm/mmap.c +2 -0
@@ -3342,6 +3342,8 @@ static const struct vm_operations_struct special_mapping_vmops = { .fault = special_mapping_fault, .mremap = special_mapping_mremap, .name = special_mapping_name, + /* vDSO code relies that VVAR can't be accessed remotely */ + .access = NULL, };static const struct vm_operations_struct legacy_special_mapping_vmops = {
PATCH v8 25/34 x86/vdso: On timens page fault prefault also VVAR page
In reply to Dmitry SafonovAs timens page has offsets to data on VVAR page VVAR is going to be accessed shortly. Set it up with timens in one page fault as optimization.
--- arch/x86/entry/vdso/vma.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
arch/x86/entry/vdso/vma.c +16 -1
@@ -169,8 +169,23 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,* offset. * See also the comment near timens_setup_vdso_data(). */ -if (timens_page) +if (timens_page) { +unsigned long addr; +vm_fault_t err; + +/* +* Optimization: inside time namespace pre-fault +* VVAR page too. As on timens page there are only +* offsets for clocks on VVAR, it'll be faulted +* shortly by VDSO code. +*/ + addr = vmf->address + (image->sym_timens_page - sym_offset); + err =vmf_insert_pfn (vma, addr, pfn); +if (unlikely (err &VM_FAULT_ERROR )) +return err; + pfn =page_to_pfn (timens_page); + }return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {
Signature · 1 line
2.24.0
[tip: timers/core] x86/vdso: On timens page fault prefault also VVAR page
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 4970dc4c31da81447c51a375a906616bf6618f7b Gitweb: https://git.kernel.org/tip/4970dc4c31da81447c51a375a906616bf6618f7b Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:14 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:57 +01:00
x86/vdso: On timens page fault prefault also VVAR page
As timens page has offsets to data on VVAR page VVAR is going to be accessed shortly. Set it up with timens in one page fault as optimization.
--- arch/x86/entry/vdso/vma.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
arch/x86/entry/vdso/vma.c +16 -1
@@ -170,8 +170,23 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,* offset. * See also the comment near timens_setup_vdso_data(). */ -if (timens_page) +if (timens_page) { +unsigned long addr; +vm_fault_t err; + +/* +* Optimization: inside time namespace pre-fault +* VVAR page too. As on timens page there are only +* offsets for clocks on VVAR, it'll be faulted +* shortly by VDSO code. +*/ + addr = vmf->address + (image->sym_timens_page - sym_offset); + err =vmf_insert_pfn (vma, addr, pfn); +if (unlikely (err &VM_FAULT_ERROR )) +return err; + pfn =page_to_pfn (timens_page); + }return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {
[tip: timers/core] x86/vdso: On timens page fault prefault also VVAR page
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: e6b28ec65b6d433624a2c290073bc356c4fce914 Gitweb: https://git.kernel.org/tip/e6b28ec65b6d433624a2c290073bc356c4fce914 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:14 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:59 +01:00
x86/vdso: On timens page fault prefault also VVAR page
As timens page has offsets to data on VVAR page VVAR is going to be accessed shortly. Set it up with timens in one page fault as optimization.
--- arch/x86/entry/vdso/vma.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
arch/x86/entry/vdso/vma.c +16 -1
@@ -170,8 +170,23 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,* offset. * See also the comment near timens_setup_vdso_data(). */ -if (timens_page) +if (timens_page) { +unsigned long addr; +vm_fault_t err; + +/* +* Optimization: inside time namespace pre-fault +* VVAR page too. As on timens page there are only +* offsets for clocks on VVAR, it'll be faulted +* shortly by VDSO code. +*/ + addr = vmf->address + (image->sym_timens_page - sym_offset); + err =vmf_insert_pfn (vma, addr, pfn); +if (unlikely (err &VM_FAULT_ERROR )) +return err; + pfn =page_to_pfn (timens_page); + }return vmf_insert_pfn (vma, vmf->address, pfn); }else if (sym_offset == image->sym_pvclock_page) {
PATCH v8 26/34 x86/vdso: Zap vvar pages on switch a time namspace
In reply to Dmitry SafonovThe VVAR page layout depends on whether a task belongs to the root or non-root time namespace. Whenever a task changes its namespace, the VVAR page tables are cleared and then they will re-faulted with a corresponding layout.
--- arch/x86/entry/vdso/vma.c | 27 +++++++++++++++++++++++++++ include/linux/time_namespace.h | 9 +++++++++ kernel/time/namespace.c | 10 ++++++++++ 3 files changed, 46 insertions(+)
arch/x86/entry/vdso/vma.c +27 -0
@@ -50,6 +50,7 @@ void __init init_vdso_image(const struct vdso_image *image) image->alt_len)); } +static const struct vm_special_mapping vvar_mapping;struct linux_binprm ; static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,
@@ -127,6 +128,32 @@ static struct page *find_timens_vvar_page(struct vm_area_struct *vma) return NULL; } + +/* +* The vvar page layout depends on whether a task belongs to the root or +* non-root time namespace. Whenever a task changes its namespace, the VVAR +* page tables are cleared and then they will re-faulted with a +* corresponding layout. +* See also the comment near timens_setup_vdso_data() for details. +*/ +int vdso_join_timens (struct task_struct *task,struct time_namespace *ns) +{ +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)) +zap_page_range (vma, vma->vm_start, size); + } + +up_write (&mm->mmap_sem); +return 0 ; +}#else static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) {
include/linux/time_namespace.h +9 -0
@@ -30,6 +30,9 @@ struct time_namespace {extern struct time_namespace init_time_ns;#ifdef CONFIG_TIME_NS +extern int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns); +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {kref_get (&ns->kref);
@@ -74,6 +77,12 @@ static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim) }#else +static inline int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns) +{ +return 0 ; +} +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {return NULL ;
kernel/time/namespace.c +10 -0
@@ -280,6 +280,7 @@ 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 err;if (!current_is_single_threaded ())return -EUSERS ;
@@ -290,6 +291,10 @@ static int timens_install(struct nsproxy *nsproxy, struct ns_common *new)timens_set_vvar_page (current, ns); + err =vdso_join_timens (current, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
@@ -304,6 +309,7 @@ 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 err;/* create_new_namespaces() already incremented the ref counter */ if (nsproxy->time_ns == nsproxy->time_ns_for_children)
@@ -311,6 +317,10 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)timens_set_vvar_page (tsk, ns); + err =vdso_join_timens (tsk, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
Signature · 1 line
2.24.0
[tip: timers/core] x86/vdso: Zap vvar pages when switching to a time namespace
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: fa8acdc8f8f58be60e43bae6ead83c7dd332337a Gitweb: https://git.kernel.org/tip/fa8acdc8f8f58be60e43bae6ead83c7dd332337a Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:15 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:57 +01:00
x86/vdso: Zap vvar pages when switching to a time namespace
The VVAR page layout depends on whether a task belongs to the root or non-root time namespace. Whenever a task changes its namespace, the VVAR page tables are cleared and then they will be re-faulted with a corresponding layout.
--- arch/x86/entry/vdso/vma.c | 27 +++++++++++++++++++++++++++ include/linux/time_namespace.h | 9 +++++++++ kernel/time/namespace.c | 10 ++++++++++ 3 files changed, 46 insertions(+)
arch/x86/entry/vdso/vma.c +27 -0
@@ -51,6 +51,7 @@ void __init init_vdso_image(const struct vdso_image *image) image->alt_len)); } +static const struct vm_special_mapping vvar_mapping;struct linux_binprm ; static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,
@@ -128,6 +129,32 @@ static struct page *find_timens_vvar_page(struct vm_area_struct *vma) return NULL; } + +/* +* The vvar page layout depends on whether a task belongs to the root or +* non-root time namespace. Whenever a task changes its namespace, the VVAR +* page tables are cleared and then they will re-faulted with a +* corresponding layout. +* See also the comment near timens_setup_vdso_data() for details. +*/ +int vdso_join_timens (struct task_struct *task,struct time_namespace *ns) +{ +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)) +zap_page_range (vma, vma->vm_start, size); + } + +up_write (&mm->mmap_sem); +return 0 ; +}#else static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) {
include/linux/time_namespace.h +9 -0
@@ -31,6 +31,9 @@ struct time_namespace {extern struct time_namespace init_time_ns;#ifdef CONFIG_TIME_NS +extern int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns); +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {kref_get (&ns->kref);
@@ -77,6 +80,12 @@ static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim) }#else +static inline int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns) +{ +return 0 ; +} +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {return NULL ;
kernel/time/namespace.c +10 -0
@@ -281,6 +281,7 @@ 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 err;if (!current_is_single_threaded ())return -EUSERS ;
@@ -291,6 +292,10 @@ static int timens_install(struct nsproxy *nsproxy, struct ns_common *new)timens_set_vvar_page (current, ns); + err =vdso_join_timens (current, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
@@ -305,6 +310,7 @@ 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 err;/* create_new_namespaces() already incremented the ref counter */ if (nsproxy->time_ns == nsproxy->time_ns_for_children)
@@ -312,6 +318,10 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)timens_set_vvar_page (tsk, ns); + err =vdso_join_timens (tsk, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
[tip: timers/core] x86/vdso: Zap vvar pages when switching to a time namespace
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 70ddf65184ec1e8989322f35193e4fde7377f0cc Gitweb: https://git.kernel.org/tip/70ddf65184ec1e8989322f35193e4fde7377f0cc Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:15 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:59 +01:00
x86/vdso: Zap vvar pages when switching to a time namespace
The VVAR page layout depends on whether a task belongs to the root or non-root time namespace. Whenever a task changes its namespace, the VVAR page tables are cleared and then they will be re-faulted with a corresponding layout.
--- arch/x86/entry/vdso/vma.c | 27 +++++++++++++++++++++++++++ include/linux/time_namespace.h | 9 +++++++++ kernel/time/namespace.c | 10 ++++++++++ 3 files changed, 46 insertions(+)
arch/x86/entry/vdso/vma.c +27 -0
@@ -51,6 +51,7 @@ void __init init_vdso_image(const struct vdso_image *image) image->alt_len)); } +static const struct vm_special_mapping vvar_mapping;struct linux_binprm ; static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,
@@ -128,6 +129,32 @@ static struct page *find_timens_vvar_page(struct vm_area_struct *vma) return NULL; } + +/* +* The vvar page layout depends on whether a task belongs to the root or +* non-root time namespace. Whenever a task changes its namespace, the VVAR +* page tables are cleared and then they will re-faulted with a +* corresponding layout. +* See also the comment near timens_setup_vdso_data() for details. +*/ +int vdso_join_timens (struct task_struct *task,struct time_namespace *ns) +{ +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)) +zap_page_range (vma, vma->vm_start, size); + } + +up_write (&mm->mmap_sem); +return 0 ; +}#else static inline struct page *find_timens_vvar_page (struct vm_area_struct *vma) {
include/linux/time_namespace.h +9 -0
@@ -31,6 +31,9 @@ struct time_namespace {extern struct time_namespace init_time_ns;#ifdef CONFIG_TIME_NS +extern int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns); +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {kref_get (&ns->kref);
@@ -77,6 +80,12 @@ static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim) }#else +static inline int vdso_join_timens (struct task_struct *task, +struct time_namespace *ns) +{ +return 0 ; +} +static inline struct time_namespace *get_time_ns (struct time_namespace *ns) {return NULL ;
kernel/time/namespace.c +10 -0
@@ -281,6 +281,7 @@ 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 err;if (!current_is_single_threaded ())return -EUSERS ;
@@ -291,6 +292,10 @@ static int timens_install(struct nsproxy *nsproxy, struct ns_common *new)timens_set_vvar_page (current, ns); + err =vdso_join_timens (current, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
@@ -305,6 +310,7 @@ 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 err;/* create_new_namespaces() already incremented the ref counter */ if (nsproxy->time_ns == nsproxy->time_ns_for_children)
@@ -312,6 +318,10 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)timens_set_vvar_page (tsk, ns); + err =vdso_join_timens (tsk, ns); +if (err) +return err; +get_time_ns (ns);put_time_ns (nsproxy->time_ns); nsproxy->time_ns = ns;
PATCH v8 27/34 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 | 100 +++++++++++++++++++++++++++++++++ 3 files changed, 205 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"
@@ -1533,6 +1534,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) {
@@ -3015,6 +3107,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
@@ -50,6 +50,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 = ¤t->nsproxy->time_ns->offsets;
kernel/time/namespace.c +100 -0
112 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] fs/proc: Introduce /proc/pid/timens_offsets
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0ca32229400a049d514e920b0b8f203750ab7942 Gitweb: https://git.kernel.org/tip/0ca32229400a049d514e920b0b8f203750ab7942 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:16 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:57 +01:00
fs/proc: Introduce /proc/pid/timens_offsets
API to set time namespace offsets for children processes, i.e.:
echo "$clockid $offset_sec $offset_nsec" > /proc/self/timens_offsets
--- fs/proc/base.c | 94 ++++++++++++++++++++++++++++++- include/linux/time_namespace.h | 10 +++- kernel/time/namespace.c | 101 ++++++++++++++++++++++++++++++++- 3 files changed, 205 insertions(+)
fs/proc/base.c +94 -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"
@@ -1533,6 +1534,96 @@ 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) {
@@ -3016,6 +3107,9 @@ static const struct pid_entry tgid_base_stuff[] = {#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 ONE("syscall", S_IRUSR, proc_pid_syscall),
include/linux/time_namespace.h +10 -0
@@ -52,6 +52,16 @@ static inline void put_time_ns(struct time_namespace *ns)kref_put (&ns->kref, free_time_ns); } +void proc_timens_show_offsets (struct task_struct *p,struct seq_file *m); + +struct proc_timens_offset { +int clockid; +struct timespec64 val; +}; + +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 = ¤t->nsproxy->time_ns->offsets;
kernel/time/namespace.c +101 -0
113 lines not on this page · raw message
[tip: timers/core] fs/proc: Introduce /proc/pid/timens_offsets
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 04a8682a71becdb639ec9c0d82b315a2baef7a5d Gitweb: https://git.kernel.org/tip/04a8682a71becdb639ec9c0d82b315a2baef7a5d Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:16 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:20:59 +01:00
fs/proc: Introduce /proc/pid/timens_offsets
API to set time namespace offsets for children processes, i.e.:
echo "$clockid $offset_sec $offset_nsec" > /proc/self/timens_offsets
--- fs/proc/base.c | 94 ++++++++++++++++++++++++++++++- include/linux/time_namespace.h | 10 +++- kernel/time/namespace.c | 101 ++++++++++++++++++++++++++++++++- 3 files changed, 205 insertions(+)
fs/proc/base.c +94 -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"
@@ -1533,6 +1534,96 @@ 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) {
@@ -3016,6 +3107,9 @@ static const struct pid_entry tgid_base_stuff[] = {#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 ONE("syscall", S_IRUSR, proc_pid_syscall),
include/linux/time_namespace.h +10 -0
@@ -52,6 +52,16 @@ static inline void put_time_ns(struct time_namespace *ns)kref_put (&ns->kref, free_time_ns); } +void proc_timens_show_offsets (struct task_struct *p,struct seq_file *m); + +struct proc_timens_offset { +int clockid; +struct timespec64 val; +}; + +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 = ¤t->nsproxy->time_ns->offsets;
kernel/time/namespace.c +101 -0
113 lines not on this page · raw message
PATCH v8 28/34 selftests/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.
Output on success:
1..10
ok 1 Passed for CLOCK_BOOTTIME (syscall)
ok 2 Passed for CLOCK_BOOTTIME (vdso)
ok 3 Passed for CLOCK_BOOTTIME_ALARM (syscall)
ok 4 Passed for CLOCK_BOOTTIME_ALARM (vdso)
ok 5 Passed for CLOCK_MONOTONIC (syscall)
ok 6 Passed for CLOCK_MONOTONIC (vdso)
ok 7 Passed for CLOCK_MONOTONIC_COARSE (syscall)
ok 8 Passed for CLOCK_MONOTONIC_COARSE (vdso)
ok 9 Passed for CLOCK_MONOTONIC_RAW (syscall)
ok 10 Passed for CLOCK_MONOTONIC_RAW (vdso)
# Pass 10 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..10
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..10
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 6 + tools/testing/selftests/timens/config | 1 + tools/testing/selftests/timens/log.h | 26 +++ tools/testing/selftests/timens/timens.c | 190 ++++++++++++++++++++++ tools/testing/selftests/timens/timens.h | 100 ++++++++++++ 7 files changed, 325 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
@@ -50,6 +50,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 +6 -0
@@ -0,0 +1,6 @@ +TEST_GEN_PROGS := timens + +CFLAGS := -Wall -Werror +LDFLAGS := -lrt + +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 +190 -0
190 lines not on this page · raw message
tools/testing/selftests/timens/timens.h new file +100 -0
100 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add Time Namespace test for supported clocks
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: c482c05e8ee8d6aa6b9a7b43b8b621c29be68bdf Gitweb: https://git.kernel.org/tip/c482c05e8ee8d6aa6b9a7b43b8b621c29be68bdf Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:17 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:58 +01:00
selftests/timens: Add Time Namespace test for supported clocks
A 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.
Output on success:
1..10
ok 1 Passed for CLOCK_BOOTTIME (syscall)
ok 2 Passed for CLOCK_BOOTTIME (vdso)
ok 3 Passed for CLOCK_BOOTTIME_ALARM (syscall)
ok 4 Passed for CLOCK_BOOTTIME_ALARM (vdso)
ok 5 Passed for CLOCK_MONOTONIC (syscall)
ok 6 Passed for CLOCK_MONOTONIC (vdso)
ok 7 Passed for CLOCK_MONOTONIC_COARSE (syscall)
ok 8 Passed for CLOCK_MONOTONIC_COARSE (vdso)
ok 9 Passed for CLOCK_MONOTONIC_RAW (syscall)
ok 10 Passed for CLOCK_MONOTONIC_RAW (vdso)
# Pass 10 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..10
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..10
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/Makefile | 1 +- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 6 +- tools/testing/selftests/timens/config | 1 +- tools/testing/selftests/timens/log.h | 26 +++- tools/testing/selftests/timens/timens.c | 190 +++++++++++++++++++++- tools/testing/selftests/timens/timens.h | 100 +++++++++++- 7 files changed, 325 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
@@ -50,6 +50,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 +6 -0
@@ -0,0 +1,6 @@ +TEST_GEN_PROGS := timens + +CFLAGS := -Wall -Werror +LDFLAGS := -lrt + +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 +190 -0
190 lines not on this page · raw message
tools/testing/selftests/timens/timens.h new file +100 -0
100 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add Time Namespace test for supported clocks
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 61c57676035df29a0a61991f4389e884ba0b68d7 Gitweb: https://git.kernel.org/tip/61c57676035df29a0a61991f4389e884ba0b68d7 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:17 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:00 +01:00
selftests/timens: Add Time Namespace test for supported clocks
A 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.
Output on success:
1..10
ok 1 Passed for CLOCK_BOOTTIME (syscall)
ok 2 Passed for CLOCK_BOOTTIME (vdso)
ok 3 Passed for CLOCK_BOOTTIME_ALARM (syscall)
ok 4 Passed for CLOCK_BOOTTIME_ALARM (vdso)
ok 5 Passed for CLOCK_MONOTONIC (syscall)
ok 6 Passed for CLOCK_MONOTONIC (vdso)
ok 7 Passed for CLOCK_MONOTONIC_COARSE (syscall)
ok 8 Passed for CLOCK_MONOTONIC_COARSE (vdso)
ok 9 Passed for CLOCK_MONOTONIC_RAW (syscall)
ok 10 Passed for CLOCK_MONOTONIC_RAW (vdso)
# Pass 10 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..10
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..10
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/Makefile | 1 +- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 6 +- tools/testing/selftests/timens/config | 1 +- tools/testing/selftests/timens/log.h | 26 +++- tools/testing/selftests/timens/timens.c | 190 +++++++++++++++++++++- tools/testing/selftests/timens/timens.h | 100 +++++++++++- 7 files changed, 325 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
@@ -50,6 +50,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 +6 -0
@@ -0,0 +1,6 @@ +TEST_GEN_PROGS := timens + +CFLAGS := -Wall -Werror +LDFLAGS := -lrt + +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 +190 -0
190 lines not on this page · raw message
tools/testing/selftests/timens/timens.h new file +100 -0
100 lines not on this page · raw message
PATCH v8 29/34 selftests/timens: Add a test for timerfd
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Check that timerfd_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..3
not ok 1 clockid: 7 elapsed: 0
not ok 2 clockid: 1 elapsed: 0
not ok 3 clockid: 9 elapsed: 0
Bail out!
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timerfd.c | 129 ++++++++++++++++++++++ 3 files changed, 131 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 LDFLAGS := -lrt
tools/testing/selftests/timens/timerfd.c new file +129 -0
129 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add a test for timerfd
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 6024b1e796435154034cf11d5e250fd716394ca8 Gitweb: https://git.kernel.org/tip/6024b1e796435154034cf11d5e250fd716394ca8 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:18 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:58 +01:00
selftests/timens: Add a test for timerfd
Check that timerfd_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..3
not ok 1 clockid: 7 elapsed: 0
not ok 2 clockid: 1 elapsed: 0
not ok 3 clockid: 9 elapsed: 0
Bail out!
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timerfd.c | 128 +++++++++++++++++++++- 3 files changed, 130 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 LDFLAGS := -lrt
tools/testing/selftests/timens/timerfd.c new file +128 -0
128 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add a test for timerfd
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 11873de3ce4d2fe289d51932c03b3668cf519186 Gitweb: https://git.kernel.org/tip/11873de3ce4d2fe289d51932c03b3668cf519186 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:18 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:00 +01:00
selftests/timens: Add a test for timerfd
Check that timerfd_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..3
not ok 1 clockid: 7 elapsed: 0
not ok 2 clockid: 1 elapsed: 0
not ok 3 clockid: 9 elapsed: 0
Bail out!
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timerfd.c | 128 +++++++++++++++++++++- 3 files changed, 130 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 LDFLAGS := -lrt
tools/testing/selftests/timens/timerfd.c new file +128 -0
128 lines not on this page · raw message
PATCH v8 30/34 selftests/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.
Output on success:
1..4
ok 1 clockid: 1 abs:0
ok 2 clockid: 1 abs:1
ok 3 clockid: 9 abs:0
ok 4 clockid: 9 abs:1
Output with lack of permissions:
1..4
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..4
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 4 +- .../selftests/timens/clock_nanosleep.c | 150 ++++++++++++++++++ 3 files changed, 153 insertions(+), 2 deletions(-) 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 +2 -2
@@ -1,6 +1,6 @@ -TEST_GEN_PROGS := timens timerfd +TEST_GEN_PROGS := timens timerfd clock_nanosleep -CFLAGS := -Wall -Werror +CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt include ../lib.mk
tools/testing/selftests/timens/clock_nanosleep.c new file +150 -0
150 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add a test for clock_nanosleep()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: c1cf3d3468e100a92e32a828284c6cc3c8efe7bb Gitweb: https://git.kernel.org/tip/c1cf3d3468e100a92e32a828284c6cc3c8efe7bb Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:19 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:58 +01:00
selftests/timens: Add a test for clock_nanosleep()
Check that clock_nanosleep() takes into account clock offsets.
Output on success:
1..4
ok 1 clockid: 1 abs:0
ok 2 clockid: 1 abs:1
ok 3 clockid: 9 abs:0
ok 4 clockid: 9 abs:1
Output with lack of permissions:
1..4
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..4
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 4 +- tools/testing/selftests/timens/clock_nanosleep.c | 149 ++++++++++++++- 3 files changed, 152 insertions(+), 2 deletions(-) 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 +2 -2
@@ -1,6 +1,6 @@ -TEST_GEN_PROGS := timens timerfd +TEST_GEN_PROGS := timens timerfd clock_nanosleep -CFLAGS := -Wall -Werror +CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt include ../lib.mk
tools/testing/selftests/timens/clock_nanosleep.c new file +149 -0
149 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add a test for clock_nanosleep()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 46e003433f8946283c3bfec1be854ca87b5ba402 Gitweb: https://git.kernel.org/tip/46e003433f8946283c3bfec1be854ca87b5ba402 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:19 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:01 +01:00
selftests/timens: Add a test for clock_nanosleep()
Check that clock_nanosleep() takes into account clock offsets.
Output on success:
1..4
ok 1 clockid: 1 abs:0
ok 2 clockid: 1 abs:1
ok 3 clockid: 9 abs:0
ok 4 clockid: 9 abs:1
Output with lack of permissions:
1..4
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..4
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 4 +- tools/testing/selftests/timens/clock_nanosleep.c | 149 ++++++++++++++- 3 files changed, 152 insertions(+), 2 deletions(-) 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 +2 -2
@@ -1,6 +1,6 @@ -TEST_GEN_PROGS := timens timerfd +TEST_GEN_PROGS := timens timerfd clock_nanosleep -CFLAGS := -Wall -Werror +CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt include ../lib.mk
tools/testing/selftests/timens/clock_nanosleep.c new file +149 -0
149 lines not on this page · raw message
PATCH v8 31/34 selftests/timens: Add procfs selftest
In reply to Dmitry SafonovCheck that /proc/uptime is correct inside a new time namespace.
Output on success:
1..1
ok 1 Passed for /proc/uptime
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 144 ++++++++++++++++++++++ 3 files changed, 146 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 -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/procfs.c new file +144 -0
144 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add procfs selftest
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: d5d19954beda4e563eb340d241d38132ac02c378 Gitweb: https://git.kernel.org/tip/d5d19954beda4e563eb340d241d38132ac02c378 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:20 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:59 +01:00
selftests/timens: Add procfs selftest
Check that /proc/uptime is correct inside a new time namespace.
Output on success:
1..1
ok 1 Passed for /proc/uptime
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 144 +++++++++++++++++++++- 3 files changed, 146 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 -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/procfs.c new file +144 -0
144 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add procfs selftest
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 9d1f5a8c9dadad29f72e40a409239d7b71cf3037 Gitweb: https://git.kernel.org/tip/9d1f5a8c9dadad29f72e40a409239d7b71cf3037 Author: Dmitry Safonov <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:20 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:01 +01:00
selftests/timens: Add procfs selftest
Check that /proc/uptime is correct inside a new time namespace.
Output on success:
1..1
ok 1 Passed for /proc/uptime
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 144 +++++++++++++++++++++- 3 files changed, 146 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 -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/procfs.c new file +144 -0
144 lines not on this page · raw message
PATCH v8 32/34 selftests/timens: Add timer offsets test
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Check that timer_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timer.c | 123 ++++++++++++++++++++++ 3 files changed, 125 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 +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/timer.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add timer offsets test
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: c116c543837f743e0202750be5e27fcbe8c69bc8 Gitweb: https://git.kernel.org/tip/c116c543837f743e0202750be5e27fcbe8c69bc8 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:21 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:10:59 +01:00
selftests/timens: Add timer offsets test
Check that timer_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timer.c | 122 +++++++++++++++++++++- 3 files changed, 124 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 +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/timer.c new file +122 -0
122 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add timer offsets test
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: d5b0117ddd4949e9ed882b6ef91316719826e8a8 Gitweb: https://git.kernel.org/tip/d5b0117ddd4949e9ed882b6ef91316719826e8a8 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:21 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:01 +01:00
selftests/timens: Add timer offsets test
Check that timer_create() takes into account clock offsets.
Output on success:
1..3
ok 1 clockid=7
ok 2 clockid=1
ok 3 clockid=9
# Pass 3 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..3
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..3
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timer.c | 122 +++++++++++++++++++++- 3 files changed, 124 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 +1 -1
@@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs CFLAGS := -Wall -Werror -pthread LDFLAGS := -lrt
tools/testing/selftests/timens/timer.c new file +122 -0
122 lines not on this page · raw message
PATCH v8 33/34 selftests/timens: Add a simple perf test for clock_gettime()
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Output on success:
1..4
ok 1 host: clock: monotonic cycles: 148323947
ok 2 host: clock: boottime cycles: 148577503
ok 3 ns: clock: monotonic cycles: 137659217
ok 4 ns: clock: boottime cycles: 137959154
# Pass 4 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP need to run as root
Output without support of time namespaces:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 2 + tools/testing/selftests/timens/Makefile | 3 +- tools/testing/selftests/timens/gettime_perf.c | 95 +++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/gettime_perf.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 +2 -1
@@ -1,6 +1,7 @@ TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs +TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread -LDFLAGS := -lrt +LDFLAGS := -lrt -ldl include ../lib.mk
tools/testing/selftests/timens/gettime_perf.c new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Add a simple perf test for clock_gettime()
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: bc98f39530891e14e9bf5119bd38a3a6af3a67d9 Gitweb: https://git.kernel.org/tip/bc98f39530891e14e9bf5119bd38a3a6af3a67d9 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:22 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:11:00 +01:00
selftests/timens: Add a simple perf test for clock_gettime()
Output on success:
1..4
ok 1 host: clock: monotonic cycles: 148323947
ok 2 host: clock: boottime cycles: 148577503
ok 3 ns: clock: monotonic cycles: 137659217
ok 4 ns: clock: boottime cycles: 137959154
# Pass 4 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP need to run as root
Output without support of time namespaces:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 2 +- tools/testing/selftests/timens/Makefile | 3 +- tools/testing/selftests/timens/gettime_perf.c | 95 ++++++++++++++++++- 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/gettime_perf.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 +2 -1
@@ -1,6 +1,7 @@ TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs +TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread -LDFLAGS := -lrt +LDFLAGS := -lrt -ldl include ../lib.mk
tools/testing/selftests/timens/gettime_perf.c new file +95 -0
95 lines not on this page · raw message
[tip: timers/core] selftests/timens: Add a simple perf test for clock_gettime()
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 1854b97e4fa6a476d5cdc3dc30c42e1528699f87 Gitweb: https://git.kernel.org/tip/1854b97e4fa6a476d5cdc3dc30c42e1528699f87 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:22 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:02 +01:00
selftests/timens: Add a simple perf test for clock_gettime()
Output on success:
1..4
ok 1 host: clock: monotonic cycles: 148323947
ok 2 host: clock: boottime cycles: 148577503
ok 3 ns: clock: monotonic cycles: 137659217
ok 4 ns: clock: boottime cycles: 137959154
# Pass 4 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output with lack of permissions:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP need to run as root
Output without support of time namespaces:
1..4
ok 1 host: clock: monotonic cycles: 145671139
ok 2 host: clock: boottime cycles: 146958357
not ok 3 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 2 +- tools/testing/selftests/timens/Makefile | 3 +- tools/testing/selftests/timens/gettime_perf.c | 95 ++++++++++++++++++- 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/gettime_perf.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 +2 -1
@@ -1,6 +1,7 @@ TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs +TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread -LDFLAGS := -lrt +LDFLAGS := -lrt -ldl include ../lib.mk
tools/testing/selftests/timens/gettime_perf.c new file +95 -0
95 lines not on this page · raw message
PATCH v8 34/34 selftests/timens: Check for right timens offsets after fork and exec
In reply to Dmitry SafonovFrom: Andrei Vagin <[email protected]>
Output on success:
1..1
ok 1 exec
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..1
not ok 1 36016 16
Bail out!
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/exec.c | 94 +++++++++++++++++++++++ 3 files changed, 96 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 +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread
tools/testing/selftests/timens/exec.c new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.24.0
[tip: timers/core] selftests/timens: Check for right timens offsets after fork and exec
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: b21f89bf26e8645852eea0c5c2bd179dd25ff124 Gitweb: https://git.kernel.org/tip/b21f89bf26e8645852eea0c5c2bd179dd25ff124 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:23 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 13 Jan 2020 08:11:00 +01:00
selftests/timens: Check for right timens offsets after fork and exec
Output on success:
1..1
ok 1 exec
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..1
not ok 1 36016 16
Bail out!
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/exec.c | 94 ++++++++++++++++++++++- 3 files changed, 96 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 +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread
tools/testing/selftests/timens/exec.c new file +94 -0
94 lines not on this page · raw message
[tip: timers/core] selftests/timens: Check for right timens offsets after fork and exec
In reply to Dmitry SafonovThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: a750c7474a5333a76e7278d353c460d26012deb6 Gitweb: https://git.kernel.org/tip/a750c7474a5333a76e7278d353c460d26012deb6 Author: Andrei Vagin <[email protected]> AuthorDate: Tue, 12 Nov 2019 01:27:23 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 14 Jan 2020 12:21:02 +01:00
selftests/timens: Check for right timens offsets after fork and exec
Output on success:
1..1
ok 1 exec
# Pass 1 Fail 0 Xfail 0 Xpass 0 Skip 0 Error 0
Output on failure:
1..1
not ok 1 36016 16
Bail out!
Output with lack of permissions:
1..1
not ok 1 # SKIP need to run as root
Output without support of time namespaces:
1..1
not ok 1 # SKIP Time namespaces are not supported
--- tools/testing/selftests/timens/.gitignore | 1 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/exec.c | 94 ++++++++++++++++++++++- 3 files changed, 96 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 +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread
tools/testing/selftests/timens/exec.c new file +94 -0
94 lines not on this page · raw message
Hi Thomas,
What is your plan on this series? We know you are probably busy with the next merge window. We just want to check that this is still in your TODO list.
Quoted 10 lines · Dmitry Safonov
v7..v8 Changes:
* Fix compile-time errors:
- on architectures without the support of time namespaces.
- whenCONFIG_POSIX_TIMERSisn't set.
* Added checks in selftests forCONFIG_POSIX_TIMERS.
* Inlinedo_hresanddo_coarse.
(And added Tested-by Vincenzo - thanks!)
* MakeTIME_NSdepends onGENERIC_VDSO_TIME_NSand set it per-arch.
Quoted 4 lines
[v1..v7 Changelogs is at the very bottom here]
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%
Here is a typo. The price of VDSO's clock_gettime() in a child time namespace is about 12% with a cold CPU cache. The table with measurements for a cold CPU cache contains correct data.
Quoted 3 lines
with a cold CPU cache. There is no performance regression for host processes outside time namespace on those tests.
....
Quoted 9 lines
Cold CPU cache (lesser tsc per cycle - the better):
| before |
CONFIG_TIME_NS=n| host | inside timens
--------------------------------------------------------------tsc | 476 | 480 | 487 | 531 stdev(tsc) | 0.6 | 1.3 | 4.3 | 5.7 diff (%) | 100 | 100.9 | 102 | 112
Gentle ping, in case you have time to look at this.
Quoted 27 lines · Andrei Vagin
Hi Thomas,
What is your plan on this series? We know you are probably busy with the next merge window. We just want to check that this is still in your TODO list.
Quoted 10 lines · Dmitry Safonov
v7..v8 Changes:
* Fix compile-time errors:
- on architectures without the support of time namespaces.
- whenCONFIG_POSIX_TIMERSisn't set.
* Added checks in selftests forCONFIG_POSIX_TIMERS.
* Inlinedo_hresanddo_coarse.
(And added Tested-by Vincenzo - thanks!)
* MakeTIME_NSdepends onGENERIC_VDSO_TIME_NSand set it per-arch.Quoted 4 lines
[v1..v7 Changelogs is at the very bottom here]
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%Here is a typo. The price of VDSO's
clock_gettime()in a child time namespace is about 12% with a cold CPU cache. The table with measurements for a cold CPU cache contains correct data.
Quoted 15 lines
Quoted 3 lines
with a cold CPU cache. There is no performance regression for host processes outside time namespace on those tests.
....
Quoted 9 lines
Cold CPU cache (lesser tsc per cycle - the better):
| before |
CONFIG_TIME_NS=n| host | inside timens
--------------------------------------------------------------tsc | 476 | 480 | 487 | 531 stdev(tsc) | 0.6 | 1.3 | 4.3 | 5.7 diff (%) | 100 | 100.9 | 102 | 112
Thanks,
Dmitry
Quoted 1 line · Dmitry Safonov
Gentle ping, in case you have time to look at this.
I'm looking at it and so far I'm quite happy.
Andy, Vincenco any opinions?
Thanks,
tglx
Vincenzo Frascino
maintainerHi Thomas,
Quoted 8 lines · Thomas Gleixner
Quoted 1 line · Dmitry Safonov
Gentle ping, in case you have time to look at this.
I'm looking at it and so far I'm quite happy.
Andy, Vincenco any opinions?
I started looking at them after the holidays, in general I am happy with what I have seen till now.
I would like to complete some testing especially on the platforms that are not touched by this patchset to make sure that there are no side effects on the unified vDSOs and then I think I am ok with the series.
Quoted 4 lines
Thanks,
tglx
Signature · 2 lines
Regards, Vincenzo