diff options
| author | NeilBrown <neilb@suse.com> | 2015-07-06 04:49:23 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-07-22 06:04:15 +0200 |
| commit | 2d5b569b665ea6d0b15c52529ff06300de81a7ce (patch) | |
| tree | bb24462863afe67677dcb5102495d9dc2c094f5a /drivers/md/raid5.h | |
| parent | Merge tag 'md/4.2' of git://neil.brown.name/md (diff) | |
| download | linux-2d5b569b665ea6d0b15c52529ff06300de81a7ce.tar.xz linux-2d5b569b665ea6d0b15c52529ff06300de81a7ce.zip | |
md/raid5: avoid races when changing cache size.
Cache size can grow or shrink due to various pressures at
any time. So when we resize the cache as part of a 'grow'
operation (i.e. change the size to allow more devices) we need
to blocks that automatic growing/shrinking.
So introduce a mutex. auto grow/shrink uses mutex_trylock()
and just doesn't bother if there is a blockage.
Resizing the whole cache holds the mutex to ensure that
the correct number of new stripes is allocated.
This bug can result in some stripes not being freed when an
array is stopped. This leads to the kmem_cache not being
freed and a subsequent array can try to use the same kmem_cache
and get confused.
Fixes: edbe83ab4c27 ("md/raid5: allow the stripe_cache to grow and shrink.")
Cc: stable@vger.kernel.org (4.1 - please delay until 2 weeks after release of 4.2)
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 02c3bf8fbfe7..d05144278690 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -482,7 +482,8 @@ struct r5conf { */ int active_name; char cache_name[2][32]; - struct kmem_cache *slab_cache; /* for allocating stripes */ + struct kmem_cache *slab_cache; /* for allocating stripes */ + struct mutex cache_size_mutex; /* Protect changes to cache size */ int seq_flush, seq_write; int quiesce; |