Skip to contentSkip to conversation

dm snapshot: implement .iterate_devices

PATCH In review Mike Snitzer 3 participants 6 messages Aug 23, 2009 – Aug 26, 2009 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm snapshot: implement .iterate_devices

This patch implements .iterate_devices for the origin and snapshot targets. dm-snapshot's lack of .iterate_devices resulted in the inability to properly establish queue_limits for both targets.

With 4K sector drives: an unfortunate side-effect of not establishing proper limits in either targets' DM device was that IO to the devices would fail even though both had been created without error.

Commit af4874e03ed82f050d5872d8c39ce64bf16b5c38 should have implemented .iterate_devices for dm-snap.c's origin and snapshot targets.

---

drivers/md/dm-snap.c +21 -2
index d573165..57f1bf7 100644
@@ -1176,6 +1176,15 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
 	return 0;
 }
 
+static int snapshot_iterate_devices(struct dm_target *ti,
+				    iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_snapshot *snap = ti->private;
+
+	return fn(ti, snap->origin, 0, ti->len, data);
+}
+
+
 /*-----------------------------------------------------------------
  * Origin methods
  *---------------------------------------------------------------*/
@@ -1410,20 +1419,29 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,
 	return 0;
 }
 
+static int origin_iterate_devices(struct dm_target *ti,
+				  iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_dev *dev = ti->private;
+
+	return fn(ti, dev, 0, ti->len, data);
+}
+
 static struct target_type origin_target = {
 	.name    = "snapshot-origin",
-	.version = {1, 6, 0},
+	.version = {1, 7, 0},
 	.module  = THIS_MODULE,
 	.ctr     = origin_ctr,
 	.dtr     = origin_dtr,
 	.map     = origin_map,
 	.resume  = origin_resume,
 	.status  = origin_status,
+	.iterate_devices = origin_iterate_devices,
 };
 
 static struct target_type snapshot_target = {
 	.name    = "snapshot",
-	.version = {1, 6, 0},
+	.version = {1, 7, 0},
 	.module  = THIS_MODULE,
 	.ctr     = snapshot_ctr,
 	.dtr     = snapshot_dtr,
@@ -1431,6 +1449,7 @@ static struct target_type snapshot_target = {
 	.end_io  = snapshot_end_io,
 	.resume  = snapshot_resume,
 	.status  = snapshot_status,
+	.iterate_devices = snapshot_iterate_devices,
 };
 
 static int __init dm_snapshot_init(void)
#1 lore raw
Quoted 7 lines · On Sun, 23 Aug 2009 02:11:07 -0400 Mike Snitzer <[email protected]> wrote:

This patch implements .iterate_devices for the origin and snapshot targets. dm-snapshot's lack of .iterate_devices resulted in the inability to properly establish queue_limits for both targets.

With 4K sector drives: an unfortunate side-effect of not establishing proper limits in either targets' DM device was that IO to the devices would fail even though both had been created without error.

Does this make the patch a regression fix?

Quoted 2 lines

Commit af4874e03ed82f050d5872d8c39ce64bf16b5c38 should have implemented .iterate_devices for dm-snap.c's origin and snapshot targets.

Please use the form af4874e03ed82f050d5872d8c39ce64bf16b5c38 ("dm target:s introduce iterate devices fn") when referring to commits. Because commits might have different IDs in different trees (I think that's the reason).

#2 lore raw
Quoted 7 lines · Andrew Morton
Quoted 4 lines · On Sun, 23 Aug 2009 02:11:07 -0400 Mike Snitzer <[email protected]> wrote:

This patch implements .iterate_devices for the origin and snapshot targets. dm-snapshot's lack of .iterate_devices resulted in the inability to properly establish queue_limits for both targets.

Quoted 5 lines
Quoted 3 lines

With 4K sector drives: an unfortunate side-effect of not establishing proper limits in either targets' DM device was that IO to the devices would fail even though both had been created without error.

Does this make the patch a regression fix?

Yes.

Quoted 7 lines
Quoted 2 lines

Commit af4874e03ed82f050d5872d8c39ce64bf16b5c38 should have implemented .iterate_devices for dm-snap.c's origin and snapshot targets.

Please use the form af4874e03ed82f050d5872d8c39ce64bf16b5c38 ("dm target:s introduce iterate devices fn") when referring to commits. Because commits might have different IDs in different trees (I think that's the reason).

OK, thanks for picking this up. I believe Alasdair is back from vacation tomorrow and will be pushing other remaining DM fixes for 2.6.31 final.

#3 lore raw
In reply to Mike Snitzer
Quoted 14 lines · Mike Snitzer

This patch implements .iterate_devices for the origin and snapshot targets. dm-snapshot's lack of .iterate_devices resulted in the inability to properly establish queue_limits for both targets. With 4K sector drives: an unfortunate side-effect of not establishing proper limits in either targets' DM device was that IO to the devices would fail even though both had been created without error. Commit af4874e03ed82f050d5872d8c39ce64bf16b5c38 should have implemented .iterate_devices for dm-snap.c's origin and snapshot targets.

drivers/md/dm-snap.c +5 -0
+static int snapshot_iterate_devices(struct dm_target *ti,
+				    iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_snapshot *snap = ti->private;
+

drivers/md/dm-snap.c static int snapshot_status(struct dm_target *ti, status_type_t type,

Quoted 10 lines
drivers/md/dm-snap.c +9 -0
+	return fn(ti, snap->origin, 0, ti->len, data);
+}
 
+static int origin_iterate_devices(struct dm_target *ti,
+				  iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_dev *dev = ti->private;
+
+	return fn(ti, dev, 0, ti->len, data);
+}

Why are these both seemingly the same? Is one sufficient? And where are the characteristics of the 'cow' device taken into account?

Alasdair

#4 lore raw
Quoted 18 lines · Alasdair G Kergon
Quoted 16 lines · Mike Snitzer

This patch implements .iterate_devices for the origin and snapshot targets. dm-snapshot's lack of .iterate_devices resulted in the inability to properly establish queue_limits for both targets. With 4K sector drives: an unfortunate side-effect of not establishing proper limits in either targets' DM device was that IO to the devices would fail even though both had been created without error. Commit af4874e03ed82f050d5872d8c39ce64bf16b5c38 should have implemented .iterate_devices for dm-snap.c's origin and snapshot targets.

drivers/md/dm-snap.c +7 -0
+static int snapshot_iterate_devices(struct dm_target *ti,
+				    iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_snapshot *snap = ti->private;
+
+	return fn(ti, snap->origin, 0, ti->len, data);
+}
Quoted 9 lines

drivers/md/dm-snap.c static int origin_status(struct dm_target *ti, status_type_t type, char *result, · line 1428

Quoted 7 lines
drivers/md/dm-snap.c +7 -0
+static int origin_iterate_devices(struct dm_target *ti,
+				  iterate_devices_callout_fn fn, void *data)
+{
+	struct dm_dev *dev = ti->private;
+
+	return fn(ti, dev, 0, ti->len, data);
+}

Why are these both seemingly the same? Is one sufficient?

One is not sufficient. If snapshot_iterate_devices() isn't provided the snapshot fails IO on 4K drives; e.g. an ext3 mount in my test case:
sd 13:0:0:0: [sdc] Bad block number requested
EXT3-fs: unable to read superblock

Quoted 1 line

And where are the characteristics of the 'cow' device taken into account?

As we discussed, the snapshot_iterate_devices() needs more intelligence.

For now the current snapshot_iterate_devices() is a means to establish more reasonable limits based on the origin. So in my 4K drive case it was a means to an end but it was naively incomplete. One _could_ have a cow with different logical_block_size, etc. (e.g. 512B origin + 4K cow). So stacking the cow limits is clearly needed.

I'll work on a proper solution for snapshot_iterate_devices() and get that to you ASAP.

Thanks for the review.

Mike

#5 lore raw
Quoted 2 lines · Mike Snitzer

I'll work on a proper solution for snapshot_iterate_devices() and get that to you ASAP.

So let's push this patch as-is for 2.6.31 as it clearly fixes one problem, and determine the right way of handling the characteristics of the 'cow' device in a supplementary patch.

Alasdair