leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/6d698901-98a4-05be-c421-bcd0713f5335@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Jan Beulich
2021-09-22 12:16:35 +02:00
committed by Juergen Gross
parent 0594c58161
commit 0432523f48
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/xen/privcmd.c
View File

@@ -420,7 +420,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs)
int rc; int rc;
struct page **pages; struct page **pages;
pages = kcalloc(numpgs, sizeof(pages[0]), GFP_KERNEL); pages = kvcalloc(numpgs, sizeof(pages[0]), GFP_KERNEL);
if (pages == NULL) if (pages == NULL)
return -ENOMEM; return -ENOMEM;
@@ -428,7 +428,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs)
if (rc != 0) { if (rc != 0) {
pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__, pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,
numpgs, rc); numpgs, rc);
kfree(pages); kvfree(pages);
return -ENOMEM; return -ENOMEM;
} }
BUG_ON(vma->vm_private_data != NULL); BUG_ON(vma->vm_private_data != NULL);
@@ -912,7 +912,7 @@ static void privcmd_close(struct vm_area_struct *vma)
else else
pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n", pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n",
numpgs, rc); numpgs, rc);
kfree(pages); kvfree(pages);
} }
static vm_fault_t privcmd_fault(struct vm_fault *vmf) static vm_fault_t privcmd_fault(struct vm_fault *vmf)