From patchwork Wed Jun 25 22:12:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 4424691 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0690DBEEAA for ; Wed, 25 Jun 2014 22:12:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AF5C20320 for ; Wed, 25 Jun 2014 22:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 422ED20304 for ; Wed, 25 Jun 2014 22:12:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756874AbaFYWMh (ORCPT ); Wed, 25 Jun 2014 18:12:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49276 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756849AbaFYWMf (ORCPT ); Wed, 25 Jun 2014 18:12:35 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 59668AD71; Wed, 25 Jun 2014 22:12:34 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini , kvm@vger.kernel.org (open list:X86) Subject: [PULL 16/19] target-i386: block migration and savevm if invariant tsc is exposed Date: Thu, 26 Jun 2014 00:12:16 +0200 Message-Id: <1403734339-14405-17-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1403734339-14405-1-git-send-email-afaerber@suse.de> References: <1403734339-14405-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Marcelo Tosatti Invariant TSC documentation mentions that "invariant TSC will run at a constant rate in all ACPI P-, C-. and T-states". This is not the case if migration to a host with different TSC frequency is allowed, or if savevm is performed. So block migration/savevm. Signed-off-by: Marcelo Tosatti Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost Reviewed-by: Juan Quintela [AF+mtosatti: Updated error message] Signed-off-by: Andreas Färber --- target-i386/cpu-qom.h | 2 +- target-i386/kvm.c | 15 +++++++++++++++ target-i386/machine.c | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index ff3a5de..71a1b97 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -121,7 +121,7 @@ static inline X86CPU *x86_env_get_cpu(CPUX86State *env) #define ENV_OFFSET offsetof(X86CPU, env) #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_x86_cpu; +extern struct VMStateDescription vmstate_x86_cpu; #endif /** diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 4bf0ac9..097fe11 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -35,6 +35,8 @@ #include "exec/ioport.h" #include #include "hw/pci/pci.h" +#include "migration/migration.h" +#include "qapi/qmp/qerror.h" //#define DEBUG_KVM @@ -448,6 +450,8 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_relaxed_timing); } +static Error *invtsc_mig_blocker; + #define KVM_MAX_CPUID_ENTRIES 100 int kvm_arch_init_vcpu(CPUState *cs) @@ -705,6 +709,17 @@ int kvm_arch_init_vcpu(CPUState *cs) !!(c->ecx & CPUID_EXT_SMX); } + c = cpuid_find_entry(&cpuid_data.cpuid, 0x80000007, 0); + if (c && (c->edx & 1<<8) && invtsc_mig_blocker == NULL) { + /* for migration */ + error_setg(&invtsc_mig_blocker, + "State blocked by non-migratable CPU device" + " (invtsc flag)"); + migrate_add_blocker(invtsc_mig_blocker); + /* for savevm */ + vmstate_x86_cpu.unmigratable = 1; + } + cpuid_data.cpuid.padding = 0; r = kvm_vcpu_ioctl(cs, KVM_SET_CPUID2, &cpuid_data); if (r) { diff --git a/target-i386/machine.c b/target-i386/machine.c index b8dcd2f..16d2f6a 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -603,7 +603,7 @@ static const VMStateDescription vmstate_msr_hyperv_time = { } }; -const VMStateDescription vmstate_x86_cpu = { +VMStateDescription vmstate_x86_cpu = { .name = "cpu", .version_id = 12, .minimum_version_id = 3,