From patchwork Fri Aug 7 09:49:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 39817 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 n779plYo030836 for ; Fri, 7 Aug 2009 09:51:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755909AbZHGJuf (ORCPT ); Fri, 7 Aug 2009 05:50:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753991AbZHGJuf (ORCPT ); Fri, 7 Aug 2009 05:50:35 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.15]:57452 "EHLO VA3EHSOBE006.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753174AbZHGJuG (ORCPT ); Fri, 7 Aug 2009 05:50:06 -0400 Received: from mail102-va3-R.bigfish.com (10.7.14.251) by VA3EHSOBE006.bigfish.com (10.7.40.26) with Microsoft SMTP Server id 8.1.340.0; Fri, 7 Aug 2009 09:50:06 +0000 Received: from mail102-va3 (localhost.localdomain [127.0.0.1]) by mail102-va3-R.bigfish.com (Postfix) with ESMTP id 9457F4D04C5; Fri, 7 Aug 2009 09:50:06 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zzzz1202hzzz32i203h43j62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, Received: by mail102-va3 (MessageSwitch) id 1249638605185689_960; Fri, 7 Aug 2009 09:50:05 +0000 (UCT) Received: from svlb1extmailp01.amd.com (unknown [139.95.251.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail102-va3.bigfish.com (Postfix) with ESMTP id 098FE19A004B; Fri, 7 Aug 2009 09:50:04 +0000 (UTC) Received: from svlb1twp02.amd.com ([139.95.250.35]) by svlb1extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n779nwGl010776; Fri, 7 Aug 2009 02:50:01 -0700 X-WSS-ID: 0KO03B9-04-L8E-01 Received: from SSVLEXBH2.amd.com (ssvlexbh2.amd.com [139.95.53.183]) by svlb1twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 2060C1103BC; Fri, 7 Aug 2009 02:49:56 -0700 (PDT) Received: from SSVLEXMB1.amd.com ([139.95.53.181]) by SSVLEXBH2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 02:49:59 -0700 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by SSVLEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 02:49:58 -0700 Received: from seurexmb1.amd.com ([165.204.9.130]) by SF30EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 11:49:53 +0200 Received: from lemmy.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 11:49:51 +0200 Received: by lemmy.amd.com (Postfix, from userid 41430) id C2CD0C9FE6; Fri, 7 Aug 2009 11:49:50 +0200 (CEST) From: Joerg Roedel To: Avi Kivity CC: Alexander Graf , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 12/21] kvm/svm: clean up nested_svm_exit_handled_msr Date: Fri, 7 Aug 2009 11:49:39 +0200 Message-ID: <1249638588-10982-13-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249638588-10982-1-git-send-email-joerg.roedel@amd.com> References: <1249638588-10982-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 07 Aug 2009 09:49:51.0140 (UTC) FILETIME=[68782640:01CA1744] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch changes nested svm to call nested_svm_exit_handled_msr directly and not through nested_svm_do. Signed-off-by: Joerg Roedel --- arch/x86/kvm/svm.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1753a64..448d493 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1486,15 +1486,20 @@ static int nested_svm_do(struct vcpu_svm *svm, return retval; } -static int nested_svm_exit_handled_msr(struct vcpu_svm *svm, - void *arg1, void *arg2, - void *opaque) +static bool nested_svm_exit_handled_msr(struct vcpu_svm *svm) { - struct vmcb *nested_vmcb = (struct vmcb *)arg1; - u8 *msrpm = (u8 *)arg2; - u32 t0, t1; - u32 msr = svm->vcpu.arch.regs[VCPU_REGS_RCX]; u32 param = svm->vmcb->control.exit_info_1 & 1; + u32 msr = svm->vcpu.arch.regs[VCPU_REGS_RCX]; + struct vmcb *nested_vmcb; + bool ret = false; + u32 t0, t1; + u8 *msrpm; + + nested_vmcb = nested_svm_map(svm, svm->nested.vmcb, KM_USER0); + msrpm = nested_svm_map(svm, svm->nested.vmcb_msrpm, KM_USER1); + + if (!nested_vmcb || !msrpm) + goto out; if (!(nested_vmcb->control.intercept & (1ULL << INTERCEPT_MSR_PROT))) return 0; @@ -1515,13 +1520,17 @@ static int nested_svm_exit_handled_msr(struct vcpu_svm *svm, t0 %= 8; break; default: - return 1; - break; + ret = true; + goto out; } - if (msrpm[t1] & ((1 << param) << t0)) - return 1; - return 0; + ret = msrpm[t1] & ((1 << param) << t0); + +out: + nested_svm_unmap(nested_vmcb, KM_USER0); + nested_svm_unmap(msrpm, KM_USER1); + + return ret; } static int nested_svm_exit_handled(struct vcpu_svm *svm, bool kvm_override) @@ -1551,9 +1560,7 @@ static int nested_svm_exit_handled(struct vcpu_svm *svm, bool kvm_override) switch (exit_code) { case SVM_EXIT_MSR: - if (nested_svm_do(svm, svm->nested.vmcb, svm->nested.vmcb_msrpm, - NULL, nested_svm_exit_handled_msr)) - vmexit = true; + vmexit = nested_svm_exit_handled_msr(svm); break; case SVM_EXIT_READ_CR0 ... SVM_EXIT_READ_CR8: { u32 cr_bits = 1 << (exit_code - SVM_EXIT_READ_CR0);