From patchwork Wed Apr 12 09:51:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 9676923 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F65160382 for ; Wed, 12 Apr 2017 09:52:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 602232855A for ; Wed, 12 Apr 2017 09:52:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54BDE285D3; Wed, 12 Apr 2017 09:52:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9FA4285A9 for ; Wed, 12 Apr 2017 09:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751890AbdDLJwD (ORCPT ); Wed, 12 Apr 2017 05:52:03 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:32874 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752668AbdDLJv7 (ORCPT ); Wed, 12 Apr 2017 05:51:59 -0400 Received: by mail-pg0-f65.google.com with SMTP id 79so4255244pgf.0 for ; Wed, 12 Apr 2017 02:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bxQe8PxCk+LUCTGLkOqW18q73Ul9EzM1BZdLG3YGtAo=; b=gTcz5n6dkwtqndxywqAkjft6m9npjy+h79LSFDUV2xm9AVnVUnCFUe4PzgVZ5XyJqw qe4VufKWG/XSOFt6veqGum2pwwJ38XV4Ywbd2M/MTuPI1bsQNEyBiOjTC56G1C95u4xk DXUEeOIWR9iaTFhpUmOUu1/3R/3ISknC7fwuTDK9PlmAg23UtDkaTC0uUkXhvtfzNNIQ Q36DTMKlY60hmRcPpY59iacyr7Bnu5gJ1mPivlcz/oQ10/LU6RrmLfxWnXq87cg8NRlR YuQRujoyv8vj3VbXUovz3aiMdS0RxNGO5RYd9zp047BVsFzB+gQwvGg6THExfDiE77tG 4sFA== 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:mime-version:content-transfer-encoding; bh=bxQe8PxCk+LUCTGLkOqW18q73Ul9EzM1BZdLG3YGtAo=; b=j8R8yQ/6IHJNn8HHw8gbUUPwGa3ZYU888uvEngMCkGOznSJM9sVdzhKjtJ39ACsXzt lTfyeGOQxVanSHK+vAnMtTclP8g9ygWb212ZWauIaYiduTHrd2euRi922nm7IdRx+vk7 hXkKVsl3yXgrqUFVP1GKREu+YKtvvSYYOwYk2lMXC1HaDW82IrxkN5bpkC2rfnkgi2lm ISgNWV28wOPuQtp9jPoneKr6Dmca+gozs+gmEfE1P5velymiGuysyXfIizMeiGA9PrI5 LYkPOlzsy8xse/175D9kPefJUu+hgfRTUI59Vj5iRbF+pGVL6YX+L9KAzrhust+3bxYI xQjg== X-Gm-Message-State: AN3rC/5x4+ixYUu5RmzfocrS2rHNhN8H0tazcu2ZM9cj4Il9Vh26z1VWklifNiLElBiFbg== X-Received: by 10.84.222.138 with SMTP id x10mr34228730pls.3.1491990718890; Wed, 12 Apr 2017 02:51:58 -0700 (PDT) Received: from eric.tencent.com ([103.7.29.8]) by smtp.gmail.com with ESMTPSA id 4sm35445749pff.17.2017.04.12.02.51.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 02:51:58 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, yunfangtai@tencent.com, Xiao Guangrong Subject: [PATCH 3/5] mc146818rtc: properly count the time for the next interrupt Date: Wed, 12 Apr 2017 17:51:09 +0800 Message-Id: <20170412095111.11728-4-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170412095111.11728-1-xiaoguangrong@tencent.com> References: <20170412095111.11728-1-xiaoguangrong@tencent.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tai Yunfang If periodic_timer_update() is called due to RegA reconfiguration, i.e, the period is updated, current time is not the start point for the next periodic timer, instead, which should start from the last interrupt, otherwise, the clock in VM will become slow This patch takes the clocks from last interrupt to current clock into account and compensates the clocks for the next interrupt, especially， if a complete interrupt was lost in this window, the time can be caught up by LOST_TICK_POLICY_SLEW [ Xiao: redesign the algorithm based on Yunfang's original work. ] Signed-off-by: Tai Yunfang Signed-off-by: Xiao Guangrong --- hw/timer/mc146818rtc.c | 71 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 649678c..3bf559d 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -161,8 +161,12 @@ static int period_code_to_clock(int period_code) return 1 << (period_code - 1); } -/* handle periodic timer */ -static void periodic_timer_update(RTCState *s, int64_t current_time) +/* + * handle periodic timer. @old_period indicates the periodic timer update + * is just due to period adjustment. + */ +static void +periodic_timer_update(RTCState *s, int64_t current_time, int old_period) { int period_code, period; int64_t cur_clock, next_irq_clock, lost_clock = 0; @@ -193,6 +197,56 @@ static void periodic_timer_update(RTCState *s, int64_t current_time) cur_clock = muldiv64(current_time, RTC_CLOCK_RATE, NANOSECONDS_PER_SECOND); + /* + * if the periodic timer's update is due to period re-configuration, + * we should count the clock since last interrupt. + */ + if (old_period) { + int64_t last_periodic_clock; + + last_periodic_clock = muldiv64(s->next_periodic_time, + RTC_CLOCK_RATE, NANOSECONDS_PER_SECOND); + /* + * if the next interrupt has not happened yet, we recall the last + * interrupt based on the original period. + */ + if (last_periodic_clock > cur_clock) { + last_periodic_clock -= period_code_to_clock(old_period); + + /* the last interrupt must have happened. */ + assert(cur_clock >= last_periodic_clock); + } + + /* calculate the clock since last interrupt. */ + lost_clock += cur_clock - last_periodic_clock; + +#ifdef TARGET_I386 + /* + * if more than period clocks were passed, i.e, the timer interrupt + * has been lost, we should catch up the time. + */ + if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW && + (lost_clock / period)) { + int lost_interrupt = lost_clock / period; + + s->irq_coalesced += lost_interrupt; + lost_clock -= lost_interrupt * period; + if (lost_interrupt) { + DPRINTF_C("cmos: compensate %d interrupts, coalesced irqs " + "increased to %d\n", lost_interrupt, + s->irq_coalesced); + rtc_coalesced_timer_update(s); + } + } else +#endif + /* + * no way to compensate the interrupt if LOST_TICK_POLICY_SLEW + * is not used, we should make the time progress anyway. + */ + lost_clock = MIN(lost_clock, period); + assert(lost_clock >= 0); + } + next_irq_clock = cur_clock + period - lost_clock; s->next_periodic_time = muldiv64(next_irq_clock, NANOSECONDS_PER_SECOND, RTC_CLOCK_RATE) + 1; @@ -209,7 +263,7 @@ static void rtc_periodic_timer(void *opaque) { RTCState *s = opaque; - periodic_timer_update(s, s->next_periodic_time); + periodic_timer_update(s, s->next_periodic_time, 0); s->cmos_data[RTC_REG_C] |= REG_C_PF; if (s->cmos_data[RTC_REG_B] & REG_B_PIE) { s->cmos_data[RTC_REG_C] |= REG_C_IRQF; @@ -428,6 +482,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { RTCState *s = opaque; + int cur_period; bool update_periodic_timer; if ((addr & 1) == 0) { @@ -461,6 +516,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, } break; case RTC_REG_A: + cur_period = s->cmos_data[RTC_REG_A] & 0xf; update_periodic_timer = rtc_periodic_timer_updated_by_regA(s, data); if ((data & 0x60) == 0x60) { @@ -487,7 +543,8 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, (s->cmos_data[RTC_REG_A] & REG_A_UIP); if (update_periodic_timer) { - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock), + cur_period); } check_update_timer(s); @@ -523,7 +580,7 @@ static void cmos_ioport_write(void *opaque, hwaddr addr, s->cmos_data[RTC_REG_B] = data; if (update_periodic_timer) { - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock), 0); } check_update_timer(s); @@ -793,7 +850,7 @@ static int rtc_post_load(void *opaque, int version_id) uint64_t now = qemu_clock_get_ns(rtc_clock); if (now < s->next_periodic_time || now > (s->next_periodic_time + get_max_clock_jump())) { - periodic_timer_update(s, qemu_clock_get_ns(rtc_clock)); + periodic_timer_update(s, qemu_clock_get_ns(rtc_clock), 0); } } @@ -858,7 +915,7 @@ static void rtc_notify_clock_reset(Notifier *notifier, void *data) int64_t now = *(int64_t *)data; rtc_set_date_from_host(ISA_DEVICE(s)); - periodic_timer_update(s, now); + periodic_timer_update(s, now, 0); check_update_timer(s); #ifdef TARGET_I386 if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) {