* [patch 2/3 v2]raid5: remove unnecessary bitmap write optimization
@ 2012-07-04 5:21 Shaohua Li
2012-07-04 6:17 ` NeilBrown
0 siblings, 1 reply; 2+ messages in thread
From: Shaohua Li @ 2012-07-04 5:21 UTC (permalink / raw)
To: linux-raid; +Cc: neilb
Neil pointed out the bitmap write optimization in handle_stripe_clean_event()
is unnecessary, because the chance one stripe gets written twice in the mean
time is rare. We can always do a bitmap_startwrite when a write request is
added to a stripe and bitmap_endwrite after write request is done. Delete the
optimization. With it, we can delete some cases of device_lock.
Signed-off-by: Shaohua Li <shli@fusionio.com>
---
drivers/md/raid5.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
Index: linux/drivers/md/raid5.c
===================================================================
--- linux.orig/drivers/md/raid5.c 2012-07-04 12:15:38.000000000 +0800
+++ linux/drivers/md/raid5.c 2012-07-04 13:01:03.126943920 +0800
@@ -2350,7 +2350,7 @@ static int add_stripe_bio(struct stripe_
spin_lock_irq(&conf->device_lock);
if (forwrite) {
bip = &sh->dev[dd_idx].towrite;
- if (*bip == NULL && sh->dev[dd_idx].written == NULL)
+ if (*bip == NULL)
firstwrite = 1;
} else
bip = &sh->dev[dd_idx].toread;
@@ -2455,6 +2455,7 @@ handle_failed_stripe(struct r5conf *conf
s->to_write--;
bitmap_end = 1;
}
+ spin_unlock_irq(&conf->device_lock);
if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
wake_up(&conf->wait_for_overlap);
@@ -2470,6 +2471,10 @@ handle_failed_stripe(struct r5conf *conf
}
bi = nextbi;
}
+ if (bitmap_end)
+ bitmap_endwrite(conf->mddev->bitmap, sh->sector,
+ STRIPE_SECTORS, 0, 0);
+ bitmap_end = 0;
/* and fail all 'written' */
bi = sh->dev[i].written;
sh->dev[i].written = NULL;
@@ -2509,7 +2514,6 @@ handle_failed_stripe(struct r5conf *conf
bi = nextbi;
}
}
- spin_unlock_irq(&conf->device_lock);
if (bitmap_end)
bitmap_endwrite(conf->mddev->bitmap, sh->sector,
STRIPE_SECTORS, 0, 0);
@@ -2713,9 +2717,7 @@ static void handle_stripe_clean_event(st
test_bit(R5_UPTODATE, &dev->flags)) {
/* We can return any write requests */
struct bio *wbi, *wbi2;
- int bitmap_end = 0;
pr_debug("Return write for disc %d\n", i);
- spin_lock_irq(&conf->device_lock);
wbi = dev->written;
dev->written = NULL;
while (wbi && wbi->bi_sector <
@@ -2728,15 +2730,10 @@ static void handle_stripe_clean_event(st
}
wbi = wbi2;
}
- if (dev->towrite == NULL)
- bitmap_end = 1;
- spin_unlock_irq(&conf->device_lock);
- if (bitmap_end)
- bitmap_endwrite(conf->mddev->bitmap,
- sh->sector,
- STRIPE_SECTORS,
+ bitmap_endwrite(conf->mddev->bitmap, sh->sector,
+ STRIPE_SECTORS,
!test_bit(STRIPE_DEGRADED, &sh->state),
- 0);
+ 0);
}
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 2/3 v2]raid5: remove unnecessary bitmap write optimization
2012-07-04 5:21 [patch 2/3 v2]raid5: remove unnecessary bitmap write optimization Shaohua Li
@ 2012-07-04 6:17 ` NeilBrown
0 siblings, 0 replies; 2+ messages in thread
From: NeilBrown @ 2012-07-04 6:17 UTC (permalink / raw)
To: Shaohua Li; +Cc: linux-raid
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
On Wed, 4 Jul 2012 13:21:43 +0800 Shaohua Li <shli@kernel.org> wrote:
> Neil pointed out the bitmap write optimization in handle_stripe_clean_event()
> is unnecessary, because the chance one stripe gets written twice in the mean
> time is rare. We can always do a bitmap_startwrite when a write request is
> added to a stripe and bitmap_endwrite after write request is done. Delete the
> optimization. With it, we can delete some cases of device_lock.
>
> Signed-off-by: Shaohua Li <shli@fusionio.com>
Thanks. I've applied all three of these.
However...
> @@ -2455,6 +2455,7 @@ handle_failed_stripe(struct r5conf *conf
> s->to_write--;
> bitmap_end = 1;
> }
> + spin_unlock_irq(&conf->device_lock);
>
> if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
> wake_up(&conf->wait_for_overlap);
I moved that spin_unlock_irq a little bit further up.
Thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-04 6:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-04 5:21 [patch 2/3 v2]raid5: remove unnecessary bitmap write optimization Shaohua Li
2012-07-04 6:17 ` NeilBrown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.