lightnvm: pblk: improve naming for internal req.

Each request type sent to the LightNVM subsystem requires different
metadata. Until now, we have tailored this metadata based on write, read
and erase commands. However, pblk uses different metadata for internal
writes that do not hit the write buffer. Instead of abusing the metadata
for reads, create a new request type - internal write to improve
code readability.

In the process, create internal values for each I/O type instead of
abusing the READ/WRITE macros, as suggested by Christoph.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 3d27d24baa0b256a8f353ed2cca459119f0d7453..a492964abea8469d9d74f8b2929ecdca17d37c2f 100644 (file)
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -152,7 +152,7 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw)
        struct nvm_rq *rqd;
        int rq_size;
 
-       if (rw == WRITE) {
+       if (rw == PBLK_WRITE) {
                pool = pblk->w_rq_pool;
                rq_size = pblk_w_rq_size;
        } else {
@@ -170,7 +170,7 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int rw)
 {
        mempool_t *pool;
 
-       if (rw == WRITE)
+       if (rw == PBLK_WRITE)
                pool = pblk->w_rq_pool;
        else
                pool = pblk->r_rq_pool;
@@ -569,10 +569,10 @@ static int pblk_line_submit_emeta_io(struct pblk *pblk, struct pblk_line *line,
        int ret;
        DECLARE_COMPLETION_ONSTACK(wait);
 
-       if (dir == WRITE) {
+       if (dir == PBLK_WRITE) {
                bio_op = REQ_OP_WRITE;
                cmd_op = NVM_OP_PWRITE;
-       } else if (dir == READ) {
+       } else if (dir == PBLK_READ) {
                bio_op = REQ_OP_READ;
                cmd_op = NVM_OP_PREAD;
        } else
@@ -612,10 +612,10 @@ next_rq:
        rqd.end_io = pblk_end_io_sync;
        rqd.private = &wait;
 
-       if (dir == WRITE) {
+       if (dir == PBLK_WRITE) {
                struct pblk_sec_meta *meta_list = rqd.meta_list;
 
-               rqd.flags = pblk_set_progr_mode(pblk, WRITE);
+               rqd.flags = pblk_set_progr_mode(pblk, PBLK_WRITE);
                for (i = 0; i < rqd.nr_ppas; ) {
                        spin_lock(&line->lock);
                        paddr = __pblk_alloc_page(pblk, line, min);
@@ -679,7 +679,7 @@ next_rq:
        reinit_completion(&wait);
 
        if (rqd.error) {
-               if (dir == WRITE)
+               if (dir == PBLK_WRITE)
                        pblk_log_write_err(pblk, &rqd);
                else
                        pblk_log_read_err(pblk, &rqd);
@@ -722,12 +722,12 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line,
        int flags;
        DECLARE_COMPLETION_ONSTACK(wait);
 
-       if (dir == WRITE) {
+       if (dir == PBLK_WRITE) {
                bio_op = REQ_OP_WRITE;
                cmd_op = NVM_OP_PWRITE;
-               flags = pblk_set_progr_mode(pblk, WRITE);
+               flags = pblk_set_progr_mode(pblk, PBLK_WRITE);
                lba_list = emeta_to_lbas(pblk, line->emeta->buf);
-       } else if (dir == READ) {
+       } else if (dir == PBLK_READ) {
                bio_op = REQ_OP_READ;
                cmd_op = NVM_OP_PREAD;
                flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);
@@ -765,7 +765,7 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line,
 
                rqd.ppa_list[i] = addr_to_gen_ppa(pblk, paddr, line->id);
 
-               if (dir == WRITE) {
+               if (dir == PBLK_WRITE) {
                        __le64 addr_empty = cpu_to_le64(ADDR_EMPTY);
 
                        meta_list[i].lba = lba_list[paddr] = addr_empty;
@@ -791,7 +791,7 @@ static int pblk_line_submit_smeta_io(struct pblk *pblk, struct pblk_line *line,
        atomic_dec(&pblk->inflight_io);
 
        if (rqd.error) {
-               if (dir == WRITE)
+               if (dir == PBLK_WRITE)
                        pblk_log_write_err(pblk, &rqd);
                else
                        pblk_log_read_err(pblk, &rqd);
@@ -807,14 +807,14 @@ int pblk_line_read_smeta(struct pblk *pblk, struct pblk_line *line)
 {
        u64 bpaddr = pblk_line_smeta_start(pblk, line);
 
-       return pblk_line_submit_smeta_io(pblk, line, bpaddr, READ);
+       return pblk_line_submit_smeta_io(pblk, line, bpaddr, PBLK_READ);
 }
 
 int pblk_line_read_emeta(struct pblk *pblk, struct pblk_line *line,
                         void *emeta_buf)
 {
        return pblk_line_submit_emeta_io(pblk, line, emeta_buf,
-                                               line->emeta_ssec, READ);
+                                               line->emeta_ssec, PBLK_READ);
 }
 
 static void pblk_setup_e_rq(struct pblk *pblk, struct nvm_rq *rqd,
@@ -823,7 +823,7 @@ static void pblk_setup_e_rq(struct pblk *pblk, struct nvm_rq *rqd,
        rqd->opcode = NVM_OP_ERASE;
        rqd->ppa_addr = ppa;
        rqd->nr_ppas = 1;
-       rqd->flags = pblk_set_progr_mode(pblk, ERASE);
+       rqd->flags = pblk_set_progr_mode(pblk, PBLK_ERASE);
        rqd->bio = NULL;
 }
 
@@ -1045,7 +1045,7 @@ static int pblk_line_init_bb(struct pblk *pblk, struct pblk_line *line,
        line->smeta_ssec = off;
        line->cur_sec = off + lm->smeta_sec;
 
-       if (init && pblk_line_submit_smeta_io(pblk, line, off, WRITE)) {
+       if (init && pblk_line_submit_smeta_io(pblk, line, off, PBLK_WRITE)) {
                pr_debug("pblk: line smeta I/O failed. Retry\n");
                return 1;
        }

diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c
index e7141b1aaded41565b14bc29597a30670b869d1a..4b1722fbe5a0c16ec88c290ca922e3cef65f208d 100644 (file)
--- a/drivers/lightnvm/pblk-read.c
+++ b/drivers/lightnvm/pblk-read.c
@@ -142,7 +142,7 @@ static void pblk_end_io_read(struct nvm_rq *rqd)
        atomic_long_sub(rqd->nr_ppas, &pblk->inflight_reads);
 #endif
 
-       pblk_free_rqd(pblk, rqd, READ);
+       pblk_free_rqd(pblk, rqd, PBLK_READ);
        atomic_dec(&pblk->inflight_io);
 }
 
@@ -307,7 +307,7 @@ int pblk_submit_read(struct pblk *pblk, struct bio *bio)
 
        bitmap_zero(&read_bitmap, nr_secs);
 
-       rqd = pblk_alloc_rqd(pblk, READ);
+       rqd = pblk_alloc_rqd(pblk, PBLK_READ);
 
        rqd->opcode = NVM_OP_PREAD;
        rqd->bio = bio;
@@ -382,7 +382,7 @@ int pblk_submit_read(struct pblk *pblk, struct bio *bio)
        return NVM_IO_OK;
 
 fail_rqd_free:
-       pblk_free_rqd(pblk, rqd, READ);
+       pblk_free_rqd(pblk, rqd, PBLK_READ);
        return ret;
 }
 

diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index e59270e60b58ee50b1f58a210a18fc981399f9ed..19f2fb1a9e4b208d840b81748441ce0b0b7abbe2 100644 (file)
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -67,7 +67,7 @@ void pblk_submit_rec(struct work_struct *work)
 
 err:
        bio_put(bio);
-       pblk_free_rqd(pblk, rqd, WRITE);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE);
 }
 
 int pblk_recov_setup_rq(struct pblk *pblk, struct pblk_c_ctx *c_ctx,
@@ -80,7 +80,7 @@ int pblk_recov_setup_rq(struct pblk *pblk, struct pblk_c_ctx *c_ctx,
        struct pblk_c_ctx *rec_ctx;
        int nr_entries = c_ctx->nr_valid + c_ctx->nr_padded;
 
-       rec_rqd = pblk_alloc_rqd(pblk, WRITE);
+       rec_rqd = pblk_alloc_rqd(pblk, PBLK_WRITE);
        rec_ctx = nvm_rq_to_pdu(rec_rqd);
 
        /* Copy completion bitmap, but exclude the first X completed entries */
@@ -334,7 +334,7 @@ static void pblk_end_io_recov(struct nvm_rq *rqd)
        pblk_up_page(pblk, rqd->ppa_list, rqd->nr_ppas);
 
        nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
-       pblk_free_rqd(pblk, rqd, WRITE);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
 
        atomic_dec(&pblk->inflight_io);
        kref_put(&pad_rq->ref, pblk_recov_complete);
@@ -404,11 +404,11 @@ next_pad_rq:
        bio->bi_iter.bi_sector = 0; /* internal bio */
        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
-       rqd = pblk_alloc_rqd(pblk, WRITE);
+       rqd = pblk_alloc_rqd(pblk, PBLK_WRITE_INT);
 
        rqd->bio = bio;
        rqd->opcode = NVM_OP_PWRITE;
-       rqd->flags = pblk_set_progr_mode(pblk, WRITE);
+       rqd->flags = pblk_set_progr_mode(pblk, PBLK_WRITE);
        rqd->meta_list = meta_list;
        rqd->nr_ppas = rq_ppas;
        rqd->ppa_list = ppa_list;
@@ -782,7 +782,7 @@ static int pblk_recov_l2p_from_oob(struct pblk *pblk, struct pblk_line *line)
                goto free_meta_list;
        }
 
-       rqd = pblk_alloc_rqd(pblk, READ);
+       rqd = pblk_alloc_rqd(pblk, PBLK_READ);
 
        p.ppa_list = ppa_list;
        p.meta_list = meta_list;

diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index 140a26edd1d3d292d91c524844626b913c1b966b..c1b8b83e149d98bbdbebcf94cd1646c670e530c6 100644 (file)
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -46,7 +46,7 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
        nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
 
        bio_put(rqd->bio);
-       pblk_free_rqd(pblk, rqd, WRITE);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE);
 
        return ret;
 }
@@ -195,7 +195,7 @@ static void pblk_end_io_write_meta(struct nvm_rq *rqd)
                                                GFP_ATOMIC, pblk->close_wq);
 
        nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
-       pblk_free_rqd(pblk, rqd, READ);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
 
        atomic_dec(&pblk->inflight_io);
 }
@@ -209,7 +209,7 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
        /* Setup write request */
        rqd->opcode = NVM_OP_PWRITE;
        rqd->nr_ppas = nr_secs;
-       rqd->flags = pblk_set_progr_mode(pblk, WRITE);
+       rqd->flags = pblk_set_progr_mode(pblk, PBLK_WRITE);
        rqd->private = pblk;
        rqd->end_io = end_io;
 
@@ -275,7 +275,7 @@ int pblk_setup_w_rec_rq(struct pblk *pblk, struct nvm_rq *rqd,
        pblk_map_rq(pblk, rqd, c_ctx->sentry, lun_bitmap, c_ctx->nr_valid, 0);
 
        rqd->ppa_status = (u64)0;
-       rqd->flags = pblk_set_progr_mode(pblk, WRITE);
+       rqd->flags = pblk_set_progr_mode(pblk, PBLK_WRITE);
 
        return ret;
 }
@@ -366,7 +366,7 @@ int pblk_submit_meta_io(struct pblk *pblk, struct pblk_line *meta_line)
        int i, j;
        int ret;
 
-       rqd = pblk_alloc_rqd(pblk, READ);
+       rqd = pblk_alloc_rqd(pblk, PBLK_WRITE_INT);
 
        m_ctx = nvm_rq_to_pdu(rqd);
        m_ctx->private = meta_line;
@@ -424,7 +424,7 @@ fail_rollback:
 fail_free_bio:
        bio_put(bio);
 fail_free_rqd:
-       pblk_free_rqd(pblk, rqd, READ);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
        return ret;
 }
 
@@ -548,7 +548,7 @@ static int pblk_submit_write(struct pblk *pblk)
        bio->bi_iter.bi_sector = 0; /* internal bio */
        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
-       rqd = pblk_alloc_rqd(pblk, WRITE);
+       rqd = pblk_alloc_rqd(pblk, PBLK_WRITE);
        rqd->bio = bio;
 
        if (pblk_rb_read_to_bio(&pblk->rwb, rqd, pos, secs_to_sync,
@@ -570,7 +570,7 @@ fail_free_bio:
        pblk_free_write_rqd(pblk, rqd);
 fail_put_bio:
        bio_put(bio);
-       pblk_free_rqd(pblk, rqd, WRITE);
+       pblk_free_rqd(pblk, rqd, PBLK_WRITE);
 
        return 1;
 }

diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 9f162057d4971cf902277bf1f0c68c3367b8301b..d01e003d3d74257351d486989358a3250e6b53c6 100644 (file)
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -55,11 +55,16 @@
                for ((i) = 0, rlun = &(pblk)->luns[0]; \
                        (i) < (pblk)->nr_luns; (i)++, rlun = &(pblk)->luns[(i)])
 
-#define ERASE 2 /* READ = 0, WRITE = 1 */
-
 /* Static pool sizes */
 #define PBLK_GEN_WS_POOL_SIZE (2)
 
+enum {
+       PBLK_READ               = READ,
+       PBLK_WRITE              = WRITE,/* Write from write buffer */
+       PBLK_WRITE_INT,                 /* Internal write - no write buffer */
+       PBLK_ERASE,
+};
+
 enum {
        /* IO Types */
        PBLK_IOTYPE_USER        = 1 << 0,
@@ -1132,7 +1137,7 @@ static inline int pblk_set_progr_mode(struct pblk *pblk, int type)
 
        flags = geo->plane_mode >> 1;
 
-       if (type == WRITE)
+       if (type == PBLK_WRITE)
                flags |= NVM_IO_SCRAMBLE_ENABLE;
 
        return flags;