lightnvm: refactor end_io functions for sync

To implement sync I/O support within the LightNVM core, the end_io
functions are refactored to take an end_io function pointer instead of
testing for initialized media manager, followed by calling its end_io
function.

Sync I/O can then be implemented using a callback that signal I/O
completion. This is similar to the logic found in blk_to_execute_io().
By implementing it this way, the underlying device I/Os submission logic
is abstracted away from core, targets, and media managers.

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

1 files changed, 14 insertions, 20 deletions

diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index 373be72816bd..12ddcaa343e9 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -317,18 +317,6 @@ static void gennvm_put_blk(struct nvm_dev *dev, struct nvm_block *blk)
         spin_unlock(&vlun->lock);
 }
 
-static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
-{
-        if (!dev->ops->submit_io)
-                return -ENODEV;
-
-        /* Convert address space */
-        nvm_generic_to_addr_mode(dev, rqd);
-
-        rqd->dev = dev;
-        return dev->ops->submit_io(dev, rqd);
-}
-
 static void gennvm_blk_set_type(struct nvm_dev *dev, struct ppa_addr *ppa,
                                                                 int type)
 {
@@ -375,25 +363,32 @@ static void gennvm_mark_blk_bad(struct nvm_dev *dev, struct nvm_rq *rqd)
                 gennvm_blk_set_type(dev, &rqd->ppa_addr, 2);
 }
 
-static int gennvm_end_io(struct nvm_rq *rqd, int error)
+static void gennvm_end_io(struct nvm_rq *rqd, int error)
 {
         struct nvm_tgt_instance *ins = rqd->ins;
-        int ret = 0;
 
         switch (error) {
         case NVM_RSP_SUCCESS:
-                break;
         case NVM_RSP_ERR_EMPTYPAGE:
                 break;
         case NVM_RSP_ERR_FAILWRITE:
                 gennvm_mark_blk_bad(rqd->dev, rqd);
-        default:
-                ret++;
         }
 
-        ret += ins->tt->end_io(rqd, error);
+        ins->tt->end_io(rqd, error);
+}
 
-        return ret;
+static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
+{
+        if (!dev->ops->submit_io)
+                return -ENODEV;
+
+        /* Convert address space */
+        nvm_generic_to_addr_mode(dev, rqd);
+
+        rqd->dev = dev;
+        rqd->end_io = gennvm_end_io;
+        return dev->ops->submit_io(dev, rqd);
 }
 
 static int gennvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk,
@@ -442,7 +437,6 @@ static struct nvmm_type gennvm = {
         .put_blk        = gennvm_put_blk,
 
         .submit_io      = gennvm_submit_io,
-        .end_io         = gennvm_end_io,
         .erase_blk      = gennvm_erase_blk,
 
         .get_lun        = gennvm_get_lun,