From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbcA0LoF (ORCPT ); Wed, 27 Jan 2016 06:44:05 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34311 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754368AbcA0Ln4 (ORCPT ); Wed, 27 Jan 2016 06:43:56 -0500 Date: Wed, 27 Jan 2016 03:43:41 -0800 From: tip-bot for Marc Zyngier Message-ID: Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, tn@semihalf.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, tn@semihalf.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, christoffer.dall@linaro.org In-Reply-To: <1452879670-16133-4-git-send-email-marc.zyngier@arm.com> References: <1452879670-16133-4-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW Git-Commit-ID: a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039 Gitweb: http://git.kernel.org/tip/a6e707ddbdf150bd1c2a5c0eccc55abdc62a0039 Author: Marc Zyngier AuthorDate: Fri, 15 Jan 2016 17:41:10 +0000 Committer: Thomas Gleixner CommitDate: Wed, 27 Jan 2016 12:38:04 +0100 KVM: arm/arm64: timer: Switch to CLOCK_MONOTONIC_RAW In order to avoid NTP messing with the guest timer behind our back, use the new and improved monotonic raw version of the hrtimers. Signed-off-by: Marc Zyngier Cc: Tomasz Nowicki Cc: Christoffer Dall Link: http://lkml.kernel.org/r/1452879670-16133-4-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- virt/kvm/arm/arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 69bca18..97c5815 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -48,7 +48,7 @@ static bool timer_is_armed(struct arch_timer_cpu *timer) static void timer_arm(struct arch_timer_cpu *timer, u64 ns) { timer->armed = true; - hrtimer_start(&timer->timer, ktime_add_ns(ktime_get(), ns), + hrtimer_start(&timer->timer, ktime_add_ns(ktime_get_raw(), ns), HRTIMER_MODE_ABS); } @@ -308,7 +308,7 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; INIT_WORK(&timer->expired, kvm_timer_inject_irq_work); - hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); + hrtimer_init(&timer->timer, CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS); timer->timer.function = kvm_timer_expire; }