From patchwork Sun Dec 8 11:33:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadim Rozenfeld X-Patchwork-Id: 3306301 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C53379F37A for ; Sun, 8 Dec 2013 11:34:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F275D20263 for ; Sun, 8 Dec 2013 11:34:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4525F20204 for ; Sun, 8 Dec 2013 11:34:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755215Ab3LHLeJ (ORCPT ); Sun, 8 Dec 2013 06:34:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13479 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754946Ab3LHLeI (ORCPT ); Sun, 8 Dec 2013 06:34:08 -0500 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.14.4/8.14.4) with ESMTP id rB8BY6B6012537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 8 Dec 2013 06:34:06 -0500 Received: from localhost.redhat.com (vpn-200-8.tlv.redhat.com [10.35.200.8]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rB8BXhrs004323; Sun, 8 Dec 2013 06:34:01 -0500 From: Vadim Rozenfeld To: kvm@vger.kernel.org Cc: mtosatti@redhat.com, pl@dlhnet.de, pbonzini@redhat.com, Vadim Rozenfeld Subject: [RFC PATCH v3 2/2] add support for Hyper-V partition reference time enlightenment Date: Sun, 8 Dec 2013 22:33:39 +1100 Message-Id: <1386502419-26614-3-git-send-email-vrozenfe@redhat.com> In-Reply-To: <1386502419-26614-1-git-send-email-vrozenfe@redhat.com> References: <1386502419-26614-1-git-send-email-vrozenfe@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-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following patch allows to activate a partition reference time enlightenment that is based on the host platform's support for an Invariant Time Stamp Counter (iTSC). v2 -> v3 Handle TSC sequence, scale, and offest changing during migration. --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 2fd0753..81fdff0 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -607,6 +607,7 @@ struct kvm_arch { u64 hv_hypercall; u64 hv_ref_count; u64 hv_tsc_page; + u64 hv_ref_time; #ifdef CONFIG_KVM_MMU_AUDIT int audit_point; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5e4e495a..cb6766a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1882,14 +1882,19 @@ static int set_msr_hyperv_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data) break; } gfn = data >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT; - addr = gfn_to_hva(kvm, data >> - HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT); + addr = gfn_to_hva(kvm, gfn); if (kvm_is_error_hva(addr)) return 1; + tsc_ref.tsc_sequence = + boot_cpu_has(X86_FEATURE_CONSTANT_TSC) ? 1 : 0; + tsc_ref.tsc_scale = + ((10000LL << 32) / vcpu->arch.virtual_tsc_khz) << 32; + tsc_ref.tsc_offset = 0; if (__copy_to_user((void __user *)addr, &tsc_ref, sizeof(tsc_ref))) return 1; mark_page_dirty(kvm, gfn); kvm->arch.hv_tsc_page = data; + kvm->arch.hv_ref_count = 0; break; } default: @@ -3879,6 +3884,19 @@ long kvm_arch_vm_ioctl(struct file *filp, local_irq_enable(); kvm->arch.kvmclock_offset = delta; kvm_gen_update_masterclock(kvm); + + if (kvm->arch.hv_tsc_page & HV_X64_MSR_TSC_REFERENCE_ENABLE) { + HV_REFERENCE_TSC_PAGE* tsc_ref; + u64 curr_time; + tsc_ref = (HV_REFERENCE_TSC_PAGE*)gfn_to_hva(kvm, + kvm->arch.hv_tsc_page >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT); + tsc_ref->tsc_sequence = + boot_cpu_has(X86_FEATURE_CONSTANT_TSC) ? tsc_ref->tsc_sequence + 1 : 0; + tsc_ref->tsc_scale = ((10000LL << 32) / __get_cpu_var(cpu_tsc_khz)) << 32; + curr_time = (((tsc_ref->tsc_scale >> 32) * native_read_tsc()) >> 32) + + tsc_ref->tsc_offset; + tsc_ref->tsc_offset = kvm->arch.hv_ref_time - curr_time; + } break; } case KVM_GET_CLOCK: { @@ -3896,6 +3914,13 @@ long kvm_arch_vm_ioctl(struct file *filp, if (copy_to_user(argp, &user_ns, sizeof(user_ns))) goto out; r = 0; + if (kvm->arch.hv_tsc_page & HV_X64_MSR_TSC_REFERENCE_ENABLE) { + HV_REFERENCE_TSC_PAGE* tsc_ref; + tsc_ref = (HV_REFERENCE_TSC_PAGE*)gfn_to_hva(kvm, + kvm->arch.hv_tsc_page >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT); + kvm->arch.hv_ref_time = (((tsc_ref->tsc_scale >> 32) * + native_read_tsc()) >> 32) + tsc_ref->tsc_offset; + } break; }