From patchwork Wed Sep 16 13:24:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 47984 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 n8GDTPRX004915 for ; Wed, 16 Sep 2009 13:29:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914AbZIPNY4 (ORCPT ); Wed, 16 Sep 2009 09:24:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752967AbZIPNYz (ORCPT ); Wed, 16 Sep 2009 09:24:55 -0400 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:22906 "EHLO VA3EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752493AbZIPNYu (ORCPT ); Wed, 16 Sep 2009 09:24:50 -0400 Received: from mail144-va3-R.bigfish.com (10.7.14.253) by VA3EHSOBE003.bigfish.com (10.7.40.23) with Microsoft SMTP Server id 8.1.340.0; Wed, 16 Sep 2009 13:24:53 +0000 Received: from mail144-va3 (localhost.localdomain [127.0.0.1]) by mail144-va3-R.bigfish.com (Postfix) with ESMTP id 615A36B84A5; Wed, 16 Sep 2009 13:24:53 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zzzz1202hzzz32i203h43j61h) X-Spam-TCS-SCL: 0:0 Received: by mail144-va3 (MessageSwitch) id 1253107492130595_31493; Wed, 16 Sep 2009 13:24:52 +0000 (UCT) Received: from ausb3extmailp01.amd.com (unknown [163.181.251.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail144-va3.bigfish.com (Postfix) with ESMTP id F39371560057; Wed, 16 Sep 2009 13:24:51 +0000 (UTC) Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n8GDOlXY028936; Wed, 16 Sep 2009 08:24:50 -0500 X-WSS-ID: 0KQ2FX9-01-3NQ-02 X-M-MSG: Received: from sausexbh1.amd.com (sausexbh1.amd.com [163.181.22.101]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.0) with ESMTP id 2E1B710284FD; Wed, 16 Sep 2009 08:24:44 -0500 (CDT) Received: from sausexmb2.amd.com ([163.181.3.157]) by sausexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 16 Sep 2009 08:24:47 -0500 Received: from SDRSEXMB1.amd.com ([172.20.3.116]) by sausexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 16 Sep 2009 08:24:47 -0500 Received: from seurexmb1.amd.com ([165.204.9.130]) by SDRSEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 16 Sep 2009 15:24:30 +0200 Received: from lemmy.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 16 Sep 2009 15:24:23 +0200 Received: by lemmy.amd.com (Postfix, from userid 41430) id BF3B9C9AC6; Wed, 16 Sep 2009 15:24:22 +0200 (CEST) From: Joerg Roedel To: Avi Kivity CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Graf , Joerg Roedel Subject: [PATCH 3/5] KVM: SVM: Fix tsc offset adjustment when running nested Date: Wed, 16 Sep 2009 15:24:17 +0200 Message-ID: <1253107459-8967-4-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1253107459-8967-1-git-send-email-joerg.roedel@amd.com> References: <1253107459-8967-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 16 Sep 2009 13:24:23.0156 (UTC) FILETIME=[014FEB40:01CA36D1] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When svm_vcpu_load is called while the vcpu is running in guest mode the tsc adjustment made there is lost on the next emulated #vmexit. This causes the tsc running backwards in the guest. This patch fixes the issue by also adjusting the tsc_offset in the emulated hsave area so that it will not get lost. Signed-off-by: Joerg Roedel --- arch/x86/kvm/svm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 80f5309..84c2c78 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -767,6 +767,8 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) rdtscll(tsc_this); delta = vcpu->arch.host_tsc - tsc_this; svm->vmcb->control.tsc_offset += delta; + if (is_nested(svm)) + svm->nested.hsave->control.tsc_offset += delta; vcpu->cpu = cpu; kvm_migrate_timers(vcpu); svm->asid_generation = 0;