From: Pavel Tatashin <pasha.tatashin@oracle.com>
To: steven.sistare@oracle.com, daniel.m.jordan@oracle.com,
linux@armlinux.org.uk, schwidefsky@de.ibm.com,
heiko.carstens@de.ibm.com, john.stultz@linaro.org,
sboyd@codeaurora.org, x86@kernel.org,
linux-kernel@vger.kernel.org, mingo@redhat.com,
tglx@linutronix.de, hpa@zytor.com, douly.fnst@cn.fujitsu.com,
peterz@infradead.org, prarit@redhat.com, feng.tang@intel.com,
pmladek@suse.com, gnomes@lxorguk.ukuu.org.uk,
linux-s390@vger.kernel.org, pasha.tatashin@oracle.com,
boris.ostrovsky@oracle.com, jgross@suse.com
Subject: [PATCH v13 17/18] sched: early boot clock
Date: Wed, 11 Jul 2018 20:04:18 -0400 [thread overview]
Message-ID: <20180712000419.5165-18-pasha.tatashin@oracle.com> (raw)
In-Reply-To: <20180712000419.5165-1-pasha.tatashin@oracle.com>
Allow sched_clock() to be used before schec_clock_init() is called.
This provides with a way to get early boot timestamps on machines with
unstable clocks.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
---
init/main.c | 2 +-
kernel/sched/clock.c | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/init/main.c b/init/main.c
index 162d931c9511..ff0a24170b95 100644
--- a/init/main.c
+++ b/init/main.c
@@ -642,7 +642,6 @@ asmlinkage __visible void __init start_kernel(void)
softirq_init();
timekeeping_init();
time_init();
- sched_clock_init();
printk_safe_init();
perf_event_init();
profile_init();
@@ -697,6 +696,7 @@ asmlinkage __visible void __init start_kernel(void)
acpi_early_init();
if (late_time_init)
late_time_init();
+ sched_clock_init();
calibrate_delay();
pid_idr_init();
anon_vma_init();
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index 3b02be1fdfda..4d07b785d566 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -201,7 +201,15 @@ static void __sched_clock_gtod_offset(void)
void __init sched_clock_init(void)
{
+ unsigned long flags;
+
sched_clock_running = 1;
+
+ /* Adjust __gtod_offset for contigious transition from early clock */
+ local_irq_save(flags);
+ sched_clock_tick();
+ local_irq_restore(flags);
+ __sched_clock_gtod_offset();
}
/*
* We run this as late_initcall() such that it runs after all built-in drivers,
@@ -355,7 +363,7 @@ u64 sched_clock_cpu(int cpu)
return sched_clock() + __sched_clock_offset;
if (unlikely(!sched_clock_running))
- return 0ull;
+ return sched_clock();
preempt_disable_notrace();
scd = cpu_sdc(cpu);
--
2.18.0
next prev parent reply other threads:[~2018-07-12 0:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 0:04 [PATCH v13 00/18] Early boot time stamps Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 01/18] x86: text_poke() may access uninitialized struct pages Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 02/18] x86: initialize static branching early Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 03/18] x86/CPU: Call detect_nopl() only on the BSP Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 04/18] x86/tsc: redefine notsc to behave as tsc=unstable Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 05/18] kvm/x86: remove kvm memblock dependency Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 06/18] x86/xen/time: initialize pv xen time in init_hypervisor_platform Pavel Tatashin
2018-07-13 1:57 ` Pavel Tatashin
2018-07-17 15:28 ` Boris Ostrovsky
2018-07-18 1:38 ` Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 07/18] x86/xen/time: output xen sched_clock time from 0 Pavel Tatashin
2018-07-17 15:43 ` Boris Ostrovsky
2018-07-18 1:59 ` Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 08/18] s390/time: add read_persistent_wall_and_boot_offset() Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 09/18] time: replace read_boot_clock64() with read_persistent_wall_and_boot_offset() Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 10/18] time: default boot time offset to local_clock() Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 11/18] s390/time: remove read_boot_clock64() Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 12/18] ARM/time: " Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 13/18] x86/tsc: calibrate tsc only once Pavel Tatashin
2018-07-13 7:22 ` Dou Liyang
2018-07-13 11:30 ` Pavel Tatashin
2018-07-16 9:32 ` Dou Liyang
2018-07-16 13:35 ` Pavel Tatashin
2018-07-17 8:59 ` Dou Liyang
2018-07-17 14:36 ` Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 14/18] x86/tsc: initialize cyc2ns when tsc freq. is determined Pavel Tatashin
2018-07-13 9:11 ` Dou Liyang
2018-07-13 11:39 ` Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 15/18] x86/tsc: use tsc early Pavel Tatashin
2018-07-12 0:04 ` [PATCH v13 16/18] sched: move sched clock initialization and merge with generic clock Pavel Tatashin
2018-07-12 23:50 ` kbuild test robot
2018-07-12 0:04 ` Pavel Tatashin [this message]
2018-07-12 0:04 ` [PATCH v13 18/18] sched: use static key for sched_clock_running Pavel Tatashin
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=20180712000419.5165-18-pasha.tatashin@oracle.com \
--to=pasha.tatashin@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=daniel.m.jordan@oracle.com \
--cc=douly.fnst@cn.fujitsu.com \
--cc=feng.tang@intel.com \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=prarit@redhat.com \
--cc=sboyd@codeaurora.org \
--cc=schwidefsky@de.ibm.com \
--cc=steven.sistare@oracle.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
all inboxes | Powered by JetHome®