From patchwork Sat May 27 03:33:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 100586 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp536079qge; Fri, 26 May 2017 20:34:04 -0700 (PDT) X-Received: by 10.99.2.68 with SMTP id 65mr6220000pgc.61.1495856044088; Fri, 26 May 2017 20:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495856044; cv=none; d=google.com; s=arc-20160816; b=yKwl07JUlaacP1iJAZbxnP77iG3JLVpAHP++4IDCd9sZdwlAkVHx5wNv7Ynj078msX opkcL37QXNg4s0XS1uZuQBgitqr/8qMwusAMDwPBgwgiYtbpCY8sBxr1xrrirF8wERUR Flbe56QwiP3HgbgDUUk1gpXSf8lLi4tsEv1OxkpfqNUfsjCMBeWM9i10whBUT6RljayN IaFmTVaIJIQn9S97ExlR2HDVSNcFuw/0q4WEh74HfSVCqj6eNN7xi+o7PaDWUqtxjLFy lRICCrgix4U9zkPJplMDVHRme080adVlH5kgxgjAc6FidwXB6pXiz+jU2RtFCkWxs6mj uO5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=/C8i3wvNUonK2NSxf19uz+zI5Pd7nUHG+q/zgHrdegY=; b=AVfA2+kJLM/69sXaXANGuNC6luCr6xQUyqlcQ5cxhZoOoU89DzEd+Hdus1HtDhu5Iy cXbnKZGX4K6m9MTM8eChPCxm0cbyIb6W62m0hEzIGtVLGp2N5uCK4RwEwuEgyQ/4elO1 ZQ/5pJQH/OfRw/ugz6lBfXMO1CEorlrXKKk/PZsSD8HwsKYV1/ZGgzn99rHX4j3kTd4R fK+kvvtWZrEd+eaS7JO5E20y5QnmK+PjwKwtfmMTnm4C2vDCfCRR97sxKfwEJOTtp+0q Cs1mrI+2h70A9pdM3agqngF45iKomvUnfFU8XtKG/56H7j/nyA/8EcO7ozMh8Yxb+eQ2 JE8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::230 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com. [2607:f8b0:400e:c00::230]) by mx.google.com with ESMTPS id d19si2873896pgk.108.2017.05.26.20.34.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 May 2017 20:34:04 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::230 as permitted sender) client-ip=2607:f8b0:400e:c00::230; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::230 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x230.google.com with SMTP id 9so25093848pfj.1 for ; Fri, 26 May 2017 20:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/C8i3wvNUonK2NSxf19uz+zI5Pd7nUHG+q/zgHrdegY=; b=EUUMmVzzt0dwV2AdvVLXE1IOcP5EjfhHxwB1lr8kyNpuGSFeLE/b120Z1gCM6+dwcg jAjTRN467S3X9zYexPtqzjDA08Fi5LJ8dpfmQikBI1UJ4q0StdIV2En9EfCU4n9Til7g 1D5uHTYiePRp1hf2IrGl0ANYMfU2yvsC1IrQ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/C8i3wvNUonK2NSxf19uz+zI5Pd7nUHG+q/zgHrdegY=; b=rnXIbg2b2sPdNR2VJ0IwIsQbnvK/fJ0njLP4Vg4h5HQFforKeB71H8MleJZgcoFr3v 89nt+DHac5jMrLHRZGq+SKHTOLKk9uaGlUO3M6wghwoFDv/Ri2DpwkMilWYAraT6upI0 +rq96gNPEp4LAd553dW03cGdAdPnaGwBsjkdnWvly1MJUSO4scDEOgrvOtOgFy4C1vBY 4U8EI82lcfrOZ8o2JKgcN7wRGiVym/kPgVZtGzOZAQll3BbEMC3UU7aIm4GrlUs4zgB5 20AeI3ODnmi6XbsDqzY9eIm2VL3tVKI6w57772B1qabqwrYp8919pInU1HVkS472We73 5c7Q== X-Gm-Message-State: AODbwcCMbEukQ0zZ8WDXbT1YtvF8TayCcZoLckQB8K69YjPyKxGdKu3w UVn+2gpUUkoPrjjJVjQ= X-Received: by 10.84.217.8 with SMTP id o8mr24946034pli.50.1495856043803; Fri, 26 May 2017 20:34:03 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id d185sm3413255pgc.39.2017.05.26.20.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 May 2017 20:34:02 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Thomas Gleixner , Ingo Molnar , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Stephen Boyd , Kevin Brodsky , Will Deacon , Daniel Mentz Subject: [RFC][PATCH 2/4] time: Fix CLOCK_MONOTONIC_RAW sub-nanosecond accounting Date: Fri, 26 May 2017 20:33:53 -0700 Message-Id: <1495856035-6622-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495856035-6622-1-git-send-email-john.stultz@linaro.org> References: <1495856035-6622-1-git-send-email-john.stultz@linaro.org> Due to how the MONOTONIC_RAW accumulation logic was handled, there is the potential for a 1ns discontinuity when we do accumulations. This small discontinuity has for the most part gone un-noticed, but since ARM64 enabled CLOCK_MONOTONIC_RAW in their vDSO clock_gettime implementation, we've seen failures with the inconsistency-check test in kselftest. This patch addresses the issue by using the same sub-ns accumulation handling that CLOCK_MONOTONIC uses, which avoids the issue for in-kernel users. Since the ARM64 vDSO implementation has its own clock_gettime calculation logic, this patch reduces the frequency of errors, but failures are still seen. The ARM64 vDSO will need to be updated to include the sub-nanosecond xtime_nsec values in its calculation for this issue to be completely fixed. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Cc: Kevin Brodsky Cc: Will Deacon Cc: Daniel Mentz Signed-off-by: John Stultz --- include/linux/timekeeper_internal.h | 4 ++-- kernel/time/timekeeping.c | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 110f453..528cc86 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -58,7 +58,7 @@ struct tk_read_base { * interval. * @xtime_remainder: Shifted nano seconds left over when rounding * @cycle_interval - * @raw_interval: Raw nano seconds accumulated per NTP interval. + * @raw_interval: Shifted raw nano seconds accumulated per NTP interval. * @ntp_error: Difference between accumulated time and NTP time in ntp * shifted nano seconds. * @ntp_error_shift: Shift conversion between clock shifted nano seconds and @@ -100,7 +100,7 @@ struct timekeeper { u64 cycle_interval; u64 xtime_interval; s64 xtime_remainder; - u32 raw_interval; + u64 raw_interval; /* The ntp_tick_length() value currently being used. * This cached copy ensures we consistently apply the tick * length for an entire tick, as ntp_tick_length may change diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index abc1968..35d3ba3 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -282,7 +282,7 @@ static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock) /* Go back from cycles -> shifted ns */ tk->xtime_interval = interval * clock->mult; tk->xtime_remainder = ntpinterval - tk->xtime_interval; - tk->raw_interval = (interval * clock->mult) >> clock->shift; + tk->raw_interval = interval * clock->mult; /* if changing clocks, convert xtime_nsec shift units */ if (old_clock) { @@ -1994,7 +1994,7 @@ static u64 logarithmic_accumulation(struct timekeeper *tk, u64 offset, u32 shift, unsigned int *clock_set) { u64 interval = tk->cycle_interval << shift; - u64 raw_nsecs; + u64 nsecps; /* If the offset is smaller than a shifted interval, do nothing */ if (offset < interval) @@ -2009,14 +2009,17 @@ static u64 logarithmic_accumulation(struct timekeeper *tk, u64 offset, *clock_set |= accumulate_nsecs_to_secs(tk); /* Accumulate raw time */ - raw_nsecs = (u64)tk->raw_interval << shift; - raw_nsecs += tk->raw_time.tv_nsec; - if (raw_nsecs >= NSEC_PER_SEC) { - u64 raw_secs = raw_nsecs; - raw_nsecs = do_div(raw_secs, NSEC_PER_SEC); - tk->raw_time.tv_sec += raw_secs; + tk->tkr_raw.xtime_nsec += (u64)tk->raw_time.tv_nsec + << tk->tkr_raw.shift; + tk->tkr_raw.xtime_nsec += tk->raw_interval << shift; + nsecps = (u64)NSEC_PER_SEC << tk->tkr_raw.shift; + while (tk->tkr_raw.xtime_nsec >= nsecps) { + tk->tkr_raw.xtime_nsec -= nsecps; + tk->raw_time.tv_sec++; } - tk->raw_time.tv_nsec = raw_nsecs; + tk->raw_time.tv_nsec = tk->tkr_raw.xtime_nsec >> tk->tkr_raw.shift; + tk->tkr_raw.xtime_nsec -= (u64)tk->raw_time.tv_nsec + << tk->tkr_raw.shift; /* Accumulate error between NTP and clock interval */ tk->ntp_error += tk->ntp_tick << shift;