lightnvm: pblk: shut down gc gracefully during exit

Shut down the GC workqueues and tasks in the right order.

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 4bac9e1531f5d596d99e625d74d06cece8dda066..e00e5a0743e960dd373d89328b4eac52bd6810a3 100644 (file)
--- a/drivers/lightnvm/pblk-gc.c
+++ b/drivers/lightnvm/pblk-gc.c
@@ -422,10 +422,15 @@ void pblk_gc_kick(struct pblk *pblk)
 {
        struct pblk_gc *gc = &pblk->gc;
 
-       wake_up_process(gc->gc_ts);
        pblk_gc_writer_kick(gc);
        pblk_gc_reader_kick(gc);
-       mod_timer(&gc->gc_timer, jiffies + msecs_to_jiffies(GC_TIME_MSECS));
+
+       /* If we're shutting down GC, let's not start it up again */
+       if (gc->gc_enabled) {
+               wake_up_process(gc->gc_ts);
+               mod_timer(&gc->gc_timer,
+                         jiffies + msecs_to_jiffies(GC_TIME_MSECS));
+       }
 }
 
 static void pblk_gc_timer(unsigned long data)
@@ -630,9 +635,6 @@ void pblk_gc_exit(struct pblk *pblk)
 {
        struct pblk_gc *gc = &pblk->gc;
 
-       flush_workqueue(gc->gc_reader_wq);
-       flush_workqueue(gc->gc_line_reader_wq);
-
        gc->gc_enabled = 0;
        del_timer_sync(&gc->gc_timer);
        pblk_gc_stop(pblk, 1);
@@ -640,15 +642,17 @@ void pblk_gc_exit(struct pblk *pblk)
        if (gc->gc_ts)
                kthread_stop(gc->gc_ts);
 
+       if (gc->gc_reader_ts)
+               kthread_stop(gc->gc_reader_ts);
+
+       flush_workqueue(gc->gc_reader_wq);
        if (gc->gc_reader_wq)
                destroy_workqueue(gc->gc_reader_wq);
 
+       flush_workqueue(gc->gc_line_reader_wq);
        if (gc->gc_line_reader_wq)
                destroy_workqueue(gc->gc_line_reader_wq);
 
        if (gc->gc_writer_ts)
                kthread_stop(gc->gc_writer_ts);
-
-       if (gc->gc_reader_ts)
-               kthread_stop(gc->gc_reader_ts);
 }