From patchwork Tue Nov 17 05:20:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 7632931 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B8365BF90C for ; Tue, 17 Nov 2015 05:21:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E91FD204D2 for ; Tue, 17 Nov 2015 05:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A4A3204D1 for ; Tue, 17 Nov 2015 05:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbbKQFVF (ORCPT ); Tue, 17 Nov 2015 00:21:05 -0500 Received: from mga03.intel.com ([134.134.136.65]:46942 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634AbbKQFVE (ORCPT ); Tue, 17 Nov 2015 00:21:04 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 16 Nov 2015 21:21:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,306,1444719600"; d="scan'208";a="821856133" Received: from hzzhang-optiplex-9020.sh.intel.com (HELO localhost) ([10.239.12.31]) by orsmga001.jf.intel.com with ESMTP; 16 Nov 2015 21:21:00 -0800 From: Haozhong Zhang To: , Eduardo Habkost , "Dr. David Alan Gilbert" Cc: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , , Marcelo Tosatti , kvm@vger.kernel.org, Haozhong Zhang Subject: [PATCH v5 2/3] target-i386: reorganize TSC rate setting code Date: Tue, 17 Nov 2015 13:20:38 +0800 Message-Id: <1447737639-6139-3-git-send-email-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.4.8 In-Reply-To: <1447737639-6139-1-git-send-email-haozhong.zhang@intel.com> References: <1447737639-6139-1-git-send-email-haozhong.zhang@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.7 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 Following two changes are made to the TSC rate setting code in kvm_arch_init_vcpu(): * The code is moved to a new function kvm_arch_set_tsc_khz(). * If setting user-specified TSC rate fails and the host TSC rate is inconsistent with the user-specified one, print a warning message. Signed-off-by: Haozhong Zhang --- target-i386/kvm.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 9e4d27f..6a1acb4 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -524,6 +524,41 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_runtime); } +/** + * Ask KVM to set vcpu's TSC rate to X86_CPU(cs)->env.tsc_khz. + * + * Returns: 0 if successful; + * -ENOTSUP if KVM_CAP_TSC_CONTROL is unavailable; + * -EIO if KVM_SET_TSC_KHZ fails. + */ +static int kvm_arch_set_tsc_khz(CPUState *cs) +{ + X86CPU *cpu = X86_CPU(cs); + CPUX86State *env = &cpu->env; + int has_tsc_control, r = 0; + + if (!env->tsc_khz) { + return 0; + } + + has_tsc_control = kvm_check_extension(cs->kvm_state, KVM_CAP_TSC_CONTROL); + if (has_tsc_control) { + r = kvm_vcpu_ioctl(cs, KVM_SET_TSC_KHZ, env->tsc_khz); + } + + if (!has_tsc_control || r < 0) { + r = kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ? + kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : -ENOTSUP; + if (r <= 0 || r != env->tsc_khz) { + error_report("warning: TSC frequency mismatch between " + "VM and host, and TSC scaling unavailable"); + return has_tsc_control ? -EIO : -ENOTSUP; + } + } + + return 0; +} + static Error *invtsc_mig_blocker; #define KVM_MAX_CPUID_ENTRIES 100 @@ -823,13 +858,9 @@ int kvm_arch_init_vcpu(CPUState *cs) return r; } - r = kvm_check_extension(cs->kvm_state, KVM_CAP_TSC_CONTROL); - if (r && env->tsc_khz) { - r = kvm_vcpu_ioctl(cs, KVM_SET_TSC_KHZ, env->tsc_khz); - if (r < 0) { - fprintf(stderr, "KVM_SET_TSC_KHZ failed\n"); - return r; - } + if (kvm_arch_set_tsc_khz(cs) == -EIO) { + fprintf(stderr, "KVM_SET_TSC_KHZ failed\n"); + return -EIO; } /*