From: "tip-bot2 for Andrei Vagin" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andrei Vagin <avagin@openvz.org>,
Dmitry Safonov <dima@arista.com>,
Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] hrtimers: Prepare hrtimer_nanosleep() for time namespaces
Date: Mon, 13 Jan 2020 19:09:28 -0000 [thread overview]
Message-ID: <157894256832.19145.15089599982985746287.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191112012724.250792-17-dima@arista.com>
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 <avagin@gmail.com>
AuthorDate: Tue, 12 Nov 2019 01:27:05
Committer: Thomas Gleixner <tglx@linutronix.de>
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.
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-17-dima@arista.com
---
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(-)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 1f98b52..15c8ac3 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -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,
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 8de90ea..d8b62f9 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -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
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index bcbaa20..5745a13 100644
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -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);
}
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 473082b..75fee6e 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -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);
}
diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c
index b9c2032..e6b6181 100644
--- a/tools/perf/examples/bpf/5sec.c
+++ b/tools/perf/examples/bpf/5sec.c
@@ -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);
next prev parent reply other threads:[~2020-01-13 19:11 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 1:26 [PATCHv8 00/34] kernel: Introduce Time Namespace Dmitry Safonov
2019-11-12 1:26 ` [PATCHv8 01/34] lib/vdso: Add unlikely() hint into vdso_read_begin() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 02/34] lib/vdso: make do_hres and do_coarse as __always_inline Dmitry Safonov
2020-01-10 9:45 ` Vincenzo Frascino
2020-01-10 11:42 ` Thomas Gleixner
2020-01-10 11:47 ` Vincenzo Frascino
2020-01-10 12:02 ` Thomas Gleixner
2020-01-10 12:18 ` Vincenzo Frascino
2020-01-13 5:27 ` Andrei Vagin
2020-01-13 19:09 ` [tip: timers/core] lib/vdso: Mark do_hres() and do_coarse() " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 03/34] ns: Introduce Time Namespace Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2020-01-27 14:12 ` [PATCHv8 03/34] " Dmitry Vyukov
2020-01-27 14:19 ` Dmitry Safonov
2020-02-17 14:20 ` Time Namespaces: CLONE_NEWTIME and clone3()? Michael Kerrisk
2020-02-17 14:59 ` Christian Brauner
2020-02-17 21:47 ` Michael Kerrisk (man-pages)
2020-02-17 23:03 ` Christian Brauner
2020-02-17 23:29 ` Thomas Gleixner
2020-02-18 2:37 ` Eric W. Biederman
2020-02-18 17:11 ` Adrian Reber
2020-02-18 17:26 ` Christian Brauner
2019-11-12 1:26 ` [PATCHv8 04/34] time: Add timens_offsets to be used for tasks in timens Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] time: Add timens_offsets to be used for tasks in time namespace tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 05/34] posix-clocks: Rename the clock_get() callback to clock_get_timespec() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 06/34] posix-clocks: Rename .clock_get_timespec() callbacks accordingly Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 07/34] alarmtimer: Rename gettime() callback to get_ktime() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 08/34] alarmtimer: Provide get_timespec() callback Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 09/34] posix-clocks: Introduce clock_get_ktime() callback Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:26 ` [PATCHv8 10/34] posix-timers: Use clock_get_ktime() in common_timer_get() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 11/34] posix-clocks: Wire up clock_gettime() with timens offsets Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 12/34] kernel: Add do_timens_ktime_to_host() helper Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] time: " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 13/34] timerfd: Make timerfd_settime() time namespace aware Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 14/34] posix-timers: Make timer_settime() " Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 15/34] alarmtimer: Make nanosleep " Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] alarmtimer: Make nanosleep() " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 16/34] hrtimers: Prepare hrtimer_nanosleep() for time namespaces Dmitry Safonov
2020-01-13 19:09 ` tip-bot2 for Andrei Vagin [this message]
2020-01-14 13:02 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 17/34] posix-timers: Make clock_nanosleep() time namespace aware Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 18/34] fs/proc: Respect boottime inside time namespace for /proc/uptime Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 19/34] x86/vdso: Restrict splitting VVAR VMA Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 20/34] lib/vdso: Prepare for time namespace support Dmitry Safonov
2020-01-12 10:32 ` Thomas Gleixner
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2020-01-14 13:02 ` tip-bot2 for Thomas Gleixner
2019-11-12 1:27 ` [PATCHv8 21/34] x86/vdso: Provide vdso_data offset on vvar_page Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 22/34] x86/vdso: Add timens page Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] x86/vdso: Add time napespace page tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 23/34] time: Allocate per-timens vvar page Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 24/34] x86/vdso: Handle faults on timens page Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 25/34] x86/vdso: On timens page fault prefault also VVAR page Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 26/34] x86/vdso: Zap vvar pages on switch a time namspace Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] x86/vdso: Zap vvar pages when switching to a time namespace tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 27/34] fs/proc: Introduce /proc/pid/timens_offsets Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 28/34] selftests/timens: Add Time Namespace test for supported clocks Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 29/34] selftests/timens: Add a test for timerfd Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 30/34] selftests/timens: Add a test for clock_nanosleep() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 31/34] selftests/timens: Add procfs selftest Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Dmitry Safonov
2020-01-14 13:02 ` tip-bot2 for Dmitry Safonov
2019-11-12 1:27 ` [PATCHv8 32/34] selftests/timens: Add timer offsets test Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 33/34] selftests/timens: Add a simple perf test for clock_gettime() Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-12 1:27 ` [PATCHv8 34/34] selftests/timens: Check for right timens offsets after fork and exec Dmitry Safonov
2020-01-13 19:09 ` [tip: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` tip-bot2 for Andrei Vagin
2019-11-21 18:05 ` [PATCHv8 00/34] kernel: Introduce Time Namespace Andrei Vagin
2019-12-11 20:38 ` Dmitry Safonov
2020-01-09 21:09 ` Thomas Gleixner
2020-01-10 9:52 ` Vincenzo Frascino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157894256832.19145.15089599982985746287.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=avagin@openvz.org \
--cc=dima@arista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).