[v4,3/5] KVM: x86: Rename mmu_memory_cache to kvm_mmu_memcache

Message ID	20191105110357.8607-4-christoffer.dall@arm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=X2oT=Y5=vger.kernel.org=kvm-owner@kernel.org> From: Christoffer Dall <christoffer.dall@arm.com> To: kvm@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, Christoffer Dall <christoffer.dall@arm.com>, James Hogan <jhogan@kernel.org>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>, Joerg Roedel <joro@8bytes.org>, Marc Zyngier <maz@kernel.org>, Paul Mackerras <paulus@ozlabs.org>, Christian Borntraeger <borntraeger@de.ibm.com>, Anshuman Khandual <anshuman.khandual@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Sean Christopherson <sean.j.christopherson@intel.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Mike Rapoport <rppt@linux.ibm.com> Subject: [PATCH v4 3/5] KVM: x86: Rename mmu_memory_cache to kvm_mmu_memcache Date: Tue, 5 Nov 2019 12:03:55 +0100 Message-Id: <20191105110357.8607-4-christoffer.dall@arm.com> In-Reply-To: <20191105110357.8607-1-christoffer.dall@arm.com> References: <20191105110357.8607-1-christoffer.dall@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: Unify mmu_memory_cache functionality across architectures \| expand [v4,0/5] KVM: Unify mmu_memory_cache functionality across architectures [v4,1/5] KVM: x86: Move memcache allocation to GFP_PGTABLE_USER [v4,2/5] KVM: x86: Move mmu_memory_cache functions to common code [v4,3/5] KVM: x86: Rename mmu_memory_cache to kvm_mmu_memcache [v4,4/5] KVM: arm/arm64: Move to common kvm_mmu_memcache infrastructure [v4,5/5] KVM: mips: Move to common kvm_mmu_memcache infrastructure

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index e5080b618f3c..47e183ca0fb2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -586,9 +586,9 @@ struct kvm_vcpu_arch { */ struct kvm_mmu *walk_mmu; - struct kvm_mmu_memory_cache mmu_pte_list_desc_cache; - struct kvm_mmu_memory_cache mmu_page_cache; - struct kvm_mmu_memory_cache mmu_page_header_cache; + struct kvm_mmu_memcache mmu_pte_list_desc_cache; + struct kvm_mmu_memcache mmu_page_cache; + struct kvm_mmu_memcache mmu_page_header_cache; /* * QEMU userspace and the guest each have their own FPU state. diff --git a/arch/x86/include/asm/kvm_types.h b/arch/x86/include/asm/kvm_types.h index 40428651dc7a..d391490ab8d1 100644 --- a/arch/x86/include/asm/kvm_types.h +++ b/arch/x86/include/asm/kvm_types.h @@ -2,8 +2,8 @@ #ifndef _ASM_X86_KVM_TYPES_H #define _ASM_X86_KVM_TYPES_H -#define KVM_ARCH_WANT_MMU_MEMORY_CACHE +#define KVM_ARCH_WANT_MMU_MEMCACHE -#define KVM_NR_MEM_OBJS 40 +#define KVM_MMU_NR_MEMCACHE_OBJS 40 #endif /* _ASM_X86_KVM_TYPES_H */ diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index abcdb47b0ac7..431ac346a1e8 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1017,35 +1017,35 @@ static void walk_shadow_page_lockless_end(struct kvm_vcpu *vcpu) local_irq_enable(); } -static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu) +static int kvm_mmu_topup_memcaches(struct kvm_vcpu *vcpu) { int r; - r = mmu_topup_memory_cache(&vcpu->arch.mmu_pte_list_desc_cache, + r = kvm_mmu_topup_memcache(&vcpu->arch.mmu_pte_list_desc_cache, pte_list_desc_cache, 8 + PTE_PREFETCH_NUM); if (r) goto out; - r = mmu_topup_memory_cache_page(&vcpu->arch.mmu_page_cache, 8); + r = kvm_mmu_topup_memcache_page(&vcpu->arch.mmu_page_cache, 8); if (r) goto out; - r = mmu_topup_memory_cache(&vcpu->arch.mmu_page_header_cache, + r = kvm_mmu_topup_memcache(&vcpu->arch.mmu_page_header_cache, mmu_page_header_cache, 4); out: return r; } -static void mmu_free_memory_caches(struct kvm_vcpu *vcpu) +static void kvm_mmu_free_memcaches(struct kvm_vcpu *vcpu) { - mmu_free_memory_cache(&vcpu->arch.mmu_pte_list_desc_cache, + kvm_mmu_free_memcache(&vcpu->arch.mmu_pte_list_desc_cache, pte_list_desc_cache); - mmu_free_memory_cache_page(&vcpu->arch.mmu_page_cache); - mmu_free_memory_cache(&vcpu->arch.mmu_page_header_cache, + kvm_mmu_free_memcache_page(&vcpu->arch.mmu_page_cache); + kvm_mmu_free_memcache(&vcpu->arch.mmu_page_header_cache, mmu_page_header_cache); } static struct pte_list_desc *mmu_alloc_pte_list_desc(struct kvm_vcpu *vcpu) { - return mmu_memory_cache_alloc(&vcpu->arch.mmu_pte_list_desc_cache); + return kvm_mmu_memcache_alloc(&vcpu->arch.mmu_pte_list_desc_cache); } static void mmu_free_pte_list_desc(struct pte_list_desc *pte_list_desc) @@ -1371,10 +1371,10 @@ static struct kvm_rmap_head *gfn_to_rmap(struct kvm *kvm, gfn_t gfn, static bool rmap_can_add(struct kvm_vcpu *vcpu) { - struct kvm_mmu_memory_cache *cache; + struct kvm_mmu_memcache *cache; cache = &vcpu->arch.mmu_pte_list_desc_cache; - return mmu_memory_cache_free_objects(cache); + return kvm_mmu_memcache_free_objects(cache); } static int rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn) @@ -2062,10 +2062,10 @@ static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, int direct { struct kvm_mmu_page *sp; - sp = mmu_memory_cache_alloc(&vcpu->arch.mmu_page_header_cache); - sp->spt = mmu_memory_cache_alloc(&vcpu->arch.mmu_page_cache); + sp = kvm_mmu_memcache_alloc(&vcpu->arch.mmu_page_header_cache); + sp->spt = kvm_mmu_memcache_alloc(&vcpu->arch.mmu_page_cache); if (!direct) - sp->gfns = mmu_memory_cache_alloc(&vcpu->arch.mmu_page_cache); + sp->gfns = kvm_mmu_memcache_alloc(&vcpu->arch.mmu_page_cache); set_page_private(virt_to_page(sp->spt), (unsigned long)sp); /* @@ -4005,7 +4005,7 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, if (page_fault_handle_page_track(vcpu, error_code, gfn)) return RET_PF_EMULATE; - r = mmu_topup_memory_caches(vcpu); + r = kvm_mmu_topup_memcaches(vcpu); if (r) return r; @@ -4121,7 +4121,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code, if (page_fault_handle_page_track(vcpu, error_code, gfn)) return RET_PF_EMULATE; - r = mmu_topup_memory_caches(vcpu); + r = kvm_mmu_topup_memcaches(vcpu); if (r) return r; @@ -5102,7 +5102,7 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu) { int r; - r = mmu_topup_memory_caches(vcpu); + r = kvm_mmu_topup_memcaches(vcpu); if (r) goto out; r = mmu_alloc_roots(vcpu); @@ -5280,7 +5280,7 @@ static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, * or not since pte prefetch is skiped if it does not have * enough objects in the cache. */ - mmu_topup_memory_caches(vcpu); + kvm_mmu_topup_memcaches(vcpu); spin_lock(&vcpu->kvm->mmu_lock); @@ -6169,7 +6169,7 @@ void kvm_mmu_destroy(struct kvm_vcpu *vcpu) kvm_mmu_unload(vcpu); free_mmu_pages(&vcpu->arch.root_mmu); free_mmu_pages(&vcpu->arch.guest_mmu); - mmu_free_memory_caches(vcpu); + kvm_mmu_free_memcaches(vcpu); } void kvm_mmu_module_exit(void) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 7d5cdb3af594..106bb08c11ee 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -765,7 +765,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code); - r = mmu_topup_memory_caches(vcpu); + r = kvm_mmu_topup_memcaches(vcpu); if (r) return r; @@ -885,7 +885,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva, hpa_t root_hpa) * No need to check return value here, rmap_can_add() can * help us to skip pte prefetch later. */ - mmu_topup_memory_caches(vcpu); + kvm_mmu_topup_memcaches(vcpu); if (!VALID_PAGE(root_hpa)) { WARN_ON(1); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 612922d440cc..c832b925d4ee 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -788,15 +788,15 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu, bool usermode_vcpu_not_eligible); void kvm_flush_remote_tlbs(struct kvm *kvm); void kvm_reload_remote_mmus(struct kvm *kvm); -#ifdef KVM_ARCH_WANT_MMU_MEMORY_CACHE -int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, +#ifdef KVM_ARCH_WANT_MMU_MEMCACHE +int kvm_mmu_topup_memcache(struct kvm_mmu_memcache *cache, struct kmem_cache *base_cache, int min); -int mmu_memory_cache_free_objects(struct kvm_mmu_memory_cache *cache); -void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc, +int kvm_mmu_memcache_free_objects(struct kvm_mmu_memcache *cache); +void kvm_mmu_free_memcache(struct kvm_mmu_memcache *mc, struct kmem_cache *cache); -int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache, int min); -void mmu_free_memory_cache_page(struct kvm_mmu_memory_cache *mc); -void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc); +int kvm_mmu_topup_memcache_page(struct kvm_mmu_memcache *cache, int min); +void kvm_mmu_free_memcache_page(struct kvm_mmu_memcache *mc); +void *kvm_mmu_memcache_alloc(struct kvm_mmu_memcache *mc); #endif bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req, diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h index ca7d3b3c8487..bfe59aa55736 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h @@ -50,14 +50,14 @@ struct gfn_to_hva_cache { struct kvm_memory_slot *memslot; }; -#ifdef KVM_ARCH_WANT_MMU_MEMORY_CACHE +#ifdef KVM_ARCH_WANT_MMU_MEMCACHE /* * We don't want allocation failures within the mmu code, so we preallocate * enough memory for a single page fault in a cache. */ -struct kvm_mmu_memory_cache { +struct kvm_mmu_memcache { int nobjs; - void *objects[KVM_NR_MEM_OBJS]; + void *objects[KVM_MMU_NR_MEMCACHE_OBJS]; }; #endif diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a4e8297152e9..278a881ca3e3 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -289,8 +289,8 @@ void kvm_reload_remote_mmus(struct kvm *kvm) kvm_make_all_cpus_request(kvm, KVM_REQ_MMU_RELOAD); } -#ifdef KVM_ARCH_WANT_MMU_MEMORY_CACHE -int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, +#ifdef KVM_ARCH_WANT_MMU_MEMCACHE +int kvm_mmu_topup_memcache(struct kvm_mmu_memcache *cache, struct kmem_cache *base_cache, int min) { void *obj; @@ -306,19 +306,19 @@ int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, return 0; } -int mmu_memory_cache_free_objects(struct kvm_mmu_memory_cache *cache) +int kvm_mmu_memcache_free_objects(struct kvm_mmu_memcache *cache) { return cache->nobjs; } -void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc, +void kvm_mmu_free_memcache(struct kvm_mmu_memcache *mc, struct kmem_cache *cache) { while (mc->nobjs) kmem_cache_free(cache, mc->objects[--mc->nobjs]); } -int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache, int min) +int kvm_mmu_topup_memcache_page(struct kvm_mmu_memcache *cache, int min) { void *page; @@ -333,13 +333,13 @@ int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache, int min) return 0; } -void mmu_free_memory_cache_page(struct kvm_mmu_memory_cache *mc) +void kvm_mmu_free_memcache_page(struct kvm_mmu_memcache *mc) { while (mc->nobjs) free_page((unsigned long)mc->objects[--mc->nobjs]); } -void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc) +void *kvm_mmu_memcache_alloc(struct kvm_mmu_memcache *mc) { void *p;

[v4,3/5] KVM: x86: Rename mmu_memory_cache to kvm_mmu_memcache

Commit Message

Patch