Commit 0432523f authored by Jan Beulich's avatar Jan Beulich Committed by Juergen Gross
Browse files

xen/privcmd: replace kcalloc() by kvcalloc() when allocating empty pages 



Osstest has been suffering test failures for a little while from order-4
allocation failures, resulting from alloc_empty_pages() calling
kcalloc(). As there's no need for physically contiguous space here,
switch to kvcalloc().

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/6d698901-98a4-05be-c421-bcd0713f5335@suse.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 0594c581

drivers/xen/privcmd.c

+3 −3
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs) 
	int rc;

	struct page **pages;



	pages = kcalloc(numpgs, sizeof(pages[0]), GFP_KERNEL);

	pages = kvcalloc(numpgs, sizeof(pages[0]), GFP_KERNEL);

	if (pages == NULL)

		return -ENOMEM;
@@ -428,7 +428,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs) 
	if (rc != 0) {

		pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,

			numpgs, rc);

		kfree(pages);

		kvfree(pages);

		return -ENOMEM;

	}

	BUG_ON(vma->vm_private_data != NULL);
@@ -912,7 +912,7 @@ static void privcmd_close(struct vm_area_struct *vma) 
	else

		pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n",

			numpgs, rc);

	kfree(pages);

	kvfree(pages);

}



static vm_fault_t privcmd_fault(struct vm_fault *vmf)