diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 12:35:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-24 12:35:57 -0400 |
| commit | 34f3780091dc714415b90b39ecc992891dd772c4 (patch) | |
| tree | e966593e92b6493336206ec66c51864e925b318d | |
| parent | a125d4d5684b1c32695c80262c6152069cc46d61 (diff) | |
| download | longterm-queue-4.12-34f3780091dc714415b90b39ecc992891dd772c4.tar.gz | |
lightnvm: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/lightnvm-pblk-prevent-gc-kicks-when-gc-is-not-operat.patch | 64 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 65 deletions
diff --git a/queue/lightnvm-pblk-prevent-gc-kicks-when-gc-is-not-operat.patch b/queue/lightnvm-pblk-prevent-gc-kicks-when-gc-is-not-operat.patch deleted file mode 100644 index 6b62cbf..0000000 --- a/queue/lightnvm-pblk-prevent-gc-kicks-when-gc-is-not-operat.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 3e3a5b8ebd5d3b1d68facc58b0674a2564653222 Mon Sep 17 00:00:00 2001 -From: Hans Holmberg <hans.holmberg@cnexlabs.com> -Date: Fri, 13 Oct 2017 14:46:34 +0200 -Subject: [PATCH] lightnvm: pblk: prevent gc kicks when gc is not operational -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 3e3a5b8ebd5d3b1d68facc58b0674a2564653222 upstream. - -GC can be kicked after it has been shut down when closing the last -line during exit, resulting in accesses to freed structures. - -Make sure that GC is not triggered while it is not operational. -Also make sure that GC won't be re-activated during exit when -running on another processor by using timer_del_sync. - -Signed-off-by: Hans Holmberg <hans.holmberg@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-gc.c b/drivers/lightnvm/pblk-gc.c -index 7b103bce58bf..81efac18ff57 100644 ---- a/drivers/lightnvm/pblk-gc.c -+++ b/drivers/lightnvm/pblk-gc.c -@@ -478,10 +478,10 @@ void pblk_gc_should_start(struct pblk *pblk) - { - struct pblk_gc *gc = &pblk->gc; - -- if (gc->gc_enabled && !gc->gc_active) -+ if (gc->gc_enabled && !gc->gc_active) { - pblk_gc_start(pblk); -- -- pblk_gc_kick(pblk); -+ pblk_gc_kick(pblk); -+ } - } - - /* -@@ -620,7 +620,8 @@ void pblk_gc_exit(struct pblk *pblk) - flush_workqueue(gc->gc_reader_wq); - flush_workqueue(gc->gc_line_reader_wq); - -- del_timer(&gc->gc_timer); -+ gc->gc_enabled = 0; -+ del_timer_sync(&gc->gc_timer); - pblk_gc_stop(pblk, 1); - - if (gc->gc_ts) -diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c -index 2e599738372d..27eb430958ff 100644 ---- a/drivers/lightnvm/pblk-init.c -+++ b/drivers/lightnvm/pblk-init.c -@@ -931,6 +931,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk, - pblk->dev = dev; - pblk->disk = tdisk; - pblk->state = PBLK_STATE_RUNNING; -+ pblk->gc.gc_enabled = 0; - - spin_lock_init(&pblk->trans_lock); - spin_lock_init(&pblk->lock); --- -2.15.0 - diff --git a/queue/series b/queue/series index e041488..b76dce7 100644 --- a/queue/series +++ b/queue/series @@ -109,7 +109,6 @@ macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch RDMA-cma-Avoid-triggering-undefined-behavior.patch IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch -lightnvm-pblk-prevent-gc-kicks-when-gc-is-not-operat.patch lightnvm-pblk-fix-changing-GC-group-list-for-a-line.patch lightnvm-pblk-initialize-debug-stat-counter.patch lightnvm-pblk-fix-min-size-for-page-mempool.patch |