diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2012-09-26 23:45:45 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2012-09-26 23:45:45 +0100 |
| commit | 3ae706561637331aa578e52bb89ecbba5edcb7a9 (patch) | |
| tree | 681ff02fc4687617e9293ac3c28919ec26f225b0 /drivers/md/dm.c | |
| parent | c3c4555edd10dbc0b388a0125b9c50de5e79af05 (diff) | |
| download | linux-3.10-3ae706561637331aa578e52bb89ecbba5edcb7a9.tar.gz linux-3.10-3ae706561637331aa578e52bb89ecbba5edcb7a9.tar.bz2 linux-3.10-3ae706561637331aa578e52bb89ecbba5edcb7a9.zip | |
dm: retain table limits when swapping to new table with no devices
Add a safety net that will re-use the DM device's existing limits in the
event that DM device has a temporary table that doesn't have any
component devices. This is to reduce the chance that requests not
respecting the hardware limits will reach the device.
DM recalculates queue limits based only on devices which currently exist
in the table. This creates a problem in the event all devices are
temporarily removed such as all paths being lost in multipath. DM will
reset the limits to the maximum permissible, which can then assemble
requests which exceed the limits of the paths when the paths are
restored. The request will fail the blk_rq_check_limits() test when
sent to a path with lower limits, and will be retried without end by
multipath. This became a much bigger issue after v3.6 commit fe86cdcef
("block: do not artificially constrain max_sectors for stacking
drivers").
Reported-by: David Jeffery <djeffery@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 6748e0c4df1..67ffa391edc 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2429,7 +2429,7 @@ static void dm_queue_flush(struct mapped_device *md) */ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table) { - struct dm_table *map = ERR_PTR(-EINVAL); + struct dm_table *live_map, *map = ERR_PTR(-EINVAL); struct queue_limits limits; int r; @@ -2439,6 +2439,19 @@ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table) if (!dm_suspended_md(md)) goto out; + /* + * If the new table has no data devices, retain the existing limits. + * This helps multipath with queue_if_no_path if all paths disappear, + * then new I/O is queued based on these limits, and then some paths + * reappear. + */ + if (dm_table_has_no_data_devices(table)) { + live_map = dm_get_live_table(md); + if (live_map) + limits = md->queue->limits; + dm_table_put(live_map); + } + r = dm_calculate_queue_limits(table, &limits); if (r) { map = ERR_PTR(r); |