From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, peterz@infradead.org,
linux-kernel@vger.kernel.org, hpa@zytor.com,
john.stultz@linaro.org, tglx@linutronix.de
Subject: [tip:perf/timer] time: Introduce tk_fast_raw
Date: Fri, 27 Mar 2015 04:45:32 -0700 [thread overview]
Message-ID: <tip-f09cb9a1808e35ad7502ea39b6bfb443c7fa0f19@git.kernel.org> (raw)
In-Reply-To: <20150319093400.562746929@infradead.org>
Commit-ID: f09cb9a1808e35ad7502ea39b6bfb443c7fa0f19
Gitweb: http://git.kernel.org/tip/f09cb9a1808e35ad7502ea39b6bfb443c7fa0f19
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Thu, 19 Mar 2015 09:39:08 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 27 Mar 2015 09:45:09 +0100
time: Introduce tk_fast_raw
Add the NMI safe CLOCK_MONOTONIC_RAW accessor..
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150319093400.562746929@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/timekeeping.h | 1 +
kernel/time/timekeeping.c | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 3eaae47..f36b1ed 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -220,6 +220,7 @@ static inline u64 ktime_get_raw_ns(void)
}
extern u64 ktime_get_mono_fast_ns(void);
+extern u64 ktime_get_raw_fast_ns(void);
/*
* Timespec interfaces utilizing the ktime based ones
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 278373e..c3fcff0 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -59,6 +59,7 @@ struct tk_fast {
};
static struct tk_fast tk_fast_mono ____cacheline_aligned;
+static struct tk_fast tk_fast_raw ____cacheline_aligned;
/* flag for if timekeeping is suspended */
int __read_mostly timekeeping_suspended;
@@ -434,6 +435,12 @@ u64 ktime_get_mono_fast_ns(void)
}
EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
+u64 ktime_get_raw_fast_ns(void)
+{
+ return __ktime_get_fast_ns(&tk_fast_raw);
+}
+EXPORT_SYMBOL_GPL(ktime_get_raw_fast_ns);
+
/* Suspend-time cycles value for halted fast timekeeper. */
static cycle_t cycles_at_suspend;
@@ -461,6 +468,11 @@ static void halt_fast_timekeeper(struct timekeeper *tk)
cycles_at_suspend = tkr->read(tkr->clock);
tkr_dummy.read = dummy_clock_read;
update_fast_timekeeper(&tkr_dummy, &tk_fast_mono);
+
+ tkr = &tk->tkr_raw;
+ memcpy(&tkr_dummy, tkr, sizeof(tkr_dummy));
+ tkr_dummy.read = dummy_clock_read;
+ update_fast_timekeeper(&tkr_dummy, &tk_fast_raw);
}
#ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD
@@ -592,6 +604,7 @@ static void timekeeping_update(struct timekeeper *tk, unsigned int action)
sizeof(tk_core.timekeeper));
update_fast_timekeeper(&tk->tkr_mono, &tk_fast_mono);
+ update_fast_timekeeper(&tk->tkr_raw, &tk_fast_raw);
}
/**
next prev parent reply other threads:[~2015-03-27 11:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 9:31 [RFC][PATCH 0/4] Another go at ktime_get_raw_fast_ns() Peter Zijlstra
2015-03-19 9:31 ` [RFC][PATCH 1/4] time: Rename timekeeper::tkr to timekeeper::tkr_mono Peter Zijlstra
2015-03-27 11:44 ` [tip:perf/timer] time: Rename timekeeper::tkr to timekeeper:: tkr_mono tip-bot for Peter Zijlstra
2015-03-19 9:31 ` [RFC][PATCH 2/4] time: Add timerkeeper::tkr_raw Peter Zijlstra
2015-03-27 11:44 ` [tip:perf/timer] " tip-bot for Peter Zijlstra
2015-03-19 9:31 ` [RFC][PATCH 3/4] time: Parametrize all tk_fast_mono users Peter Zijlstra
2015-03-27 11:45 ` [tip:perf/timer] " tip-bot for Peter Zijlstra
2015-03-19 9:31 ` [RFC][PATCH 4/4] time: Introduce tk_fast_raw Peter Zijlstra
2015-03-27 11:45 ` tip-bot for Peter Zijlstra [this message]
2015-03-24 15:20 ` [RFC][PATCH 0/4] Another go at ktime_get_raw_fast_ns() John Stultz
2015-03-24 15:48 ` Peter Zijlstra
2015-03-24 16:00 ` John Stultz
2015-03-24 21:02 ` John Stultz
2015-03-25 14:58 ` Peter Zijlstra
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=tip-f09cb9a1808e35ad7502ea39b6bfb443c7fa0f19@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--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