lightnvm: pblk: fix mapping issue on failed writes

On 1.2-devices, the mapping-out of remaning sectors in the
failed-write's block can result in an infinite loop,
stalling the write pipeline, fix this.

Fixes: 6a3abf5beef6 ("lightnvm: pblk: rework write error recovery path")
Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index 61fe22ccc7a1..9554febee480 100644
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -106,8 +106,6 @@ retry:
 /* Map remaining sectors in chunk, starting from ppa */
 static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa)
 {
-        struct nvm_tgt_dev *dev = pblk->dev;
-        struct nvm_geo *geo = &dev->geo;
         struct pblk_line *line;
         struct ppa_addr map_ppa = *ppa;
         u64 paddr;
@@ -125,15 +123,7 @@ static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa)
                 if (!test_and_set_bit(paddr, line->invalid_bitmap))
                         le32_add_cpu(line->vsc, -1);
 
-                if (geo->version == NVM_OCSSD_SPEC_12) {
-                        map_ppa.ppa++;
-                        if (map_ppa.g.pg == geo->num_pg)
-                                done = 1;
-                } else {
-                        map_ppa.m.sec++;
-                        if (map_ppa.m.sec == geo->clba)
-                                done = 1;
-                }
+                done = nvm_next_ppa_in_chk(pblk->dev, &map_ppa);
         }
 
         line->w_err_gc->has_write_err = 1;