From patchwork Fri Mar 27 14:31:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 14731 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 n2REWejM009739 for ; Fri, 27 Mar 2009 14:32:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756686AbZC0Oc0 (ORCPT ); Fri, 27 Mar 2009 10:32:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756388AbZC0OcZ (ORCPT ); Fri, 27 Mar 2009 10:32:25 -0400 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:5262 "EHLO VA3EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755682AbZC0OcW (ORCPT ); Fri, 27 Mar 2009 10:32:22 -0400 Received: from mail126-va3-R.bigfish.com (10.7.14.238) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 8.1.340.0; Fri, 27 Mar 2009 14:32:18 +0000 Received: from mail126-va3 (localhost.localdomain [127.0.0.1]) by mail126-va3-R.bigfish.com (Postfix) with ESMTP id 6EBC9940308; Fri, 27 Mar 2009 14:32:18 +0000 (UTC) X-BigFish: VPS3(zzzz1202hzzz32i43j61h) X-Spam-TCS-SCL: 0:0 X-FB-SS: 5, Received: by mail126-va3 (MessageSwitch) id 1238164336997562_1912; Fri, 27 Mar 2009 14:32:16 +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 mail126-va3.bigfish.com (Postfix) with ESMTP id D934E13F005A; Fri, 27 Mar 2009 14:32:16 +0000 (UTC) Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n2REWA4B032714; Fri, 27 Mar 2009 09:32:13 -0500 X-WSS-ID: 0KH65PG-02-E3T-01 Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 2CE191234008; Fri, 27 Mar 2009 09:32:04 -0500 (CDT) Received: from sausexmb1.amd.com ([163.181.3.156]) by sausexbh2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Mar 2009 09:32:11 -0500 Received: from SDRSEXMB1.amd.com ([172.20.3.116]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Mar 2009 09:32:11 -0500 Received: from seurexmb1.amd.com ([165.204.82.130]) by SDRSEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Mar 2009 15:32:01 +0100 Received: from lemmy.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Mar 2009 15:32:00 +0100 Received: by lemmy.amd.com (Postfix, from userid 41430) id EAB2924638; Fri, 27 Mar 2009 15:31:59 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 6/7] kvm mmu: enabling 1GB pages by extending backing_size funtion Date: Fri, 27 Mar 2009 15:31:58 +0100 Message-ID: <1238164319-16092-7-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.5.6.4 In-Reply-To: <1238164319-16092-1-git-send-email-joerg.roedel@amd.com> References: <1238164319-16092-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 27 Mar 2009 14:32:00.0634 (UTC) FILETIME=[CA4B2DA0:01C9AEE8] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch enables support for 1GB pages in KVM by implementing the support in backing_size(). Signed-off-by: Joerg Roedel --- arch/x86/kvm/mmu.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 3f5e20b..471e5d0 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -479,7 +479,9 @@ static enum kvm_page_size host_page_size(struct kvm *kvm, gfn_t gfn) vma = find_vma(current->mm, addr); if (vma) { size = vma_kernel_pagesize(vma); - if (size >= KVM_PAGE_SIZE_2M) + if (size == KVM_PAGE_SIZE_1G) + ret = KVM_PAGE_SIZE_1G; + else if (size >= KVM_PAGE_SIZE_2M) ret = KVM_PAGE_SIZE_2M; } up_read(¤t->mm->mmap_sem); @@ -490,18 +492,30 @@ static enum kvm_page_size host_page_size(struct kvm *kvm, gfn_t gfn) static enum kvm_page_size backing_size(struct kvm_vcpu *vcpu, gfn_t gfn) { struct kvm_memory_slot *slot; - - if (has_wrprotected_page(vcpu->kvm, gfn)) - return KVM_PAGE_SIZE_4k; - - if (host_page_size(vcpu->kvm, gfn) < KVM_PAGE_SIZE_2M) - return KVM_PAGE_SIZE_4k; + enum kvm_page_size host_size, ret; slot = gfn_to_memslot(vcpu->kvm, gfn); if (slot && slot->dirty_bitmap) return KVM_PAGE_SIZE_4k; - return KVM_PAGE_SIZE_2M; + host_size = host_page_size(vcpu->kvm, gfn); + + switch (host_size) { + case KVM_PAGE_SIZE_1G: + if (!has_wrprotected_largepage(vcpu->kvm, gfn)) { + ret = KVM_PAGE_SIZE_1G; + break; + } + case KVM_PAGE_SIZE_2M: + if (!has_wrprotected_page(vcpu->kvm, gfn)) { + ret = KVM_PAGE_SIZE_2M; + break; + } + default: + ret = KVM_PAGE_SIZE_4k; + } + + return ret; } /*