public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xen/gntdev: don't needlessly allocate k{,un}map_ops[]

Browse source 
They're needed only in the not-auto-translate (i.e. PV) case; there's no
point in allocating memory that's never going to get accessed.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/180d50cb-5531-8952-4bf0-d65c554638ed@suse.com
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
This commit is contained in:
Jan Beulich 2021-03-10 11:45:00 +01:00 • committed by Boris Ostrovsky
parent 0f9b05b9a0
commit 36caa3fedf
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/xen/gntdev.c
View file

@ -136,17 +136,20 @@ struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,
add->grants = kvcalloc(count, sizeof(add->grants[0]), GFP_KERNEL); add->grants = kvcalloc(count, sizeof(add->grants[0]), GFP_KERNEL);
add->map_ops = kvcalloc(count, sizeof(add->map_ops[0]), GFP_KERNEL); add->map_ops = kvcalloc(count, sizeof(add->map_ops[0]), GFP_KERNEL);
add->unmap_ops = kvcalloc(count, sizeof(add->unmap_ops[0]), GFP_KERNEL); add->unmap_ops = kvcalloc(count, sizeof(add->unmap_ops[0]), GFP_KERNEL);
add->kmap_ops = kvcalloc(count, sizeof(add->kmap_ops[0]), GFP_KERNEL);
add->kunmap_ops = kvcalloc(count,
sizeof(add->kunmap_ops[0]), GFP_KERNEL);
add->pages = kvcalloc(count, sizeof(add->pages[0]), GFP_KERNEL); add->pages = kvcalloc(count, sizeof(add->pages[0]), GFP_KERNEL);
if (NULL == add->grants || if (NULL == add->grants ||
NULL == add->map_ops || NULL == add->map_ops ||
NULL == add->unmap_ops || NULL == add->unmap_ops ||
NULL == add->kmap_ops ||
NULL == add->kunmap_ops ||
NULL == add->pages) NULL == add->pages)
goto err; goto err;
if (use_ptemod) {
add->kmap_ops = kvcalloc(count, sizeof(add->kmap_ops[0]),
GFP_KERNEL);
add->kunmap_ops = kvcalloc(count, sizeof(add->kunmap_ops[0]),
GFP_KERNEL);
if (NULL == add->kmap_ops || NULL == add->kunmap_ops)
goto err;
}
#ifdef CONFIG_XEN_GRANT_DMA_ALLOC #ifdef CONFIG_XEN_GRANT_DMA_ALLOC
add->dma_flags = dma_flags; add->dma_flags = dma_flags;
@ -185,8 +188,10 @@ struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
add->map_ops[i].handle = -1; add->map_ops[i].handle = -1;
add->unmap_ops[i].handle = -1; add->unmap_ops[i].handle = -1;
add->kmap_ops[i].handle = -1; if (use_ptemod) {
add->kunmap_ops[i].handle = -1; add->kmap_ops[i].handle = -1;
add->kunmap_ops[i].handle = -1;
}
} }
add->index = 0; add->index = 0;
@ -332,8 +337,8 @@ int gntdev_map_grant_pages(struct gntdev_grant_map *map)
} }
pr_debug("map %d+%d\n", map->index, map->count); pr_debug("map %d+%d\n", map->index, map->count);
err = gnttab_map_refs(map->map_ops, use_ptemod ? map->kmap_ops : NULL, err = gnttab_map_refs(map->map_ops, map->kmap_ops, map->pages,
map->pages, map->count); map->count);
for (i = 0; i < map->count; i++) { for (i = 0; i < map->count; i++) {
if (map->map_ops[i].status == GNTST_okay) if (map->map_ops[i].status == GNTST_okay)