diff mbox series

[16/45] KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs

Message ID	20191022015925.31916-17-sean.j.christopherson@intel.com
State	Not Applicable
Headers	show Return-Path: <kvm-ppc-owner@vger.kernel.org> From: Sean Christopherson <sean.j.christopherson@intel.com> To: Marc Zyngier <maz@kernel.org>, James Hogan <jhogan@kernel.org>, Paul Mackerras <paulus@ozlabs.org>, Christian Borntraeger <borntraeger@de.ibm.com>, Janosch Frank <frankja@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Cc: James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Sean Christopherson <sean.j.christopherson@intel.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/45] KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs Date: Mon, 21 Oct 2019 18:58:56 -0700 Message-Id: <20191022015925.31916-17-sean.j.christopherson@intel.com> In-Reply-To: <20191022015925.31916-1-sean.j.christopherson@intel.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk
Series	KVM: Refactor vCPU creation \| expand [00/45] KVM: Refactor vCPU creation [01/45] KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails [02/45] KVM: PPC: Book3S PR: Free shared page if mmu initialization fails [03/45] KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails [04/45] KVM: VMX: Allocate VPID after initializing VCPU [05/45] KVM: VMX: Use direct vcpu pointer during vCPU create/free [06/45] KVM: SVM: Use direct vcpu pointer during vCPU create/free [07/45] KVM: x86: Allocate vcpu struct in common x86 code [08/45] KVM: x86: Move FPU allocation to common x86 code [09/45] KVM: x86: Move allocation of pio_data page down a few lines [10/45] KVM: x86: Move kvm_vcpu_init() invocation to common code [11/45] KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0 [12/45] KVM: PPC: Allocate vcpu struct in common PPC code [13/45] KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init [14/45] KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init() [15/45] KVM: PPC: Move kvm_vcpu_init() invocation to common code [16/45] KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs [17/45] KVM: MIPS: Drop kvm_arch_vcpu_free() [18/45] KVM: PPC: Drop kvm_arch_vcpu_free() [19/45] KVM: arm: Drop kvm_arch_vcpu_free() [20/45] KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path [21/45] KVM: x86: Remove spurious clearing of async #PF MSR [22/45] KVM: x86: Drop kvm_arch_vcpu_free() [23/45] KVM: Remove kvm_arch_vcpu_free() declaration [24/45] KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues [25/45] KVM: s390: Move guts of kvm_arch_vcpu_init() into kvm_arch_vcpu_create() [26/45] KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page [27/45] KVM: MIPS: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu [28/45] KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu [29/45] KVM: Introduce kvm_vcpu_destroy() [30/45] KVM: Move vcpu alloc and init invocation to common code [31/45] KVM: Unexport kvm_vcpu_cache and kvm_{un}init_vcpu() [32/45] KVM: Move initialization of preempt notifier to kvm_vcpu_init() [33/45] KVM: x86: Move guts of kvm_arch_vcpu_setup() into kvm_arch_vcpu_create() [34/45] KVM: MIPS: Move .vcpu_setup() call to kvm_arch_vcpu_create() [35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create() [36/45] KVM: PPC: BookE: Setup vcpu during kvmppc_core_vcpu_create() [37/45] KVM: Drop kvm_arch_vcpu_setup() [38/45] KVM: x86: Move all vcpu init code into kvm_arch_vcpu_create() [39/45] KVM: MIPS: Move all vcpu init code into kvm_arch_vcpu_create() [40/45] KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create() [41/45] KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create() [42/45] KVM: arm64: Free sve_state via arm specific hook [43/45] KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() [44/45] KVM: Move putting of vcpu->pid to kvm_vcpu_destroy() [45/45] KVM: Move vcpu->run page allocation out of kvm_vcpu_init()

Commit Message

Sean Christopherson Oct. 22, 2019, 1:58 a.m. UTC

For reasons unknown, MIPS configures the vCPU allocation cache but
allocates vCPUs via kzalloc().  Allocate from the vCPU cache in
preparation for moving vCPU allocation to common KVM code.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 arch/mips/kvm/mips.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 1109924560d8..5f985773417c 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -286,7 +286,7 @@  struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 	void *gebase, *p, *handler, *refill_start, *refill_end;
 	int i;
 
-	struct kvm_vcpu *vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);
+	struct kvm_vcpu *vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
 
 	if (!vcpu) {
 		err = -ENOMEM;
@@ -401,7 +401,7 @@  struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 	kvm_vcpu_uninit(vcpu);
 
 out_free_cpu:
-	kfree(vcpu);
+	kmem_cache_free(kvm_vcpu_cache, vcpu);
 
 out:
 	return ERR_PTR(err);
@@ -418,7 +418,7 @@  void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
 	kvm_mmu_free_memory_caches(vcpu);
 	kfree(vcpu->arch.guest_ebase);
 	kfree(vcpu->arch.kseg0_commpage);
-	kfree(vcpu);
+	kmem_cache_free(kvm_vcpu_cache, vcpu);
 }
 
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)