openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

lightnvm: pblk: decouple bad block from line alloc 

Decouple bad block discovery from line allocation logic. This allows to
return meaningful error codes in case of bad block discovery failure.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Javier González 2017-06-26 11:57:22 +02:00 committed by Jens Axboe
parent f680f19aa6
commit dffdd960ee
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/lightnvm/pblk-init.c
View File

@ -328,6 +328,12 @@ static void pblk_luns_free(struct pblk *pblk)
kfree(pblk->luns); kfree(pblk->luns);
} }
static void pblk_free_line_bitmaps(struct pblk_line *line)
{
kfree(line->blk_bitmap);
kfree(line->erase_bitmap);
}
static void pblk_lines_free(struct pblk *pblk) static void pblk_lines_free(struct pblk *pblk)
{ {
struct pblk_line_mgmt *l_mg = &pblk->l_mg; struct pblk_line_mgmt *l_mg = &pblk->l_mg;
@ -339,8 +345,7 @@ static void pblk_lines_free(struct pblk *pblk)
line = &pblk->lines[i]; line = &pblk->lines[i];
pblk_line_free(pblk, line); pblk_line_free(pblk, line);
kfree(line->blk_bitmap); pblk_free_line_bitmaps(line);
kfree(line->erase_bitmap);
} }
spin_unlock(&l_mg->free_lock); spin_unlock(&l_mg->free_lock);
} }
@ -397,14 +402,31 @@ static int pblk_bb_discovery(struct nvm_tgt_dev *dev, struct pblk_lun *rlun)
return ret; return ret;
} }
static int pblk_bb_line(struct pblk *pblk, struct nvm_geo *geo, static int pblk_bb_line(struct pblk *pblk, struct pblk_line *line,
struct pblk_line *line) int blk_per_line)
{ {
struct pblk_line_meta *lm = &pblk->lm; struct nvm_tgt_dev *dev = pblk->dev;
struct nvm_geo *geo = &dev->geo;
struct pblk_lun *rlun; struct pblk_lun *rlun;
int bb_cnt = 0; int bb_cnt = 0;
int i; int i;
for (i = 0; i < blk_per_line; i++) {
rlun = &pblk->luns[i];
if (rlun->bb_list[line->id] == NVM_BLK_T_FREE)
continue;
set_bit(pblk_ppa_to_pos(geo, rlun->bppa), line->blk_bitmap);
bb_cnt++;
}
return bb_cnt;
}
static int pblk_alloc_line_bitmaps(struct pblk *pblk, struct pblk_line *line)
{
struct pblk_line_meta *lm = &pblk->lm;
line->blk_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL); line->blk_bitmap = kzalloc(lm->blk_bitmap_len, GFP_KERNEL);
if (!line->blk_bitmap) if (!line->blk_bitmap)
return -ENOMEM; return -ENOMEM;
@ -415,16 +437,7 @@ static int pblk_bb_line(struct pblk *pblk, struct nvm_geo *geo,
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < lm->blk_per_line; i++) { return 0;
rlun = &pblk->luns[i];
if (rlun->bb_list[line->id] == NVM_BLK_T_FREE)
continue;
set_bit(pblk_ppa_to_pos(geo, rlun->bppa), line->blk_bitmap);
bb_cnt++;
}
return bb_cnt;
} }
static int pblk_luns_init(struct pblk *pblk, struct ppa_addr *luns) static int pblk_luns_init(struct pblk *pblk, struct ppa_addr *luns)
@ -749,8 +762,13 @@ static int pblk_lines_init(struct pblk *pblk)
line->vsc = &l_mg->vsc_list[i]; line->vsc = &l_mg->vsc_list[i];
spin_lock_init(&line->lock); spin_lock_init(&line->lock);
nr_bad_blks = pblk_bb_line(pblk, geo, line); ret = pblk_alloc_line_bitmaps(pblk, line);
if (ret)
goto fail_free_lines;
nr_bad_blks = pblk_bb_line(pblk, line, lm->blk_per_line);
if (nr_bad_blks < 0 || nr_bad_blks > lm->blk_per_line) { if (nr_bad_blks < 0 || nr_bad_blks > lm->blk_per_line) {
pblk_free_line_bitmaps(line);
ret = -EINVAL; ret = -EINVAL;
goto fail_free_lines; goto fail_free_lines;
} }
@ -777,6 +795,9 @@ static int pblk_lines_init(struct pblk *pblk)
return 0; return 0;
fail_free_lines: fail_free_lines:
while (--i >= 0)
pblk_free_line_bitmaps(&pblk->lines[i]);
kfree(pblk->lines); kfree(pblk->lines);
fail_free_bb_aux: fail_free_bb_aux:
kfree(l_mg->bb_aux); kfree(l_mg->bb_aux);