[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZFnkp6dlOuJqm2II@osiris>
Date: Tue, 9 May 2023 08:13:59 +0200
From: Heiko Carstens <hca@...ux.ibm.com>
To: Peter Zijlstra <peterz@...radead.org>
Cc: bigeasy@...utronix.de, mark.rutland@....com, maz@...nel.org,
catalin.marinas@....com, will@...nel.org, chenhuacai@...nel.org,
kernel@...0n.name, gor@...ux.ibm.com, agordeev@...ux.ibm.com,
borntraeger@...ux.ibm.com, svens@...ux.ibm.com,
pbonzini@...hat.com, wanpengli@...cent.com, vkuznets@...hat.com,
tglx@...utronix.de, mingo@...hat.com, bp@...en8.de,
dave.hansen@...ux.intel.com, x86@...nel.org, hpa@...or.com,
jgross@...e.com, boris.ostrovsky@...cle.com,
daniel.lezcano@...aro.org, kys@...rosoft.com,
haiyangz@...rosoft.com, wei.liu@...nel.org, decui@...rosoft.com,
rafael@...nel.org, longman@...hat.com, boqun.feng@...il.com,
pmladek@...e.com, senozhatsky@...omium.org, rostedt@...dmis.org,
john.ogness@...utronix.de, juri.lelli@...hat.com,
vincent.guittot@...aro.org, dietmar.eggemann@....com,
bsegall@...gle.com, mgorman@...e.de, bristot@...hat.com,
vschneid@...hat.com, jstultz@...gle.com, sboyd@...nel.org,
linux-kernel@...r.kernel.org, loongarch@...ts.linux.dev,
linux-s390@...r.kernel.org, kvm@...r.kernel.org,
linux-hyperv@...r.kernel.org, linux-pm@...r.kernel.org
Subject: Re: [RFC][PATCH 6/9] s390/time: Provide sched_clock_noinstr()
1;115;0cOn Mon, May 08, 2023 at 11:19:57PM +0200, Peter Zijlstra wrote:
> With the intent to provide local_clock_noinstr(), a variant of
> local_clock() that's safe to be called from noinstr code (with the
> assumption that any such code will already be non-preemptible),
> prepare for things by providing a noinstr sched_clock_noinstr()
> function.
>
> Specifically, preempt_enable_*() calls out to schedule(), which upsets
> noinstr validation efforts.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
> ---
> arch/s390/include/asm/timex.h | 13 +++++++++----
> arch/s390/kernel/time.c | 11 ++++++++++-
> 2 files changed, 19 insertions(+), 5 deletions(-)
...
> +static __always_inline unsigned long __get_tod_clock_monotonic(void)
> +{
> + return get_tod_clock() - tod_clock_base.tod;
> +}
> +
> /**
> * get_clock_monotonic - returns current time in clock rate units
> *
> @@ -216,7 +221,7 @@ static inline unsigned long get_tod_cloc
> unsigned long tod;
>
> preempt_disable_notrace();
> - tod = get_tod_clock() - tod_clock_base.tod;
> + tod = __get_tod_clock_monotonic();
> preempt_enable_notrace();
> return tod;
> }
...
> +unsigned long long noinstr sched_clock_noinstr(void)
> +{
> + return tod_to_ns(__get_tod_clock_monotonic());
> +}
> +
> /*
> * Scheduler clock - returns current time in nanosec units.
> */
> unsigned long long notrace sched_clock(void)
> {
> - return tod_to_ns(get_tod_clock_monotonic());
> + unsigned long long ns;
> + preempt_disable_notrace();
> + ns = tod_to_ns(get_tod_clock_monotonic());
> + preempt_enable_notrace();
> + return ns;
> }
> NOKPROBE_SYMBOL(sched_clock);
This disables preemption twice within sched_clock(). So this should either
call __get_tod_clock_monotonic() instead, or the function could stay as it
is, which I would prefer.
Powered by blists - more mailing lists