Messages in this thread Patch in this message | | | Date | Tue, 14 Jan 2020 13:02:18 -0000 | From | "tip-bot2 for Andrei Vagin" <> | Subject | [tip: timers/core] posix-timers: Make timer_settime() time namespace aware |
| |
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 <avagin@gmail.com> AuthorDate: Tue, 12 Nov 2019 01:27:03 Committer: Thomas Gleixner <tglx@linutronix.de> 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.
Co-developed-by: Dmitry Safonov <dima@arista.com> Signed-off-by: Andrei Vagin <avagin@openvz.org> Signed-off-by: Dmitry Safonov <dima@arista.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20191112012724.250792-15-dima@arista.com
--- kernel/time/posix-timers.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index d26b915..473082b 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -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);
| |