Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 9 May 2023 08:42:22 +0200
From:   Peter Zijlstra <peterz@infradead.org>
To:     Heiko Carstens <hca@linux.ibm.com>
Cc:     bigeasy@linutronix.de, mark.rutland@arm.com, maz@kernel.org,
        catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org,
        kernel@xen0n.name, gor@linux.ibm.com, agordeev@linux.ibm.com,
        borntraeger@linux.ibm.com, svens@linux.ibm.com,
        pbonzini@redhat.com, wanpengli@tencent.com, vkuznets@redhat.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
        dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
        jgross@suse.com, boris.ostrovsky@oracle.com,
        daniel.lezcano@linaro.org, kys@microsoft.com,
        haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com,
        rafael@kernel.org, longman@redhat.com, boqun.feng@gmail.com,
        pmladek@suse.com, senozhatsky@chromium.org, rostedt@goodmis.org,
        john.ogness@linutronix.de, juri.lelli@redhat.com,
        vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
        bsegall@google.com, mgorman@suse.de, bristot@redhat.com,
        vschneid@redhat.com, jstultz@google.com, sboyd@kernel.org,
        linux-kernel@vger.kernel.org, loongarch@lists.linux.dev,
        linux-s390@vger.kernel.org, kvm@vger.kernel.org,
        linux-hyperv@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [RFC][PATCH 6/9] s390/time: Provide sched_clock_noinstr()
Message-ID: <20230509064222.GA2065796@hirez.programming.kicks-ass.net>
References: <20230508211951.901961964@infradead.org>
 <20230508213147.786238095@infradead.org>
 <ZFnkp6dlOuJqm2II@osiris>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZFnkp6dlOuJqm2II@osiris>
Precedence: bulk

On Tue, May 09, 2023 at 08:13:59AM +0200, Heiko Carstens wrote:
> 
> 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@infradead.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.

Duh. Will fix.