From patchwork Thu Sep 24 03:29:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 49734 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8O3WlLp024591 for ; Thu, 24 Sep 2009 03:32:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753001AbZIXDbg (ORCPT ); Wed, 23 Sep 2009 23:31:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752746AbZIXDbe (ORCPT ); Wed, 23 Sep 2009 23:31:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58791 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbZIXDb3 (ORCPT ); Wed, 23 Sep 2009 23:31:29 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8O3VXJv020111; Wed, 23 Sep 2009 23:31:33 -0400 Received: from localhost.localdomain (vpn-12-112.rdu.redhat.com [10.11.12.112]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8O3VLPx019943; Wed, 23 Sep 2009 23:31:31 -0400 From: Zachary Amsden To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Zachary Amsden , Avi Kivity , Marcelo Tosatti Subject: [PATCH: kvm 5/6] Don't unconditionally clear cpu_khz_tsc in hardware_enable. Date: Wed, 23 Sep 2009 17:29:04 -1000 Message-Id: <1253762945-5750-5-git-send-email-zamsden@redhat.com> In-Reply-To: <1253762945-5750-4-git-send-email-zamsden@redhat.com> References: <1253762945-5750-1-git-send-email-zamsden@redhat.com> <1253762945-5750-2-git-send-email-zamsden@redhat.com> <1253762945-5750-3-git-send-email-zamsden@redhat.com> <1253762945-5750-4-git-send-email-zamsden@redhat.com> Organization: Frobozz Magic Timekeeping Company X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For the non-hotplug case, this TSC speed should be available; instead, clear cpu_khz_tsc when bringing down a CPU so it is recomputed at the next bringup. Signed-off-by: Zachary Amsden --- arch/x86/kvm/x86.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 38ba4a6..f1470ce 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4721,18 +4721,16 @@ int kvm_arch_cpu_hotadd(int cpu) void kvm_arch_cpu_hotremove(int cpu) { + /* + * Reset TSC khz to zero so it is recomputed on bringup + */ + if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) + per_cpu(cpu_tsc_khz, cpu) = 0; kvm_x86_ops->cpu_hotremove(cpu); } int kvm_arch_hardware_enable(void *garbage) { - /* - * Notifier callback chain may not have called cpufreq code - * yet, thus we must reset TSC khz to zero and recompute it - * before entering. - */ - if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) - per_cpu(cpu_tsc_khz, raw_smp_processor_id()) = 0; return kvm_x86_ops->hardware_enable(garbage); }