lightnvm: pblk: decouple read/erase mempools

Since read and erase paths offer different guarantees for inflight I/Os,
separate the mempools to set the right min_nr for each on creation.

Reported-by: Jens Axboe <axboe@kernel.dk>
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>

3 files changed, 22 insertions, 13 deletions

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index b92532211866..0c22e5ccdfdd 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -64,7 +64,7 @@ static void pblk_end_io_erase(struct nvm_rq *rqd)
         struct pblk *pblk = rqd->private;
 
         __pblk_end_io_erase(pblk, rqd);
-        mempool_free(rqd, pblk->g_rq_pool);
+        mempool_free(rqd, pblk->e_rq_pool);
 }
 
 void __pblk_map_invalidate(struct pblk *pblk, struct pblk_line *line,
@@ -161,7 +161,7 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw)
                 pool = pblk->w_rq_pool;
                 rq_size = pblk_w_rq_size;
         } else {
-                pool = pblk->g_rq_pool;
+                pool = pblk->r_rq_pool;
                 rq_size = pblk_g_rq_size;
         }
 
@@ -178,7 +178,7 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int rw)
         if (rw == WRITE)
                 pool = pblk->w_rq_pool;
         else
-                pool = pblk->g_rq_pool;
+                pool = pblk->r_rq_pool;
 
         mempool_free(rqd, pool);
 }
@@ -1479,7 +1479,7 @@ int pblk_blk_erase_async(struct pblk *pblk, struct ppa_addr ppa)
         struct nvm_rq *rqd;
         int err;
 
-        rqd = mempool_alloc(pblk->g_rq_pool, GFP_KERNEL);
+        rqd = mempool_alloc(pblk->e_rq_pool, GFP_KERNEL);
         memset(rqd, 0, pblk_g_rq_size);
 
         pblk_setup_e_rq(pblk, rqd, ppa);
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 340552253580..2f8d3f9ffbaf 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -261,15 +261,20 @@ static int pblk_core_init(struct pblk *pblk)
         if (!pblk->rec_pool)
                 goto free_gen_ws_pool;
 
-        pblk->g_rq_pool = mempool_create_slab_pool(PBLK_READ_REQ_POOL_SIZE,
+        pblk->r_rq_pool = mempool_create_slab_pool(geo->nr_luns,
                                                         pblk_g_rq_cache);
-        if (!pblk->g_rq_pool)
+        if (!pblk->r_rq_pool)
                 goto free_rec_pool;
 
-        pblk->w_rq_pool = mempool_create_slab_pool(geo->nr_luns * 2,
+        pblk->e_rq_pool = mempool_create_slab_pool(geo->nr_luns,
+                                                        pblk_g_rq_cache);
+        if (!pblk->e_rq_pool)
+                goto free_r_rq_pool;
+
+        pblk->w_rq_pool = mempool_create_slab_pool(geo->nr_luns,
                                                         pblk_w_rq_cache);
         if (!pblk->w_rq_pool)
-                goto free_g_rq_pool;
+                goto free_e_rq_pool;
 
         pblk->line_meta_pool =
                         mempool_create_slab_pool(PBLK_META_POOL_SIZE,
@@ -304,8 +309,10 @@ free_line_meta_pool:
         mempool_destroy(pblk->line_meta_pool);
 free_w_rq_pool:
         mempool_destroy(pblk->w_rq_pool);
-free_g_rq_pool:
-        mempool_destroy(pblk->g_rq_pool);
+free_e_rq_pool:
+        mempool_destroy(pblk->e_rq_pool);
+free_r_rq_pool:
+        mempool_destroy(pblk->r_rq_pool);
 free_rec_pool:
         mempool_destroy(pblk->rec_pool);
 free_gen_ws_pool:
@@ -326,7 +333,8 @@ static void pblk_core_free(struct pblk *pblk)
         mempool_destroy(pblk->page_bio_pool);
         mempool_destroy(pblk->gen_ws_pool);
         mempool_destroy(pblk->rec_pool);
-        mempool_destroy(pblk->g_rq_pool);
+        mempool_destroy(pblk->r_rq_pool);
+        mempool_destroy(pblk->e_rq_pool);
         mempool_destroy(pblk->w_rq_pool);
         mempool_destroy(pblk->line_meta_pool);
 
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index efaa781abb06..419e1b7328e4 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -41,7 +41,6 @@
 #define PBLK_MAX_REQ_ADDRS_PW (6)
 
 #define PBLK_META_POOL_SIZE (128)
-#define PBLK_READ_REQ_POOL_SIZE (1024)
 
 #define PBLK_NR_CLOSE_JOBS (4)
 
@@ -60,6 +59,7 @@
 
 #define ERASE 2 /* READ = 0, WRITE = 1 */
 
+/* Static pool sizes */
 #define PBLK_GEN_WS_POOL_SIZE (2)
 
 enum {
@@ -624,8 +624,9 @@ struct pblk {
         mempool_t *page_bio_pool;
         mempool_t *gen_ws_pool;
         mempool_t *rec_pool;
-        mempool_t *g_rq_pool;
+        mempool_t *r_rq_pool;
         mempool_t *w_rq_pool;
+        mempool_t *e_rq_pool;
         mempool_t *line_meta_pool;
 
         struct workqueue_struct *close_wq;