From da5215b9ca04850d7d959d8cd8680c4e74854694 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Oct 10 2013 12:54:46 +0000
Subject: Fix large order allocation in dm mq policy (rhbz 993744)


---

diff --git a/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch b/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
new file mode 100644
index 0000000..71234c1
--- /dev/null
+++ b/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
@@ -0,0 +1,31 @@
+diff --git a/drivers/md/dm-cache-policy-mq.c b/drivers/md/dm-cache-policy-mq.c
+index cab6dd2..ec79c8f 100644
+--- a/drivers/md/dm-cache-policy-mq.c
++++ b/drivers/md/dm-cache-policy-mq.c
+@@ -868,7 +868,7 @@ static void mq_destroy(struct dm_cache_policy *p)
+ 	struct mq_policy *mq = to_mq_policy(p);
+ 
+ 	free_bitset(mq->allocation_bitset);
+-	kfree(mq->table);
++	vfree(mq->table);
+ 	free_entries(mq);
+ 	kfree(mq);
+ }
+@@ -1189,7 +1189,7 @@ static struct dm_cache_policy *mq_create(dm_cblock_t cache_size,
+ 
+ 	mq->nr_buckets = next_power(from_cblock(cache_size) / 2, 16);
+ 	mq->hash_bits = ffs(mq->nr_buckets) - 1;
+-	mq->table = kzalloc(sizeof(*mq->table) * mq->nr_buckets, GFP_KERNEL);
++	mq->table = vzalloc(sizeof(*mq->table) * mq->nr_buckets);
+ 	if (!mq->table)
+ 		goto bad_alloc_table;
+ 
+@@ -1200,7 +1200,7 @@ static struct dm_cache_policy *mq_create(dm_cblock_t cache_size,
+ 	return &mq->policy;
+ 
+ bad_alloc_bitset:
+-	kfree(mq->table);
++	vfree(mq->table);
+ bad_alloc_table:
+ 	free_entries(mq);
+ bad_cache_alloc:
diff --git a/kernel.spec b/kernel.spec
index facf13b..4852238 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -779,6 +779,9 @@ Patch25125: vfio-iommu-Fixed-interaction-of-VFIO_IOMMU_MAP_DMA.patch
 Patch25126: 0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
 Patch25127: 0002-iwlwifi-don-t-WARN-on-bad-firmware-state.patch
 
+#rhbz 993744
+Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1506,6 +1509,9 @@ ApplyPatch vfio-iommu-Fixed-interaction-of-VFIO_IOMMU_MAP_DMA.patch
 ApplyPatch 0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
 ApplyPatch 0002-iwlwifi-don-t-WARN-on-bad-firmware-state.patch
 
+#rhbz 993744
+ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2318,6 +2324,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 10 2013 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix large order allocation in dm mq policy (rhbz 993744)
+
 * Wed Oct 09 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Don't trigger a stack trace on crashing iwlwifi firmware (rhbz 896695)
 - Add patch to fix VFIO IOMMU crash (rhbz 998732)