lightnvm: expose gennvm_mark_blk to targets

Targets can update a block state when having a reference to an
in-memory virtual block. In the case that a target does not keep the
block metadata in memory, it does not have a way to update this
structure.

Therefore, expose gennvm_mark_blk() through the media managers
->mark_blk() callback and let targets update the state structure through
this callback.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index 61790aebb8da9e6d563a6cd4e4d21051db81f2e6..33a66d8c039d3aa335c597a289c9dfc30149b1df 100644 (file)
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -407,29 +407,28 @@ static void gennvm_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
        spin_unlock(&vlun->lock);
 }
 
-static void gennvm_blk_set_type(struct nvm_dev *dev, struct ppa_addr *ppa,
-                                                               int type)
+static void gennvm_mark_blk(struct nvm_dev *dev, struct ppa_addr ppa, int type)
 {
        struct gen_nvm *gn = dev->mp;
        struct gen_lun *lun;
        struct nvm_block *blk;
 
        pr_debug("gennvm: ppa  (ch: %u lun: %u blk: %u pg: %u) -> %u\n",
-                       ppa->g.ch, ppa->g.lun, ppa->g.blk, ppa->g.pg, type);
+                       ppa.g.ch, ppa.g.lun, ppa.g.blk, ppa.g.pg, type);
 
-       if (unlikely(ppa->g.ch > dev->nr_chnls ||
-                                       ppa->g.lun > dev->luns_per_chnl ||
-                                       ppa->g.blk > dev->blks_per_lun)) {
+       if (unlikely(ppa.g.ch > dev->nr_chnls ||
+                                       ppa.g.lun > dev->luns_per_chnl ||
+                                       ppa.g.blk > dev->blks_per_lun)) {
                WARN_ON_ONCE(1);
                pr_err("gennvm: ppa broken (ch: %u > %u lun: %u > %u blk: %u > %u",
-                               ppa->g.ch, dev->nr_chnls,
-                               ppa->g.lun, dev->luns_per_chnl,
-                               ppa->g.blk, dev->blks_per_lun);
+                               ppa.g.ch, dev->nr_chnls,
+                               ppa.g.lun, dev->luns_per_chnl,
+                               ppa.g.blk, dev->blks_per_lun);
                return;
        }
 
-       lun = &gn->luns[ppa->g.lun * ppa->g.ch];
-       blk = &lun->vlun.blocks[ppa->g.blk];
+       lun = &gn->luns[ppa.g.lun * ppa.g.ch];
+       blk = &lun->vlun.blocks[ppa.g.blk];
 
        /* will be moved to bb list on put_blk from target */
        blk->state = type;
@@ -448,12 +447,12 @@ static void gennvm_mark_blk_bad(struct nvm_dev *dev, struct nvm_rq *rqd)
 
        /* look up blocks and mark them as bad */
        if (rqd->nr_pages == 1) {
-               gennvm_blk_set_type(dev, &rqd->ppa_addr, NVM_BLK_ST_BAD);
+               gennvm_mark_blk(dev, rqd->ppa_addr, NVM_BLK_ST_BAD);
                return;
        }
 
        while ((bit = find_next_bit(comp_bits, max_secs, bit + 1)) < max_secs)
-               gennvm_blk_set_type(dev, &rqd->ppa_list[bit], NVM_BLK_ST_BAD);
+               gennvm_mark_blk(dev, rqd->ppa_list[bit], NVM_BLK_ST_BAD);
 }
 
 static void gennvm_end_io(struct nvm_rq *rqd)
@@ -544,6 +543,8 @@ static struct nvmm_type gennvm = {
        .submit_io              = gennvm_submit_io,
        .erase_blk              = gennvm_erase_blk,
 
+       .mark_blk               = gennvm_mark_blk,
+
        .get_lun                = gennvm_get_lun,
        .reserve_lun            = gennvm_reserve_lun,
        .release_lun            = gennvm_release_lun,

diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index cde31ffe2d6256e426cbccb00bde26f971d7f751..3c53911e5758efb956344f0539fea884a7d079b7 100644 (file)
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -467,6 +467,7 @@ typedef void (nvmm_flush_blk_fn)(struct nvm_dev *, struct nvm_block *);
 typedef int (nvmm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *);
 typedef int (nvmm_erase_blk_fn)(struct nvm_dev *, struct nvm_block *,
                                                                unsigned long);
+typedef void (nvmm_mark_blk_fn)(struct nvm_dev *, struct ppa_addr, int);
 typedef struct nvm_lun *(nvmm_get_lun_fn)(struct nvm_dev *, int);
 typedef int (nvmm_reserve_lun)(struct nvm_dev *, int);
 typedef void (nvmm_release_lun)(struct nvm_dev *, int);
@@ -494,6 +495,9 @@ struct nvmm_type {
        nvmm_submit_io_fn *submit_io;
        nvmm_erase_blk_fn *erase_blk;
 
+       /* Bad block mgmt */
+       nvmm_mark_blk_fn *mark_blk;
+
        /* Configuration management */
        nvmm_get_lun_fn *get_lun;
        nvmm_reserve_lun *reserve_lun;