From patchwork Tue Jun 15 13:55:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hansen X-Patchwork-Id: 106207 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 o5FDvacQ012980 for ; Tue, 15 Jun 2010 13:57:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932144Ab0FONzd (ORCPT ); Tue, 15 Jun 2010 09:55:33 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:56224 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932120Ab0FONza (ORCPT ); Tue, 15 Jun 2010 09:55:30 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e31.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5FDirVu024151; Tue, 15 Jun 2010 07:44:53 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5FDtNZ0143758; Tue, 15 Jun 2010 07:55:24 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5FDtL5l032623; Tue, 15 Jun 2010 07:55:22 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5FDtL8x032580; Tue, 15 Jun 2010 07:55:21 -0600 Received: from localhost.localdomain (localhost [127.0.0.1]) by kernel.beaverton.ibm.com (Postfix) with ESMTP id 157111E74F9; Tue, 15 Jun 2010 06:55:21 -0700 (PDT) Subject: [RFC][PATCH 2/9] rename x86 kvm->arch.n_alloc_mmu_pages To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, Dave Hansen From: Dave Hansen Date: Tue, 15 Jun 2010 06:55:20 -0700 References: <20100615135518.BC244431@kernel.beaverton.ibm.com> In-Reply-To: <20100615135518.BC244431@kernel.beaverton.ibm.com> Message-Id: <20100615135520.7B9E71AB@kernel.beaverton.ibm.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]); Tue, 15 Jun 2010 13:57:37 +0000 (UTC) diff -puN arch/x86/include/asm/kvm_host.h~rename-kvm_alloc arch/x86/include/asm/kvm_host.h --- linux-2.6.git/arch/x86/include/asm/kvm_host.h~rename-kvm_alloc 2010-06-09 15:14:28.000000000 -0700 +++ linux-2.6.git-dave/arch/x86/include/asm/kvm_host.h 2010-06-09 15:14:28.000000000 -0700 @@ -382,7 +382,7 @@ struct kvm_arch { unsigned int n_free_mmu_pages; unsigned int n_requested_mmu_pages; - unsigned int n_alloc_mmu_pages; + unsigned int n_max_mmu_pages; atomic_t invlpg_counter; struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES]; /* diff -puN arch/x86/kvm/mmu.c~rename-kvm_alloc arch/x86/kvm/mmu.c --- linux-2.6.git/arch/x86/kvm/mmu.c~rename-kvm_alloc 2010-06-09 15:14:28.000000000 -0700 +++ linux-2.6.git-dave/arch/x86/kvm/mmu.c 2010-06-09 15:14:28.000000000 -0700 @@ -1522,7 +1522,7 @@ void kvm_mmu_change_mmu_pages(struct kvm { int used_pages; - used_pages = kvm->arch.n_alloc_mmu_pages - kvm_mmu_available_pages(kvm); + used_pages = kvm->arch.n_max_mmu_pages - kvm_mmu_available_pages(kvm); used_pages = max(0, used_pages); /* @@ -1546,9 +1546,9 @@ void kvm_mmu_change_mmu_pages(struct kvm } else kvm->arch.n_free_mmu_pages += kvm_nr_mmu_pages - - kvm->arch.n_alloc_mmu_pages; + - kvm->arch.n_max_mmu_pages; - kvm->arch.n_alloc_mmu_pages = kvm_nr_mmu_pages; + kvm->arch.n_max_mmu_pages = kvm_nr_mmu_pages; } static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn) @@ -2932,7 +2932,7 @@ static int mmu_shrink(int nr_to_scan, gf idx = srcu_read_lock(&kvm->srcu); spin_lock(&kvm->mmu_lock); - npages = kvm->arch.n_alloc_mmu_pages - + npages = kvm->arch.n_max_mmu_pages - kvm_mmu_available_pages(kvm); cache_count += npages; if (!kvm_freed && nr_to_scan > 0 && npages > 0) { diff -puN arch/x86/kvm/x86.c~rename-kvm_alloc arch/x86/kvm/x86.c --- linux-2.6.git/arch/x86/kvm/x86.c~rename-kvm_alloc 2010-06-09 15:14:28.000000000 -0700 +++ linux-2.6.git-dave/arch/x86/kvm/x86.c 2010-06-09 15:14:28.000000000 -0700 @@ -2557,7 +2557,7 @@ static int kvm_vm_ioctl_set_nr_mmu_pages static int kvm_vm_ioctl_get_nr_mmu_pages(struct kvm *kvm) { - return kvm->arch.n_alloc_mmu_pages; + return kvm->arch.n_max_mmu_pages; } gfn_t unalias_gfn_instantiation(struct kvm *kvm, gfn_t gfn)