From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Paul Cercueil <paul@crapouillou.net>,
Thomas Gleixner <tglx@linutronix.de>
Cc: od@zcrc.me, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/2] time/sched_clock: Disable interrupts in sched_clock_register
Date: Thu, 9 Jan 2020 12:55:47 +0100 [thread overview]
Message-ID: <40cce150-0783-d382-b236-928fbe34e8d4@linaro.org> (raw)
In-Reply-To: <20200107010630.954648-1-paul@crapouillou.net>
On 07/01/2020 02:06, Paul Cercueil wrote:
> Instead of issueing a warning if sched_clock_register is called from a
> context where IRQs are enabled, the code now ensures that IRQs are
> indeed disabled.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>
> Notes:
> v2: New patch
>
> kernel/time/sched_clock.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
> index dbd69052eaa6..e4332e3e2d56 100644
> --- a/kernel/time/sched_clock.c
> +++ b/kernel/time/sched_clock.c
> @@ -169,14 +169,15 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate)
> {
> u64 res, wrap, new_mask, new_epoch, cyc, ns;
> u32 new_mult, new_shift;
> - unsigned long r;
> + unsigned long r, flags;
> char r_unit;
> struct clock_read_data rd;
>
> if (cd.rate > rate)
> return;
>
> - WARN_ON(!irqs_disabled());
> + /* Cannot register a sched_clock with interrupts on */
> + local_irq_save(flags);
>
> /* Calculate the mult/shift to convert counter ticks to ns. */
> clocks_calc_mult_shift(&new_mult, &new_shift, rate, NSEC_PER_SEC, 3600);
> @@ -233,6 +234,8 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate)
> if (irqtime > 0 || (irqtime == -1 && rate >= 1000000))
> enable_sched_clock_irqtime();
>
> + local_irq_restore(flags);
> +
> pr_debug("Registered %pS as sched_clock source\n", read);
> }
>
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2020-01-09 11:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 1:06 [PATCH v2 1/2] time/sched_clock: Disable interrupts in sched_clock_register Paul Cercueil
2020-01-07 1:06 ` [PATCH v2 2/2] clocksource: Add driver for the Ingenic JZ47xx OST Paul Cercueil
2020-01-09 14:28 ` Thomas Gleixner
2020-01-09 18:26 ` Paul Cercueil
2020-01-09 11:55 ` Daniel Lezcano [this message]
2020-01-09 17:33 ` [tip: timers/core] time/sched_clock: Disable interrupts in sched_clock_register() tip-bot2 for Paul Cercueil
2020-01-09 17:56 ` tip-bot2 for Paul Cercueil
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=40cce150-0783-d382-b236-928fbe34e8d4@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=od@zcrc.me \
--cc=paul@crapouillou.net \
--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).