From patchwork Tue Dec 15 04:08:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 67480 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBF4QSLt016846 for ; Tue, 15 Dec 2009 04:26:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759290AbZLOEMb (ORCPT ); Mon, 14 Dec 2009 23:12:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759281AbZLOEM3 (ORCPT ); Mon, 14 Dec 2009 23:12:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25824 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755510AbZLOEHD (ORCPT ); Mon, 14 Dec 2009 23:07:03 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBF472Zh010469 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 14 Dec 2009 23:07:02 -0500 Received: from localhost.localdomain (vpn-9-100.rdu.redhat.com [10.11.9.100]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBF46m8x031119; Mon, 14 Dec 2009 23:07:00 -0500 From: Zachary Amsden To: kvm@vger.kernel.org Cc: Zachary Amsden , Avi Kivity , Marcelo Tosatti , Joerg Roedel , linux-kernel@vger.kernel.org, Dor Laor Subject: [PATCH RFC: kvm tsc virtualization 05/20] Fix AMD C1 TSC desynchronization Date: Mon, 14 Dec 2009 18:08:32 -1000 Message-Id: <1260850127-9766-6-git-send-email-zamsden@redhat.com> In-Reply-To: <1260850127-9766-5-git-send-email-zamsden@redhat.com> References: <1260850127-9766-1-git-send-email-zamsden@redhat.com> <1260850127-9766-2-git-send-email-zamsden@redhat.com> <1260850127-9766-3-git-send-email-zamsden@redhat.com> <1260850127-9766-4-git-send-email-zamsden@redhat.com> <1260850127-9766-5-git-send-email-zamsden@redhat.com> Organization: Frobozz Magic Timekeeping Company X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a599c78..4c4d2e0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -43,6 +43,12 @@ #define CREATE_TRACE_POINTS #include "trace.h" +#ifdef CONFIG_K8_NB +#include +#include +#include +#endif + #include #include #include @@ -3548,10 +3554,42 @@ static struct notifier_block kvm_x86_cpu_notifier = { .priority = -INT_MAX, /* we want to be called last */ }; +static u8 disabled_c1_ramp = 0; + static void kvm_timer_init(void) { int cpu; + /* + * AMD processors can de-synchronize TSC on halt in C1 state, because + * processors in lower P state will have TSC scaled properly during + * normal operation, but will have TSC scaled improperly while + * servicing cache probes. Because there is no way to determine how + * TSC was adjusted during cache probes, there are two solutions: + * resynchronize after halt, or disable C1-clock ramping. + * + * We implemenent solution 2. + */ +#ifdef CONFIG_K8_NB + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD && + boot_cpu_data.x86 == 0x0f && + !boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) { + struct pci_dev *nb; + int i; + cache_k8_northbridges(); + for (i = 0; i < num_k8_northbridges; i++) { + u8 byte; + nb = k8_northbridges[i]; + pci_read_config_byte(nb, 0x87, &byte); + if (byte & 1) { + printk(KERN_INFO "%s: AMD C1 clock ramping detected, performing workaround\n", __func__); + disabled_c1_ramp = byte; + pci_write_config_byte(nb, 0x87, byte & 0xFC); + + } + } + } +#endif register_cpu_notifier(&kvm_x86_cpu_notifier); if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) { cpufreq_register_notifier(&kvmclock_cpufreq_notifier_block, @@ -3627,6 +3665,13 @@ void kvm_arch_exit(void) unregister_cpu_notifier(&kvm_x86_cpu_notifier); kvm_x86_ops = NULL; kvm_mmu_module_exit(); +#ifdef CONFIG_K8_NB + if (disabled_c1_ramp) { + struct pci_dev **nb; + for (nb = k8_northbridges; *nb; nb++) + pci_write_config_byte(*nb, 0x87, disabled_c1_ramp); + } +#endif } int kvm_emulate_halt(struct kvm_vcpu *vcpu)