From: "Christopher S. Hall" <christopher.s.hall@intel.com>
To: tglx@linutronix.de, richardcochran@gmail.com, mingo@redhat.com,
john.stultz@linaro.org, hpa@zytor.com,
jeffrey.t.kirsher@intel.com
Cc: "Christopher S. Hall" <christopher.s.hall@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
kevin.b.stanton@intel.com
Subject: [PATCH v6 5/9] Add timekeeping snapshot code capturing system time and counter
Date: Wed, 13 Jan 2016 04:12:25 -0800 [thread overview]
Message-ID: <1452687149-11281-6-git-send-email-christopher.s.hall@intel.com> (raw)
In-Reply-To: <1452687149-11281-1-git-send-email-christopher.s.hall@intel.com>
In the current timekeeping code there isn't any interface to
atomically capture the current relationship between the system counter
and system time. ktime_get_snapshot() returns this triple (counter,
monotonic raw, realtime) in the system_time_snapshot struct.
Signed-off-by: Christopher S. Hall <christopher.s.hall@intel.com>
---
include/linux/clocksource.h | 13 +++++++++++++
include/linux/timekeeping.h | 6 ++++++
kernel/time/timekeeping.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 726ca68..cccbd1c 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -281,4 +281,17 @@ struct correlated_cs {
cycle_t cycles);
};
+/*
+ * struct system_time_snapshot - simultaneous raw/real time capture with
+ * counter value
+ * @cycles: Clocksource counter value to produce the system times
+ * @real: Realtime system time
+ * @raw: Monotonic raw system time
+ */
+struct system_time_snapshot {
+ cycles_t cycles;
+ ktime_t real;
+ ktime_t raw;
+};
+
#endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 2651e0a..f5fe657 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -301,6 +301,12 @@ struct sync_device_time_cb {
extern int get_device_system_crosststamp(struct sync_device_time_cb *cb,
struct system_device_crosststamp *ts);
+struct system_time_snapshot;
+/*
+ * Simultaneously snapshot realtime and monotonic raw clocks
+ */
+extern void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot);
+
/*
* Persistent clock related interfaces
*/
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 84534f8..26049df 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -862,6 +862,37 @@ time64_t ktime_get_real_seconds(void)
}
EXPORT_SYMBOL_GPL(ktime_get_real_seconds);
+/**
+ * ktime_get_snapshot - snapshots the realtime/monotonic raw clocks with counter
+ * @systime_snapshot: pointer to struct receiving the system time snapshot
+ */
+void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
+{
+ struct timekeeper *tk = &tk_core.timekeeper;
+ unsigned long seq;
+ ktime_t base_raw;
+ ktime_t base_real;
+ s64 nsec_raw;
+ s64 nsec_real;
+ cycle_t now;
+
+ do {
+ seq = read_seqcount_begin(&tk_core.seq);
+
+ now = tk->tkr_mono.read(tk->tkr_mono.clock);
+ base_real = ktime_add(tk->tkr_mono.base,
+ tk_core.timekeeper.offs_real);
+ base_raw = tk->tkr_raw.base;
+ nsec_real = timekeeping_cycles_to_ns(&tk->tkr_mono, now);
+ nsec_raw = timekeeping_cycles_to_ns(&tk->tkr_raw, now);
+ } while (read_seqcount_retry(&tk_core.seq, seq));
+
+ systime_snapshot->cycles = now;
+ systime_snapshot->real = ktime_add_ns(base_real, nsec_real);
+ systime_snapshot->raw = ktime_add_ns(base_raw, nsec_raw);
+}
+EXPORT_SYMBOL_GPL(ktime_get_snapshot);
+
#ifdef CONFIG_NTP_PPS
/**
--
2.1.4
next prev parent reply other threads:[~2016-01-13 12:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 12:12 [PATCH v6 0/9] Patchset enabling hardware based cross-timestamps for next gen Intel platforms Christopher S. Hall
2016-01-13 12:12 ` [PATCH v6 1/9] Add cycles to nanoseconds translation Christopher S. Hall
2016-01-13 12:12 ` [PATCH v6 2/9] Add driver cross timestamp interface for higher precision time synchronization Christopher S. Hall
2016-01-13 21:30 ` Richard Cochran
2016-01-13 12:12 ` [PATCH v6 3/9] Add correlated clocksource relating aliased auxiliary and system clocks Christopher S. Hall
2016-01-15 0:24 ` John Stultz
2016-01-15 10:29 ` Thomas Gleixner
2016-01-13 12:12 ` [PATCH v6 4/9] Always Running Timer (ART) correlated clocksource Christopher S. Hall
2016-01-14 22:00 ` John Stultz
2016-01-13 12:12 ` Christopher S. Hall [this message]
2016-01-13 12:12 ` [PATCH v6 6/9] Add history to cross timestamp interface supporting slower devices Christopher S. Hall
2016-01-13 12:12 ` [PATCH v6 7/9] Remove duplicated code in ktime_get_raw_and_real() Christopher S. Hall
2016-01-13 12:12 ` [PATCH v6 8/9] Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping Christopher S. Hall
2016-01-13 21:31 ` Richard Cochran
2016-01-13 12:12 ` [PATCH v6 9/9] Adds hardware supported cross timestamp Christopher S. Hall
2016-01-15 0:49 ` [PATCH v6 0/9] Patchset enabling hardware based cross-timestamps for next gen Intel platforms John Stultz
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=1452687149-11281-6-git-send-email-christopher.s.hall@intel.com \
--to=christopher.s.hall@intel.com \
--cc=hpa@zytor.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=john.stultz@linaro.org \
--cc=kevin.b.stanton@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--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).