From patchwork Wed Feb 24 17:59:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 81787 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1OI0vsh001829 for ; Wed, 24 Feb 2010 18:00:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757555Ab0BXSAL (ORCPT ); Wed, 24 Feb 2010 13:00:11 -0500 Received: from va3ehsobe002.messaging.microsoft.com ([216.32.180.12]:51441 "EHLO VA3EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757553Ab0BXSAH (ORCPT ); Wed, 24 Feb 2010 13:00:07 -0500 Received: from mail171-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 8.1.240.5; Wed, 24 Feb 2010 18:00:07 +0000 Received: from mail171-va3 (localhost [127.0.0.1]) by mail171-va3-R.bigfish.com (Postfix) with ESMTP id 0714E1980A16; Wed, 24 Feb 2010 18:00:07 +0000 (UTC) X-SpamScore: -4 X-BigFish: VPS-4(zz936eMab9bhzz1202hzzz32i87h6bh62h) X-Spam-TCS-SCL: 1:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail171-va3 (localhost.localdomain [127.0.0.1]) by mail171-va3 (MessageSwitch) id 1267034401812404_8293; Wed, 24 Feb 2010 18:00:01 +0000 (UTC) Received: from VA3EHSMHS028.bigfish.com (unknown [10.7.14.251]) by mail171-va3.bigfish.com (Postfix) with ESMTP id 32798F4016C; Wed, 24 Feb 2010 17:59:40 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by VA3EHSMHS028.bigfish.com (10.7.99.38) with Microsoft SMTP Server (TLS) id 14.0.482.39; Wed, 24 Feb 2010 17:59:36 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id o1OI2WYa016920; Wed, 24 Feb 2010 12:02:35 -0600 X-WSS-ID: 0KYCXZ4-01-2RE-02 X-M-MSG: Received: from sausexbh1.amd.com (sausexbh1.amd.com [163.181.22.101]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2FF2A102856C; Wed, 24 Feb 2010 11:59:27 -0600 (CST) Received: from sausexmb1.amd.com ([163.181.3.156]) by sausexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 24 Feb 2010 11:59:32 -0600 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 24 Feb 2010 11:59:31 -0600 Received: from lemmy.osrc.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 24 Feb 2010 18:59:23 +0100 Received: by lemmy.osrc.amd.com (Postfix, from userid 41430) id 8AF2FC9AB9; Wed, 24 Feb 2010 18:59:23 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: Alexander Graf , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 11/11] KVM: SVM: Optimize nested svm msrpm merging Date: Wed, 24 Feb 2010 18:59:20 +0100 Message-ID: <1267034360-5907-12-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267034360-5907-1-git-send-email-joerg.roedel@amd.com> References: <1267034360-5907-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 24 Feb 2010 17:59:23.0730 (UTC) FILETIME=[18ED7320:01CAB57B] MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.com Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 24 Feb 2010 18:00:58 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ae2f211..eb25fea 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -754,6 +754,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->nested.hsave = page_address(hsave_page); svm->nested.msrpm = page_address(nested_msrpm_pages); + svm_vcpu_init_msrpm(svm->nested.msrpm); svm->vmcb = page_address(page); clear_page(svm->vmcb); @@ -1824,20 +1825,46 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) { - u32 *nested_msrpm; - struct page *page; + /* + * This function merges the msr permission bitmaps of kvm and the + * nested vmcb. It is omptimized in that it only merges the parts where + * the kvm msr permission bitmap may contain zero bits + */ + static const u32 msrpm_offsets[] = { + 0x0000002c, /* SYSENTER_CS */ + + 0x00000038, /* LASTBRANCHFROMIP + LASTBRANCHTOIP + LASTINTFROMIP + LASTINTTOIP */ + + 0x00000820, /* STAR + LSTAR + CSTAR + SYSCALL_MASK */ + + 0x00000840, /* FS_BASE + GS_BASE + KERNEL_GS_BASE */ + + 0xffffffff, /* End of List */ + }; int i; - nested_msrpm = nested_svm_map(svm, svm->nested.vmcb_msrpm, &page); - if (!nested_msrpm) - return false; + for (i = 0; msrpm_offsets[i] != 0xffffffff; i++) { + u32 value, p; + u64 offset; - for (i = 0; i < PAGE_SIZE * (1 << MSRPM_ALLOC_ORDER) / 4; i++) - svm->nested.msrpm[i] = svm->msrpm[i] | nested_msrpm[i]; + offset = svm->nested.vmcb_msrpm + msrpm_offsets[i]; + p = msrpm_offsets[i] / 4; - svm->vmcb->control.msrpm_base_pa = __pa(svm->nested.msrpm); + if (kvm_read_guest(svm->vcpu.kvm, offset, &value, 4)) + return false; - nested_svm_unmap(page); + svm->nested.msrpm[p] = svm->msrpm[p] | value; + } + + svm->vmcb->control.msrpm_base_pa = __pa(svm->nested.msrpm); return true; }