| Date | Tue, 14 Jan 2020 13:02:17 -0000 | From | "tip-bot2 for Andrei Vagin" <> | Subject | [tip: timers/core] alarmtimer: Make nanosleep() time namespace aware |
| |
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 <avagin@gmail.com> AuthorDate: Tue, 12 Nov 2019 01:27:04 Committer: Thomas Gleixner <tglx@linutronix.de> 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.
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-16-dima@arista.com
--- kernel/time/alarmtimer.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 9a8e81b..b51b36e 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -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);
|