lightnvm: pblk: expose generic disk name on pr_* msgs

The error messages in pblk does not say which pblk instance that
a message occurred from. Update each error message to reflect the
instance it belongs to, and also prefix it with pblk, so we know
the message comes from the pblk module.

Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Reviewed-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 39 insertions, 37 deletions

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 9ea30102f61c..d023ea6116bc 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -117,13 +117,13 @@ static int pblk_l2p_recover(struct pblk *pblk, bool factory_init)
         } else {
                 line = pblk_recov_l2p(pblk);
                 if (IS_ERR(line)) {
-                        pr_err("pblk: could not recover l2p table\n");
+                        pblk_err(pblk, "could not recover l2p table\n");
                         return -EFAULT;
                 }
         }
 
 #ifdef CONFIG_NVM_PBLK_DEBUG
-        pr_info("pblk init: L2P CRC: %x\n", pblk_l2p_crc(pblk));
+        pblk_info(pblk, "init: L2P CRC: %x\n", pblk_l2p_crc(pblk));
 #endif
 
         /* Free full lines directly as GC has not been started yet */
@@ -166,7 +166,7 @@ static int pblk_l2p_init(struct pblk *pblk, bool factory_init)
 static void pblk_rwb_free(struct pblk *pblk)
 {
         if (pblk_rb_tear_down_check(&pblk->rwb))
-                pr_err("pblk: write buffer error on tear down\n");
+                pblk_err(pblk, "write buffer error on tear down\n");
 
         pblk_rb_data_free(&pblk->rwb);
         vfree(pblk_rb_entries_ref(&pblk->rwb));
@@ -203,7 +203,8 @@ static int pblk_rwb_init(struct pblk *pblk)
 /* Minimum pages needed within a lun */
 #define ADDR_POOL_SIZE 64
 
-static int pblk_set_addrf_12(struct nvm_geo *geo, struct nvm_addrf_12 *dst)
+static int pblk_set_addrf_12(struct pblk *pblk, struct nvm_geo *geo,
+                             struct nvm_addrf_12 *dst)
 {
         struct nvm_addrf_12 *src = (struct nvm_addrf_12 *)&geo->addrf;
         int power_len;
@@ -211,14 +212,14 @@ static int pblk_set_addrf_12(struct nvm_geo *geo, struct nvm_addrf_12 *dst)
         /* Re-calculate channel and lun format to adapt to configuration */
         power_len = get_count_order(geo->num_ch);
         if (1 << power_len != geo->num_ch) {
-                pr_err("pblk: supports only power-of-two channel config.\n");
+                pblk_err(pblk, "supports only power-of-two channel config.\n");
                 return -EINVAL;
         }
         dst->ch_len = power_len;
 
         power_len = get_count_order(geo->num_lun);
         if (1 << power_len != geo->num_lun) {
-                pr_err("pblk: supports only power-of-two LUN config.\n");
+                pblk_err(pblk, "supports only power-of-two LUN config.\n");
                 return -EINVAL;
         }
         dst->lun_len = power_len;
@@ -285,18 +286,19 @@ static int pblk_set_addrf(struct pblk *pblk)
         case NVM_OCSSD_SPEC_12:
                 div_u64_rem(geo->clba, pblk->min_write_pgs, &mod);
                 if (mod) {
-                        pr_err("pblk: bad configuration of sectors/pages\n");
+                        pblk_err(pblk, "bad configuration of sectors/pages\n");
                         return -EINVAL;
                 }
 
-                pblk->addrf_len = pblk_set_addrf_12(geo, (void *)&pblk->addrf);
+                pblk->addrf_len = pblk_set_addrf_12(pblk, geo,
+                                                        (void *)&pblk->addrf);
                 break;
         case NVM_OCSSD_SPEC_20:
                 pblk->addrf_len = pblk_set_addrf_20(geo, (void *)&pblk->addrf,
-                                                                &pblk->uaddrf);
+                                                        &pblk->uaddrf);
                 break;
         default:
-                pr_err("pblk: OCSSD revision not supported (%d)\n",
+                pblk_err(pblk, "OCSSD revision not supported (%d)\n",
                                                                 geo->version);
                 return -EINVAL;
         }
@@ -375,7 +377,7 @@ static int pblk_core_init(struct pblk *pblk)
         pblk_set_sec_per_write(pblk, pblk->min_write_pgs);
 
         if (pblk->max_write_pgs > PBLK_MAX_REQ_ADDRS) {
-                pr_err("pblk: vector list too big(%u > %u)\n",
+                pblk_err(pblk, "vector list too big(%u > %u)\n",
                                 pblk->max_write_pgs, PBLK_MAX_REQ_ADDRS);
                 return -EINVAL;
         }
@@ -608,7 +610,7 @@ static int pblk_luns_init(struct pblk *pblk)
 
         /* TODO: Implement unbalanced LUN support */
         if (geo->num_lun < 0) {
-                pr_err("pblk: unbalanced LUN config.\n");
+                pblk_err(pblk, "unbalanced LUN config.\n");
                 return -EINVAL;
         }
 
@@ -1027,7 +1029,7 @@ add_emeta_page:
                                         lm->emeta_sec[0], geo->clba);
 
         if (lm->min_blk_line > lm->blk_per_line) {
-                pr_err("pblk: config. not supported. Min. LUN in line:%d\n",
+                pblk_err(pblk, "config. not supported. Min. LUN in line:%d\n",
                                                         lm->blk_per_line);
                 return -EINVAL;
         }
@@ -1079,7 +1081,7 @@ static int pblk_lines_init(struct pblk *pblk)
         }
 
         if (!nr_free_chks) {
-                pr_err("pblk: too many bad blocks prevent for sane instance\n");
+                pblk_err(pblk, "too many bad blocks prevent for sane instance\n");
                 return -EINTR;
         }
 
@@ -1109,7 +1111,7 @@ static int pblk_writer_init(struct pblk *pblk)
                 int err = PTR_ERR(pblk->writer_ts);
 
                 if (err != -EINTR)
-                        pr_err("pblk: could not allocate writer kthread (%d)\n",
+                        pblk_err(pblk, "could not allocate writer kthread (%d)\n",
                                         err);
                 return err;
         }
@@ -1155,7 +1157,7 @@ static void pblk_tear_down(struct pblk *pblk, bool graceful)
         pblk_rb_sync_l2p(&pblk->rwb);
         pblk_rl_free(&pblk->rl);
 
-        pr_debug("pblk: consistent tear down (graceful:%d)\n", graceful);
+        pblk_debug(pblk, "consistent tear down (graceful:%d)\n", graceful);
 }
 
 static void pblk_exit(void *private, bool graceful)
