Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbdH3PZO (ORCPT ); Wed, 30 Aug 2017 11:25:14 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:48590 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbdH3PZN (ORCPT ); Wed, 30 Aug 2017 11:25:13 -0400 From: Denis Plotnikov To: pbonzini@redhat.com, rkrcmar@redhat.com, kvm@vger.kernel.org, john.stultz@linaro.org, tglx@linutronix.de Cc: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, x86@kernel.org, rkagan@virtuozzo.com, den@virtuozzo.com Subject: [PATCH v5 2/6] timekeeper: introduce boot field in system_time_snapshot Date: Wed, 30 Aug 2017 18:23:44 +0300 Message-Id: <1504106628-172372-3-git-send-email-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504106628-172372-1-git-send-email-dplotnikov@virtuozzo.com> References: <1504106628-172372-1-git-send-email-dplotnikov@virtuozzo.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2349 Lines: 64 The field keeps monotonic time since boot. The value of boot will be used in KVM for masterclock. This is a part of the work aiming to move to a more simple scheme of masterclock related values calculation in KVM Signed-off-by: Denis Plotnikov --- include/linux/timekeeping.h | 2 ++ kernel/time/timekeeping.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index ddc229f..5008e3e 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -283,6 +283,7 @@ extern void ktime_get_raw_and_real_ts64(struct timespec64 *ts_raw, * @cycles: Clocksource counter value to produce the system times * @real: Realtime system time * @raw: Monotonic raw system time + * @boot: Monotonic time since boot * @clock_was_set_seq: The sequence number of clock was set events * @cs_was_changed_seq: The sequence number of clocksource change events */ @@ -290,6 +291,7 @@ struct system_time_snapshot { u64 cycles; ktime_t real; ktime_t raw; + ktime_t boot; unsigned int clock_was_set_seq; u8 cs_was_changed_seq; }; diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index cedafa0..66f7701 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -953,6 +953,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot) unsigned long seq; ktime_t base_raw; ktime_t base_real; + ktime_t base_boot; u64 nsec_raw; u64 nsec_real; u64 now; @@ -967,6 +968,8 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot) base_real = ktime_add(tk->tkr_mono.base, tk_core.timekeeper.offs_real); base_raw = tk->tkr_raw.base; + base_boot = ktime_add(tk->tkr_mono.base, + tk_core.timekeeper.offs_boot); nsec_real = timekeeping_cycles_to_ns(&tk->tkr_mono, now); nsec_raw = timekeeping_cycles_to_ns(&tk->tkr_raw, now); } while (read_seqcount_retry(&tk_core.seq, seq)); @@ -974,6 +977,7 @@ void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot) systime_snapshot->cycles = now; systime_snapshot->real = ktime_add_ns(base_real, nsec_real); systime_snapshot->raw = ktime_add_ns(base_raw, nsec_raw); + systime_snapshot->boot = ktime_add_ns(base_boot, nsec_real); } EXPORT_SYMBOL_GPL(ktime_get_snapshot); -- 2.7.4