kvm: use vzalloc instead of vmalloc
Subsystems (4)
PATCH 2/2 kvm: use vzalloc instead of vmalloc
Use vzalloc instead of vmalloc in kvm code.
Signed-off-by Dave Young <[email protected]>
--- arch/x86/kvm/x86.c | 3 +-- virt/kvm/kvm_main.c | 13 ++++--------- 2 files changed, 5 insertions(+), 11 deletions(-)
virt/kvm/kvm_main.c +4 -9
@@ -604,13 +604,11 @@ int __kvm_set_memory_region(struct kvm */* Allocate if a slot is being created */ #ifndef CONFIG_S390 if (npages && !new.rmap) { - new.rmap =vmalloc (npages *sizeof (*new.rmap)); + new.rmap =vzalloc (npages *sizeof (*new.rmap));if (!new.rmap) goto out_free; -memset (new.rmap,0 , npages *sizeof (*new.rmap)); - new.user_alloc = user_alloc; new.userspace_addr = mem->userspace_addr; }
@@ -633,14 +631,12 @@ int __kvm_set_memory_region(struct kvm * >> KVM_HPAGE_GFN_SHIFT(level)); lpages -= base_gfn >>KVM_HPAGE_GFN_SHIFT (level); - new.lpage_info[i] =vmalloc (lpages *sizeof (*new.lpage_info[i])); + new.lpage_info[i] =vzalloc (lpages * +sizeof (*new.lpage_info[i]));if (!new.lpage_info[i]) goto out_free; -memset (new.lpage_info[i],0 , - lpages *sizeof (*new.lpage_info[i])); -if (base_gfn & (KVM_PAGES_PER_HPAGE (level) -1 )) new.lpage_info[i][0 ].write_count =1 ;if ((base_gfn+npages) & (KVM_PAGES_PER_HPAGE (level) -1 ))
@@ -663,10 +659,9 @@ skip_lpage:if ((new.flags &KVM_MEM_LOG_DIRTY_PAGES ) && !new.dirty_bitmap) {unsigned long dirty_bytes =kvm_dirty_bitmap_bytes (&new); - new.dirty_bitmap =vmalloc (dirty_bytes); + new.dirty_bitmap =vzalloc (dirty_bytes);if (!new.dirty_bitmap) goto out_free; -memset (new.dirty_bitmap,0 , dirty_bytes);/* destroy any largepage mappings for dirty tracking */ if (old.npages) flush_shadow =1 ;
arch/x86/kvm/x86.c +1 -2
@@ -2917,10 +2917,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvspin_unlock (&kvm->mmu_lock); r = -ENOMEM ; - dirty_bitmap =vmalloc (n); + dirty_bitmap =vzalloc (n);if (!dirty_bitmap) goto out; -memset (dirty_bitmap,0 , n); r = -ENOMEM ; slots =kzalloc (sizeof (struct kvm_memslots ),GFP_KERNEL );
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>