aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm/pblk-core.c
diff options
context:
space:
mode:
authorRakesh Pandit <rakesh@tuxera.com>2017-10-13 08:45:56 -0400
committerJens Axboe <axboe@kernel.dk>2017-10-13 10:34:57 -0400
commite57903fd972a398b7140d0bc055714e13a0e58c5 (patch)
tree588abe3834761bd39dd27abbb437369e130256a1 /drivers/lightnvm/pblk-core.c
parent32c662c58a9b9d0c99e713a14ca323a9a91c73a0 (diff)
lightnvm: pblk: protect line bitmap while submitting meta io
It seems pblk_dealloc_page would race against pblk_alloc_pages for line bitmap for sector allocation.The chances are very low but might as well protect the bitmap properly. Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> Reviewed-by: Javier González <javier@cnexlabs.com> Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/lightnvm/pblk-core.c')
-rw-r--r--drivers/lightnvm/pblk-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 81501644fb15..b53bb00a9918 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -486,12 +486,14 @@ void pblk_dealloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs)
486 u64 addr; 486 u64 addr;
487 int i; 487 int i;
488 488
489 spin_lock(&line->lock);
489 addr = find_next_zero_bit(line->map_bitmap, 490 addr = find_next_zero_bit(line->map_bitmap,
490 pblk->lm.sec_per_line, line->cur_sec); 491 pblk->lm.sec_per_line, line->cur_sec);
491 line->cur_sec = addr - nr_secs; 492 line->cur_sec = addr - nr_secs;
492 493
493 for (i = 0; i < nr_secs; i++, line->cur_sec--) 494 for (i = 0; i < nr_secs; i++, line->cur_sec--)
494 WARN_ON(!test_and_clear_bit(line->cur_sec, line->map_bitmap)); 495 WARN_ON(!test_and_clear_bit(line->cur_sec, line->map_bitmap));
496 spin_unlock(&line->lock);
495} 497}
496 498
497u64 __pblk_alloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs) 499u64 __pblk_alloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs)