# HG changeset patch # User Tim Deegan # Date 1275473752 -3600 # Node ID f86930e17ed9caf478b1498c855c82caaeaf23ff # Parent 8dc07d072ed6e70031672fc854aef995b097f9ee Add a safety valve to the HVM RTC model for big time jumps. If xen's time leaps forward by a large amount, the RTC will try to model a tick for every second that it thinks has passed. This can livelock a CPU with a series of timer requests each of which fires immediately and requests the next one. This patch treats a delay of more than a day between ticks as a special case, abandoning the attempt to catch up. That should be good enough to avoid livelock but doesn't fix the underlying time problem. Signed-off-by: Tim Deegan diff -r 8dc07d072ed6 -r f86930e17ed9 xen/arch/x86/hvm/rtc.c --- a/xen/arch/x86/hvm/rtc.c Wed Jun 02 11:15:45 2010 +0100 +++ b/xen/arch/x86/hvm/rtc.c Wed Jun 02 11:15:52 2010 +0100 @@ -281,8 +281,21 @@ static void rtc_update_second(void *opaque) { RTCState *s = opaque; + s_time_t now = NOW(); spin_lock(&s->lock); + + /* If we somehow get way out of sync (say, Xen time leaps forward), + * don't livelock the system trying to emulate every second. Time + * is already in bad trouble, so just skip forward rather than + * trying to sync the RTC registers */ + if ( unlikely(now - s->next_second_time > SECONDS(86400)) ) + { + dprintk(XENLOG_WARNING, "HVM RTC: dom %u skipping %llu seconds\n", + vrtc_domain(s)->domain_id, + (now - s->next_second_time) / SYSTEM_TIME_HZ); + s->next_second_time = now; + } /* if the oscillator is not in normal operation, we do not update */ if ( (s->hw.cmos_data[RTC_REG_A] & RTC_DIV_CTL) != RTC_REF_CLCK_32KHZ )