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 S1754751AbdHZKVX convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Sat, 26 Aug 2017 06:21:23 -0400
Received: from mail.fireflyinternet.com ([109.228.58.192]:51423 "EHLO
        fireflyinternet.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
        with ESMTP id S1754709AbdHZKVV (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 26 Aug 2017 06:21:21 -0400
X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8BIT
To: John Stultz <john.stultz@linaro.org>,
        "lkml" <linux-kernel@vger.kernel.org>
From: Chris Wilson <chris@chris-wilson.co.uk>
In-Reply-To: <1503701824-1645-1-git-send-email-john.stultz@linaro.org>
Cc: "John Stultz" <john.stultz@linaro.org>,
        "Thomas Gleixner" <tglx@linutronix.de>,
        "Ingo Molnar" <mingo@kernel.org>,
        "Miroslav Lichvar" <mlichvar@redhat.com>,
        "Richard Cochran" <richardcochran@gmail.com>,
        "Prarit Bhargava" <prarit@redhat.com>,
        "Stephen Boyd" <stephen.boyd@linaro.org>,
        "Kevin Brodsky" <kevin.brodsky@arm.com>,
        "Will Deacon" <will.deacon@arm.com>,
        "Daniel Mentz" <danielmentz@google.com>
References: <150366841319.27971.6041120504203143444@mail.alporthouse.com>
 <1503701824-1645-1-git-send-email-john.stultz@linaro.org>
Message-ID: <150374284140.27971.6998536117165259592@mail.alporthouse.com>
User-Agent: alot/0.3.6
Subject: Re: [RFC][PATCH] time: Fix ktime_get_raw() issues caused by incorrect base
 accumulation
Date: Sat, 26 Aug 2017 11:20:41 +0100
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Quoting John Stultz (2017-08-25 23:57:04)
> In commit fc6eead7c1e2 ("time: Clean up CLOCK_MONOTONIC_RAW time
> handling"), I mistakenly added the following:
> 
>  /* Update the monotonic raw base */
>  seconds = tk->raw_sec;
>  nsec = (u32)(tk->tkr_raw.xtime_nsec >> tk->tkr_raw.shift);
>  tk->tkr_raw.base = ns_to_ktime(seconds * NSEC_PER_SEC + nsec);
> 
> Which adds the raw_sec value and the shifted down raw xtime_nsec
> to the base value.
> 
> This is problematic as when calling ktime_get_raw(), we add the
> tk->tkr_raw.xtime_nsec and current offset, shift it down and add
> it to the raw base.
> 
> This results in the shifted down tk->tkr_raw.xtime_nsec being
> added twice.
> 
> My mistake, was that I was matching the monotonic base logic
> above:
> 
>  seconds = (u64)(tk->xtime_sec + tk->wall_to_monotonic.tv_sec);
>  nsec = (u32) tk->wall_to_monotonic.tv_nsec;
>  tk->tkr_mono.base = ns_to_ktime(seconds * NSEC_PER_SEC + nsec);
> 
> Which adds the wall_to_monotonic.tv_nsec value, but not the
> tk->tkr_mono.xtime_nsec value to the base.
> 
> The result of this is that ktime_get_raw() users (which are all
> internal users) see the raw time move faster then it should
> (the rate at which can vary with the current size of
> tkr_raw.xtime_nsec), which has resulted in at least problems
> with graphics rendering performance.
> 
> To fix this, we simplify the tkr_raw.base accumulation to only
> accumulate the raw_sec portion, and do not include the
> tkr_raw.xtime_nsec portion, which will be added at read time.

This fixes our testcase of using ktime_get_raw() deltas. Thanks,
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris