evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: Use kmem_cache_free for kmem_cache_zalloc'ed objects

Browse source 
We use kfree in svm.c and vmx.c, and this works, but it could break at
any time.  kfree() is supposed to match up with kmalloc().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Rusty Russell 2007-08-01 14:46:11 +10:00 • committed by Avi Kivity
parent f02424785a
commit a477034750
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/kvm/svm.c
View file

@ -610,7 +610,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)
uninit: uninit:
kvm_vcpu_uninit(&svm->vcpu); kvm_vcpu_uninit(&svm->vcpu);
free_svm: free_svm:
kfree(svm); kmem_cache_free(kvm_vcpu_cache, svm);
out: out:
return ERR_PTR(err); return ERR_PTR(err);
} }
@ -621,7 +621,7 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu)
__free_page(pfn_to_page(svm->vmcb_pa >> PAGE_SHIFT)); __free_page(pfn_to_page(svm->vmcb_pa >> PAGE_SHIFT));
kvm_vcpu_uninit(vcpu); kvm_vcpu_uninit(vcpu);
kfree(svm); kmem_cache_free(kvm_vcpu_cache, svm);
} }
static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

4
drivers/kvm/vmx.c
View file

@ -2359,7 +2359,7 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)
kfree(vmx->host_msrs); kfree(vmx->host_msrs);
kfree(vmx->guest_msrs); kfree(vmx->guest_msrs);
kvm_vcpu_uninit(vcpu); kvm_vcpu_uninit(vcpu);
kfree(vmx); kmem_cache_free(kvm_vcpu_cache, vmx);
} }
static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
@ -2410,7 +2410,7 @@ free_guest_msrs:
uninit_vcpu: uninit_vcpu:
kvm_vcpu_uninit(&vmx->vcpu); kvm_vcpu_uninit(&vmx->vcpu);
free_vcpu: free_vcpu:
kfree(vmx); kmem_cache_free(kvm_vcpu_cache, vmx);
return ERR_PTR(err); return ERR_PTR(err);
} }