|
|
|
|
|
|
|
|
|
|
xen-devel
[Xen-devel] [PATCH 04/12] kvm/pvclock: add monotonicity check
To: |
Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx> |
Subject: |
[Xen-devel] [PATCH 04/12] kvm/pvclock: add monotonicity check |
From: |
Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> |
Date: |
Wed, 14 Oct 2009 12:28:28 -0700 |
Cc: |
Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, kurt.hackel@xxxxxxxxxx, the arch/x86 maintainers <x86@xxxxxxxxxx>, Glauber de Oliveira Costa <gcosta@xxxxxxxxxx>, Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>, Avi Kivity <avi@xxxxxxxxxx>, Chris Mason <chris.mason@xxxxxxxxxx> |
Delivery-date: |
Wed, 14 Oct 2009 12:32:46 -0700 |
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
In-reply-to: |
<1255548516-15260-1-git-send-email-jeremy.fitzhardinge@xxxxxxxxxx> |
List-help: |
<mailto:xen-devel-request@lists.xensource.com?subject=help> |
List-id: |
Xen developer discussion <xen-devel.lists.xensource.com> |
List-post: |
<mailto:xen-devel@lists.xensource.com> |
List-subscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
List-unsubscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
References: |
<1255548516-15260-1-git-send-email-jeremy.fitzhardinge@xxxxxxxxxx> |
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
Other tsc-based clocksources add a monotonicity test to make sure there's
no regression in the returned cycles.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Avi Kivity <avi@xxxxxxxxxx>
---
arch/x86/kernel/kvmclock.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 223af43..46cb77f 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -77,9 +77,14 @@ static cycle_t kvm_clock_read(void)
return ret;
}
+static struct clocksource kvm_clock;
+
static cycle_t kvm_clock_get_cycles(struct clocksource *cs)
{
- return kvm_clock_read();
+ cycle_t ret = kvm_clock_read();
+
+ return ret >= kvm_clock.cycle_last ?
+ ret : kvm_clock.cycle_last;
}
/*
--
1.6.2.5
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
|
|