summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2010-08-23 16:13:15 +0800
committerAvi Kivity <avi@redhat.com>2010-10-24 10:51:21 +0200
commit45bf21a8ce7a2884f067a702a5c7683684846ce1 (patch)
tree68d4ed52d4125543e741027ab89f8f6f4bce6183
parent80b63faf028fba79e630d3643b0e615bddf4067b (diff)
downloadlinux-3.10-45bf21a8ce7a2884f067a702a5c7683684846ce1.tar.gz
linux-3.10-45bf21a8ce7a2884f067a702a5c7683684846ce1.tar.bz2
linux-3.10-45bf21a8ce7a2884f067a702a5c7683684846ce1.zip
KVM: MMU: fix missing percpu counter destroy
commit ad05c88266b4cce1c820928ce8a0fb7690912ba1 (KVM: create aggregate kvm_total_used_mmu_pages value) introduce percpu counter kvm_total_used_mmu_pages but never destroy it, this may cause oops when rmmod & modprobe. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Acked-by: Tim Pepper <lnxninja@linux.vnet.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/mmu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index c2ac7004441..54a50268ceb 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -3185,6 +3185,7 @@ static void mmu_destroy_caches(void)
void kvm_mmu_module_exit(void)
{
mmu_destroy_caches();
+ percpu_counter_destroy(&kvm_total_used_mmu_pages);
unregister_shrinker(&mmu_shrinker);
}
@@ -3207,7 +3208,9 @@ int kvm_mmu_module_init(void)
if (!mmu_page_header_cache)
goto nomem;
- percpu_counter_init(&kvm_total_used_mmu_pages, 0);
+ if (percpu_counter_init(&kvm_total_used_mmu_pages, 0))
+ goto nomem;
+
register_shrinker(&mmu_shrinker);
return 0;