raid5: add an option to avoid copy data from bio to stripe cache
RFC 1/1 raid5: add an option to avoid copy data from bio to stripe cache
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default, so I added an option to control it.
--- drivers/md/raid5.c | 92 +++++++++++++++++++++++++++++++++++++++++++++-------- drivers/md/raid5.h | 4 +- 2 files changed, 82 insertions(+), 14 deletions(-)
drivers/md/raid5.c +79 -13
@@ -479,6 +479,7 @@ static void shrink_buffers(struct stripeint num = sh->raid_conf->pool_size;for (i =0 ; i < num ; i++) { +BUG_ON (sh->dev[i].page != sh->dev[i].orig_page); p = sh->dev[i].page;if (!p)continue ;
@@ -499,6 +500,7 @@ static int grow_buffers(struct stripe_hereturn 1 ; } sh->dev[i].page = page; + sh->dev[i].orig_page = page; }return 0 ; }
@@ -855,6 +857,9 @@ static void ops_run_io(struct stripe_heaif (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) bi->bi_rw |=REQ_NOMERGE ; +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].vec.bv_page = sh->dev[i].page; bi->bi_vcnt =1 ; bi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; bi->bi_io_vec[0 ].bv_offset =0 ;
@@ -899,6 +904,9 @@ static void ops_run_io(struct stripe_heaelse rbi->bi_iter.bi_sector = (sh->sector + rrdev->data_offset); +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].rvec.bv_page = sh->dev[i].page; rbi->bi_vcnt =1 ; rbi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; rbi->bi_io_vec[0 ].bv_offset =0 ;
@@ -927,8 +935,9 @@ static void ops_run_io(struct stripe_hea }static struct dma_async_tx_descriptor * -async_copy_data (int frombio,struct bio *bio,struct page *page, -sector_t sector,struct dma_async_tx_descriptor *tx) +async_copy_data (int frombio,struct bio *bio,struct page **page, +sector_t sector,struct dma_async_tx_descriptor *tx, +struct stripe_head *sh) {struct bio_vec bvl;struct bvec_iter iter;
@@ -965,11 +974,16 @@ async_copy_data(int frombio, struct bioif (clen >0 ) { b_offset += bvl.bv_offset; bio_page = bvl.bv_page; -if (frombio) - tx =async_memcpy (page, bio_page, page_offset, +if (frombio) { +if (sh->raid_conf->skip_copy && + b_offset ==0 && page_offset ==0 && + clen ==STRIPE_SIZE ) + *page = bio_page; +else + tx =async_memcpy (*page, bio_page, page_offset, b_offset, clen, &submit); -else - tx =async_memcpy (bio_page, page, b_offset, + }else + tx =async_memcpy (bio_page, *page, b_offset, page_offset, clen, &submit); }/* chain the operations */
@@ -1045,8 +1059,8 @@ static void ops_run_biofill(struct stripspin_unlock_irq (&sh->stripe_lock);while (rbi && rbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) { - tx =async_copy_data (0 , rbi, dev->page, - dev->sector, tx); + tx =async_copy_data (0 , rbi, &dev->page, + dev->sector, tx, sh); rbi =r5_next_bio (rbi, dev->sector); } }
@@ -1384,6 +1398,7 @@ ops_run_biodrain(struct stripe_head *sh,BUG_ON (dev->written); wbi = dev->written = chosen;spin_unlock_irq (&sh->stripe_lock); +BUG_ON (dev->page != dev->orig_page);while (wbi && wbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) {
@@ -1393,9 +1408,15 @@ ops_run_biodrain(struct stripe_head *sh,set_bit (R5_SyncIO, &dev->flags);if (wbi->bi_rw &REQ_DISCARD )set_bit (R5_Discard, &dev->flags); -else - tx =async_copy_data (1 , wbi, dev->page, - dev->sector, tx); +else { + tx =async_copy_data (1 , wbi, &dev->page, + dev->sector, tx, sh); +if (dev->page != dev->orig_page) { +set_bit (R5_SkipCopy, &dev->flags); +clear_bit (R5_UPTODATE , &dev->flags); +clear_bit (R5_OVERWRITE , &dev->flags); + } + } wbi =r5_next_bio (wbi, dev->sector); } }
@@ -1426,7 +1447,7 @@ static void ops_complete_reconstruct(voistruct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags))set_bit (R5_UPTODATE , &dev->flags);if (fua)set_bit (R5_WantFUA, &dev->flags);
@@ -2750,6 +2771,11 @@ handle_failed_stripe(struct r5conf *conf/* and fail all 'written' */ bi = sh->dev[i].written; sh->dev[i].written =NULL ; +if (test_and_clear_bit (R5_SkipCopy, &sh->dev[i].flags)) { +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].page = sh->dev[i].orig_page; + } +if (bi) bitmap_end =1 ;while (bi && bi->bi_iter.bi_sector < sh->dev[i].sector +STRIPE_SECTORS ) {
@@ -2991,12 +3017,17 @@ static void handle_stripe_clean_event(st dev = &sh->dev[i]; if (!test_bit(R5_LOCKED, &dev->flags) && (test_bit(R5_UPTODATE, &dev->flags) || - test_bit(R5_Discard, &dev->flags))) { + test_bit(R5_Discard, &dev->flags) || + test_bit(R5_SkipCopy, &dev->flags))) { /* We can return any write requests */ struct bio *wbi, *wbi2; pr_debug("Return write for disc %d\n", i); if (test_and_clear_bit(R5_Discard, &dev->flags)) clear_bit(R5_UPTODATE, &dev->flags); + if (test_and_clear_bit(R5_SkipCopy, &dev->flags)) { + BUG_ON(test_bit(R5_UPTODATE, &dev->flags)); + dev->page = dev->orig_page; + } wbi = dev->written; dev->written = NULL; while (wbi && wbi->bi_iter.bi_sector <
@@ -3015,6 +3046,8 @@ static void handle_stripe_clean_event(st 0); }else if (test_bit (R5_Discard, &dev->flags)) discard_pending =1 ; +BUG_ON (test_bit (R5_SkipCopy, &dev->flags)); +BUG_ON (dev->page != dev->orig_page); }if (!discard_pending &&test_bit (R5_Discard, &sh->dev[sh->pd_idx].flags)) {
@@ -5355,6 +5388,38 @@ raid5_preread_bypass_threshold = __ATTR( raid5_store_preread_threshold);static ssize_t +raid5_show_skip_copy (struct mddev *mddev,char *page) +{ +struct r5conf *conf = mddev->private; +if (conf) +return sprintf (page,"%d\n" , conf->skip_copy); +else +return 0 ; +} + +static ssize_t +raid5_store_skip_copy (struct mddev *mddev,const char *page,size_t len) +{ +struct r5conf *conf = mddev->private; +unsigned long new; +if (len >=PAGE_SIZE ) +return -EINVAL ; +if (!conf) +return -ENODEV ; + +if (kstrtoul (page,10 , &new)) +return -EINVAL ; + conf->skip_copy = new; +return len; +} + +static struct md_sysfs_entry +raid5_skip_copy =__ATTR (skip_copy,S_IRUGO |S_IWUSR , + raid5_show_skip_copy, + raid5_store_skip_copy); + + +static ssize_t stripe_cache_active_show (struct mddev *mddev,char *page) {struct r5conf *conf = mddev->private;
@@ -5439,6 +5504,7 @@ static struct attribute *raid5_attrs[] = &raid5_stripecache_active.attr, &raid5_preread_bypass_threshold.attr, &raid5_group_thread_cnt.attr, + &raid5_skip_copy.attr, NULL, }; static struct attribute_group raid5_attrs_group = {
drivers/md/raid5.h +3 -1
@@ -232,7 +232,7 @@ struct stripe_head {*/ struct bio req, rreq;struct bio_vec vec, rvec; -struct page *page; +struct page *page, *orig_page;struct bio *toread, *read, *towrite, *written;sector_t sector;/* sector of this page */ unsigned long flags;
@@ -299,6 +299,7 @@ enum r5dev_flags {* data in, and now is a good time to write it out. */ R5_Discard,/* Discard the stripe */ + R5_SkipCopy, /* Don't copy data from bio to stripe cache */ };/*
@@ -436,6 +437,7 @@ struct r5conf {atomic_t pending_full_writes;/* full write backlog */ int bypass_count;/* bypassed prereads */ int bypass_threshold;/* preread nice */ +int skip_copy;/* Don't copy data from bio to stripe cache */ struct list_head *last_hold;/* detect hold_list promotions */ atomic_t reshape_stripes;/* stripes with pending writes for reshape */
Quoted 13 lines · On Mon, 28 Apr 2014 14:58:41 +0800 Shaohua Li <[email protected]> wrote:
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.In my environment, I can guarantee 2 will not happen. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
Quoted 6 lines
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default, so I added an option to control it.
I'm happy to avoid copying when we know that we can.
I'm not really happy about using a sysfs attribute to control it.
How do you guarantee that '2' won't happen?
BTW I don't see '1' as important. The stripe cache is really for gathering writes together to increase the chance of full-stripe writes, and for handling synchronisation between IO and resync/reshape/etc. The copying is primarily for stability.
Thanks,
NeilBrown
Quoted 243 lines
Signed-off-by Shaohua Li <[email protected]>--- drivers/md/raid5.c | 92 +++++++++++++++++++++++++++++++++++++++++++++-------- drivers/md/raid5.h | 4 +- 2 files changed, 82 insertions(+), 14 deletions(-)Index:
linux/drivers/md/raid5.c
===================================================================drivers/md/raid5.c +79
-13@@ -479,6 +479,7 @@ static void shrink_buffers(struct stripeint num = sh->raid_conf->pool_size;for (i =0 ; i < num ; i++) { +BUG_ON (sh->dev[i].page != sh->dev[i].orig_page); p = sh->dev[i].page;if (!p)continue ;@@ -499,6 +500,7 @@ static int grow_buffers(struct stripe_hereturn 1 ; } sh->dev[i].page = page; + sh->dev[i].orig_page = page; }return 0 ; }@@ -855,6 +857,9 @@ static void ops_run_io(struct stripe_heaif (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) bi->bi_rw |=REQ_NOMERGE ; +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].vec.bv_page = sh->dev[i].page; bi->bi_vcnt =1 ; bi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; bi->bi_io_vec[0 ].bv_offset =0 ;@@ -899,6 +904,9 @@ static void ops_run_io(struct stripe_heaelse rbi->bi_iter.bi_sector = (sh->sector + rrdev->data_offset); +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].rvec.bv_page = sh->dev[i].page; rbi->bi_vcnt =1 ; rbi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; rbi->bi_io_vec[0 ].bv_offset =0 ;@@ -927,8 +935,9 @@ static void ops_run_io(struct stripe_hea }static struct dma_async_tx_descriptor * -async_copy_data (int frombio,struct bio *bio,struct page *page, -sector_t sector,struct dma_async_tx_descriptor *tx) +async_copy_data (int frombio,struct bio *bio,struct page **page, +sector_t sector,struct dma_async_tx_descriptor *tx, +struct stripe_head *sh) {struct bio_vec bvl;struct bvec_iter iter;@@ -965,11 +974,16 @@ async_copy_data(int frombio, struct bioif (clen >0 ) { b_offset += bvl.bv_offset; bio_page = bvl.bv_page; -if (frombio) - tx =async_memcpy (page, bio_page, page_offset, +if (frombio) { +if (sh->raid_conf->skip_copy && + b_offset ==0 && page_offset ==0 && + clen ==STRIPE_SIZE ) + *page = bio_page; +else + tx =async_memcpy (*page, bio_page, page_offset, b_offset, clen, &submit); -else - tx =async_memcpy (bio_page, page, b_offset, + }else + tx =async_memcpy (bio_page, *page, b_offset, page_offset, clen, &submit); }/* chain the operations */ @@ -1045,8 +1059,8 @@ static void ops_run_biofill(struct stripspin_unlock_irq (&sh->stripe_lock);while (rbi && rbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) { - tx =async_copy_data (0 , rbi, dev->page, - dev->sector, tx); + tx =async_copy_data (0 , rbi, &dev->page, + dev->sector, tx, sh); rbi =r5_next_bio (rbi, dev->sector); } }@@ -1384,6 +1398,7 @@ ops_run_biodrain(struct stripe_head *sh,BUG_ON (dev->written); wbi = dev->written = chosen;spin_unlock_irq (&sh->stripe_lock); +BUG_ON (dev->page != dev->orig_page);while (wbi && wbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) {@@ -1393,9 +1408,15 @@ ops_run_biodrain(struct stripe_head *sh,set_bit (R5_SyncIO, &dev->flags);if (wbi->bi_rw &REQ_DISCARD )set_bit (R5_Discard, &dev->flags); -else - tx =async_copy_data (1 , wbi, dev->page, - dev->sector, tx); +else { + tx =async_copy_data (1 , wbi, &dev->page, + dev->sector, tx, sh); +if (dev->page != dev->orig_page) { +set_bit (R5_SkipCopy, &dev->flags); +clear_bit (R5_UPTODATE , &dev->flags); +clear_bit (R5_OVERWRITE , &dev->flags); + } + } wbi =r5_next_bio (wbi, dev->sector); } }@@ -1426,7 +1447,7 @@ static void ops_complete_reconstruct(voistruct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags))set_bit (R5_UPTODATE , &dev->flags);if (fua)set_bit (R5_WantFUA, &dev->flags);@@ -2750,6 +2771,11 @@ handle_failed_stripe(struct r5conf *conf/* and fail all 'written' */ bi = sh->dev[i].written; sh->dev[i].written =NULL ; +if (test_and_clear_bit (R5_SkipCopy, &sh->dev[i].flags)) { +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].page = sh->dev[i].orig_page; + } +if (bi) bitmap_end =1 ;while (bi && bi->bi_iter.bi_sector < sh->dev[i].sector +STRIPE_SECTORS ) {@@ -2991,12 +3017,17 @@ static void handle_stripe_clean_event(st dev = &sh->dev[i]; if (!test_bit(R5_LOCKED, &dev->flags) && (test_bit(R5_UPTODATE, &dev->flags) || - test_bit(R5_Discard, &dev->flags))) { + test_bit(R5_Discard, &dev->flags) || + test_bit(R5_SkipCopy, &dev->flags))) { /* We can return any write requests */ struct bio *wbi, *wbi2; pr_debug("Return write for disc %d\n", i); if (test_and_clear_bit(R5_Discard, &dev->flags)) clear_bit(R5_UPTODATE, &dev->flags); + if (test_and_clear_bit(R5_SkipCopy, &dev->flags)) { + BUG_ON(test_bit(R5_UPTODATE, &dev->flags)); + dev->page = dev->orig_page; + } wbi = dev->written; dev->written = NULL; while (wbi && wbi->bi_iter.bi_sector <@@ -3015,6 +3046,8 @@ static void handle_stripe_clean_event(st 0); }else if (test_bit (R5_Discard, &dev->flags)) discard_pending =1 ; +BUG_ON (test_bit (R5_SkipCopy, &dev->flags)); +BUG_ON (dev->page != dev->orig_page); }if (!discard_pending &&test_bit (R5_Discard, &sh->dev[sh->pd_idx].flags)) {@@ -5355,6 +5388,38 @@ raid5_preread_bypass_threshold = __ATTR( raid5_store_preread_threshold);static ssize_t +raid5_show_skip_copy (struct mddev *mddev,char *page) +{ +struct r5conf *conf = mddev->private; +if (conf) +return sprintf (page,"%d\n" , conf->skip_copy); +else +return 0 ; +} + +static ssize_t +raid5_store_skip_copy (struct mddev *mddev,const char *page,size_t len) +{ +struct r5conf *conf = mddev->private; +unsigned long new; +if (len >=PAGE_SIZE ) +return -EINVAL ; +if (!conf) +return -ENODEV ; + +if (kstrtoul (page,10 , &new)) +return -EINVAL ; + conf->skip_copy = new; +return len; +} + +static struct md_sysfs_entry +raid5_skip_copy =__ATTR (skip_copy,S_IRUGO |S_IWUSR , + raid5_show_skip_copy, + raid5_store_skip_copy); + + +static ssize_t stripe_cache_active_show (struct mddev *mddev,char *page) {struct r5conf *conf = mddev->private;@@ -5439,6 +5504,7 @@ static struct attribute *raid5_attrs[] = &raid5_stripecache_active.attr, &raid5_preread_bypass_threshold.attr, &raid5_group_thread_cnt.attr, + &raid5_skip_copy.attr, NULL, }; static struct attribute_group raid5_attrs_group = {Index:
linux/drivers/md/raid5.h
===================================================================drivers/md/raid5.h +3
-1@@ -232,7 +232,7 @@ struct stripe_head {*/ struct bio req, rreq;struct bio_vec vec, rvec; -struct page *page; +struct page *page, *orig_page;struct bio *toread, *read, *towrite, *written;sector_t sector;/* sector of this page */ unsigned long flags;@@ -299,6 +299,7 @@ enum r5dev_flags {* data in, and now is a good time to write it out. */ R5_Discard,/* Discard the stripe */ + R5_SkipCopy, /* Don't copy data from bio to stripe cache */ };/* @@ -436,6 +437,7 @@ struct r5conf {atomic_t pending_full_writes;/* full write backlog */ int bypass_count;/* bypassed prereads */ int bypass_threshold;/* preread nice */ +int skip_copy;/* Don't copy data from bio to stripe cache */ struct list_head *last_hold;/* detect hold_list promotions */ atomic_t reshape_stripes;/* stripes with pending writes for reshape */
Quoted 24 lines · NeilBrown
Quoted 13 lines · On Mon, 28 Apr 2014 14:58:41 +0800 Shaohua Li <[email protected]> wrote:
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.In my environment, I can guarantee 2 will not happen. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
Quoted 6 lines
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default, so I added an option to control it.
I'm happy to avoid copying when we know that we can.
Quoted 8 lines
I'm not really happy about using a sysfs attribute to control it.
How do you guarantee that '2' won't happen?
BTW I don't see '1' as important. The stripe cache is really for gathering writes together to increase the chance of full-stripe writes, and for handling synchronisation between IO and resync/reshape/etc. The copying is primarily for stability.
We are using raid5 in a SCSI target appliance. BIO is dispatched from a SCSI target layer (like LIO) and no filesytem is involved, so I can guarantee the BIO data is stable.
What's your favorite way to control it?
Thanks,
Shaohua
Quoted 34 lines · On Mon, 28 Apr 2014 15:28:21 +0800 Shaohua Li <[email protected]> wrote:
Quoted 24 lines · NeilBrown
Quoted 13 lines · On Mon, 28 Apr 2014 14:58:41 +0800 Shaohua Li <[email protected]> wrote:
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.In my environment, I can guarantee 2 will not happen. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
Quoted 6 lines
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default, so I added an option to control it.
I'm happy to avoid copying when we know that we can.
Quoted 8 lines
I'm not really happy about using a sysfs attribute to control it.
How do you guarantee that '2' won't happen?
BTW I don't see '1' as important. The stripe cache is really for gathering writes together to increase the chance of full-stripe writes, and for handling synchronisation between IO and resync/reshape/etc. The copying is primarily for stability.
Quoted 5 lines
We are using raid5 in a SCSI target appliance. BIO is dispatched from a SCSI target layer (like LIO) and no filesytem is involved, so I can guarantee the BIO data is stable.
What's your favorite way to control it?
I would like a bio flag with the meaning "this data is stable until bi_end_io is called".
I had hoped something like that would come of out the stable-pages effort, but that focussed on meeting the needs for filesystems more than that needs of devices.
Maybe we just need to make one ourselves.
NeilBrown
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Quoted 2 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES
if and only iff 'skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.
NeilBrown
Quoted 32 lines · NeilBrown
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Quoted 8 lines
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities|=BDI_CAP_STABLE_WRITESif and only iff '
skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.
IIRC, we switched from 'force wait page writeback' to 'wait page writeback if required' because of performance issues reported, so we shoudn't always enable BDI_CAP_STABLE_WRITES. Is it safe to set/clear BDI_CAP_STABLE_WRITES at runtime, if we use 'skip_copy' to control it? Ofcourse, we don't need runtime changing the setting, but we need a mechanism to setup it before array runs.
As of performance, the 'skip_copy' is very helpful (> 30% boost) for my raid5 array (with 6 fast PCIe SSD) for 1M request size workload. Nothing changed for 4k randwrite workload.
Thanks,
Shaohua
Quoted 39 lines · On Tue, 29 Apr 2014 10:01:24 +0800 Shaohua Li <[email protected]> wrote:
Quoted 38 lines · NeilBrown
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities|=BDI_CAP_STABLE_WRITES
Quoted 8 lines
Quoted 2 lines
if and only iff '
skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.IIRC, we switched from 'force wait page writeback' to 'wait page writeback if required' because of performance issues reported, so we shoudn't always enable
BDI_CAP_STABLE_WRITES. Is it safe to set/clearBDI_CAP_STABLE_WRITESat runtime, if we use 'skip_copy' to control it? Ofcourse, we don't need runtime changing the setting, but we need a mechanism to setup it before array runs.
So for md/RAID5 the trade off is:
- If we set BDI_CAP_STABLE_WRITES then processes might sometimes have to wait for the writeout to complete where otherwise they would not
- If we don't then RAID5 *always* has to copy the page into the stripe cache.
It isn't at all clear to me which is best. It is very possible that copying costs a lot. But then waiting for read-modify-write cycles can be a real cost too....
I think it is perfectly safe to change BDI_CAP_STABLE_WRITES while the array is suspended. So
mddev_suspend(mddev);
change BDI_CAP_STABLE_WRITES
mddev_resume(mddev);
should be safe.
Quoted 4 lines
As of performance, the '
skip_copy' is very helpful (> 30% boost) for my raid5 array (with 6 fast PCIe SSD) for 1M request size workload. Nothing changed for 4k randwrite workload.
It would be really good to see comparison for sequential and random loads on various filesytems with both rotating and SSD devices, in RAID5 and RAID6, with various numbers of devices.
:-)
If you'd like to update your patch to adjust BDI_CAP_STABLE_WRITES when skip_copy is changed, I'll apply it so that people can test it.
Thanks,
NeilBrown
Quoted 59 lines · NeilBrown
Quoted 39 lines · On Tue, 29 Apr 2014 10:01:24 +0800 Shaohua Li <[email protected]> wrote:
Quoted 38 lines · NeilBrown
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities|=BDI_CAP_STABLE_WRITESQuoted 8 lines
Quoted 2 lines
if and only iff '
skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.IIRC, we switched from 'force wait page writeback' to 'wait page writeback if required' because of performance issues reported, so we shoudn't always enable
BDI_CAP_STABLE_WRITES. Is it safe to set/clearBDI_CAP_STABLE_WRITESat runtime, if we use 'skip_copy' to control it? Ofcourse, we don't need runtime changing the setting, but we need a mechanism to setup it before array runs.So for md/RAID5 the trade off is:
- If we setBDI_CAP_STABLE_WRITESthen processes might sometimes have to wait for the writeout to complete where otherwise they would not
- If we don't then RAID5 *always* has to copy the page into the stripe cache.It isn't at all clear to me which is best. It is very possible that copying costs a lot. But then waiting for read-modify-write cycles can be a real cost too....
Quoted 7 lines
I think it is perfectly safe to change
BDI_CAP_STABLE_WRITESwhile the array is suspended. So
mddev_suspend(mddev);
changeBDI_CAP_STABLE_WRITES
mddev_resume(mddev);should be safe.
sounds good.
Quoted 5 lines
Quoted 4 lines
As of performance, the '
skip_copy' is very helpful (> 30% boost) for my raid5 array (with 6 fast PCIe SSD) for 1M request size workload. Nothing changed for 4k randwrite workload.
Quoted 7 lines
It would be really good to see comparison for sequential and random loads on various filesytems with both rotating and SSD devices, in RAID5 and RAID6, with various numbers of devices.
:-)If you'd like to update your patch to adjust
BDI_CAP_STABLE_WRITESwhenskip_copyis changed, I'll apply it so that people can test it.
Here it is.
Subject: raid5: add an option to avoid copy data from bio to stripe cache
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen. And BDI_CAP_STABLE_WRITES can guarantee 2 too. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default. It's reported enabling BDI_CAP_STABLE_WRITES can harm some workloads before, so I added an option to control it.
--- drivers/md/raid5.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++------- drivers/md/raid5.h | 4 +- 2 files changed, 94 insertions(+), 14 deletions(-)
drivers/md/raid5.c +91 -13
@@ -479,6 +479,7 @@ static void shrink_buffers(struct stripeint num = sh->raid_conf->pool_size;for (i =0 ; i < num ; i++) { +BUG_ON (sh->dev[i].page != sh->dev[i].orig_page); p = sh->dev[i].page;if (!p)continue ;
@@ -499,6 +500,7 @@ static int grow_buffers(struct stripe_hereturn 1 ; } sh->dev[i].page = page; + sh->dev[i].orig_page = page; }return 0 ; }
@@ -855,6 +857,9 @@ static void ops_run_io(struct stripe_heaif (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) bi->bi_rw |=REQ_NOMERGE ; +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].vec.bv_page = sh->dev[i].page; bi->bi_vcnt =1 ; bi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; bi->bi_io_vec[0 ].bv_offset =0 ;
@@ -899,6 +904,9 @@ static void ops_run_io(struct stripe_heaelse rbi->bi_iter.bi_sector = (sh->sector + rrdev->data_offset); +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].rvec.bv_page = sh->dev[i].page; rbi->bi_vcnt =1 ; rbi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; rbi->bi_io_vec[0 ].bv_offset =0 ;
@@ -927,8 +935,9 @@ static void ops_run_io(struct stripe_hea }static struct dma_async_tx_descriptor * -async_copy_data (int frombio,struct bio *bio,struct page *page, -sector_t sector,struct dma_async_tx_descriptor *tx) +async_copy_data (int frombio,struct bio *bio,struct page **page, +sector_t sector,struct dma_async_tx_descriptor *tx, +struct stripe_head *sh) {struct bio_vec bvl;struct bvec_iter iter;
@@ -965,11 +974,16 @@ async_copy_data(int frombio, struct bioif (clen >0 ) { b_offset += bvl.bv_offset; bio_page = bvl.bv_page; -if (frombio) - tx =async_memcpy (page, bio_page, page_offset, +if (frombio) { +if (sh->raid_conf->skip_copy && + b_offset ==0 && page_offset ==0 && + clen ==STRIPE_SIZE ) + *page = bio_page; +else + tx =async_memcpy (*page, bio_page, page_offset, b_offset, clen, &submit); -else - tx =async_memcpy (bio_page, page, b_offset, + }else + tx =async_memcpy (bio_page, *page, b_offset, page_offset, clen, &submit); }/* chain the operations */
@@ -1045,8 +1059,8 @@ static void ops_run_biofill(struct stripspin_unlock_irq (&sh->stripe_lock);while (rbi && rbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) { - tx =async_copy_data (0 , rbi, dev->page, - dev->sector, tx); + tx =async_copy_data (0 , rbi, &dev->page, + dev->sector, tx, sh); rbi =r5_next_bio (rbi, dev->sector); } }
@@ -1384,6 +1398,7 @@ ops_run_biodrain(struct stripe_head *sh,BUG_ON (dev->written); wbi = dev->written = chosen;spin_unlock_irq (&sh->stripe_lock); +BUG_ON (dev->page != dev->orig_page);while (wbi && wbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) {
@@ -1393,9 +1408,15 @@ ops_run_biodrain(struct stripe_head *sh,set_bit (R5_SyncIO, &dev->flags);if (wbi->bi_rw &REQ_DISCARD )set_bit (R5_Discard, &dev->flags); -else - tx =async_copy_data (1 , wbi, dev->page, - dev->sector, tx); +else { + tx =async_copy_data (1 , wbi, &dev->page, + dev->sector, tx, sh); +if (dev->page != dev->orig_page) { +set_bit (R5_SkipCopy, &dev->flags); +clear_bit (R5_UPTODATE , &dev->flags); +clear_bit (R5_OVERWRITE , &dev->flags); + } + } wbi =r5_next_bio (wbi, dev->sector); } }
@@ -1426,7 +1447,7 @@ static void ops_complete_reconstruct(voistruct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags))set_bit (R5_UPTODATE , &dev->flags);if (fua)set_bit (R5_WantFUA, &dev->flags);
@@ -2750,6 +2771,11 @@ handle_failed_stripe(struct r5conf *conf/* and fail all 'written' */ bi = sh->dev[i].written; sh->dev[i].written =NULL ; +if (test_and_clear_bit (R5_SkipCopy, &sh->dev[i].flags)) { +BUG_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].page = sh->dev[i].orig_page; + } +if (bi) bitmap_end =1 ;while (bi && bi->bi_iter.bi_sector < sh->dev[i].sector +STRIPE_SECTORS ) {
@@ -2991,12 +3017,17 @@ static void handle_stripe_clean_event(st dev = &sh->dev[i]; if (!test_bit(R5_LOCKED, &dev->flags) && (test_bit(R5_UPTODATE, &dev->flags) || - test_bit(R5_Discard, &dev->flags))) { + test_bit(R5_Discard, &dev->flags) || + test_bit(R5_SkipCopy, &dev->flags))) { /* We can return any write requests */ struct bio *wbi, *wbi2; pr_debug("Return write for disc %d\n", i); if (test_and_clear_bit(R5_Discard, &dev->flags)) clear_bit(R5_UPTODATE, &dev->flags); + if (test_and_clear_bit(R5_SkipCopy, &dev->flags)) { + BUG_ON(test_bit(R5_UPTODATE, &dev->flags)); + dev->page = dev->orig_page; + } wbi = dev->written; dev->written = NULL; while (wbi && wbi->bi_iter.bi_sector <
@@ -3015,6 +3046,8 @@ static void handle_stripe_clean_event(st 0); }else if (test_bit (R5_Discard, &dev->flags)) discard_pending =1 ; +BUG_ON (test_bit (R5_SkipCopy, &dev->flags)); +BUG_ON (dev->page != dev->orig_page); }if (!discard_pending &&test_bit (R5_Discard, &sh->dev[sh->pd_idx].flags)) {
@@ -5355,6 +5388,50 @@ raid5_preread_bypass_threshold = __ATTR( raid5_store_preread_threshold);static ssize_t +raid5_show_skip_copy (struct mddev *mddev,char *page) +{ +struct r5conf *conf = mddev->private; +if (conf) +return sprintf (page,"%d\n" , conf->skip_copy); +else +return 0 ; +} + +static ssize_t +raid5_store_skip_copy (struct mddev *mddev,const char *page,size_t len) +{ +struct r5conf *conf = mddev->private; +unsigned long new; +if (len >=PAGE_SIZE ) +return -EINVAL ; +if (!conf) +return -ENODEV ; + +if (kstrtoul (page,10 , &new)) +return -EINVAL ; + new = !!new; +if (new == conf->skip_copy) +return len; + +mddev_suspend (mddev); + conf->skip_copy = new; +if (new) + mddev->queue->backing_dev_info.capabilities |= +BDI_CAP_STABLE_WRITES ; +else + mddev->queue->backing_dev_info.capabilities &= + ~BDI_CAP_STABLE_WRITES ; +mddev_resume (mddev); +return len; +} + +static struct md_sysfs_entry +raid5_skip_copy =__ATTR (skip_copy,S_IRUGO |S_IWUSR , + raid5_show_skip_copy, + raid5_store_skip_copy); + + +static ssize_t stripe_cache_active_show (struct mddev *mddev,char *page) {struct r5conf *conf = mddev->private;
@@ -5439,6 +5516,7 @@ static struct attribute *raid5_attrs[] = &raid5_stripecache_active.attr, &raid5_preread_bypass_threshold.attr, &raid5_group_thread_cnt.attr, + &raid5_skip_copy.attr, NULL, }; static struct attribute_group raid5_attrs_group = {
drivers/md/raid5.h +3 -1
@@ -232,7 +232,7 @@ struct stripe_head {*/ struct bio req, rreq;struct bio_vec vec, rvec; -struct page *page; +struct page *page, *orig_page;struct bio *toread, *read, *towrite, *written;sector_t sector;/* sector of this page */ unsigned long flags;
@@ -299,6 +299,7 @@ enum r5dev_flags {* data in, and now is a good time to write it out. */ R5_Discard,/* Discard the stripe */ + R5_SkipCopy, /* Don't copy data from bio to stripe cache */ };/*
@@ -436,6 +437,7 @@ struct r5conf {atomic_t pending_full_writes;/* full write backlog */ int bypass_count;/* bypassed prereads */ int bypass_threshold;/* preread nice */ +int skip_copy;/* Don't copy data from bio to stripe cache */ struct list_head *last_hold;/* detect hold_list promotions */ atomic_t reshape_stripes;/* stripes with pending writes for reshape */
Quoted 80 lines · On Tue, 29 Apr 2014 19:13:58 +0800 Shaohua Li <[email protected]> wrote:
Quoted 59 lines · NeilBrown
Quoted 39 lines · On Tue, 29 Apr 2014 10:01:24 +0800 Shaohua Li <[email protected]> wrote:
Quoted 38 lines · NeilBrown
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities|=BDI_CAP_STABLE_WRITESQuoted 8 lines
Quoted 2 lines
if and only iff '
skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.IIRC, we switched from 'force wait page writeback' to 'wait page writeback if required' because of performance issues reported, so we shoudn't always enable
BDI_CAP_STABLE_WRITES. Is it safe to set/clearBDI_CAP_STABLE_WRITESat runtime, if we use 'skip_copy' to control it? Ofcourse, we don't need runtime changing the setting, but we need a mechanism to setup it before array runs.So for md/RAID5 the trade off is:
- If we setBDI_CAP_STABLE_WRITESthen processes might sometimes have to wait for the writeout to complete where otherwise they would not
- If we don't then RAID5 *always* has to copy the page into the stripe cache.It isn't at all clear to me which is best. It is very possible that copying costs a lot. But then waiting for read-modify-write cycles can be a real cost too....
Quoted 7 lines
I think it is perfectly safe to change
BDI_CAP_STABLE_WRITESwhile the array is suspended. So
mddev_suspend(mddev);
changeBDI_CAP_STABLE_WRITES
mddev_resume(mddev);should be safe.
sounds good.
Quoted 10 lines
Quoted 4 lines
As of performance, the '
skip_copy' is very helpful (> 30% boost) for my raid5 array (with 6 fast PCIe SSD) for 1M request size workload. Nothing changed for 4k randwrite workload.It would be really good to see comparison for sequential and random loads on various filesytems with both rotating and SSD devices, in RAID5 and RAID6, with various numbers of devices.
:-)
Quoted 4 lines
Quoted 2 lines
If you'd like to update your patch to adjust
BDI_CAP_STABLE_WRITESwhenskip_copyis changed, I'll apply it so that people can test it.Here it is.
I've removed this patch for now. It causes a nasty crash when running the 07changelevels test in the mdadm test suite.
First we get
kernel: [ 8282.822194] WARNING: CPU: 0 PID: 16377 at /home/git/md/drivers/md/raid5.c:1404 raid_run
which is
+ BUG_ON(sh->dev[i].page != sh->dev[i].orig_page);
which I changed to WARN_ON,
then
kernel: [ 8284.116364] BUG: sleeping function called from invalid context at /home/git/md/kernel/locking/rwsem.c:20
kernel: [ 8284.116369] in_atomic(): 1, irqs_disabled(): 0, pid: 16377, name: md0_raid5
kernel: [ 8284.116372] INFO: lockdep is turned off.
kernel: [ 8284.116379] Preemption disabled at:[<ffffffff81a63de4>] handle_stripe_expansion+0x134/0x1e0
kernel: [ 8284.116380]
kernel: [ 8284.116385] CPU: 0 PID: 16377 Comm: md0_raid5 Tainted: G D W 3.15.0-rc5+ #855
kernel: [ 8284.116388] Hardware name: HP ProLiant ML310 G3, BIOS W02 04/17/2006
kernel: [ 8284.116400] ffff8800d25641d0 ffff8800b7403888 ffffffff81c62893 0000000000000000
kernel: [ 8284.116409] ffff8800b74038b0 ffffffff810c4dea ffff88014091d410 ffff88014091d470
kernel: [ 8284.116415] ffff8800d25641d0 ffff8800b74038d8 ffffffff81c716e5 ffff8800d25641d0
kernel: [ 8284.116416] Call Trace:
kernel: [ 8284.116422] [<ffffffff81c62893>] dump_stack+0x4e/0x7a
kernel: [ 8284.116429] [<ffffffff810c4dea>] __might_sleep+0x15a/0x250
kernel: [ 8284.116436] [<ffffffff81c716e5>] down_read+0x25/0xa0
kernel: [ 8284.116445] [<ffffffff810a6dcf>] exit_signals+0x1f/0x120
kernel: [ 8284.116453] [<ffffffff81093d35>] do_exit+0xb5/0xc70
kernel: [ 8284.116462] [<ffffffff810f7bcd>] ? kmsg_dump+0x1ad/0x220
kernel: [ 8284.116465] [<ffffffff810f7a40>] ? kmsg_dump+0x20/0x220
kernel: [ 8284.116473] [<ffffffff81055515>] oops_end+0x85/0xc0
kernel: [ 8284.116480] [<ffffffff81055686>] die+0x46/0x70
kernel: [ 8284.116487] [<ffffffff8105250a>] do_general_protection+0xca/0x150
kernel: [ 8284.116494] [<ffffffff81c739d2>] general_protection+0x22/0x30
kernel: [ 8284.116501] [<ffffffff8166a0a9>] ? memcpy+0x29/0x110
kernel: [ 8284.116508] [<ffffffff81638275>] ? async_memcpy+0xc5/0x160
kernel: [ 8284.116516] [<ffffffff81a63de4>] handle_stripe_expansion+0x134/0x1e0
kernel: [ 8284.116522] [<ffffffff81a6496e>] handle_stripe+0xade/0x23e0
I've haven't looked at why this might be.
And re the other patch you send, I meant to also say to please use __test_and_clear_bit(). This version is sufficient when the variable is only used by one thread, and it is slightly more efficient.
NeilBrown
Quoted 30 lines
Subject: raid5: add an option to avoid copy data from bio to stripe cache
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.In my environment, I can guarantee 2 will not happen. And
BDI_CAP_STABLE_WRITEScan guarantee 2 too. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default. It's reported enabling
BDI_CAP_STABLE_WRITEScan harm some workloads before, so I added an option to control it.Signed-off-by Shaohua Li <[email protected]>--- drivers/md/raid5.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++------- drivers/md/raid5.h | 4 +- 2 files changed, 94 insertions(+), 14 deletions(-)
Quoted 82 lines · NeilBrown
Quoted 80 lines · On Tue, 29 Apr 2014 19:13:58 +0800 Shaohua Li <[email protected]> wrote:
Quoted 59 lines · NeilBrown
Quoted 39 lines · On Tue, 29 Apr 2014 10:01:24 +0800 Shaohua Li <[email protected]> wrote:
Quoted 38 lines · NeilBrown
Quoted 9 lines · On Mon, 28 Apr 2014 03:17:48 -0700 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Shaohua Li
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.I think this is mostly a side effect. We have a much larger and better tuned page cache to take care of this.
Quoted 8 lines
Quoted 5 lines
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen.
Why just in your environment? Now that we got stable pages in the page cache this should always be the case.
Hmm... I hadn't realised that we were guaranteed stabled pages always (if requested). It seems that we are.
Quoted 7 lines
Quoted 3 lines
Of course, this shouldn't be enabled by default, so I added an option to control it.
Unless careful benchmarking in various scenarious shows adverse effects this should be the default. And if we can find adverse effects we need to look into them.
Certainly some benchmarking is needed.
We should set
mddev->queue->backing_dev_info.capabilities|=BDI_CAP_STABLE_WRITESQuoted 8 lines
Quoted 2 lines
if and only iff '
skip_copy' is set. Then test various cases just to confirm that it is generally an improvement.IIRC, we switched from 'force wait page writeback' to 'wait page writeback if required' because of performance issues reported, so we shoudn't always enable
BDI_CAP_STABLE_WRITES. Is it safe to set/clearBDI_CAP_STABLE_WRITESat runtime, if we use 'skip_copy' to control it? Ofcourse, we don't need runtime changing the setting, but we need a mechanism to setup it before array runs.So for md/RAID5 the trade off is:
- If we setBDI_CAP_STABLE_WRITESthen processes might sometimes have to wait for the writeout to complete where otherwise they would not
- If we don't then RAID5 *always* has to copy the page into the stripe cache.It isn't at all clear to me which is best. It is very possible that copying costs a lot. But then waiting for read-modify-write cycles can be a real cost too....
Quoted 7 lines
I think it is perfectly safe to change
BDI_CAP_STABLE_WRITESwhile the array is suspended. So
mddev_suspend(mddev);
changeBDI_CAP_STABLE_WRITES
mddev_resume(mddev);should be safe.
sounds good.
Quoted 10 lines
Quoted 4 lines
As of performance, the '
skip_copy' is very helpful (> 30% boost) for my raid5 array (with 6 fast PCIe SSD) for 1M request size workload. Nothing changed for 4k randwrite workload.It would be really good to see comparison for sequential and random loads on various filesytems with both rotating and SSD devices, in RAID5 and RAID6, with various numbers of devices.
:-)
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
If you'd like to update your patch to adjust
BDI_CAP_STABLE_WRITESwhenskip_copyis changed, I'll apply it so that people can test it.Here it is.
I've removed this patch for now. It causes a nasty crash when running the 07changelevels test in the mdadm test suite.
I've haven't looked at why this might be.
Forgot to reset orig_page in resize_stripes(), fixed now.
Quoted 3 lines
And re the other patch you send, I meant to also say to please use
__test_and_clear_bit(). This version is sufficient when the variable is only used by one thread, and it is slightly more efficient.
Yes, I actually tried, but no improvement, but of course it should be slightly more efficient, I'll have such change in next post.
Thanks,
Shaohua
raid5: add an option to avoid copy data from bio to stripe cache
The stripe cache has two goals:
1. cache data, so next time if data can be found in stripe cache, disk access can be avoided.
2. stable data. data is copied from bio to stripe cache and calculated parity. data written to disk is from stripe cache, so if upper layer changes bio data, data written to disk isn't impacted.
In my environment, I can guarantee 2 will not happen. And BDI_CAP_STABLE_WRITES can guarantee 2 too. For 1, it's not common too. block plug mechanism will dispatch a bunch of sequentail small requests together. And since I'm using SSD, I'm using small chunk size. It's rare case stripe cache is really useful.
So I'd like to avoid the copy from bio to stripe cache and it's very helpful for performance. In my 1M randwrite tests, avoid the copy can increase the performance more than 30%.
Of course, this shouldn't be enabled by default. It's reported enabling BDI_CAP_STABLE_WRITES can harm some workloads before, so I added an option to control it.
Neilb:
changed BUG_ON to WARN_ON
Removed some assignments from raid5_build_block which are now not needed.
--- drivers/md/raid5.c | 119 +++++++++++++++++++++++++++++++++++++++++++---------- drivers/md/raid5.h | 4 + 2 files changed, 101 insertions(+), 22 deletions(-)
drivers/md/raid5.c +98 -21
@@ -479,6 +479,7 @@ static void shrink_buffers(struct stripeint num = sh->raid_conf->pool_size;for (i =0 ; i < num ; i++) { +WARN_ON (sh->dev[i].page != sh->dev[i].orig_page); p = sh->dev[i].page;if (!p)continue ;
@@ -499,6 +500,7 @@ static int grow_buffers(struct stripe_hereturn 1 ; } sh->dev[i].page = page; + sh->dev[i].orig_page = page; }return 0 ; }
@@ -855,6 +857,9 @@ static void ops_run_io(struct stripe_heaif (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) bi->bi_rw |=REQ_NOMERGE ; +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +WARN_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].vec.bv_page = sh->dev[i].page; bi->bi_vcnt =1 ; bi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; bi->bi_io_vec[0 ].bv_offset =0 ;
@@ -899,6 +904,9 @@ static void ops_run_io(struct stripe_heaelse rbi->bi_iter.bi_sector = (sh->sector + rrdev->data_offset); +if (test_bit (R5_SkipCopy, &sh->dev[i].flags)) +WARN_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].rvec.bv_page = sh->dev[i].page; rbi->bi_vcnt =1 ; rbi->bi_io_vec[0 ].bv_len =STRIPE_SIZE ; rbi->bi_io_vec[0 ].bv_offset =0 ;
@@ -927,8 +935,9 @@ static void ops_run_io(struct stripe_hea }static struct dma_async_tx_descriptor * -async_copy_data (int frombio,struct bio *bio,struct page *page, -sector_t sector,struct dma_async_tx_descriptor *tx) +async_copy_data (int frombio,struct bio *bio,struct page **page, +sector_t sector,struct dma_async_tx_descriptor *tx, +struct stripe_head *sh) {struct bio_vec bvl;struct bvec_iter iter;
@@ -965,11 +974,16 @@ async_copy_data(int frombio, struct bioif (clen >0 ) { b_offset += bvl.bv_offset; bio_page = bvl.bv_page; -if (frombio) - tx =async_memcpy (page, bio_page, page_offset, +if (frombio) { +if (sh->raid_conf->skip_copy && + b_offset ==0 && page_offset ==0 && + clen ==STRIPE_SIZE ) + *page = bio_page; +else + tx =async_memcpy (*page, bio_page, page_offset, b_offset, clen, &submit); -else - tx =async_memcpy (bio_page, page, b_offset, + }else + tx =async_memcpy (bio_page, *page, b_offset, page_offset, clen, &submit); }/* chain the operations */
@@ -1045,8 +1059,8 @@ static void ops_run_biofill(struct stripspin_unlock_irq (&sh->stripe_lock);while (rbi && rbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) { - tx =async_copy_data (0 , rbi, dev->page, - dev->sector, tx); + tx =async_copy_data (0 , rbi, &dev->page, + dev->sector, tx, sh); rbi =r5_next_bio (rbi, dev->sector); } }
@@ -1384,6 +1398,7 @@ ops_run_biodrain(struct stripe_head *sh,BUG_ON (dev->written); wbi = dev->written = chosen;spin_unlock_irq (&sh->stripe_lock); +WARN_ON (dev->page != dev->orig_page);while (wbi && wbi->bi_iter.bi_sector < dev->sector +STRIPE_SECTORS ) {
@@ -1393,9 +1408,15 @@ ops_run_biodrain(struct stripe_head *sh,set_bit (R5_SyncIO, &dev->flags);if (wbi->bi_rw &REQ_DISCARD )set_bit (R5_Discard, &dev->flags); -else - tx =async_copy_data (1 , wbi, dev->page, - dev->sector, tx); +else { + tx =async_copy_data (1 , wbi, &dev->page, + dev->sector, tx, sh); +if (dev->page != dev->orig_page) { +set_bit (R5_SkipCopy, &dev->flags); +clear_bit (R5_UPTODATE , &dev->flags); +clear_bit (R5_OVERWRITE , &dev->flags); + } + } wbi =r5_next_bio (wbi, dev->sector); } }
@@ -1426,7 +1447,7 @@ static void ops_complete_reconstruct(voistruct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags))set_bit (R5_UPTODATE , &dev->flags);if (fua)set_bit (R5_WantFUA, &dev->flags);
@@ -1839,8 +1860,10 @@ static int resize_stripes(struct r5conf osh =get_free_stripe (conf, hash);unlock_device_hash_lock (conf, hash);atomic_set (&nsh->count,1 ); -for (i=0 ; i<conf->pool_size; i++) +for (i=0 ; i<conf->pool_size; i++) { nsh->dev[i].page = osh->dev[i].page; + nsh->dev[i].orig_page = osh->dev[i].page; + }for ( ; i<newsize; i++) nsh->dev[i].page =NULL ; nsh->hash_lock_index = hash;
@@ -1896,6 +1919,7 @@ static int resize_stripes(struct r5confif (nsh->dev[i].page ==NULL ) {struct page *p =alloc_page (GFP_NOIO ); nsh->dev[i].page = p; + nsh->dev[i].orig_page = p;if (!p) err = -ENOMEM ; }
@@ -2133,24 +2157,20 @@ static void raid5_end_write_request(stru }static sector_t compute_blocknr (struct stripe_head *sh,int i,int previous); - +static void raid5_build_block (struct stripe_head *sh,int i,int previous) {struct r5dev *dev = &sh->dev[i];bio_init (&dev->req); dev->req.bi_io_vec = &dev->vec; - dev->req.bi_vcnt++; - dev->req.bi_max_vecs++; + dev->req.bi_max_vecs =1 ; dev->req.bi_private = sh; - dev->vec.bv_page = dev->page;bio_init (&dev->rreq); dev->rreq.bi_io_vec = &dev->rvec; - dev->rreq.bi_vcnt++; - dev->rreq.bi_max_vecs++; + dev->rreq.bi_max_vecs =1 ; dev->rreq.bi_private = sh; - dev->rvec.bv_page = dev->page; dev->flags =0 ; dev->sector =compute_blocknr (sh, i, previous);
@@ -2750,6 +2770,11 @@ handle_failed_stripe(struct r5conf *conf/* and fail all 'written' */ bi = sh->dev[i].written; sh->dev[i].written =NULL ; +if (test_and_clear_bit (R5_SkipCopy, &sh->dev[i].flags)) { +WARN_ON (test_bit (R5_UPTODATE , &sh->dev[i].flags)); + sh->dev[i].page = sh->dev[i].orig_page; + } +if (bi) bitmap_end =1 ;while (bi && bi->bi_iter.bi_sector < sh->dev[i].sector +STRIPE_SECTORS ) {
@@ -2991,12 +3016,17 @@ static void handle_stripe_clean_event(st dev = &sh->dev[i]; if (!test_bit(R5_LOCKED, &dev->flags) && (test_bit(R5_UPTODATE, &dev->flags) || - test_bit(R5_Discard, &dev->flags))) { + test_bit(R5_Discard, &dev->flags) || + test_bit(R5_SkipCopy, &dev->flags))) { /* We can return any write requests */ struct bio *wbi, *wbi2; pr_debug("Return write for disc %d\n", i); if (test_and_clear_bit(R5_Discard, &dev->flags)) clear_bit(R5_UPTODATE, &dev->flags); + if (test_and_clear_bit(R5_SkipCopy, &dev->flags)) { + WARN_ON(test_bit(R5_UPTODATE, &dev->flags)); + dev->page = dev->orig_page; + } wbi = dev->written; dev->written = NULL; while (wbi && wbi->bi_iter.bi_sector <
@@ -3015,6 +3045,8 @@ static void handle_stripe_clean_event(st 0); }else if (test_bit (R5_Discard, &dev->flags)) discard_pending =1 ; +WARN_ON (test_bit (R5_SkipCopy, &dev->flags)); +WARN_ON (dev->page != dev->orig_page); }if (!discard_pending &&test_bit (R5_Discard, &sh->dev[sh->pd_idx].flags)) {
@@ -5355,6 +5387,50 @@ raid5_preread_bypass_threshold = __ATTR( raid5_store_preread_threshold);static ssize_t +raid5_show_skip_copy (struct mddev *mddev,char *page) +{ +struct r5conf *conf = mddev->private; +if (conf) +return sprintf (page,"%d\n" , conf->skip_copy); +else +return 0 ; +} + +static ssize_t +raid5_store_skip_copy (struct mddev *mddev,const char *page,size_t len) +{ +struct r5conf *conf = mddev->private; +unsigned long new; +if (len >=PAGE_SIZE ) +return -EINVAL ; +if (!conf) +return -ENODEV ; + +if (kstrtoul (page,10 , &new)) +return -EINVAL ; + new = !!new; +if (new == conf->skip_copy) +return len; + +mddev_suspend (mddev); + conf->skip_copy = new; +if (new) + mddev->queue->backing_dev_info.capabilities |= +BDI_CAP_STABLE_WRITES ; +else + mddev->queue->backing_dev_info.capabilities &= + ~BDI_CAP_STABLE_WRITES ; +mddev_resume (mddev); +return len; +} + +static struct md_sysfs_entry +raid5_skip_copy =__ATTR (skip_copy,S_IRUGO |S_IWUSR , + raid5_show_skip_copy, + raid5_store_skip_copy); + + +static ssize_t stripe_cache_active_show (struct mddev *mddev,char *page) {struct r5conf *conf = mddev->private;
@@ -5439,6 +5515,7 @@ static struct attribute *raid5_attrs[] = &raid5_stripecache_active.attr, &raid5_preread_bypass_threshold.attr, &raid5_group_thread_cnt.attr, + &raid5_skip_copy.attr, NULL, }; static struct attribute_group raid5_attrs_group = {
drivers/md/raid5.h +3 -1
@@ -232,7 +232,7 @@ struct stripe_head {*/ struct bio req, rreq;struct bio_vec vec, rvec; -struct page *page; +struct page *page, *orig_page;struct bio *toread, *read, *towrite, *written;sector_t sector;/* sector of this page */ unsigned long flags;
@@ -299,6 +299,7 @@ enum r5dev_flags {* data in, and now is a good time to write it out. */ R5_Discard,/* Discard the stripe */ + R5_SkipCopy, /* Don't copy data from bio to stripe cache */ };/*
@@ -436,6 +437,7 @@ struct r5conf {atomic_t pending_full_writes;/* full write backlog */ int bypass_count;/* bypassed prereads */ int bypass_threshold;/* preread nice */ +int skip_copy;/* Don't copy data from bio to stripe cache */ struct list_head *last_hold;/* detect hold_list promotions */ atomic_t reshape_stripes;/* stripes with pending writes for reshape */
Quoted 5 lines · On Wed, 21 May 2014 17:57:44 +0800 Shaohua Li <[email protected]> wrote:
Quoted 3 lines
I've removed this patch for now. It causes a nasty crash when running the 07changelevels test in the mdadm test suite.
I've haven't looked at why this might be.Forgot to reset
orig_pageinresize_stripes(), fixed now.
Thanks. This new version appears to pass my tests so it should appear in -next soon.
thanks,
NeilBrown