From patchwork Mon Jan 24 18:06:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 501301 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 p0OJh2Yc026265 for ; Mon, 24 Jan 2011 19:46:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753989Ab1AXSIA (ORCPT ); Mon, 24 Jan 2011 13:08:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16832 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891Ab1AXSH6 (ORCPT ); Mon, 24 Jan 2011 13:07:58 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0OI7qoX019224 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Jan 2011 13:07:52 -0500 Received: from virtlab1.virt.bos.redhat.com (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0OI7gkA003799; Mon, 24 Jan 2011 13:07:51 -0500 From: Glauber Costa To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, aliguori@us.ibm.com, Avi Kivity Subject: [PATCH 07/16] KVM-GST: Implement wallclock over KVM - KVM Virtual Memory Date: Mon, 24 Jan 2011 13:06:28 -0500 Message-Id: <1295892397-11354-8-git-send-email-glommer@redhat.com> In-Reply-To: <1295892397-11354-1-git-send-email-glommer@redhat.com> References: <1295892397-11354-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 24 Jan 2011 19:46:47 +0000 (UTC) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index f98d3ea..b8809f0 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -31,6 +31,7 @@ static int kvmclock = 1; static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME; static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK; +static int kvm_memory_area_available = 0; static int parse_no_kvmclock(char *arg) { @@ -43,6 +44,27 @@ early_param("no-kvmclock", parse_no_kvmclock); static DEFINE_PER_CPU_SHARED_ALIGNED(struct pvclock_vcpu_time_info, hv_clock); static struct pvclock_wall_clock wall_clock; +static int kvm_register_mem_area(u64 base, int type, int size) +{ + int low, high; + + struct kvm_memory_area mem; + + if (!kvm_memory_area_available) + return 1; + + mem.base = base; + mem.size = size; + mem.type = type; + + low = (int)__pa_symbol(&mem); + high = ((u64)__pa_symbol(&mem) >> 32); + + native_write_msr(MSR_KVM_REGISTER_MEM_AREA, low, high); + return mem.result; +} + + /* * The wallclock is the time of day when we booted. Since then, some time may * have elapsed since the hypervisor wrote the data. So we try to account for @@ -53,11 +75,17 @@ static unsigned long kvm_get_wallclock(void) struct pvclock_vcpu_time_info *vcpu_time; struct timespec ts; int low, high; - - low = (int)__pa_symbol(&wall_clock); - high = ((u64)__pa_symbol(&wall_clock) >> 32); - - native_write_msr(msr_kvm_wall_clock, low, high); + u64 addr = __pa_symbol(&wall_clock); + int ret; + + ret = kvm_register_mem_area(addr, KVM_AREA_WALLCLOCK, + sizeof(wall_clock)); + if (ret != 0) { + low = (int)addr; + high = ((u64)addr >> 32); + + native_write_msr(msr_kvm_wall_clock, low, high); + } vcpu_time = &get_cpu_var(hv_clock); pvclock_read_wallclock(&wall_clock, vcpu_time, &ts); @@ -179,6 +207,9 @@ void __init kvmclock_init(void) if (!kvm_para_available()) return; + if (kvm_para_has_feature(KVM_FEATURE_MEMORY_AREA)) + kvm_memory_area_available = 1; + if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE2)) { msr_kvm_system_time = MSR_KVM_SYSTEM_TIME_NEW; msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK_NEW;