From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: "Christopher S. Hall" <christopher.s.hall@intel.com>,
Prarit Bhargava <prarit@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Andy Lutomirski <luto@amacapital.net>,
kevin.b.stanton@intel.com, kevin.j.clarke@intel.com,
hpa@zytor.com, jeffrey.t.kirsher@intel.com,
netdev@vger.kernel.org, John Stultz <john.stultz@linaro.org>
Subject: [PATCH 3/8] time: Remove duplicated code in ktime_get_raw_and_real()
Date: Wed, 2 Mar 2016 20:21:54 -0800 [thread overview]
Message-ID: <1456978919-30076-4-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1456978919-30076-1-git-send-email-john.stultz@linaro.org>
From: "Christopher S. Hall" <christopher.s.hall@intel.com>
The code in ktime_get_snapshot() is a superset of the code in
ktime_get_raw_and_real() code. Further, ktime_get_raw_and_real() is
called only by the PPS code, pps_get_ts(). Consolidate the
pps_get_ts() code into a single function calling ktime_get_snapshot()
and eliminate ktime_get_raw_and_real(). A side effect of this is that
the raw and real results of pps_get_ts() correspond to exactly the
same clock cycle. Previously these values represented separate reads
of the system clock.
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: kevin.b.stanton@intel.com
Cc: kevin.j.clarke@intel.com
Cc: hpa@zytor.com
Cc: jeffrey.t.kirsher@intel.com
Cc: netdev@vger.kernel.org
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Christopher S. Hall <christopher.s.hall@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
include/linux/pps_kernel.h | 17 ++++++-----------
kernel/time/timekeeping.c | 40 ++--------------------------------------
2 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index 54bf148..35ac903 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -111,22 +111,17 @@ static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
kt->nsec = ts.tv_nsec;
}
-#ifdef CONFIG_NTP_PPS
-
static inline void pps_get_ts(struct pps_event_time *ts)
{
- ktime_get_raw_and_real_ts64(&ts->ts_raw, &ts->ts_real);
-}
+ struct system_time_snapshot snap;
-#else /* CONFIG_NTP_PPS */
-
-static inline void pps_get_ts(struct pps_event_time *ts)
-{
- ktime_get_real_ts64(&ts->ts_real);
+ ktime_get_snapshot(&snap);
+ ts->ts_real = ktime_to_timespec64(snap.real);
+#ifdef CONFIG_NTP_PPS
+ ts->ts_raw = ktime_to_timespec64(snap.raw);
+#endif
}
-#endif /* CONFIG_NTP_PPS */
-
/* Subtract known time delay from PPS event time(s) */
static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec64 delta)
{
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 89b4695..af19a49 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -888,6 +888,8 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
s64 nsec_real;
cycle_t now;
+ WARN_ON_ONCE(timekeeping_suspended);
+
do {
seq = read_seqcount_begin(&tk_core.seq);
@@ -905,44 +907,6 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot)
}
EXPORT_SYMBOL_GPL(ktime_get_snapshot);
-#ifdef CONFIG_NTP_PPS
-
-/**
- * ktime_get_raw_and_real_ts64 - get day and raw monotonic time in timespec format
- * @ts_raw: pointer to the timespec to be set to raw monotonic time
- * @ts_real: pointer to the timespec to be set to the time of day
- *
- * This function reads both the time of day and raw monotonic time at the
- * same time atomically and stores the resulting timestamps in timespec
- * format.
- */
-void ktime_get_raw_and_real_ts64(struct timespec64 *ts_raw, struct timespec64 *ts_real)
-{
- struct timekeeper *tk = &tk_core.timekeeper;
- unsigned long seq;
- s64 nsecs_raw, nsecs_real;
-
- WARN_ON_ONCE(timekeeping_suspended);
-
- do {
- seq = read_seqcount_begin(&tk_core.seq);
-
- *ts_raw = tk->raw_time;
- ts_real->tv_sec = tk->xtime_sec;
- ts_real->tv_nsec = 0;
-
- nsecs_raw = timekeeping_get_ns(&tk->tkr_raw);
- nsecs_real = timekeeping_get_ns(&tk->tkr_mono);
-
- } while (read_seqcount_retry(&tk_core.seq, seq));
-
- timespec64_add_ns(ts_raw, nsecs_raw);
- timespec64_add_ns(ts_real, nsecs_real);
-}
-EXPORT_SYMBOL(ktime_get_raw_and_real_ts64);
-
-#endif /* CONFIG_NTP_PPS */
-
/**
* do_gettimeofday - Returns the time of day in a timeval
* @tv: pointer to the timeval to be set
--
1.9.1
next prev parent reply other threads:[~2016-03-03 4:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 4:21 [PATCH 0/8][GIT PULL] time: Cross-timestamp infrastructure for 4.6 John Stultz
2016-03-03 4:21 ` [PATCH 1/8] time: Add cycles to nanoseconds translation John Stultz
2016-03-03 4:21 ` [PATCH 2/8] time: Add timekeeping snapshot code capturing system time and counter John Stultz
2016-03-03 4:21 ` John Stultz [this message]
2016-03-03 4:21 ` [PATCH 4/8] time: Add driver cross timestamp interface for higher precision time synchronization John Stultz
2016-03-03 4:21 ` [PATCH 5/8] time: Add history to cross timestamp interface supporting slower devices John Stultz
2016-03-03 4:21 ` [PATCH 6/8] x86: tsc: Always Running Timer (ART) correlated clocksource John Stultz
2016-03-03 10:21 ` Thomas Gleixner
2016-03-03 22:24 ` John Stultz
2016-03-03 4:21 ` [PATCH 7/8] ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping John Stultz
2016-03-03 4:21 ` [PATCH 8/8] net: e1000e: Adds hardware supported cross timestamp on e1000e nic John Stultz
2016-03-03 22:27 ` Jeff Kirsher
2016-03-03 22:29 ` John Stultz
2016-03-04 1:56 [PATCHv2 0/8][GIT PULLv2] time: Cross-timestamp infrastructure for 4.6 John Stultz
2016-03-04 1:57 ` [PATCH 3/8] time: Remove duplicated code in ktime_get_raw_and_real() 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=1456978919-30076-4-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=christopher.s.hall@intel.com \
--cc=hpa@zytor.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=kevin.b.stanton@intel.com \
--cc=kevin.j.clarke@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=tglx@linutronix.de \
/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).