From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: DengChao <chao.deng@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Miroslav Lichvar <mlichvar@redhat.com>,
Prarit Bhargava <prarit@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 08/11] timekeeping: Provide internal function __ktime_get_real_seconds
Date: Fri, 18 Dec 2015 13:39:13 -0800 [thread overview]
Message-ID: <1450474756-10144-9-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1450474756-10144-1-git-send-email-john.stultz@linaro.org>
From: DengChao <chao.deng@linaro.org>
In order to fix Y2038 issues in the ntp code we will need replace
get_seconds() with ktime_get_real_seconds() but as the ntp code uses
the timekeeping lock which is also used by ktime_get_real_seconds(),
we need a version without locking.
Add a new function __ktime_get_real_seconds() in timekeeping to
do this.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: DengChao <chao.deng@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
kernel/time/timekeeping.c | 13 +++++++++++++
kernel/time/timekeeping_internal.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d9249da..21cc239 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -845,6 +845,19 @@ time64_t ktime_get_real_seconds(void)
}
EXPORT_SYMBOL_GPL(ktime_get_real_seconds);
+/**
+ * __ktime_get_real_seconds - The same as ktime_get_real_seconds
+ * but without the sequence counter protect. This internal function
+ * is called just when timekeeping lock is already held.
+ */
+time64_t __ktime_get_real_seconds(void)
+{
+ struct timekeeper *tk = &tk_core.timekeeper;
+
+ return tk->xtime_sec;
+}
+
+
#ifdef CONFIG_NTP_PPS
/**
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
index 4ea005a..e20466f 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -26,4 +26,6 @@ static inline cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t mask)
}
#endif
+extern time64_t __ktime_get_real_seconds(void);
+
#endif /* _TIMEKEEPING_INTERNAL_H */
--
1.9.1
next prev parent reply other threads:[~2015-12-18 21:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 21:39 [PATCH 00/11][GIT PULL] Timekeeping items for 4.5 John Stultz
2015-12-18 21:39 ` [PATCH 01/11] MAINTAINERS: Add entry for kernel/time/alarmtimer.c John Stultz
2015-12-18 21:39 ` [PATCH 02/11] alarmtimer: Avoid unexpected rtc interrupt when system resume from S3 John Stultz
2015-12-18 21:39 ` [PATCH 03/11] time: Avoid signed overflow in timekeeping_get_ns() John Stultz
2015-12-18 21:39 ` [PATCH 04/11] clocksource: Add CPU info to clocksource watchdog reporting John Stultz
2015-12-18 21:39 ` [PATCH 05/11] selftests/timers: fix write return value handlng John Stultz
2015-12-18 21:39 ` [PATCH 06/11] ntp: Verify offset doesn't overflow in ntp_update_offset John Stultz
2015-12-18 21:39 ` [PATCH 07/11] time: Verify time values in adjtimex ADJ_SETOFFSET to avoid overflow John Stultz
2015-12-18 21:39 ` John Stultz [this message]
2015-12-18 21:39 ` [PATCH 09/11] ntp: Change time_reftime to time64_t and utilize 64bit __ktime_get_real_seconds John Stultz
2015-12-18 21:39 ` [PATCH 10/11] ntp: Fix second_overflow's input parameter type to be 64bits John Stultz
2015-12-18 21:39 ` [PATCH 11/11] timekeeping: Cap adjustments so they don't exceed the maxadj value 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=1450474756-10144-9-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=chao.deng@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mlichvar@redhat.com \
--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
Powered by JetHome