From: guangrong.xiao@gmail.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 <xiaoguangrong@tencent.com> Subject: [PATCH 2/5] mc146818rtc: fix clock lost after scaling coalesced irq Date: Wed, 12 Apr 2017 17:51:08 +0800 [thread overview] Message-ID: <20170412095111.11728-3-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20170412095111.11728-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> If the period is changed by re-configuring RegA, the coalesced irq will be scaled to reflect the new period, however, it calculates the new interrupt number like this: s->irq_coalesced = (s->irq_coalesced * s->period) / period; There are some clocks will be lost if they are not enough to be squeezed to a single new period that will cause the VM clock slower In order to fix the issue, we calculate the interrupt window based on the precise clock rather than period, then the clocks lost during period is scaled can be compensated properly Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- hw/timer/mc146818rtc.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 749e206..649678c 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -146,23 +146,46 @@ static void rtc_coalesced_timer(void *opaque) } #endif +static int period_code_to_clock(int period_code) +{ + /* periodic timer is disabled. */ + if (!period_code) { + return 0; + } + + if (period_code <= 2) { + period_code += 7; + } + + /* period in 32 Khz cycles */ + return 1 << (period_code - 1); +} + /* handle periodic timer */ static void periodic_timer_update(RTCState *s, int64_t current_time) { int period_code, period; - int64_t cur_clock, next_irq_clock; + int64_t cur_clock, next_irq_clock, lost_clock = 0; period_code = s->cmos_data[RTC_REG_A] & 0x0f; if (period_code != 0 && (s->cmos_data[RTC_REG_B] & REG_B_PIE)) { - if (period_code <= 2) - period_code += 7; - /* period in 32 Khz cycles */ - period = 1 << (period_code - 1); + period = period_code_to_clock(period_code); #ifdef TARGET_I386 if (period != s->period) { - s->irq_coalesced = (s->irq_coalesced * s->period) / period; - DPRINTF_C("cmos: coalesced irqs scaled to %d\n", s->irq_coalesced); + int current_irq_coalesced = s->irq_coalesced; + + s->irq_coalesced = (current_irq_coalesced * s->period) / period; + + /* + * calculate the lost clock after it is scaled which should be + * compensated in the next interrupt. + */ + lost_clock += current_irq_coalesced * s->period - + s->irq_coalesced * period; + DPRINTF_C("cmos: coalesced irqs scaled from %d to %d, %ld clocks " + "are compensated.\n", + current_irq_coalesced, s->irq_coalesced, lost_clock); } s->period = period; #endif @@ -170,7 +193,7 @@ static void periodic_timer_update(RTCState *s, int64_t current_time) cur_clock = muldiv64(current_time, RTC_CLOCK_RATE, NANOSECONDS_PER_SECOND); - next_irq_clock = (cur_clock & ~(period - 1)) + period; + next_irq_clock = cur_clock + period - lost_clock; s->next_periodic_time = muldiv64(next_irq_clock, NANOSECONDS_PER_SECOND, RTC_CLOCK_RATE) + 1; timer_mod(s->periodic_timer, s->next_periodic_time); -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: guangrong.xiao@gmail.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 <xiaoguangrong@tencent.com> Subject: [Qemu-devel] [PATCH 2/5] mc146818rtc: fix clock lost after scaling coalesced irq Date: Wed, 12 Apr 2017 17:51:08 +0800 [thread overview] Message-ID: <20170412095111.11728-3-xiaoguangrong@tencent.com> (raw) In-Reply-To: <20170412095111.11728-1-xiaoguangrong@tencent.com> From: Xiao Guangrong <xiaoguangrong@tencent.com> If the period is changed by re-configuring RegA, the coalesced irq will be scaled to reflect the new period, however, it calculates the new interrupt number like this: s->irq_coalesced = (s->irq_coalesced * s->period) / period; There are some clocks will be lost if they are not enough to be squeezed to a single new period that will cause the VM clock slower In order to fix the issue, we calculate the interrupt window based on the precise clock rather than period, then the clocks lost during period is scaled can be compensated properly Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> --- hw/timer/mc146818rtc.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 749e206..649678c 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -146,23 +146,46 @@ static void rtc_coalesced_timer(void *opaque) } #endif +static int period_code_to_clock(int period_code) +{ + /* periodic timer is disabled. */ + if (!period_code) { + return 0; + } + + if (period_code <= 2) { + period_code += 7; + } + + /* period in 32 Khz cycles */ + return 1 << (period_code - 1); +} + /* handle periodic timer */ static void periodic_timer_update(RTCState *s, int64_t current_time) { int period_code, period; - int64_t cur_clock, next_irq_clock; + int64_t cur_clock, next_irq_clock, lost_clock = 0; period_code = s->cmos_data[RTC_REG_A] & 0x0f; if (period_code != 0 && (s->cmos_data[RTC_REG_B] & REG_B_PIE)) { - if (period_code <= 2) - period_code += 7; - /* period in 32 Khz cycles */ - period = 1 << (period_code - 1); + period = period_code_to_clock(period_code); #ifdef TARGET_I386 if (period != s->period) { - s->irq_coalesced = (s->irq_coalesced * s->period) / period; - DPRINTF_C("cmos: coalesced irqs scaled to %d\n", s->irq_coalesced); + int current_irq_coalesced = s->irq_coalesced; + + s->irq_coalesced = (current_irq_coalesced * s->period) / period; + + /* + * calculate the lost clock after it is scaled which should be + * compensated in the next interrupt. + */ + lost_clock += current_irq_coalesced * s->period - + s->irq_coalesced * period; + DPRINTF_C("cmos: coalesced irqs scaled from %d to %d, %ld clocks " + "are compensated.\n", + current_irq_coalesced, s->irq_coalesced, lost_clock); } s->period = period; #endif @@ -170,7 +193,7 @@ static void periodic_timer_update(RTCState *s, int64_t current_time) cur_clock = muldiv64(current_time, RTC_CLOCK_RATE, NANOSECONDS_PER_SECOND); - next_irq_clock = (cur_clock & ~(period - 1)) + period; + next_irq_clock = cur_clock + period - lost_clock; s->next_periodic_time = muldiv64(next_irq_clock, NANOSECONDS_PER_SECOND, RTC_CLOCK_RATE) + 1; timer_mod(s->periodic_timer, s->next_periodic_time); -- 2.9.3
next prev parent reply other threads:[~2017-04-12 9:51 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-12 9:51 [PATCH 0/5] mc146818rtc: fix Windows VM clock faster guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-04-12 9:51 ` [PATCH 1/5] mc146818rtc: update periodic timer only if it is needed guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:42 ` Paolo Bonzini 2017-05-03 15:42 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 3:27 ` Xiao Guangrong 2017-05-04 3:27 ` [Qemu-devel] " Xiao Guangrong 2017-04-12 9:51 ` guangrong.xiao [this message] 2017-04-12 9:51 ` [Qemu-devel] [PATCH 2/5] mc146818rtc: fix clock lost after scaling coalesced irq guangrong.xiao 2017-05-03 15:15 ` Paolo Bonzini 2017-05-03 15:15 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 2:51 ` Xiao Guangrong 2017-05-04 2:51 ` [Qemu-devel] " Xiao Guangrong 2017-04-12 9:51 ` [PATCH 3/5] mc146818rtc: properly count the time for the next interrupt guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:32 ` Paolo Bonzini 2017-05-03 15:32 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 2:54 ` Xiao Guangrong 2017-05-04 2:54 ` [Qemu-devel] " Xiao Guangrong 2017-05-04 12:02 ` Paolo Bonzini 2017-05-04 12:02 ` [Qemu-devel] " Paolo Bonzini 2017-04-12 9:51 ` [PATCH 4/5] mc146818rtc: move x86 specific code out of periodic_timer_update guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-05-03 15:39 ` Paolo Bonzini 2017-05-03 15:39 ` [Qemu-devel] " Paolo Bonzini 2017-05-04 3:25 ` Xiao Guangrong 2017-05-04 3:25 ` [Qemu-devel] " Xiao Guangrong 2017-05-04 7:08 ` Paolo Bonzini 2017-05-04 7:08 ` [Qemu-devel] " Paolo Bonzini 2017-04-12 9:51 ` [PATCH 5/5] mc146818rtc: embrace all x86 specific code guangrong.xiao 2017-04-12 9:51 ` [Qemu-devel] " guangrong.xiao 2017-04-13 6:37 ` [PATCH 0/5] mc146818rtc: fix Windows VM clock faster Paolo Bonzini 2017-04-13 6:37 ` [Qemu-devel] " Paolo Bonzini 2017-04-13 8:39 ` Xiao Guangrong 2017-04-13 8:39 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 8:52 ` Xiao Guangrong 2017-04-13 8:52 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:05 ` 答复: " Zhanghailiang 2017-04-13 9:05 ` [Qemu-devel] " Zhanghailiang 2017-04-13 9:18 ` Xiao Guangrong 2017-04-13 9:18 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:29 ` Hailiang Zhang 2017-04-13 9:29 ` [Qemu-devel] " Hailiang Zhang 2017-04-13 9:35 ` Xiao Guangrong 2017-04-13 9:35 ` [Qemu-devel] " Xiao Guangrong 2017-04-13 9:38 ` Hailiang Zhang 2017-04-13 9:38 ` [Qemu-devel] " Hailiang Zhang 2017-04-19 2:02 ` Xiao Guangrong 2017-04-19 2:02 ` [Qemu-devel] " Xiao Guangrong 2017-04-19 10:41 ` Hailiang Zhang 2017-04-19 10:41 ` [Qemu-devel] " Hailiang Zhang 2017-04-19 11:13 ` Xiao Guangrong 2017-04-19 11:13 ` [Qemu-devel] " Xiao Guangrong 2017-04-19 16:44 ` Paolo Bonzini 2017-04-19 16:44 ` [Qemu-devel] " Paolo Bonzini 2017-04-14 5:09 ` Paolo Bonzini 2017-04-14 5:09 ` [Qemu-devel] " Paolo Bonzini 2017-04-14 6:07 ` Xiao Guangrong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170412095111.11728-3-xiaoguangrong@tencent.com \ --to=guangrong.xiao@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=xiaoguangrong@tencent.com \ --cc=yunfangtai@tencent.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.