1 files changed, 40 insertions, 1 deletions

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 100368eb7991..daf25d0890b3 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -967,13 +967,22 @@ bool dm_table_request_based(struct dm_table *t)
 int dm_table_alloc_md_mempools(struct dm_table *t)
 {
         unsigned type = dm_table_get_type(t);
+        unsigned per_bio_data_size = 0;
+        struct dm_target *tgt;
+        unsigned i;
 
         if (unlikely(type == DM_TYPE_NONE)) {
                 DMWARN("no table type is set, can't allocate mempools");
                 return -EINVAL;
         }
 
-        t->mempools = dm_alloc_md_mempools(type, t->integrity_supported);
+        if (type == DM_TYPE_BIO_BASED)
+                for (i = 0; i < t->num_targets; i++) {
+                        tgt = t->targets + i;
+                        per_bio_data_size = max(per_bio_data_size, tgt->per_bio_data_size);
+                }
+
+        t->mempools = dm_alloc_md_mempools(type, t->integrity_supported, per_bio_data_size);
         if (!t->mempools)
                 return -ENOMEM;
 
@@ -1414,6 +1423,33 @@ static bool dm_table_all_devices_attribute(struct dm_table *t,
         return 1;
 }
 
+static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
+                                         sector_t start, sector_t len, void *data)
+{
+        struct request_queue *q = bdev_get_queue(dev->bdev);
+
+        return q && !q->limits.max_write_same_sectors;
+}
+
+static bool dm_table_supports_write_same(struct dm_table *t)
+{
+        struct dm_target *ti;
+        unsigned i = 0;
+
+        while (i < dm_table_get_num_targets(t)) {
+                ti = dm_table_get_target(t, i++);
+
+                if (!ti->num_write_same_requests)
+                        return false;
+
+                if (!ti->type->iterate_devices ||
+                    !ti->type->iterate_devices(ti, device_not_write_same_capable, NULL))
+                        return false;
+        }
+
+        return true;
+}
+
 void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
                                struct queue_limits *limits)
 {
@@ -1445,6 +1481,9 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
         else
                 queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, q);
 
+        if (!dm_table_supports_write_same(t))
+                q->limits.max_write_same_sectors = 0;
+
         dm_table_set_integrity(t);
 
         /*