Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daefb794 authored by Wei Yang's avatar Wei Yang Committed by Paolo Bonzini
Browse files

KVM: x86: return 0 in case kvm_mmu_memory_cache has min number of objects 



The code tries to pre-allocate *min* number of objects, so it is ok to
return 0 when the kvm_mmu_memory_cache meets the requirement.

Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 55c1dcd8

arch/x86/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, 
	while (cache->nobjs < ARRAY_SIZE(cache->objects)) {

		obj = kmem_cache_zalloc(base_cache, GFP_KERNEL);

		if (!obj)

			return -ENOMEM;

			return cache->nobjs >= min ? 0 : -ENOMEM;

		cache->objects[cache->nobjs++] = obj;

	}

	return 0;
@@ -960,7 +960,7 @@ static int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache, 
	while (cache->nobjs < ARRAY_SIZE(cache->objects)) {

		page = (void *)__get_free_page(GFP_KERNEL_ACCOUNT);

		if (!page)

			return -ENOMEM;

			return cache->nobjs >= min ? 0 : -ENOMEM;

		cache->objects[cache->nobjs++] = page;

	}

	return 0;