@@ -1167,7 +1169,7 @@ static void pblk_exit(void *private, bool graceful)
         pblk_tear_down(pblk, graceful);
 
 #ifdef CONFIG_NVM_PBLK_DEBUG
-        pr_info("pblk exit: L2P CRC: %x\n", pblk_l2p_crc(pblk));
+        pblk_info(pblk, "exit: L2P CRC: %x\n", pblk_l2p_crc(pblk));
 #endif
 
         pblk_free(pblk);
@@ -1190,29 +1192,30 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
         struct pblk *pblk;
         int ret;
 
-        /* pblk supports 1.2 and 2.0 versions */
+        pblk = kzalloc(sizeof(struct pblk), GFP_KERNEL);
+        if (!pblk)
+                return ERR_PTR(-ENOMEM);
+
+        pblk->dev = dev;
+        pblk->disk = tdisk;
+        pblk->state = PBLK_STATE_RUNNING;
+        pblk->gc.gc_enabled = 0;
+
         if (!(geo->version == NVM_OCSSD_SPEC_12 ||
                                         geo->version == NVM_OCSSD_SPEC_20)) {
-                pr_err("pblk: OCSSD version not supported (%u)\n",
+                pblk_err(pblk, "OCSSD version not supported (%u)\n",
                                                         geo->version);
+                kfree(pblk);
                 return ERR_PTR(-EINVAL);
         }
 
         if (geo->version == NVM_OCSSD_SPEC_12 && geo->dom & NVM_RSP_L2P) {
-                pr_err("pblk: host-side L2P table not supported. (%x)\n",
+                pblk_err(pblk, "host-side L2P table not supported. (%x)\n",
                                                         geo->dom);
+                kfree(pblk);
                 return ERR_PTR(-EINVAL);
         }
 
-        pblk = kzalloc(sizeof(struct pblk), GFP_KERNEL);
-        if (!pblk)
-                return ERR_PTR(-ENOMEM);
-
-        pblk->dev = dev;
-        pblk->disk = tdisk;
-        pblk->state = PBLK_STATE_RUNNING;
-        pblk->gc.gc_enabled = 0;
-
         spin_lock_init(&pblk->resubmit_lock);
         spin_lock_init(&pblk->trans_lock);
         spin_lock_init(&pblk->lock);
@@ -1242,38 +1245,38 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
 
         ret = pblk_core_init(pblk);
         if (ret) {
-                pr_err("pblk: could not initialize core\n");
+                pblk_err(pblk, "could not initialize core\n");
                 goto fail;
         }
 
         ret = pblk_lines_init(pblk);
         if (ret) {
-                pr_err("pblk: could not initialize lines\n");
+                pblk_err(pblk, "could not initialize lines\n");
                 goto fail_free_core;
         }
 
         ret = pblk_rwb_init(pblk);
         if (ret) {
-                pr_err("pblk: could not initialize write buffer\n");
+                pblk_err(pblk, "could not initialize write buffer\n");
                 goto fail_free_lines;
         }
 
         ret = pblk_l2p_init(pblk, flags & NVM_TARGET_FACTORY);
         if (ret) {
-                pr_err("pblk: could not initialize maps\n");
+                pblk_err(pblk, "could not initialize maps\n");
                 goto fail_free_rwb;
         }
 
         ret = pblk_writer_init(pblk);
         if (ret) {
                 if (ret != -EINTR)
-                        pr_err("pblk: could not initialize write thread\n");
+                        pblk_err(pblk, "could not initialize write thread\n");
                 goto fail_free_l2p;
         }
 
         ret = pblk_gc_init(pblk);
         if (ret) {
-                pr_err("pblk: could not initialize gc\n");
+                pblk_err(pblk, "could not initialize gc\n");
                 goto fail_stop_writer;
         }
 
@@ -1288,8 +1291,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
         blk_queue_max_discard_sectors(tqueue, UINT_MAX >> 9);
         blk_queue_flag_set(QUEUE_FLAG_DISCARD, tqueue);
 
-        pr_info("pblk(%s): luns:%u, lines:%d, secs:%llu, buf entries:%u\n",
-                        tdisk->disk_name,
+        pblk_info(pblk, "luns:%u, lines:%d, secs:%llu, buf entries:%u\n",
                         geo->all_luns, pblk->l_mg.nr_lines,
                         (unsigned long long)pblk->rl.nr_secs,
                         pblk->rwb.nr_entries);