* block offset shift, mirroring bug resolved?
2005-02-12 4:45 Multipath target does not shift block offset? Tim Burgess
@ 2005-02-14 1:42 ` Tim Burgess
2005-02-16 16:02 ` Multipath target does not shift block offset? Kevin Corry
1 sibling, 0 replies; 3+ messages in thread
From: Tim Burgess @ 2005-02-14 1:42 UTC (permalink / raw)
To: device-mapper development
I've tried Kevin Corry's patches (with my extra modification to
do_write, as quoted below), and the mirroring problem seems resolved. I
might have a poke around and see if I can figure out why it was happening...
The setup I had was:
#!/bin/sh
dmsetup remove_all
dmsetup create mirror <<EOF
0 16777216 mirror core 1 2048 2 /dev/sdd 0 /dev/sdt 0
16777216 16777216 mirror core 1 2048 2 /dev/sde 0 /dev/sdu 0
33554432 16777216 mirror core 1 2048 2 /dev/sdf 0 /dev/sdv 0
50331648 16777216 mirror core 1 2048 2 /dev/sdg 0 /dev/sdw 0
67108864 16777216 mirror core 1 2048 2 /dev/sdp 0 /dev/sdae 0
83886080 16777216 mirror core 1 2048 2 /dev/sdq 0 /dev/sdaf 0
100663296 16777216 mirror core 1 2048 2 /dev/sdr 0 /dev/sdag 0
117440512 16777216 mirror core 1 2048 2 /dev/sds 0 /dev/sdah 0
EOF
dmsetup create reliable <<EOF
0 134217728 striped 8 512 /dev/mapper/mirror 0 /dev/mapper/mirror
16777216 /dev/mapper/mirror 33554432 /dev/mapper/mirror 50331648
/dev/mapper/mirror 67108864 /dev/mapper/mirror 83886080
/dev/mapper/mirror 100663296 /dev/mapper/mirror 117440512
EOF
Writing to /dev/mapper/reliable in the above configuration caused i/o to
/dev/sd[defgpqrs] (the primary legs) and /dev/sdt but none of the other
secondary mirror legs.
As I said before though, Kevin's patch + the extra bit fixes this. I'd
post a patch but since I'm running an older version there's probably not
much point.
I'm seeing kernel panics using the mirror target though - another post
follows.
Cheers,
Tim
The extra change (haven't tested without, it just made sense to change
this too - correct me if I'm wrong here!) was:
function do_write() in dm-raid1.c
Old:
for (i = 0; i < ms->nr_mirrors; i++) {
m = ms->mirror + i;
io[i].bdev = m->dev->bdev;
io[i].sector = m->offset + (bio->bi_sector -
ms->ti->begin);
io[i].count = bio->bi_size >> 9;
}
New:
for (i = 0; i < ms->nr_mirrors; i++) {
m = ms->mirror + i;
io[i].bdev = m->dev->bdev;
io[i].sector = m->offset + bio->bi_sector;
io[i].count = bio->bi_size >> 9;
}
Tim Burgess wrote:
> Re the patch from Kevin:
>
> there looks like there is another reference to ti->begin in dm-raid1.c
> that the patch does not remove (in do_write). I wasn't sure whether to
> leave it there or not, since you were talking about making each target
> unaware of its position within the overall mapped device...?
>
> (note that my copy is not the latest - it's SUSE SLES SP1, so I
> apologise if anything I say is not 100% true for the latest code :S)
>
> Related:
>
> I noticed that a similar collection of concatenated raid1 devices
> (description below) was behaving strangely also, and splitting each
> raid1 map into its own table fixed the problem...
>
> For some reason, each of the mirror pairs was writing to its primary
> leg, but only the first one listed in the file was writing to its second
> leg... (note that this is before Kevin's patches - will try them in a
> moment!).
>
>
>
>> On Thursday 10 February 2005 11:18 am, Alasdair G Kergon wrote:
>>
>>> On Thu, Feb 10, 2005 at 04:02:28PM +1100, Tim Burgess wrote:
>>> > However, dm appears to be trying
>>> > to map the range 286749488-573498975 of the dm device to the same
>>> > offsets in the sde/sdm device.
>>> >
>>> > Is this what was intended?
>>>
>>> No.
>>>
>>> In dm-mpath.c try adding to multipath_map() at the top of the function:
>>>
>>> bio->bi_sector = (bio->bi_sector - ti->begin);
>>
>>
>> Actually, now that you point this out, I think this responsibility should
>> really be handled by the core driver's I/O path instead of each target
>> module. There's really no reason for the target modules to care or even
>> know about the presence of multiple targets within a device table. We can
>> move this line into the core's __map_bio() and get rid of a lot of
>> duplicate code. Here's a patch to demonstrate what I'm talking about.
>>
>
--
--------------------------------------------------------------------------
ANU Supercomputer Facility
tim.burgess@anu.edu.au and APAC National Facility
Phone: +61 2 6125 1431 Leonard Huxley Bldg (No. 56)
Fax: +61 2 6125 8199 Australian National University
Canberra, ACT, 0200, Australia
--------------------------------------------------------------------------
"Money can buy bandwidth, but latency is forever" -- John Mashey
--------------------------------------------------------------------------
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Multipath target does not shift block offset?
2005-02-12 4:45 Multipath target does not shift block offset? Tim Burgess
2005-02-14 1:42 ` block offset shift, mirroring bug resolved? Tim Burgess
@ 2005-02-16 16:02 ` Kevin Corry
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Corry @ 2005-02-16 16:02 UTC (permalink / raw)
To: dm-devel
On Fri February 11 2005 10:45 pm, Tim Burgess wrote:
> Re the patch from Kevin:
>
> there looks like there is another reference to ti->begin in dm-raid1.c
> that the patch does not remove (in do_write). I wasn't sure whether to
> leave it there or not, since you were talking about making each target
> unaware of its position within the overall mapped device...?
Oops. You're right, there are some other occurrances of ti->begin in the
target modules that I missed in my previous patch. I accidentally only
reviewing the mapping code. But dm-crypt and dm-raid1 each have code in their
workqueue routines that used that field as well. Here's a new version of last
week's patch with the two extra fixes.
And now that I think about it, we may want to make a similar patch for the 2.4
version of DM. I'll try to write one up a little later.
--
Kevin Corry
kevcorry@us.ibm.com
http://www.ibm.com/linux/ltc/
http://evms.sourceforge.net/
--- diff/drivers/md/dm-crypt.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm-crypt.c 2005-02-16 09:51:42.211358152 -0600
@@ -476,7 +476,7 @@
int r;
crypt_convert_init(cc, &ctx, io->bio, io->bio,
- io->bio->bi_sector - io->target->begin, 0);
+ io->bio->bi_sector, 0);
r = crypt_convert(cc, &ctx);
dec_pending(io, r);
@@ -808,7 +808,7 @@
struct convert_context ctx;
struct bio *clone;
unsigned int remaining = bio->bi_size;
- sector_t sector = bio->bi_sector - ti->begin;
+ sector_t sector = bio->bi_sector;
unsigned int bvec_idx = 0;
io->target = ti;
--- diff/drivers/md/dm-flakey.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm-flakey.c 2005-02-10 13:06:25.000000000 -0600
@@ -97,7 +97,7 @@
else {
bio->bi_bdev = f->dev->bdev;
- bio->bi_sector = f->start + (bio->bi_sector - ti->begin);
+ bio->bi_sector += f->start;
}
return 1;
--- diff/drivers/md/dm-linear.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm-linear.c 2005-02-10 13:07:53.000000000 -0600
@@ -71,7 +71,7 @@
struct linear_c *lc = (struct linear_c *) ti->private;
bio->bi_bdev = lc->dev->bdev;
- bio->bi_sector = lc->start + (bio->bi_sector - ti->begin);
+ bio->bi_sector += lc->start;
return 1;
}
--- diff/drivers/md/dm-raid1.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm-raid1.c 2005-02-16 09:52:51.626805400 -0600
@@ -687,7 +687,7 @@
static void map_bio(struct mirror_set *ms, struct mirror *m, struct bio *bio)
{
bio->bi_bdev = m->dev->bdev;
- bio->bi_sector = m->offset + (bio->bi_sector - ms->ti->begin);
+ bio->bi_sector += m->offset;
}
static void do_reads(struct mirror_set *ms, struct bio_list *reads)
@@ -764,7 +764,7 @@
m = ms->mirror + i;
io[i].bdev = m->dev->bdev;
- io[i].sector = m->offset + (bio->bi_sector - ms->ti->begin);
+ io[i].sector = m->offset + bio->bi_sector;
io[i].count = bio->bi_size >> 9;
}
--- diff/drivers/md/dm-stripe.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm-stripe.c 2005-02-10 13:13:50.000000000 -0600
@@ -172,13 +172,12 @@
{
struct stripe_c *sc = (struct stripe_c *) ti->private;
- sector_t offset = bio->bi_sector - ti->begin;
- sector_t chunk = offset >> sc->chunk_shift;
+ sector_t chunk = bio->bi_sector >> sc->chunk_shift;
uint32_t stripe = do_div(chunk, sc->stripes);
bio->bi_bdev = sc->stripe[stripe].dev->bdev;
bio->bi_sector = sc->stripe[stripe].physical_start +
- (chunk << sc->chunk_shift) + (offset & sc->chunk_mask);
+ (chunk << sc->chunk_shift) + (bio->bi_sector & sc->chunk_mask);
return 1;
}
--- diff/drivers/md/dm.c 2005-02-10 13:15:17.000000000 -0600
+++ source/drivers/md/dm.c 2005-02-10 13:04:25.000000000 -0600
@@ -366,6 +366,7 @@
* this io.
*/
atomic_inc(&tio->io->io_count);
+ clone->bi_sector -= ti->begin;
r = ti->type->map(ti, clone, &tio->info);
if (r > 0)
/* the bio has been remapped so dispatch it */
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 3+ messages in thread