From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Andrei Vagin <avagin@gmail.com>, Dmitry Safonov <dima@arista.com>,
Adrian Reber <adrian@lisas.de>, Andrei Vagin <avagin@openvz.org>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Christian Brauner <christian.brauner@ubuntu.com>,
Cyrill Gorcunov <gorcunov@openvz.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
Jann Horn <jannh@google.com>, Jeff Dike <jdike@addtoit.com>,
Oleg Nesterov <oleg@redhat.com>,
Pavel Emelyanov <xemul@virtuozzo.com>,
Shuah Khan <shuah@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
containers@lists.linux-foundation.org, criu@openvz.org,
linux-api@vger.kernel.org, x86@kernel.org
Subject: [PATCHv8 12/34] kernel: Add do_timens_ktime_to_host() helper
Date: Tue, 12 Nov 2019 01:27:01 +0000 [thread overview]
Message-ID: <20191112012724.250792-13-dima@arista.com> (raw)
In-Reply-To: <20191112012724.250792-1-dima@arista.com>
From: Andrei Vagin <avagin@gmail.com>
The helper subtracts namespace's clock offset from the given time
and checks that the result is in [0, KTIME_MAX].
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Co-developed-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
include/linux/time_namespace.h | 17 ++++++++++++++++
kernel/time/namespace.c | 36 ++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/include/linux/time_namespace.h b/include/linux/time_namespace.h
index 3d429c7ecca5..a68b1ab7b5bb 100644
--- a/include/linux/time_namespace.h
+++ b/include/linux/time_namespace.h
@@ -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 *ts
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 */
diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c
index c2a58e45fc4b..1a0fbaa5d2d4 100644
--- a/kernel/time/namespace.c
+++ b/kernel/time/namespace.c
@@ -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);
--
2.24.0
next prev parent reply other threads:[~2019-11-12 1:29 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 ` Dmitry Safonov [this message]
2020-01-13 19:09 ` [tip: timers/core] time: Add do_timens_ktime_to_host() helper 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: timers/core] " tip-bot2 for Andrei Vagin
2020-01-14 13:02 ` 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=20191112012724.250792-13-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=adrian@lisas.de \
--cc=arnd@arndb.de \
--cc=avagin@gmail.com \
--cc=avagin@openvz.org \
--cc=christian.brauner@ubuntu.com \
--cc=containers@lists.linux-foundation.org \
--cc=criu@openvz.org \
--cc=ebiederm@xmission.com \
--cc=gorcunov@openvz.org \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=jdike@addtoit.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=x86@kernel.org \
--cc=xemul@virtuozzo.com \
/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).