Commit 8e61f6f7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-5.2b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "Just one fix for the Xen block frontend driver avoiding allocations
  with order > 0"

* tag 'for-linus-5.2b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkfront: switch kcalloc to kvcalloc for large array allocation
parents 3d4645bf 1d5c76e6
...@@ -1310,11 +1310,11 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) ...@@ -1310,11 +1310,11 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo)
} }
free_shadow: free_shadow:
kfree(rinfo->shadow[i].grants_used); kvfree(rinfo->shadow[i].grants_used);
rinfo->shadow[i].grants_used = NULL; rinfo->shadow[i].grants_used = NULL;
kfree(rinfo->shadow[i].indirect_grants); kvfree(rinfo->shadow[i].indirect_grants);
rinfo->shadow[i].indirect_grants = NULL; rinfo->shadow[i].indirect_grants = NULL;
kfree(rinfo->shadow[i].sg); kvfree(rinfo->shadow[i].sg);
rinfo->shadow[i].sg = NULL; rinfo->shadow[i].sg = NULL;
} }
...@@ -1353,7 +1353,7 @@ static void blkif_free(struct blkfront_info *info, int suspend) ...@@ -1353,7 +1353,7 @@ static void blkif_free(struct blkfront_info *info, int suspend)
for (i = 0; i < info->nr_rings; i++) for (i = 0; i < info->nr_rings; i++)
blkif_free_ring(&info->rinfo[i]); blkif_free_ring(&info->rinfo[i]);
kfree(info->rinfo); kvfree(info->rinfo);
info->rinfo = NULL; info->rinfo = NULL;
info->nr_rings = 0; info->nr_rings = 0;
} }
...@@ -1914,9 +1914,9 @@ static int negotiate_mq(struct blkfront_info *info) ...@@ -1914,9 +1914,9 @@ static int negotiate_mq(struct blkfront_info *info)
if (!info->nr_rings) if (!info->nr_rings)
info->nr_rings = 1; info->nr_rings = 1;
info->rinfo = kcalloc(info->nr_rings, info->rinfo = kvcalloc(info->nr_rings,
sizeof(struct blkfront_ring_info), sizeof(struct blkfront_ring_info),
GFP_KERNEL); GFP_KERNEL);
if (!info->rinfo) { if (!info->rinfo) {
xenbus_dev_fatal(info->xbdev, -ENOMEM, "allocating ring_info structure"); xenbus_dev_fatal(info->xbdev, -ENOMEM, "allocating ring_info structure");
info->nr_rings = 0; info->nr_rings = 0;
...@@ -2232,17 +2232,17 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo) ...@@ -2232,17 +2232,17 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
for (i = 0; i < BLK_RING_SIZE(info); i++) { for (i = 0; i < BLK_RING_SIZE(info); i++) {
rinfo->shadow[i].grants_used = rinfo->shadow[i].grants_used =
kcalloc(grants, kvcalloc(grants,
sizeof(rinfo->shadow[i].grants_used[0]), sizeof(rinfo->shadow[i].grants_used[0]),
GFP_NOIO); GFP_NOIO);
rinfo->shadow[i].sg = kcalloc(psegs, rinfo->shadow[i].sg = kvcalloc(psegs,
sizeof(rinfo->shadow[i].sg[0]), sizeof(rinfo->shadow[i].sg[0]),
GFP_NOIO); GFP_NOIO);
if (info->max_indirect_segments) if (info->max_indirect_segments)
rinfo->shadow[i].indirect_grants = rinfo->shadow[i].indirect_grants =
kcalloc(INDIRECT_GREFS(grants), kvcalloc(INDIRECT_GREFS(grants),
sizeof(rinfo->shadow[i].indirect_grants[0]), sizeof(rinfo->shadow[i].indirect_grants[0]),
GFP_NOIO); GFP_NOIO);
if ((rinfo->shadow[i].grants_used == NULL) || if ((rinfo->shadow[i].grants_used == NULL) ||
(rinfo->shadow[i].sg == NULL) || (rinfo->shadow[i].sg == NULL) ||
(info->max_indirect_segments && (info->max_indirect_segments &&
...@@ -2256,11 +2256,11 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo) ...@@ -2256,11 +2256,11 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
out_of_memory: out_of_memory:
for (i = 0; i < BLK_RING_SIZE(info); i++) { for (i = 0; i < BLK_RING_SIZE(info); i++) {
kfree(rinfo->shadow[i].grants_used); kvfree(rinfo->shadow[i].grants_used);
rinfo->shadow[i].grants_used = NULL; rinfo->shadow[i].grants_used = NULL;
kfree(rinfo->shadow[i].sg); kvfree(rinfo->shadow[i].sg);
rinfo->shadow[i].sg = NULL; rinfo->shadow[i].sg = NULL;
kfree(rinfo->shadow[i].indirect_grants); kvfree(rinfo->shadow[i].indirect_grants);
rinfo->shadow[i].indirect_grants = NULL; rinfo->shadow[i].indirect_grants = NULL;
} }
if (!list_empty(&rinfo->indirect_pages)) { if (!list_empty(&rinfo->indirect_pages)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment