Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/block/xen-blkfront.c

+19 −19
Original line number Diff line number Diff line
@@ -1310,11 +1310,11 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 
		}



free_shadow:

		kfree(rinfo->shadow[i].grants_used);

		kvfree(rinfo->shadow[i].grants_used);

		rinfo->shadow[i].grants_used = NULL;

		kfree(rinfo->shadow[i].indirect_grants);

		kvfree(rinfo->shadow[i].indirect_grants);

		rinfo->shadow[i].indirect_grants = NULL;

		kfree(rinfo->shadow[i].sg);

		kvfree(rinfo->shadow[i].sg);

		rinfo->shadow[i].sg = NULL;

	}
@@ -1353,7 +1353,7 @@ static void blkif_free(struct blkfront_info *info, int suspend) 
	for (i = 0; i < info->nr_rings; i++)

		blkif_free_ring(&info->rinfo[i]);



	kfree(info->rinfo);

	kvfree(info->rinfo);

	info->rinfo = NULL;

	info->nr_rings = 0;

}
@@ -1914,7 +1914,7 @@ static int negotiate_mq(struct blkfront_info *info) 
	if (!info->nr_rings)

		info->nr_rings = 1;



	info->rinfo = kcalloc(info->nr_rings,

	info->rinfo = kvcalloc(info->nr_rings,

			       sizeof(struct blkfront_ring_info),

			       GFP_KERNEL);

	if (!info->rinfo) {
@@ -2232,15 +2232,15 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo) 


	for (i = 0; i < BLK_RING_SIZE(info); i++) {

		rinfo->shadow[i].grants_used =

			kcalloc(grants,

			kvcalloc(grants,

				 sizeof(rinfo->shadow[i].grants_used[0]),

				 GFP_NOIO);

		rinfo->shadow[i].sg = kcalloc(psegs,

		rinfo->shadow[i].sg = kvcalloc(psegs,

					       sizeof(rinfo->shadow[i].sg[0]),

					       GFP_NOIO);

		if (info->max_indirect_segments)

			rinfo->shadow[i].indirect_grants =

				kcalloc(INDIRECT_GREFS(grants),

				kvcalloc(INDIRECT_GREFS(grants),

					 sizeof(rinfo->shadow[i].indirect_grants[0]),

					 GFP_NOIO);

		if ((rinfo->shadow[i].grants_used == NULL) ||
@@ -2256,11 +2256,11 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo) 


out_of_memory:

	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;

		kfree(rinfo->shadow[i].sg);

		kvfree(rinfo->shadow[i].sg);

		rinfo->shadow[i].sg = NULL;

		kfree(rinfo->shadow[i].indirect_grants);

		kvfree(rinfo->shadow[i].indirect_grants);

		rinfo->shadow[i].indirect_grants = NULL;

	}

	if (!list_empty(&rinfo->indirect_pages)) {