diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 13:12:40 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 13:12:40 -0400 |
commit | 0fb3234fa0ae661e282ba1f46670a515bffacc71 (patch) | |
tree | ed647a0e0374f9548ef6bae5e1539e57ccaafa8e | |
parent | dbbd0c6839a367531cd01de40d3bf3bb7861763b (diff) | |
download | longterm-queue-4.12-0fb3234fa0ae661e282ba1f46670a515bffacc71.tar.gz |
lightnvm: another context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch b/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch index 96b26ad..59ae046 100644 --- a/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch +++ b/queue/lightnvm-pblk-fix-min-size-for-page-mempool.patch @@ -1,4 +1,4 @@ -From bd432417681a224d9fa4a9d43be7d4edc82135b2 Mon Sep 17 00:00:00 2001 +From c9cae7951cbfcd1ae100967f24a160a48d05bd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= <javier@cnexlabs.com> Date: Fri, 13 Oct 2017 14:46:06 +0200 Subject: [PATCH] lightnvm: pblk: fix min size for page mempool @@ -25,13 +25,14 @@ 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> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c -index 9299a5a75a18..f5fbb9a46784 100644 +index 5e44768ccffa..e3f79a66f7b7 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c -@@ -192,7 +192,7 @@ void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off, - +@@ -205,7 +205,7 @@ void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off, + bio_advance(bio, off * PBLK_EXPOSED_PAGE_SIZE); for (i = off; i < nr_pages + off; i++) { bv = bio->bi_io_vec[i]; - mempool_free(bv.bv_page, pblk->page_pool); @@ -39,7 +40,7 @@ index 9299a5a75a18..f5fbb9a46784 100644 } } -@@ -204,14 +204,14 @@ int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags, +@@ -217,14 +217,14 @@ int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags, int i, ret; for (i = 0; i < nr_pages; i++) { @@ -57,10 +58,10 @@ index 9299a5a75a18..f5fbb9a46784 100644 } } diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c -index eee4eeb47d07..7b1f29c71338 100644 +index d09954a5b603..ab3263bf375c 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c -@@ -132,7 +132,6 @@ static int pblk_rwb_init(struct pblk *pblk) +@@ -131,7 +131,6 @@ static int pblk_rwb_init(struct pblk *pblk) } /* Minimum pages needed within a lun */ @@ -68,7 +69,7 @@ index eee4eeb47d07..7b1f29c71338 100644 #define ADDR_POOL_SIZE 64 static int pblk_set_ppaf(struct pblk *pblk) -@@ -247,14 +246,16 @@ static int pblk_core_init(struct pblk *pblk) +@@ -263,14 +262,16 @@ static int pblk_core_init(struct pblk *pblk) if (pblk_init_global_caches(pblk)) return -ENOMEM; @@ -80,7 +81,7 @@ index eee4eeb47d07..7b1f29c71338 100644 + if (!pblk->page_bio_pool) return -ENOMEM; - pblk->line_ws_pool = mempool_create_slab_pool(PBLK_WS_POOL_SIZE, + pblk->line_ws_pool = mempool_create_slab_pool(geo->nr_luns, pblk_blk_ws_cache); if (!pblk->line_ws_pool) - goto free_page_pool; @@ -88,7 +89,7 @@ index eee4eeb47d07..7b1f29c71338 100644 pblk->rec_pool = mempool_create_slab_pool(geo->nr_luns, pblk_rec_cache); if (!pblk->rec_pool) -@@ -309,8 +310,8 @@ static int pblk_core_init(struct pblk *pblk) +@@ -315,8 +316,8 @@ static int pblk_core_init(struct pblk *pblk) mempool_destroy(pblk->rec_pool); free_blk_ws_pool: mempool_destroy(pblk->line_ws_pool); @@ -99,20 +100,20 @@ index eee4eeb47d07..7b1f29c71338 100644 return -ENOMEM; } -@@ -322,7 +323,7 @@ static void pblk_core_free(struct pblk *pblk) - if (pblk->bb_wq) - destroy_workqueue(pblk->bb_wq); +@@ -325,7 +326,7 @@ static void pblk_core_free(struct pblk *pblk) + if (pblk->kw_wq) + destroy_workqueue(pblk->kw_wq); - mempool_destroy(pblk->page_pool); + mempool_destroy(pblk->page_bio_pool); mempool_destroy(pblk->line_ws_pool); mempool_destroy(pblk->rec_pool); - mempool_destroy(pblk->g_rq_pool); + mempool_destroy(pblk->r_rq_pool); diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c -index ee8efb55b330..402c732f0970 100644 +index 4a12f14d78c6..6ddd2267f2dc 100644 --- a/drivers/lightnvm/pblk-read.c +++ b/drivers/lightnvm/pblk-read.c -@@ -238,7 +238,7 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, +@@ -222,7 +222,7 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, kunmap_atomic(src_p); kunmap_atomic(dst_p); @@ -122,10 +123,10 @@ index ee8efb55b330..402c732f0970 100644 hole = find_next_zero_bit(read_bitmap, nr_secs, hole + 1); } while (hole < nr_secs); diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h -index b592e5194b0f..229f6020ad8a 100644 +index 99f3186b5288..e955996f3a98 100644 --- a/drivers/lightnvm/pblk.h +++ b/drivers/lightnvm/pblk.h -@@ -620,7 +620,7 @@ struct pblk { +@@ -539,7 +539,7 @@ struct pblk { struct list_head compl_list; @@ -133,7 +134,7 @@ index b592e5194b0f..229f6020ad8a 100644 + mempool_t *page_bio_pool; mempool_t *line_ws_pool; mempool_t *rec_pool; - mempool_t *g_rq_pool; + mempool_t *r_rq_pool; -- 2.15.0 |