From patchwork Mon Aug 30 17:06:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 142981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7UHO8lQ023519 for ; Mon, 30 Aug 2010 17:24:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756130Ab0H3RYF (ORCPT ); Mon, 30 Aug 2010 13:24:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49608 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756112Ab0H3RYD (ORCPT ); Mon, 30 Aug 2010 13:24:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7UHNl1h017262 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Aug 2010 13:23:47 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7UHNhjo001675; Mon, 30 Aug 2010 13:23:46 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com, riel@redhat.com, peterz@infradead.org, mingo@elte.hu, jeremy@goop.org Subject: [RFC v2 3/7] measure time out of guest Date: Mon, 30 Aug 2010 13:06:37 -0400 Message-Id: <1283188001-7911-4-git-send-email-glommer@redhat.com> In-Reply-To: <1283188001-7911-1-git-send-email-glommer@redhat.com> References: <1283188001-7911-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 (demeter1.kernel.org [140.211.167.41]); Mon, 30 Aug 2010 17:24:09 +0000 (UTC) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 502e53f..bc28aff 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -364,6 +364,8 @@ struct kvm_vcpu_arch { u64 hv_vapic; cpumask_var_t wbinvd_dirty_mask; + u64 time_out; + u64 last_time_out; }; struct kvm_arch { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f4b77ea..9d08032 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -906,6 +906,7 @@ static void kvm_write_guest_time(struct kvm_vcpu *v, bool update_time) if ((!vcpu->time_page)) return; + vcpu->hv_clock.steal_time = vcpu->time_out / 1000000; if (!update_time) return; @@ -928,8 +929,7 @@ static void kvm_write_guest_time(struct kvm_vcpu *v, bool update_time) vcpu->hv_clock.system_time = ts.tv_nsec + (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset; - vcpu->hv_clock.flags = 0; - + vcpu->hv_clock.flags = PVCLOCK_STEAL_BIT; /* * The interface expects us to write an even number signaling that the * update is finished. Since the guest won't see the intermediate @@ -1801,6 +1801,8 @@ static bool need_emulate_wbinvd(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) { + s64 now; + /* Address WBINVD may be executed by guest */ if (need_emulate_wbinvd(vcpu)) { if (kvm_x86_ops->has_wbinvd_exit()) @@ -1818,12 +1820,19 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) per_cpu(cpu_tsc_khz, cpu) = khz; } kvm_request_guest_time_update(vcpu); + + now = getnsboottime(); + + if (vcpu->arch.last_time_out != 0) + vcpu->arch.time_out += now - vcpu->arch.last_time_out; } void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { kvm_x86_ops->vcpu_put(vcpu); kvm_put_guest_fpu(vcpu); + + vcpu->arch.last_time_out = getnsboottime(); } static int is_efer_nx(void)