From patchwork Fri Aug 20 08:07:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 120530 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7K8DFd9003726 for ; Fri, 20 Aug 2010 08:13:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580Ab0HTIMT (ORCPT ); Fri, 20 Aug 2010 04:12:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12221 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187Ab0HTIJF (ORCPT ); Fri, 20 Aug 2010 04:09:05 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7K891bk010003 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Aug 2010 04:09:01 -0400 Received: from mysore (vpn-9-158.rdu.redhat.com [10.11.9.158]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7K87qfK027969; Fri, 20 Aug 2010 04:08:58 -0400 From: Zachary Amsden To: kvm@vger.kernel.org Cc: Zachary Amsden , Avi Kivity , Marcelo Tosatti , Glauber Costa , Thomas Gleixner , John Stultz , linux-kernel@vger.kernel.org Subject: [KVM timekeeping 26/35] Catchup slower TSC to guest rate Date: Thu, 19 Aug 2010 22:07:40 -1000 Message-Id: <1282291669-25709-27-git-send-email-zamsden@redhat.com> In-Reply-To: <1282291669-25709-1-git-send-email-zamsden@redhat.com> References: <1282291669-25709-1-git-send-email-zamsden@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 20 Aug 2010 08:13:16 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a4215d7..086d56a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1013,8 +1013,11 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) kvm_x86_ops->adjust_tsc_offset(v, tsc-tsc_timestamp); } local_irq_restore(flags); - if (catchup) + if (catchup) { + if (this_tsc_khz < v->kvm->arch.virtual_tsc_khz) + vcpu->tsc_rebase = 1; return 0; + } /* * Time as measured by the TSC may go backwards when resetting the base @@ -5022,6 +5025,10 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) kvm_guest_exit(); + /* Running on slower TSC without kvmclock, we must bump TSC */ + if (vcpu->arch.tsc_rebase) + kvm_request_clock_update(vcpu); + preempt_enable(); vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);