[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157894256854.19145.5832898443280847905.tip-bot2@tip-bot2>
Date: Mon, 13 Jan 2020 19:09:28 -0000
From: "tip-bot2 for Andrei Vagin" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Andrei Vagin <avagin@...nvz.org>, Dmitry Safonov <dima@...sta.com>,
Thomas Gleixner <tglx@...utronix.de>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
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: a27f00cd18d392fadcaca463506303ab668a6891
Gitweb: https://git.kernel.org/tip/a27f00cd18d392fadcaca463506303ab668a6891
Author: Andrei Vagin <avagin@...il.com>
AuthorDate: Tue, 12 Nov 2019 01:27:04
Committer: Thomas Gleixner <tglx@...utronix.de>
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.
Co-developed-by: Dmitry Safonov <dima@...sta.com>
Signed-off-by: Andrei Vagin <avagin@...nvz.org>
Signed-off-by: Dmitry Safonov <dima@...sta.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.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);
Powered by blists - more mailing lists