From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1757488AbcHWJtS (ORCPT <rfc822;w@1wt.eu>);
        Tue, 23 Aug 2016 05:49:18 -0400
Received: from merlin.infradead.org ([205.233.59.134]:47278 "EHLO
        merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754881AbcHWJtR (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 23 Aug 2016 05:49:17 -0400
Date: Tue, 23 Aug 2016 10:47:35 +0200
From: Peter Zijlstra <peterz@infradead.org>
To: John Stultz <john.stultz@linaro.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
        lkml <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Clark Williams <williams@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>, Jon Masters <jcm@redhat.com>,
        Daniel Wagner <wagi@monom.org>, Carsten Emde <C.Emde@osadl.org>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: Re: [PATCH v2 0/4] tracing: Add Hardware Latency detector tracer
Message-ID: <20160823084735.GO10153@twins.programming.kicks-ass.net>
References: <20160810135356.265780824@goodmis.org>
 <20160819140928.GK10121@twins.programming.kicks-ass.net>
 <20160819102620.763bd7a0@gandalf.local.home>
 <20160819150551.GE10153@twins.programming.kicks-ass.net>
 <CALAqxLULtT+13n6eGYBmDVd=UPUNORCnViXiysgAM+V7g3mN4A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CALAqxLULtT+13n6eGYBmDVd=UPUNORCnViXiysgAM+V7g3mN4A@mail.gmail.com>
User-Agent: Mutt/1.5.23.1 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Aug 19, 2016 at 09:36:41AM -0700, John Stultz wrote:
> On Fri, Aug 19, 2016 at 8:05 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> > John, looks like 4ca22c2648f9 ("timekeeping: Add warnings when overflows
> > or underflows are observed") buggered things.
> 
> Oof. Apologies. I missed that the fast methods called that helper as well.
> 
> 
> Any objection to open-coding it for the fast method, like (sorry for
> the whitespace damage here):
> 
> @@ -401,7 +401,10 @@ static __always_inline u64
> __ktime_get_fast_ns(struct tk_fast *tkf)
>         do {
>                 seq = raw_read_seqcount_latch(&tkf->seq);
>                 tkr = tkf->base + (seq & 0x01);
> -               now = ktime_to_ns(tkr->base) + timekeeping_get_ns(tkr);
> +               now = ktime_to_ns(tkr->base);
> +
> +               now += clocksource_delta(tkr->read(tkr->clock),
> +                                        tkr->cycle_last, tkr->mask);
>         } while (read_seqcount_retry(&tkf->seq, seq));
> 
>         return now;
> 
> If not I'll get such a patch sorted, tested and tagged for -stable.

Works for me, Thomas?