GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lightnvm: remove gen_lun abstraction

Browse source 
The gen_lun abstraction in the generic media manager was conceived on
the assumption that a single target would instantiated on top of it.
This has complicated target design to implement multi-instances. Remove
this abstraction and move its logic to nvm_lun, which manages physical
lun geometry and operations.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Javier González 2016-11-28 22:39:04 +01:00 • committed by Jens Axboe
parent 98379a12c5
commit de93434fcf
3 changed files with 53 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

85
drivers/lightnvm/gennvm.c
View file

@ -223,13 +223,13 @@ static void gen_put_area(struct nvm_dev *dev, sector_t begin)
static void gen_blocks_free(struct nvm_dev *dev) static void gen_blocks_free(struct nvm_dev *dev)
{ {
struct gen_dev *gn = dev->mp; struct gen_dev *gn = dev->mp;
struct gen_lun *lun; struct nvm_lun *lun;
int i; int i;
gen_for_each_lun(gn, lun, i) { gen_for_each_lun(gn, lun, i) {
if (!lun->vlun.blocks) if (!lun->blocks)
break; break;
vfree(lun->vlun.blocks); vfree(lun->blocks);
} }
} }
@ -242,24 +242,24 @@ static void gen_luns_free(struct nvm_dev *dev)
static int gen_luns_init(struct nvm_dev *dev, struct gen_dev *gn) static int gen_luns_init(struct nvm_dev *dev, struct gen_dev *gn)
{ {
struct gen_lun *lun; struct nvm_lun *lun;
int i; int i;
gn->luns = kcalloc(dev->nr_luns, sizeof(struct gen_lun), GFP_KERNEL); gn->luns = kcalloc(dev->nr_luns, sizeof(struct nvm_lun), GFP_KERNEL);
if (!gn->luns) if (!gn->luns)
return -ENOMEM; return -ENOMEM;
gen_for_each_lun(gn, lun, i) { gen_for_each_lun(gn, lun, i) {
spin_lock_init(&lun->vlun.lock);
INIT_LIST_HEAD(&lun->free_list); INIT_LIST_HEAD(&lun->free_list);
INIT_LIST_HEAD(&lun->used_list); INIT_LIST_HEAD(&lun->used_list);
INIT_LIST_HEAD(&lun->bb_list); INIT_LIST_HEAD(&lun->bb_list);
lun->reserved_blocks = 2; /* for GC only */ spin_lock_init(&lun->lock);
lun->vlun.id = i;
lun->vlun.lun_id = i % dev->luns_per_chnl; lun->id = i;
lun->vlun.chnl_id = i / dev->luns_per_chnl; lun->lun_id = i % dev->luns_per_chnl;
lun->vlun.nr_free_blocks = dev->blks_per_lun; lun->chnl_id = i / dev->luns_per_chnl;
lun->nr_free_blocks = dev->blks_per_lun;
} }
return 0; return 0;
} }
@ -268,7 +268,7 @@ static int gen_block_bb(struct gen_dev *gn, struct ppa_addr ppa,
u8 *blks, int nr_blks) u8 *blks, int nr_blks)
{ {
struct nvm_dev *dev = gn->dev; struct nvm_dev *dev = gn->dev;
struct gen_lun *lun; struct nvm_lun *lun;
struct nvm_block *blk; struct nvm_block *blk;
int i; int i;
@ -282,9 +282,10 @@ static int gen_block_bb(struct gen_dev *gn, struct ppa_addr ppa,
if (blks[i] == NVM_BLK_T_FREE) if (blks[i] == NVM_BLK_T_FREE)
continue; continue;
blk = &lun->vlun.blocks[i]; blk = &lun->blocks[i];
list_move_tail(&blk->list, &lun->bb_list); list_move_tail(&blk->list, &lun->bb_list);
lun->vlun.nr_free_blocks--; blk->state = NVM_BLK_ST_BAD;
lun->nr_free_blocks--;
} }
return 0; return 0;
@ -295,7 +296,7 @@ static int gen_block_map(u64 slba, u32 nlb, __le64 *entries, void *private)
struct nvm_dev *dev = private; struct nvm_dev *dev = private;
struct gen_dev *gn = dev->mp; struct gen_dev *gn = dev->mp;
u64 elba = slba + nlb; u64 elba = slba + nlb;
struct gen_lun *lun; struct nvm_lun *lun;
struct nvm_block *blk; struct nvm_block *blk;
u64 i; u64 i;
int lun_id; int lun_id;
@ -326,7 +327,7 @@ static int gen_block_map(u64 slba, u32 nlb, __le64 *entries, void *private)
/* Calculate block offset into lun */ /* Calculate block offset into lun */
pba = pba - (dev->sec_per_lun * lun_id); pba = pba - (dev->sec_per_lun * lun_id);
blk = &lun->vlun.blocks[div_u64(pba, dev->sec_per_blk)]; blk = &lun->blocks[div_u64(pba, dev->sec_per_blk)];
if (!blk->state) { if (!blk->state) {
/* at this point, we don't know anything about the /* at this point, we don't know anything about the
@ -335,7 +336,7 @@ static int gen_block_map(u64 slba, u32 nlb, __le64 *entries, void *private)
*/ */
list_move_tail(&blk->list, &lun->used_list); list_move_tail(&blk->list, &lun->used_list);
blk->state = NVM_BLK_ST_TGT; blk->state = NVM_BLK_ST_TGT;
lun->vlun.nr_free_blocks--; lun->nr_free_blocks--;
} }
} }
@ -344,7 +345,7 @@ static int gen_block_map(u64 slba, u32 nlb, __le64 *entries, void *private)
static int gen_blocks_init(struct nvm_dev *dev, struct gen_dev *gn) static int gen_blocks_init(struct nvm_dev *dev, struct gen_dev *gn)
{ {
struct gen_lun *lun; struct nvm_lun *lun;
struct nvm_block *block; struct nvm_block *block;
sector_t lun_iter, blk_iter, cur_block_id = 0; sector_t lun_iter, blk_iter, cur_block_id = 0;
int ret, nr_blks; int ret, nr_blks;
@ -356,19 +357,19 @@ static int gen_blocks_init(struct nvm_dev *dev, struct gen_dev *gn)
return -ENOMEM; return -ENOMEM;
gen_for_each_lun(gn, lun, lun_iter) { gen_for_each_lun(gn, lun, lun_iter) {
lun->vlun.blocks = vzalloc(sizeof(struct nvm_block) * lun->blocks = vzalloc(sizeof(struct nvm_block) *
dev->blks_per_lun); dev->blks_per_lun);
if (!lun->vlun.blocks) { if (!lun->blocks) {
kfree(blks); kfree(blks);
return -ENOMEM; return -ENOMEM;
} }
for (blk_iter = 0; blk_iter < dev->blks_per_lun; blk_iter++) { for (blk_iter = 0; blk_iter < dev->blks_per_lun; blk_iter++) {
block = &lun->vlun.blocks[blk_iter]; block = &lun->blocks[blk_iter];
INIT_LIST_HEAD(&block->list); INIT_LIST_HEAD(&block->list);
block->lun = &lun->vlun; block->lun = lun;
block->id = cur_block_id++; block->id = cur_block_id++;
list_add_tail(&block->list, &lun->free_list); list_add_tail(&block->list, &lun->free_list);
@ -378,8 +379,8 @@ static int gen_blocks_init(struct nvm_dev *dev, struct gen_dev *gn)
struct ppa_addr ppa; struct ppa_addr ppa;
ppa.ppa = 0; ppa.ppa = 0;
ppa.g.ch = lun->vlun.chnl_id; ppa.g.ch = lun->chnl_id;
ppa.g.lun = lun->vlun.lun_id; ppa.g.lun = lun->lun_id;
ret = nvm_get_bb_tbl(dev, ppa, blks); ret = nvm_get_bb_tbl(dev, ppa, blks);
if (ret) if (ret)
@ -468,41 +469,39 @@ static void gen_unregister(struct nvm_dev *dev)
} }
static struct nvm_block *gen_get_blk(struct nvm_dev *dev, static struct nvm_block *gen_get_blk(struct nvm_dev *dev,
struct nvm_lun *vlun, unsigned long flags) struct nvm_lun *lun, unsigned long flags)
{ {
struct gen_lun *lun = container_of(vlun, struct gen_lun, vlun);
struct nvm_block *blk = NULL; struct nvm_block *blk = NULL;
int is_gc = flags & NVM_IOTYPE_GC; int is_gc = flags & NVM_IOTYPE_GC;
spin_lock(&vlun->lock); spin_lock(&lun->lock);
if (list_empty(&lun->free_list)) { if (list_empty(&lun->free_list)) {
pr_err_ratelimited("gen: lun %u have no free pages available", pr_err_ratelimited("gen: lun %u have no free pages available",
lun->vlun.id); lun->id);
goto out; goto out;
} }
if (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) if (!is_gc && lun->nr_free_blocks < lun->reserved_blocks)
goto out; goto out;
blk = list_first_entry(&lun->free_list, struct nvm_block, list); blk = list_first_entry(&lun->free_list, struct nvm_block, list);
list_move_tail(&blk->list, &lun->used_list); list_move_tail(&blk->list, &lun->used_list);
blk->state = NVM_BLK_ST_TGT; blk->state = NVM_BLK_ST_TGT;
lun->vlun.nr_free_blocks--; lun->nr_free_blocks--;
out: out:
spin_unlock(&vlun->lock); spin_unlock(&lun->lock);
return blk; return blk;
} }
static void gen_put_blk(struct nvm_dev *dev, struct nvm_block *blk) static void gen_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
{ {
struct nvm_lun *vlun = blk->lun; struct nvm_lun *lun = blk->lun;
struct gen_lun *lun = container_of(vlun, struct gen_lun, vlun);
spin_lock(&vlun->lock); spin_lock(&lun->lock);
if (blk->state & NVM_BLK_ST_TGT) { if (blk->state & NVM_BLK_ST_TGT) {
list_move_tail(&blk->list, &lun->free_list); list_move_tail(&blk->list, &lun->free_list);
lun->vlun.nr_free_blocks++; lun->nr_free_blocks++;
blk->state = NVM_BLK_ST_FREE; blk->state = NVM_BLK_ST_FREE;
} else if (blk->state & NVM_BLK_ST_BAD) { } else if (blk->state & NVM_BLK_ST_BAD) {
list_move_tail(&blk->list, &lun->bb_list); list_move_tail(&blk->list, &lun->bb_list);
@ -513,13 +512,13 @@ static void gen_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
blk->id, blk->state); blk->id, blk->state);
list_move_tail(&blk->list, &lun->bb_list); list_move_tail(&blk->list, &lun->bb_list);
} }
spin_unlock(&vlun->lock); spin_unlock(&lun->lock);
} }
static void gen_mark_blk(struct nvm_dev *dev, struct ppa_addr ppa, int type) static void gen_mark_blk(struct nvm_dev *dev, struct ppa_addr ppa, int type)
{ {
struct gen_dev *gn = dev->mp; struct gen_dev *gn = dev->mp;
struct gen_lun *lun; struct nvm_lun *lun;
struct nvm_block *blk; struct nvm_block *blk;
pr_debug("gen: ppa (ch: %u lun: %u blk: %u pg: %u) -> %u\n", pr_debug("gen: ppa (ch: %u lun: %u blk: %u pg: %u) -> %u\n",
@ -537,7 +536,7 @@ static void gen_mark_blk(struct nvm_dev *dev, struct ppa_addr ppa, int type)
} }
lun = &gn->luns[(dev->luns_per_chnl * ppa.g.ch) + ppa.g.lun]; lun = &gn->luns[(dev->luns_per_chnl * ppa.g.ch) + ppa.g.lun];
blk = &lun->vlun.blocks[ppa.g.blk]; blk = &lun->blocks[ppa.g.blk];
/* will be moved to bb list on put_blk from target */ /* will be moved to bb list on put_blk from target */
blk->state = type; blk->state = type;
@ -587,23 +586,23 @@ static struct nvm_lun *gen_get_lun(struct nvm_dev *dev, int lunid)
if (unlikely(lunid >= dev->nr_luns)) if (unlikely(lunid >= dev->nr_luns))
return NULL; return NULL;
return &gn->luns[lunid].vlun; return &gn->luns[lunid];
} }
static void gen_lun_info_print(struct nvm_dev *dev) static void gen_lun_info_print(struct nvm_dev *dev)
{ {
struct gen_dev *gn = dev->mp; struct gen_dev *gn = dev->mp;
struct gen_lun *lun; struct nvm_lun *lun;
unsigned int i; unsigned int i;
gen_for_each_lun(gn, lun, i) { gen_for_each_lun(gn, lun, i) {
spin_lock(&lun->vlun.lock); spin_lock(&lun->lock);
pr_info("%s: lun%8u\t%u\n", dev->name, i, pr_info("%s: lun%8u\t%u\n", dev->name, i,
lun->vlun.nr_free_blocks); lun->nr_free_blocks);
spin_unlock(&lun->vlun.lock); spin_unlock(&lun->lock);
} }
} }

16
drivers/lightnvm/gennvm.h
View file

@ -20,25 +20,11 @@
#include <linux/lightnvm.h> #include <linux/lightnvm.h>
struct gen_lun {
struct nvm_lun vlun;
int reserved_blocks;
/* lun block lists */
struct list_head used_list; /* In-use blocks */
struct list_head free_list; /* Not used blocks i.e. released
* and ready for use
*/
struct list_head bb_list; /* Bad blocks. Mutually exclusive with
* free_list and used_list
*/
};
struct gen_dev { struct gen_dev {
struct nvm_dev *dev; struct nvm_dev *dev;
int nr_luns; int nr_luns;
struct gen_lun *luns; struct nvm_lun *luns;
struct list_head area_list; struct list_head area_list;
struct mutex lock; struct mutex lock;

10
include/linux/lightnvm.h
View file

@ -275,7 +275,17 @@ struct nvm_lun {
spinlock_t lock; spinlock_t lock;
/* lun block lists */
struct list_head used_list; /* In-use blocks */
struct list_head free_list; /* Not used blocks i.e. released
* and ready for use
*/
struct list_head bb_list; /* Bad blocks. Mutually exclusive with
* free_list and used_list
*/
unsigned int nr_free_blocks; /* Number of unused blocks */ unsigned int nr_free_blocks; /* Number of unused blocks */
int reserved_blocks;
struct nvm_block *blocks; struct nvm_block *blocks;
}; };