From: "tip-bot2 for Andrei Vagin" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Andrei Vagin <avagin@gmail.com>, Dmitry Safonov <dima@arista.com>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] posix-clocks: Rename .clock_get_timespec() callbacks accordingly
Date: Mon, 13 Jan 2020 19:09:30 -0000 [thread overview]
Message-ID: <157894257072.19145.6442283045077975243.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191112012724.250792-7-dima@arista.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 80703145d5feb87c34333d1a136b5ecbcfa09eef
Gitweb: https://git.kernel.org/tip/80703145d5feb87c34333d1a136b5ecbcfa09eef
Author: Andrei Vagin <avagin@gmail.com>
AuthorDate: Tue, 12 Nov 2019 01:26:55
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 13 Jan 2020 08:10:48 +01:00
posix-clocks: Rename .clock_get_timespec() callbacks accordingly
The upcoming support for time namespaces requires to have access to:
- The time in a task's time namespace for sys_clock_gettime()
- The time in the root name space for common_timer_get()
That adds a valid reason to finally implement a separate callback which
returns the time in ktime_t format in (struct k_clock).
As a preparation ground for introducing clock_get_ktime(), the original
callback clock_get() was renamed into clock_get_timespec().
Reflect the renaming into the callback implementations.
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Co-developed-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20191112012724.250792-7-dima@arista.com
---
kernel/time/alarmtimer.c | 6 +++---
kernel/time/posix-timers.c | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 8523df7..62b06cf 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -657,13 +657,13 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp
}
/**
- * alarm_clock_get - posix clock_get_timespec interface
+ * alarm_clock_get_timespec - posix clock_get_timespec interface
* @which_clock: clockid
* @tp: timespec to fill.
*
* Provides the underlying alarm base time.
*/
-static int alarm_clock_get(clockid_t which_clock, struct timespec64 *tp)
+static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tp)
{
struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)];
@@ -837,7 +837,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
const struct k_clock alarm_clock = {
.clock_getres = alarm_clock_getres,
- .clock_get_timespec = alarm_clock_get,
+ .clock_get_timespec = alarm_clock_get_timespec,
.timer_create = alarm_timer_create,
.timer_set = common_timer_set,
.timer_del = common_timer_del,
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 44d4f9c..68d4690 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -165,7 +165,7 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
}
/* Get clock_realtime */
-static int posix_clock_realtime_get(clockid_t which_clock, struct timespec64 *tp)
+static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64 *tp)
{
ktime_get_real_ts64(tp);
return 0;
@@ -187,7 +187,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,
/*
* Get monotonic time for posix timers
*/
-static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp)
+static int posix_get_monotonic_timespec(clockid_t which_clock, struct timespec64 *tp)
{
ktime_get_ts64(tp);
return 0;
@@ -222,13 +222,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *
return 0;
}
-static int posix_get_boottime(const clockid_t which_clock, struct timespec64 *tp)
+static int posix_get_boottime_timespec(const clockid_t which_clock, struct timespec64 *tp)
{
ktime_get_boottime_ts64(tp);
return 0;
}
-static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp)
+static int posix_get_tai_timespec(clockid_t which_clock, struct timespec64 *tp)
{
ktime_get_clocktai_ts64(tp);
return 0;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,
static const struct k_clock clock_realtime = {
.clock_getres = posix_get_hrtimer_res,
- .clock_get_timespec = posix_clock_realtime_get,
+ .clock_get_timespec = posix_get_realtime_timespec,
.clock_set = posix_clock_realtime_set,
.clock_adj = posix_clock_realtime_adj,
.nsleep = common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = {
static const struct k_clock clock_monotonic = {
.clock_getres = posix_get_hrtimer_res,
- .clock_get_timespec = posix_ktime_get_ts,
+ .clock_get_timespec = posix_get_monotonic_timespec,
.nsleep = common_nsleep,
.timer_create = common_timer_create,
.timer_set = common_timer_set,
@@ -1310,7 +1310,7 @@ static const struct k_clock clock_monotonic_coarse = {
static const struct k_clock clock_tai = {
.clock_getres = posix_get_hrtimer_res,
- .clock_get_timespec = posix_get_tai,
+ .clock_get_timespec = posix_get_tai_timespec,
.nsleep = common_nsleep,
.timer_create = common_timer_create,
.timer_set = common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = {
static const struct k_clock clock_boottime = {
.clock_getres = posix_get_hrtimer_res,
- .clock_get_timespec = posix_get_boottime,
+ .clock_get_timespec = posix_get_boottime_timespec,
.nsleep = common_nsleep,
.timer_create = common_timer_create,
.timer_set = common_timer_set,
next prev parent reply other threads:[~2020-01-13 19:10 UTC|newest]
Thread overview: 160+ 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 ` Dmitry Safonov
2019-11-12 1:26 ` [PATCHv8 01/34] lib/vdso: Add unlikely() hint into vdso_read_begin() Dmitry Safonov
2019-11-12 1:26 ` 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
2019-11-12 1:26 ` Dmitry Safonov
2020-01-10 9:45 ` Vincenzo Frascino
2020-01-10 9:45 ` Vincenzo Frascino
2020-01-10 11:42 ` Thomas Gleixner
2020-01-10 11:47 ` Vincenzo Frascino
2020-01-10 11:47 ` Vincenzo Frascino
2020-01-10 12:02 ` Thomas Gleixner
2020-01-10 12:18 ` Vincenzo Frascino
2020-01-10 12:18 ` Vincenzo Frascino
2020-01-13 5:27 ` Andrei Vagin
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
2019-11-12 1:26 ` 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:12 ` Dmitry Vyukov
2020-01-27 14:19 ` Dmitry Safonov
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
2019-11-12 1:26 ` 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
2019-11-12 1:26 ` 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:26 ` [PATCHv8 07/34] alarmtimer: Rename gettime() callback to get_ktime() Dmitry Safonov
2019-11-12 1:26 ` 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
2019-11-12 1:26 ` 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
2019-11-12 1:26 ` 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
2019-11-12 1:26 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` Dmitry Safonov
2020-01-12 10:32 ` Thomas Gleixner
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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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
2019-11-12 1:27 ` 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=157894257072.19145.6442283045077975243.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=avagin@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.