diff mbox

[6/9] lightnvm: pblk: shut down gc gracefully during exit

Message ID 1507025113-13351-7-git-send-email-hans.ml.holmberg@owltronix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans Holmberg Oct. 3, 2017, 10:05 a.m. UTC 
From: Hans Holmberg <hans.holmberg@cnexlabs.com>

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

Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
---
 drivers/lightnvm/pblk-gc.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Comments

=?UTF-8?q?Javier=20Gonz=C3=A1lez?= Oct. 3, 2017, 10:38 a.m. UTC | #1 
> On 3 Oct 2017, at 12.05, Hans Holmberg <hans.ml.holmberg@owltronix.com> wrote:
> 
> From: Hans Holmberg <hans.holmberg@cnexlabs.com>
> 
> Shut down the GC workqueues and tasks in the right order.
> 
> Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
> ---
> drivers/lightnvm/pblk-gc.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
> index 374089f..f343f90 100644
> --- 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)
> @@ -625,9 +630,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);
> @@ -635,15 +637,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);
> }
> --
> 2.7.4

LGTM.

Reviewed-by: Javier González <javier@cnexlabs.com>
diff mbox

Patch

diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
index 374089f..f343f90 100644
--- 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)
@@ -625,9 +630,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);
@@ -635,15 +637,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);
 }