From: tip-bot for Pavel Tatashin <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: peterz@infradead.org, mingo@kernel.org, linux@roeck-us.net,
tglx@linutronix.de, pasha.tatashin@oracle.com,
linux-kernel@vger.kernel.org, hpa@zytor.com
Subject: [tip:x86/timers] sched/clock: Disable interrupts when calling generic_sched_clock_init()
Date: Mon, 30 Jul 2018 10:37:22 -0700 [thread overview]
Message-ID: <tip-bd9f943e5d2a42d864f9692477a25034c9d47dcc@git.kernel.org> (raw)
In-Reply-To: <20180730135252.24599-1-pasha.tatashin@oracle.com>
Commit-ID: bd9f943e5d2a42d864f9692477a25034c9d47dcc
Gitweb: https://git.kernel.org/tip/bd9f943e5d2a42d864f9692477a25034c9d47dcc
Author: Pavel Tatashin <pasha.tatashin@oracle.com>
AuthorDate: Mon, 30 Jul 2018 09:52:52 -0400
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 30 Jul 2018 19:33:35 +0200
sched/clock: Disable interrupts when calling generic_sched_clock_init()
sched_clock_init() used be called early during boot when interrupts were
still disabled. After the recent changes to utilize sched clock early the
sched_clock_init() call happens when interrupts are already enabled, which
triggers the following warning:
WARNING: CPU: 0 PID: 0 at kernel/time/sched_clock.c:180 sched_clock_register+0x44/0x278
[<c001a13c>] (warn_slowpath_null) from [<c052367c>] (sched_clock_register+0x44/0x278)
[<c052367c>] (sched_clock_register) from [<c05238d8>] (generic_sched_clock_init+0x28/0x88)
[<c05238d8>] (generic_sched_clock_init) from [<c0521a00>] (sched_clock_init+0x54/0x74)
[<c0521a00>] (sched_clock_init) from [<c0519c18>] (start_kernel+0x310/0x3e4)
[<c0519c18>] (start_kernel) from [<00000000>] ( (null))
Disable IRQs for the duration of generic_sched_clock_init().
Fixes: 857baa87b642 ("sched/clock: Enable sched clock early")
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: steven.sistare@oracle.com
Cc: daniel.m.jordan@oracle.com
Link: https://lkml.kernel.org/r/20180730135252.24599-1-pasha.tatashin@oracle.com
---
kernel/sched/clock.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index 811a39aca1ce..e3e3b979f9bd 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -452,7 +452,9 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);
void __init sched_clock_init(void)
{
static_branch_inc(&sched_clock_running);
+ local_irq_disable();
generic_sched_clock_init();
+ local_irq_enable();
}
u64 sched_clock_cpu(int cpu)
next prev parent reply other threads:[~2018-07-30 17:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 13:52 [PATCH] sched/clock: disable irq for generic_sched_clock_init Pavel Tatashin
2018-07-30 17:37 ` tip-bot for Pavel Tatashin [this message]
2018-07-31 13:19 ` Guenter Roeck
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-bd9f943e5d2a42d864f9692477a25034c9d47dcc@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mingo@kernel.org \
--cc=pasha.tatashin@oracle.com \
--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